From 1dd8ba896e0e5be7452f89c8def783d84b958032 Mon Sep 17 00:00:00 2001
From: zds <2388969634@qq.com>
Date: Tue, 20 Sep 2022 16:55:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nl/wms/pdm/wql/QPDM_PRODUCTDAILYPLAN.wql  |  4 +--
 .../impl/StatisticalReportServiceImpl.java    |  3 +-
 .../wql/statistical_report_query_01.wql       | 30 ++++++++++---------
 3 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_PRODUCTDAILYPLAN.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_PRODUCTDAILYPLAN.wql
index ec23d2b9..6f706aad 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_PRODUCTDAILYPLAN.wql
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_PRODUCTDAILYPLAN.wql
@@ -255,7 +255,7 @@
             QUERY
                 SELECT
                     sum(ProcedureOffline.qty) AS total_qty,
-                    WorkOrder.device_id
+                   MAX(WorkOrder.device_id) AS device_id
                 FROM
                     PDM_BI_WorkOrder WorkOrder
                 LEFT JOIN PDM_BI_ProcedureOffline ProcedureOffline ON ProcedureOffline.workorder_id = WorkOrder.workorder_id
@@ -377,7 +377,7 @@
             SELECT
                 sum(ProcedureOffline.qty) AS total_qty,
                 count(WorkOrder.workorder_id) AS in_num,
-                WorkOrder.device_id
+                MAX(WorkOrder.device_id) AS device_id
             FROM
                 PDM_BI_WorkOrder WorkOrder
             LEFT JOIN PDM_BI_ProcedureOffline ProcedureOffline ON ProcedureOffline.workorder_id = WorkOrder.workorder_id
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/StatisticalReportServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/StatisticalReportServiceImpl.java
index 764511ce..734aa104 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/StatisticalReportServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/StatisticalReportServiceImpl.java
@@ -212,9 +212,10 @@ public class StatisticalReportServiceImpl implements StatisticalReportService {
         JSONArray rows = new JSONArray();
         for (int i = 0; i < jsonArr.size(); i++) {
             JSONObject row = jsonArr.getJSONObject(i);
+            String material_code = row.getString("material_code");
             JSONObject bom = WQLObject.getWQLObject("md_pd_productbom").query("material_id = '"+row.get("material_id")+"'").uniqueResult(0);
             if (ObjectUtil.isEmpty(bom)){
-                throw new BadRequestException("未查询到该产品对应BOM信息");
+                throw new BadRequestException("未查询到该产品  "+material_code+"  对应BOM信息");
             }
             row.put("1",row.getString("planstart_date"));
             row.put("2",row.getString("old_mark"));
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/wql/statistical_report_query_01.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/wql/statistical_report_query_01.wql
index b7b9aeb0..85dfa6ee 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/wql/statistical_report_query_01.wql
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/wql/statistical_report_query_01.wql
@@ -1,10 +1,10 @@
 [交易说明]
 	交易名：	压制性能分页查询
-	所属模块：	
-	功能简述：	
-	版权所有：	
-	表引用：	
-	版本经历：	
+	所属模块：
+	功能简述：
+	版权所有：
+	表引用：
+	版本经历：
 
 [数据库]
 	--指定数据库，为空采用默认值，默认为db.properties中列出的第一个库
@@ -33,22 +33,22 @@
 
 [临时表]
 	--这边列出来的临时表就会在运行期动态创建
-	
+
 [临时变量]
 	--所有中间过程变量均可在此处定义
-		 
+
 [业务过程]
 
 	##########################################
 	#			1、输入输出检查				 #
 	##########################################
 
-	
+
 	##########################################
 	#			2、主过程前处理				 #
 	##########################################
-	
-	
+
+
 	##########################################
 	#			3、业务主过程			 	 #
 	##########################################
@@ -58,14 +58,14 @@
                  SELECT
                  	MAX( mb.material_code ) AS material_code,
                  	SUM( off.qty ) AS qty,
-                 	off.material_id,
-                 	off.pcsn,
+                 	MAX( off.material_id) AS material_id,
+                 	MAX( off.pcsn) AS pcsn,
                  	MAX( off.create_time ) AS create_time,
                  	MAX( off.create_name ) AS create_name,
                  	MAX( wo.planend_time ) AS planend_time,
                  	MAX( wo.realend_time ) AS realend_time,
                  	datediff (MAX( wo.planend_time ),MAX( wo.realend_time )) AS off_days,
-                 	ext.old_mark
+                 	MAX( ext.old_mark) AS old_mark
                  FROM
                  	pdm_bi_procedureoffline off
                  	LEFT JOIN pdm_bi_workorder wo ON wo.workorder_id = off.workorder_id
@@ -446,10 +446,12 @@
                     plan.product_num,
                     ext.old_mark,
                     plan.product_weight,
-                    plan.material_id
+                    plan.material_id,
+                    materialbase.material_code
                 FROM
                 	mps_bd_productdailyplan plan
                 	LEFT JOIN md_me_producmaterialext ext ON ext.material_id = plan.material_id
+                	LEFT JOIN md_me_materialbase materialbase ON materialbase.material_id = plan.material_id
                 WHERE
                     1=1
                 OPTION 输入.begin_time <> ""