解决需用计划分析中的销售计划量计算错误的问题

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

@@ -18,13 +18,17 @@
 				projectFiled.projectName AS projectName,
 				'需用计划' AS type,
 				needPlan.needPlanTotalAmount AS needPlanTotalAmount,
-				salesPlan.planTotalAmount AS planTotalAmount
+				salesPlanDetail.planTotalAmount AS planTotalAmount
 			FROM
 				NeedPlan AS needPlan
 				LEFT JOIN xystOrganization AS xystorganization ON xystorganization.id = needPlan.regionalCompany
 				LEFT JOIN PlanningCycle AS planningCycle ON planningCycle.id = needPlan.planningCycle
-				LEFT JOIN SalesPlan AS salesPlan  ON salesPlan.planningCycle = needPlan.planningCycle
 				LEFT JOIN ProjectFiled AS projectFiled ON projectFiled.id = needPlan.project
+				LEFT JOIN (
+					SELECT detail.project AS projectId, salesPlan.planningCycle AS planningCycle, SUM(detail.planAmount) AS planTotalAmount FROM SalesPlanAssociatedSalesPlanDetail AS detail 
+					LEFT JOIN SalesPlan AS salesPlan ON detail.master = salesPlan.id
+					WHERE salesPlan.approveState = 2 group by detail.project, salesPlan.planningCycle
+					) AS salesPlanDetail ON needPlan.project = salesPlanDetail.projectId AND needPlan.planningCycle = salesPlanDetail.planningCycle
 			WHERE ( needPlan.DISCARD = FALSE OR needPlan.DISCARD IS NULL )
 			AND needPlan.regionalCompany = :?regionalCompanyId
 			AND projectFiled.id = :?projectId

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

@@ -146,7 +146,7 @@
 									        },
 									        {
 									            "key":"effectiveSale",
-									            "title":"销售计划量（吨）"
+									            "title":"实际销售量（吨）"
 									        }
 									    ],
 									  "listenerName":"execute-deatil"

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

@@ -475,6 +475,22 @@
 						<m:annotation>
 							<m:type>bcp.type.json.JsonIgnore</m:type>
 						</m:annotation>
+						<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>master_id</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>233c82e2-e7b6-49fc-96cc-bb947ba2cc99</m:id>
 					<m:name>master</m:name>