Skip to content

C
cloud-fb
Commit a287f82c by 杨清松
Options

需用计划加购砂单位

parent 14e18d4a
Showing with 62 additions and 5 deletions
backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/datamodel/NeedPlan.mk
...@@ -31,6 +31,12 @@ ...@@ -31,6 +31,12 @@
<annotation id='ada2d620-105b-47b4-88e2-ca1a20f77124' attributeId='ed744460-9e80-43fb-a1b1-541039f01dbd' name='mappingType' value='many-to-one'> <annotation id='ada2d620-105b-47b4-88e2-ca1a20f77124' attributeId='ed744460-9e80-43fb-a1b1-541039f01dbd' name='mappingType' value='many-to-one'>
</annotation> </annotation>
</attribute> </attribute>
<attribute id='29a06969-5581-44ec-947e-30d36a5854e4' name='purchaseSandUnit' columnName='purchase_sand_unit' title='购砂单位' type='com.xyst.dinas.project.datamodel.PurchaseSandCompany' default='' precision='' isArray='false'>
<annotation id='acb65425-001b-4949-bfa9-454cc48178bb' attributeId='d84f42c7-524b-4f1e-ad0f-8540b6d4f589' name='length' value='undefined'>
</annotation>
<annotation id='551227d3-3d2b-49fc-8a1e-26318ddea29a' attributeId='45a7cefe-97b6-4bdb-9480-51718d5f35bc' name='mappingType' value='many-to-one'>
</annotation>
</attribute>
<attribute id='223d42f7-5d33-461d-9e00-33a5b6bfc87e' name='planningCycle' columnName='planning_cycle' title='计划周期' type='com.xyst.dinas.biz.datamodel.PlanningCycle' default='' precision='' isArray='false'> <attribute id='223d42f7-5d33-461d-9e00-33a5b6bfc87e' name='planningCycle' columnName='planning_cycle' title='计划周期' type='com.xyst.dinas.biz.datamodel.PlanningCycle' default='' precision='' isArray='false'>
<annotation id='ce75318c-46ca-45a7-8482-f400cebd8b4c' attributeId='25d7dcfa-2180-4114-b1e7-e21db55f6cc5' name='length' value='undefined'> <annotation id='ce75318c-46ca-45a7-8482-f400cebd8b4c' attributeId='25d7dcfa-2180-4114-b1e7-e21db55f6cc5' name='length' value='undefined'>
</annotation> </annotation>
......
backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/query/NeedPlan.mk
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
</ref> </ref>
<description></description> <description></description>
</field> </field>
<field title='项目name'> <field title='合同name'>
<name>contract.contractName</name> <name>contract.contractName</name>
<type>string</type> <type>string</type>
<ref> <ref>
...@@ -86,6 +86,24 @@ ...@@ -86,6 +86,24 @@
</ref> </ref>
<description></description> <description></description>
</field> </field>
<field title='购砂单位'>
<name>purchaseSandUnit.id</name>
<type>uuid</type>
<ref>
<type></type>
<name>com.xyst.dinas.project.datamodel.PurchaseSandCompany</name>
</ref>
<description></description>
</field>
<field title='购砂单位name'>
<name>purchaseSandUnit.name</name>
<type>string</type>
<ref>
<type></type>
<name>com.xyst.dinas.project.datamodel.PurchaseSandCompany</name>
</ref>
<description></description>
</field>
<field title='计划周期'> <field title='计划周期'>
<name>planningCycle.id</name> <name>planningCycle.id</name>
<type>uuid</type> <type>uuid</type>
......
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/bill/NeedPlan$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>dc491d79-c661-41b7-b972-2610d41a0b4f</id> <id>62eb70a8-08f8-4c72-ac76-1a3cb8933c2b</id>
<name>com.xyst.dinas.sales.bill.NeedPlan$sequence</name> <name>com.xyst.dinas.sales.bill.NeedPlan$sequence</name>
<title>需用计划$sequence</title> <title>需用计划$sequence</title>
<description>需用计划</description> <description>需用计划</description>
......
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/bill/NeedPlan$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>915502ee-df4a-4308-8cda-a1b5eb8a31db</id> <id>10a841fd-093c-423d-9ed8-f54f9ce65ce1</id>
<name>com.xyst.dinas.sales.bill.NeedPlan$serial</name> <name>com.xyst.dinas.sales.bill.NeedPlan$serial</name>
<title>需用计划$serial</title> <title>需用计划$serial</title>
<description>需用计划</description> <description>需用计划</description>
......
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/bill/NeedPlan.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>d40bd4d2-24b6-4d11-b9fb-2ef125b22852</id> <id>78ebbc11-054b-49b3-ba24-55ecac56112f</id>
<name>com.xyst.dinas.sales.bill.NeedPlan</name> <name>com.xyst.dinas.sales.bill.NeedPlan</name>
<title>需用计划</title> <title>需用计划</title>
<description>需用计划</description> <description>需用计划</description>
......
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/datamodel/NeedPlan.jmx
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
<define>bcp.type.Class</define> <define>bcp.type.Class</define>
<define-version>1.0</define-version> <define-version>1.0</define-version>
<dependency>com.xyst.dinas.biz.datamodel.Organization</dependency> <dependency>com.xyst.dinas.biz.datamodel.Organization</dependency>
<dependency>com.xyst.dinas.project.datamodel.PurchaseSandCompany</dependency>
<dependency>com.xyst.dinas.sales.datamodel.NeedPlan$NeedPlanDetail</dependency> <dependency>com.xyst.dinas.sales.datamodel.NeedPlan$NeedPlanDetail</dependency>
<dependency>bcp.type.constraint.StringLength</dependency> <dependency>bcp.type.constraint.StringLength</dependency>
<dependency>com.beecode.bap.biztrait.datamodel.SubTableAnnotation</dependency> <dependency>com.beecode.bap.biztrait.datamodel.SubTableAnnotation</dependency>
...@@ -53,6 +54,15 @@ ...@@ -53,6 +54,15 @@
</m:attribute> </m:attribute>
<m:attribute> <m:attribute>
<m:annotations/> <m:annotations/>
<m:id>29a06969-5581-44ec-947e-30d36a5854e4</m:id>
<m:name>purchaseSandUnit</m:name>
<m:title>购砂单位</m:title>
<m:type>com.xyst.dinas.project.datamodel.PurchaseSandCompany</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations/>
<m:id>223d42f7-5d33-461d-9e00-33a5b6bfc87e</m:id> <m:id>223d42f7-5d33-461d-9e00-33a5b6bfc87e</m:id>
<m:name>planningCycle</m:name> <m:name>planningCycle</m:name>
<m:title>计划周期</m:title> <m:title>计划周期</m:title>
......
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/query/NeedPlan.jmx
...@@ -92,7 +92,7 @@ ...@@ -92,7 +92,7 @@
</m:field> </m:field>
<m:field> <m:field>
<m:name>contract.contractName</m:name> <m:name>contract.contractName</m:name>
<m:title>项目name</m:title> <m:title>合同name</m:title>
<m:type>string</m:type> <m:type>string</m:type>
<m:ref> <m:ref>
<m:name>com.xyst.dinas.contract.datamodel.Contract</m:name> <m:name>com.xyst.dinas.contract.datamodel.Contract</m:name>
...@@ -101,6 +101,26 @@ ...@@ -101,6 +101,26 @@
<m:desc></m:desc> <m:desc></m:desc>
</m:field> </m:field>
<m:field> <m:field>
<m:name>purchaseSandUnit.id</m:name>
<m:title>购砂单位</m:title>
<m:type>uuid</m:type>
<m:ref>
<m:name>com.xyst.dinas.project.datamodel.PurchaseSandCompany</m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>purchaseSandUnit.name</m:name>
<m:title>购砂单位name</m:title>
<m:type>string</m:type>
<m:ref>
<m:name>com.xyst.dinas.project.datamodel.PurchaseSandCompany</m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>planningCycle.id</m:name> <m:name>planningCycle.id</m:name>
<m:title>计划周期</m:title> <m:title>计划周期</m:title>
<m:type>uuid</m:type> <m:type>uuid</m:type>
......
backend/xyst.dinas.sales/src/main/resources/config/NeedPlan.hbm.xml
...@@ -48,6 +48,9 @@ ...@@ -48,6 +48,9 @@
<many-to-one name="contract" entity-name="com.xyst.dinas.contract.datamodel.Contract" fetch="select"> <many-to-one name="contract" entity-name="com.xyst.dinas.contract.datamodel.Contract" fetch="select">
<column name="contract" not-null="false"></column> <column name="contract" not-null="false"></column>
</many-to-one> </many-to-one>
<many-to-one name="purchaseSandUnit" entity-name="com.xyst.dinas.project.datamodel.PurchaseSandCompany" fetch="select">
<column name="purchase_sand_unit" not-null="false"/>
</many-to-one>
<many-to-one name="planningCycle" entity-name="com.xyst.dinas.biz.datamodel.PlanningCycle" fetch="select"> <many-to-one name="planningCycle" entity-name="com.xyst.dinas.biz.datamodel.PlanningCycle" fetch="select">
<column name="planning_cycle" not-null="false"></column> <column name="planning_cycle" not-null="false"></column>
</many-to-one> </many-to-one>
......
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