Skip to content

C
cloud-fb
Commit 20aa4240 by 王炜晨
Options

修改包名

parent b4585e8a
Showing with 143 additions and 19 deletions
backend/xyst.dinas.biz/src/main/model/com/xyst/dinas/biz/bill/xystOrganization.mk
...@@ -3,13 +3,13 @@ ...@@ -3,13 +3,13 @@
<type>bcp.biz.Bill</type> <type>bcp.biz.Bill</type>
<package>com.xyst.dinas.biz.bill</package> <package>com.xyst.dinas.biz.bill</package>
<title>组织机构</title> <title>组织机构</title>
<name>Organization</name> <name>xystOrganization</name>
<description>组织机构</description> <description>组织机构</description>
</header> </header>
<content> <content>
<bill> <bill>
<data> <data>
{"baseData":{"name":"Organization","title":"组织机构","billModel":"com.beecode.bap.biztrait.BasicBillBiztrait","functionLibrarys":[],"description":"组织机构","dataModel":"com.xyst.dinas.biz.datamodel.xystOrganization"},"serial":{"serialData":[{"segment":"literal","segmentData":"EM"},{"segment":"sequence","segmentData":{"start-with":0,"increment":1,"min":0,"max":99999,"length":5,"cycle":true,"cut-direction":"left","pad-string":"0","pad-direction":"left","cache-size":10}}],"buildTime":"add"},"formula":[],"workflow":{"workflow":"","processParamConfig":[]},"print":[],"authority":[]} {"baseData":{"name":"xystOrganization","title":"组织机构","billModel":"com.beecode.bap.biztrait.BasicBillBiztrait","functionLibrarys":[],"description":"组织机构","dataModel":"com.xyst.dinas.biz.datamodel.xystOrganization"},"serial":{"serialData":[{"segment":"literal","segmentData":"EM"},{"segment":"sequence","segmentData":{"start-with":0,"increment":1,"min":0,"max":99999,"length":5,"cycle":true,"cut-direction":"left","pad-string":"0","pad-direction":"left","cache-size":10}}],"buildTime":"add"},"formula":[],"workflow":{"workflow":"","processParamConfig":[]},"print":[],"authority":[]}
</data> </data>
</bill> </bill>
</content> </content>
......
backend/xyst.dinas.biz/src/main/model/com/xyst/dinas/biz/query/xystOrganization.mk
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<header> <header>
<type>inz.query.Query</type> <type>inz.query.Query</type>
<package>com.xyst.dinas.biz.query</package> <package>com.xyst.dinas.biz.query</package>
<name>Organization</name> <name>xystOrganization</name>
<title>组织机构</title> <title>组织机构</title>
<tags></tags> <tags></tags>
<description>组织机构</description> <description>组织机构</description>
......
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/Organization$sequence.jmx → backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/xystOrganization$sequence.jmx
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-sequence"> <metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-sequence">
<specification>1.0</specification> <specification>1.0</specification>
<id>ded44291-5b64-4e96-b979-9ab7c6b425c1</id> <id>5e568530-fff2-41dc-8389-caa10463e601</id>
<name>com.xyst.dinas.biz.bill.Organization$sequence</name> <name>com.xyst.dinas.biz.bill.xystOrganization$sequence</name>
<title>组织机构$sequence</title> <title>组织机构$sequence</title>
<description>组织机构</description> <description>组织机构</description>
<define>bcp.sequence</define> <define>bcp.sequence</define>
......
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/Organization$serial.jmx → backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/xystOrganization$serial.jmx
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-serial"> <metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-serial">
<specification>1.0</specification> <specification>1.0</specification>
<id>dbd4ce21-d600-4331-ad4c-13ba2d44917b</id> <id>fbf08768-f045-4eab-b49f-d94b99767d95</id>
<name>com.xyst.dinas.biz.bill.Organization$serial</name> <name>com.xyst.dinas.biz.bill.xystOrganization$serial</name>
<title>组织机构$serial</title> <title>组织机构$serial</title>
<description>组织机构</description> <description>组织机构</description>
<define>bcp.serial</define> <define>bcp.serial</define>
<define-version>1.0</define-version> <define-version>1.0</define-version>
<dependency>com.xyst.dinas.biz.datamodel.xystOrganization</dependency> <dependency>com.xyst.dinas.biz.datamodel.xystOrganization</dependency>
<dependency>com.xyst.dinas.biz.bill.Organization$sequence</dependency> <dependency>com.xyst.dinas.biz.bill.xystOrganization$sequence</dependency>
<content> <content>
<m:serial> <m:serial>
<m:input>com.xyst.dinas.biz.datamodel.xystOrganization</m:input> <m:input>com.xyst.dinas.biz.datamodel.xystOrganization</m:input>
...@@ -21,8 +21,8 @@ ...@@ -21,8 +21,8 @@
<m:length>5</m:length> <m:length>5</m:length>
<m:pad-direction>left</m:pad-direction> <m:pad-direction>left</m:pad-direction>
<m:pad-string>0</m:pad-string> <m:pad-string>0</m:pad-string>
<m:key>com.xyst.dinas.biz.bill.Organization$serial</m:key> <m:key>com.xyst.dinas.biz.bill.xystOrganization$serial</m:key>
<m:sequenceName>com.xyst.dinas.biz.bill.Organization$sequence</m:sequenceName> <m:sequenceName>com.xyst.dinas.biz.bill.xystOrganization$sequence</m:sequenceName>
</m:sequence> </m:sequence>
</m:segments> </m:segments>
</m:serial> </m:serial>
......
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/Organization.jmx → backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/xystOrganization.jmx
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-biztype"> <metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-biztype">
<specification>1.0</specification> <specification>1.0</specification>
<id>e96dd315-e9ac-4317-a05a-313d1e597f36</id> <id>2edef471-de90-4cf9-b4ec-d10ec115ce9b</id>
<name>com.xyst.dinas.biz.bill.Organization</name> <name>com.xyst.dinas.biz.bill.xystOrganization</name>
<title>组织机构</title> <title>组织机构</title>
<description>组织机构</description> <description>组织机构</description>
<define>bcp.biz.Biztype</define> <define>bcp.biz.Biztype</define>
<define-version>1.0</define-version> <define-version>1.0</define-version>
<dependency>com.xyst.dinas.biz.datamodel.xystOrganization</dependency> <dependency>com.xyst.dinas.biz.datamodel.xystOrganization</dependency>
<dependency>com.xyst.dinas.biz.bill.Organization$serial</dependency> <dependency>com.xyst.dinas.biz.bill.xystOrganization$serial</dependency>
<dependency>com.beecode.bap.biztrait.BasicBillBiztrait</dependency> <dependency>com.beecode.bap.biztrait.BasicBillBiztrait</dependency>
<content> <content>
<m:biztype> <m:biztype>
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<m:inheritance> <m:inheritance>
<m:biztrait>com.beecode.bap.biztrait.BasicBillBiztrait</m:biztrait> <m:biztrait>com.beecode.bap.biztrait.BasicBillBiztrait</m:biztrait>
<m:config type="xml"> <m:config type="xml">
<m:content>&lt;billBasictraitConfig&gt;&lt;formulas/&gt;&lt;parents&gt;&lt;parent&gt;&lt;billCodeConfig&gt;&lt;serialName&gt;com.xyst.dinas.biz.bill.Organization$serial&lt;/serialName&gt;&lt;buildTime&gt;add&lt;/buildTime&gt;&lt;/billCodeConfig&gt;&lt;/parent&gt;&lt;parent&gt;&lt;workflowConfig&gt;&lt;workflow&gt;&lt;/workflow&gt;&lt;/workflowConfig&gt;&lt;/parent&gt;&lt;parent&gt;&lt;printConfig&gt;&lt;templates/&gt;&lt;/printConfig&gt;&lt;/parent&gt;&lt;/parents&gt;&lt;functionLibrarys/&gt;&lt;/billBasictraitConfig&gt;</m:content> <m:content>&lt;billBasictraitConfig&gt;&lt;formulas/&gt;&lt;parents&gt;&lt;parent&gt;&lt;billCodeConfig&gt;&lt;serialName&gt;com.xyst.dinas.biz.bill.xystOrganization$serial&lt;/serialName&gt;&lt;buildTime&gt;add&lt;/buildTime&gt;&lt;/billCodeConfig&gt;&lt;/parent&gt;&lt;parent&gt;&lt;workflowConfig&gt;&lt;workflow&gt;&lt;/workflow&gt;&lt;/workflowConfig&gt;&lt;/parent&gt;&lt;parent&gt;&lt;printConfig&gt;&lt;templates/&gt;&lt;/printConfig&gt;&lt;/parent&gt;&lt;/parents&gt;&lt;functionLibrarys/&gt;&lt;/billBasictraitConfig&gt;</m:content>
</m:config> </m:config>
</m:inheritance> </m:inheritance>
</m:inheritances> </m:inheritances>
......
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/query/Organization.jmx → backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/query/xystOrganization.jmx
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/inz-query"> <metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/inz-query">
<specification>1.0</specification> <specification>1.0</specification>
<id>e9932470-2599-4a92-a1e2-1d5d418a96a3</id> <id>e9932470-2599-4a92-a1e2-1d5d418a96a3</id>
<name>com.xyst.dinas.biz.query.Organization</name> <name>com.xyst.dinas.biz.query.xystOrganization</name>
<title>组织机构</title> <title>组织机构</title>
<description>组织机构</description> <description>组织机构</description>
<define>inz.query.Query</define> <define>inz.query.Query</define>
......
backend/xyst.dinas.contract/src/main/resources/com/xyst/dinas/contract/datamodel/Contract.jmx
...@@ -837,7 +837,17 @@ ...@@ -837,7 +837,17 @@
<m:default></m:default> <m:default></m:default>
</m:attribute> </m:attribute>
<m:attribute> <m:attribute>
<m:annotations/> <m:annotations>
<m:annotation>
<m:type>javax.persistence.Column</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>detail_auto</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>10a76a69-ea9c-40e7-a29a-c7f7378838e7</m:id> <m:id>10a76a69-ea9c-40e7-a29a-c7f7378838e7</m:id>
<m:name>detailAuto</m:name> <m:name>detailAuto</m:name>
<m:title>是否自动生成子表</m:title> <m:title>是否自动生成子表</m:title>
......
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/advanquery/SalesPlanAdvQuery.jmx
...@@ -10,7 +10,36 @@ ...@@ -10,7 +10,36 @@
<content> <content>
<template> <template>
<sql-type>SQL</sql-type> <sql-type>SQL</sql-type>
<sql>SELECT planningCycle.title as planningCycleTitle from NeedPlan as needPlan left join PlanningCycle as planningCycle on needPlan.planningCycle = planningCycle.id </sql> <sql>
SELECT
xystorganization.NAME AS organization,
planningCycle.title AS planningCycleTitle,
projectFiled.projectName AS projectName,
'销售计划' AS type,
salesPlan.requiredTotalAmount AS requiredTotalAmount,
salesPlan.planTotalAmount AS totalPlanAmount,
salesPlan.actualSaleTotalAmount AS actualSaleTotalAmount
FROM
SalesPlan AS salesPlan
LEFT JOIN xystOrganization AS xystorganization ON xystorganization.id = salesPlan.regionalCompany
LEFT JOIN PlanningCycle AS planningCycle ON planningCycle.id = salesPlan.planningCycle
LEFT JOIN NeedPlan AS needPlan ON needPlan.planningCycle = salesPlan.planningCycle
LEFT JOIN ProjectFiled AS projectFiled ON projectFiled.id = needPlan.project UNION
SELECT
xystorganizationrTemp.NAME AS organization,
planningCycleTemp.title AS planningCycleTitle,
projectFiledTemp.projectName AS projectName,
'临时销售计划' AS type,
needPlanTemp.needPlanTotalAmount AS requiredTotalAmount,
salesPlanTemp.totalPlanAmount AS totalPlanAmount,
'' AS actualSaleTotalAmount
FROM
SalesPlanTemp AS salesPlanTemp
LEFT JOIN xystOrganizationrTemp AS xystorganizationrTemp ON xystorganizationrTemp.id = salesPlanTemp.regional_company
LEFT JOIN PlanningCycleTemp AS planningCycleTemp ON planningCycleTemp.id = salesPlanTemp.planningCycle
LEFT JOIN ProjectFiledTemp AS projectFiledTemp ON projectFiledTemp.id = salesPlanTemp.project
LEFT JOIN NeedPlanTemp AS needPlanTemp ON needPlanTemp.planningCycle = salesPlanTemp.planningCycle
</sql>
</template> </template>
</content> </content>
</metadata> </metadata>
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/advanquery/SalesPlanQueryView.jmx
...@@ -65,7 +65,18 @@ ...@@ -65,7 +65,18 @@
"columns": [ "columns": [
{ {
"type": "VALUE", "type": "VALUE",
"title": "账单金额", "title": "区域公司",
"key": "organization",
"columnType": {
"name": "select",
"data": {
"selected": true
}
}
},
{
"type": "VALUE",
"title": "计划周期",
"key": "planningCycleTitle", "key": "planningCycleTitle",
"columnType": { "columnType": {
"name": "select", "name": "select",
...@@ -73,7 +84,81 @@ ...@@ -73,7 +84,81 @@
"selected": true "selected": true
} }
} }
} },
{
"type": "VALUE",
"title": "项目名称",
"key": "projectName",
"columnType": {
"name": "select",
"data": {
"selected": true
}
}
},
{
"type": "VALUE",
"title": "计划类型",
"key": "type",
"columnType": {
"name": "select",
"data": {
"selected": true
}
}
},
{
"type": "VALUE",
"title": "需用计划量（吨）",
"key": "requiredTotalAmount",
"columnType": {
"name": "select",
"data": {
"selected": true
}
}
},
{
"type": "VALUE",
"title": "销售计划量（吨）",
"key": "totalPlanAmount",
"columnType": {
"name": "select",
"data": {
"selected": true
}
}
},
{
"type": "VALUE",
"title": "实际运输量（吨）",
"key": "actualSaleTotalAmount",
"columnType": {
"name": "select",
"data": {
"selected": true
}
}
},
{
"type" : "ACTION",
"key" : "new_logo77b16046-4d20-4e43-b6bc-5e5e264014fe",
"title" : "操作列",
"width" : 150,
"actions" : [ {
"name" : "new_action",
"title" : "详情",
"action" : "openDetail",
"param" : {
"viewName" : "123",
"billId" : "id"
},
"type" : ""
} ],
"nodeKey" : 13,
"align" : "center",
"isShow" : false
}
] ]
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment