补充提交

backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/datamodel/DinasType.jmx

@@ -13,15 +13,50 @@
 	<dependency>com.beecode.inz.common.datamodel.BaseInfo</dependency>
 	<dependency>com.xyst.dinas.biz.datamodel.xystOrganization</dependency>
 	<dependency>com.beecode.bap.biztrait.datamodel.BasicBillRequirement</dependency>
+	<dependency>javax.persistence.Column</dependency>
+	<dependency>javax.persistence.Table</dependency>
+	<dependency>javax.persistence.Entity</dependency>
+	<dependency>bcp.type.constraint.StringLength</dependency>
+	<dependency>javax.persistence.JoinColumn</dependency>
+	<dependency>javax.persistence.ManyToOne</dependency>
 	<content>
 		<m:class>
+			<m:annotations>
+				<m:annotation>
+					<m:type>javax.persistence.Entity</m:type>
+				</m:annotation>
+				<m:annotation>
+					<m:type>javax.persistence.Table</m:type>
+					<m:properties>
+						<m:property>
+							<m:key>name</m:key>
+							<m:value>xyst_dinas_contract_master</m:value>
+						</m:property>
+					</m:properties>
+				</m:annotation>
+			</m:annotations>
 			<m:parents>
 				<m:parent>com.beecode.inz.common.datamodel.BaseInfo</m:parent>
                 <m:parent>com.beecode.bap.biztrait.datamodel.BasicBillRequirement</m:parent>
 			</m:parents>
+			
 			<m:attributes>
 				<m:attribute>
-					<m:annotations/>
+					<m:annotations>
+						<m:annotation>
+							<m:type>bcp.type.constraint.StringLength</m:type>
+							<m:value>50</m:value>
+						</m:annotation>
+						<m:annotation>
+							<m:type>javax.persistence.Column</m:type>
+							<m:properties>
+								<m:property>
+									<m:key>name</m:key>
+									<m:value>dinas_type_name</m:value>
+								</m:property>
+							</m:properties>
+						</m:annotation>
+					</m:annotations>
 					<m:id>38095d83-03e6-4fd3-82ed-11da0f330367</m:id>
 					<m:name>dinasTypeName</m:name>
 					<m:title>砂石种类名称</m:title>
@@ -30,7 +65,21 @@
 					<m:default></m:default>
 				</m:attribute>
 				<m:attribute>
-					<m:annotations/>
+					<m:annotations>
+						<m:annotation>
+							<m:type>bcp.type.constraint.StringLength</m:type>
+							<m:value>50</m:value>
+						</m:annotation>
+						<m:annotation>
+							<m:type>javax.persistence.Column</m:type>
+							<m:properties>
+								<m:property>
+									<m:key>name</m:key>
+									<m:value>dinas_is_sell</m:value>
+								</m:property>
+							</m:properties>
+						</m:annotation>
+					</m:annotations>
 					<m:id>38095d83-03e6-4fd3-82ed-11da0f330367</m:id>
 					<m:name>dinasIsSell</m:name>
 					<m:title>是否售卖</m:title>
@@ -39,7 +88,24 @@
 					<m:default></m:default>
 				</m:attribute>
 				<m:attribute>
-					<m:annotations/>
+					<m:annotations>
+						<m:annotation>
+							<m:type>javax.persistence.ManyToOne</m:type>
+						</m:annotation>
+						<m:annotation>
+							<m:type>javax.persistence.JoinColumn</m:type>
+							<m:properties>
+								<m:property>
+									<m:key>name</m:key>
+									<m:value>regional_company</m:value>
+								</m:property>
+								<m:property>
+									<m:key>referencedColumnName</m:key>
+									<m:value>ID</m:value>
+								</m:property>
+							</m:properties>
+						</m:annotation>
+					</m:annotations>
 					<m:id>cdaced8b-be3f-440e-a0f3-ce9ae701124a</m:id>
 					<m:name>regionalCompany</m:name>
 					<m:title>所属组织机构</m:title>
@@ -63,6 +129,19 @@
 				</m:attribute>
 				<m:attribute>
 					<m:annotations>
+						<m:annotation>
+							<m:type>bcp.type.constraint.StringLength</m:type>
+							<m:value>50</m:value>
+						</m:annotation>
+						<m:annotation>
+							<m:type>javax.persistence.Column</m:type>
+							<m:properties>
+								<m:property>
+									<m:key>name</m:key>
+									<m:value>type</m:value>
+								</m:property>
+							</m:properties>
+						</m:annotation>
 					</m:annotations>
 					<m:id>c3a59b7d-ee72-4e8e-a961-441ab4a07055</m:id>
 					<m:name>type</m:name>
@@ -72,7 +151,21 @@
 					<m:default></m:default>
 				</m:attribute>
                <m:attribute>
-					<m:annotations></m:annotations>
+					<m:annotations>
+						<m:annotation>
+							<m:type>bcp.type.constraint.StringLength</m:type>
+							<m:value>50</m:value>
+						</m:annotation>
+						<m:annotation>
+							<m:type>javax.persistence.Column</m:type>
+							<m:properties>
+								<m:property>
+									<m:key>name</m:key>
+									<m:value>sort_order</m:value>
+								</m:property>
+							</m:properties>
+						</m:annotation>
+					</m:annotations>
 					<m:id>bd60d3ff-9308-4f15-aa1e-67d2923192f2</m:id>
 					<m:name>sortOrder</m:name>
 					<m:title>排序</m:title>

backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/datamodel/WarnSetting.jmx

@@ -173,42 +173,42 @@
 				<m:attribute>
 					<m:annotations>
 						<m:annotation>
-							<m:type>bcp.type.constraint.StringLength</m:type>
-							<m:value>100</m:value>
-						</m:annotation>
-						<m:annotation>
 							<m:type>javax.persistence.Column</m:type>
 							<m:properties>
 								<m:property>
 									<m:key>name</m:key>
-									<m:value>warn_calculator</m:value>
+									<m:value>is_open</m:value>
 								</m:property>
 							</m:properties>
 						</m:annotation>
 					</m:annotations>
 					<m:id>cbb5b983-299b-4259-97d9-6470651bb18b</m:id>
-					<m:name>warnCalculator</m:name>
-					<m:title>预警计算器</m:title>
-					<m:type>string</m:type>
+					<m:name>isOpen</m:name>
+					<m:title>是否开启</m:title>
+					<m:type>boolean</m:type>
 					<m:description></m:description>
 					<m:default></m:default>
 				</m:attribute>
 				<m:attribute>
 					<m:annotations>
 						<m:annotation>
+							<m:type>bcp.type.constraint.StringLength</m:type>
+							<m:value>100</m:value>
+						</m:annotation>
+						<m:annotation>
 							<m:type>javax.persistence.Column</m:type>
 							<m:properties>
 								<m:property>
 									<m:key>name</m:key>
-									<m:value>is_open</m:value>
+									<m:value>warn_calculator</m:value>
 								</m:property>
 							</m:properties>
 						</m:annotation>
 					</m:annotations>
 					<m:id>cbb5b983-299b-4259-97d9-6470651bb18b</m:id>
-					<m:name>isOpen</m:name>
-					<m:title>是否开启</m:title>
-					<m:type>boolean</m:type>
+					<m:name>warnCalculator</m:name>
+					<m:title>预警计算器</m:title>
+					<m:type>string</m:type>
 					<m:description></m:description>
 					<m:default></m:default>
 				</m:attribute>

backend/xyst.dinas.contract/src/main/model/com/xyst/dinas/contract/query/ContractDetail.mk

@@ -9,7 +9,7 @@
   </header>
   <content>
     <customQuery id='58b626c6-c457-4bb3-81e4-d09f11ecd553'>
-      <kclass>com.xyst.dinas.contract.datamodel.Contract$contractDetail</kclass>
+      <kclass>com.xyst.dinas.contract.datamodel.ContractAssociatedcontractDetail</kclass>
       <innerScene title='全部'>
         <id>cfd478b1-7e2e-41c5-bb5e-f6500c101341</id>
         <javaImplement>com.beecode.inz.common.scene.CommonSubAllScene</javaImplement>

backend/xyst.dinas.contract/src/main/resources/com/xyst/dinas/contract/datamodel/Contract.jmx

@@ -15,13 +15,13 @@
 	<dependency>bcp.type.constraint.Numeric</dependency>
 	<dependency>javax.persistence.JoinColumn</dependency>
 	<dependency>javax.persistence.OneToMany</dependency>
+	<dependency>com.xyst.dinas.contract.datamodel.ContractAssociatedcontractDetail</dependency>
 	<dependency>com.xyst.dinas.biz.datamodel.xystOrganization</dependency>
 	<dependency>com.xyst.dinas.project.datamodel.PurchaseSandCompany</dependency>
 	<dependency>javax.persistence.Column</dependency>
 	<dependency>javax.persistence.Table</dependency>
 	<dependency>com.xyst.dinas.biz.datamodel.Station</dependency>
 	<dependency>com.beecode.bap.biztrait.datamodel.BasicBillRequirement</dependency>
-	<dependency>com.xyst.dinas.contract.datamodel.Contract$contractDetail</dependency>
 	<dependency>com.xyst.dinas.project.datamodel.ProjectFiled</dependency>
 	<content>
 		<m:class>
@@ -896,7 +896,7 @@
 					<m:id>06a76145-09c6-4e83-b91e-66aec616b9ca</m:id>
 					<m:name>contractDetails</m:name>
 					<m:title>合同子表</m:title>
-					<m:type>com.xyst.dinas.contract.datamodel.Contract$contractDetail[]</m:type>
+					<m:type>com.xyst.dinas.contract.datamodel.ContractAssociatedcontractDetail[]</m:type>
 					<m:description></m:description>
 					<m:default></m:default>
 				</m:attribute>

backend/xyst.dinas.contract/src/main/resources/com/xyst/dinas/contract/query/ContractDetail.jmx

@@ -6,10 +6,10 @@
 	<title>合同详情子表</title>
 	<define>inz.query.Query</define>
 	<define-version>1.0</define-version>
-	<dependency>com.xyst.dinas.contract.datamodel.Contract$contractDetail</dependency>
+	<dependency>com.xyst.dinas.contract.datamodel.ContractAssociatedcontractDetail</dependency>
 	<content>
 		<m:query>
-			<m:type>com.xyst.dinas.contract.datamodel.Contract$contractDetail</m:type>
+			<m:type>com.xyst.dinas.contract.datamodel.ContractAssociatedcontractDetail</m:type>
 			<m:dataProcessor></m:dataProcessor>
 			<m:authorityItem></m:authorityItem>
 			<m:innerScenes>

backend/xyst.dinas.project/src/main/resources/com/xyst/dinas/project/datamodel/ProjectFiled.jmx

@@ -7,18 +7,18 @@
 	<description>项目备案</description>
 	<define>bcp.type.Class</define>
 	<define-version>1.0</define-version>
-	<dependency>com.xyst.dinas.project.datamodel.ProjectFiled$ProjectFiledDinasDetail</dependency>
 	<dependency>javax.persistence.Entity</dependency>
 	<dependency>bcp.type.constraint.StringLength</dependency>
 	<dependency>com.beecode.bap.biztrait.datamodel.SubTableAnnotation</dependency>
 	<dependency>javax.persistence.ManyToOne</dependency>
 	<dependency>com.beecode.inz.common.datamodel.BaseInfo</dependency>
-	<dependency>com.xyst.dinas.project.datamodel.ProjectFiled$ProjectSubContractorDetail</dependency>
 	<dependency>javax.persistence.JoinColumn</dependency>
+	<dependency>com.xyst.dinas.project.datamodel.ProjectFiledAssociatedProjectFiledDinasDetail</dependency>
 	<dependency>javax.persistence.OneToMany</dependency>
 	<dependency>com.xyst.dinas.biz.datamodel.xystOrganization</dependency>
 	<dependency>javax.persistence.Column</dependency>
 	<dependency>javax.persistence.Table</dependency>
+	<dependency>com.xyst.dinas.project.datamodel.ProjectFiledAssociatedProjectSubContractorDetail</dependency>
 	<dependency>com.beecode.bap.biztrait.datamodel.BasicBillRequirement</dependency>
 	<dependency>com.xyst.dinas.project.dict.datamodel.ProjectType</dependency>
 	<content>
@@ -287,7 +287,7 @@
 					<m:id>06a76145-09c6-4e88-b91e-66aec616b9ca</m:id>
 					<m:name>ProjectFiledDinasDetails</m:name>
 					<m:title>砂石明细表</m:title>
-					<m:type>com.xyst.dinas.project.datamodel.ProjectFiled$ProjectFiledDinasDetail[]</m:type>
+					<m:type>com.xyst.dinas.project.datamodel.ProjectFiledAssociatedProjectFiledDinasDetail[]</m:type>
 					<m:description></m:description>
 					<m:default></m:default>
 				</m:attribute>
@@ -300,7 +300,7 @@
 					<m:id>cd606daf-07b1-47c0-a96c-d604040b3222</m:id>
 					<m:name>ProjectSubContractorDetails</m:name>
 					<m:title>分包明细表</m:title>
-					<m:type>com.xyst.dinas.project.datamodel.ProjectFiled$ProjectSubContractorDetail[]</m:type>
+					<m:type>com.xyst.dinas.project.datamodel.ProjectFiledAssociatedProjectSubContractorDetail[]</m:type>
 					<m:description></m:description>
 					<m:default></m:default>
 				</m:attribute>

backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/advanquery/SalesPlanDetailAdvQuery.jmx

@@ -13,12 +13,12 @@
 			<sql>
 			SELECT
 				salesPlanDetail.id AS id,
-				dinasType.name AS dinasTypeName,
+				dinasType.dinasTypeName AS dinasTypeName,
 				salesPlanDetail.requiredAmount AS requiredAmount,
 				salesPlanDetail.planAmount AS planAmount,
 				salesPlanDetail.actualSaleAmount AS actualSaleAmount 
 			FROM
-				NeedPlan$NeedPlanDetail AS salesPlanDetail
+				NeedPlanAssociatedNeedPlanDetail AS salesPlanDetail
 				LEFT JOIN DinasType AS dinasType ON dinasType.id = salesPlanDetail.dinasType
 				WHERE salesPlanDetail.masterId = :?billId
 				</sql>

backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/datamodel/NeedPlan.jmx

@@ -8,7 +8,6 @@
 	<define>bcp.type.Class</define>
 	<define-version>1.0</define-version>
 	<dependency>javax.persistence.Entity</dependency>
-	<dependency>com.xyst.dinas.sales.datamodel.NeedPlan$NeedPlanDetail</dependency>
 	<dependency>bcp.type.constraint.StringLength</dependency>
 	<dependency>com.beecode.bap.biztrait.datamodel.SubTableAnnotation</dependency>
 	<dependency>javax.persistence.ManyToOne</dependency>
@@ -23,6 +22,7 @@
 	<dependency>javax.persistence.Table</dependency>
 	<dependency>com.beecode.bap.biztrait.datamodel.BasicBillRequirement</dependency>
 	<dependency>com.xyst.dinas.project.datamodel.ProjectFiled</dependency>
+	<dependency>com.xyst.dinas.sales.datamodel.NeedPlanAssociatedNeedPlanDetail</dependency>
 	<dependency>com.xyst.dinas.biz.datamodel.PlanningCycle</dependency>
 	<content>
 		<m:class>
@@ -363,7 +363,7 @@
 					<m:id>b706360e-39b1-44c5-9ed6-0b82c4a72807</m:id>
 					<m:name>NeedPlanDetails</m:name>
 					<m:title>需用计划明细表</m:title>
-					<m:type>com.xyst.dinas.sales.datamodel.NeedPlan$NeedPlanDetail[]</m:type>
+					<m:type>com.xyst.dinas.sales.datamodel.NeedPlanAssociatedNeedPlanDetail[]</m:type>
 					<m:description></m:description>
 					<m:default></m:default>
 				</m:attribute>

backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/datamodel/SalesPlan.jmx

@@ -8,6 +8,7 @@
 	<define-version>1.0</define-version>
 	<dependency>javax.persistence.Entity</dependency>
 	<dependency>bcp.type.constraint.StringLength</dependency>
+	<dependency>com.xyst.dinas.sales.datamodel.SalesPlanAssociatedSalesPlanDetail</dependency>
 	<dependency>com.beecode.bap.biztrait.datamodel.SubTableAnnotation</dependency>
 	<dependency>javax.persistence.ManyToOne</dependency>
 	<dependency>com.beecode.inz.common.datamodel.BaseInfo</dependency>
@@ -19,7 +20,6 @@
 	<dependency>javax.persistence.Table</dependency>
 	<dependency>com.beecode.bap.biztrait.datamodel.BasicBillRequirement</dependency>
 	<dependency>com.xyst.dinas.biz.datamodel.PlanningCycle</dependency>
-	<dependency>com.xyst.dinas.sales.datamodel.SalesPlan$SalesPlanDetail</dependency>
 	<content>
 		<m:class>
 			<m:annotations>
@@ -240,7 +240,7 @@
 					<m:id>06a76145-09c6-4e83-b91e-66aec616b9ca</m:id>
 					<m:name>SalesPlanDetails</m:name>
 					<m:title>销售计划子表</m:title>
-					<m:type>com.xyst.dinas.sales.datamodel.SalesPlan$SalesPlanDetail[]</m:type>
+					<m:type>com.xyst.dinas.sales.datamodel.SalesPlanAssociatedSalesPlanDetail[]</m:type>
 					<m:description></m:description>
 					<m:default></m:default>
 				</m:attribute>

backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/datamodel/SalesPlanTemp.jmx

@@ -17,9 +17,9 @@
 	<dependency>com.xyst.dinas.contract.datamodel.Contract</dependency>
 	<dependency>com.xyst.dinas.biz.datamodel.xystOrganization</dependency>
 	<dependency>javax.persistence.Column</dependency>
-	<dependency>com.xyst.dinas.sales.datamodel.SalesPlanTemp$SalesPlanTempDetail</dependency>
 	<dependency>javax.persistence.Table</dependency>
 	<dependency>com.xyst.dinas.biz.datamodel.Station</dependency>
+	<dependency>com.xyst.dinas.sales.datamodel.SalesPlanTempAssociatedSalesPlanTempDetail</dependency>
 	<dependency>com.beecode.bap.biztrait.datamodel.BasicBillRequirement</dependency>
 	<dependency>com.xyst.dinas.project.datamodel.ProjectFiled</dependency>
 	<dependency>com.xyst.dinas.biz.datamodel.PlanningCycle</dependency>
@@ -303,7 +303,7 @@
 					<m:id>b706360e-39b1-44c5-9ed6-0b82c4a72807</m:id>
 					<m:name>SalesPlanTempDetails</m:name>
 					<m:title>临时销售计划子表</m:title>
-					<m:type>com.xyst.dinas.sales.datamodel.SalesPlanTemp$SalesPlanTempDetail[]</m:type>
+					<m:type>com.xyst.dinas.sales.datamodel.SalesPlanTempAssociatedSalesPlanTempDetail[]</m:type>
 					<m:description></m:description>
 					<m:default></m:default>
 				</m:attribute>