From d627899cce7edf33198adaa6905f790221e94ee8 Mon Sep 17 00:00:00 2001
From: liyongde <1419499670@qq.com>
Date: Thu, 23 Mar 2023 19:59:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E4=BF=AE=E5=A4=8D=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/nl/wms/ext/dp/wql/QST_BIG_SCREEN.wql    | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/dp/wql/QST_BIG_SCREEN.wql b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/dp/wql/QST_BIG_SCREEN.wql
index 9a99fef..a8788e7 100644
--- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/dp/wql/QST_BIG_SCREEN.wql
+++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/dp/wql/QST_BIG_SCREEN.wql
@@ -285,7 +285,8 @@ IF 输入.flag = "3"
                 				SELECT
                                             	max( ivtflow.material_uuid ) AS material_uuid,
                                             	max( material.material_code ) AS material_code,
-                                            	round (sum( ivtflow.change_qty ),0) AS out_quantity
+                                            	round (sum( ivtflow.change_qty ),0) AS out_quantity,
+                                            	material.material_name
                                             FROM
                                             	st_ivt_structIvtFlow ivtflow
                                                  left join sch_base_point point on point.point_uuid = ivtflow.struct_uuid
@@ -313,7 +314,8 @@ IF 输入.flag = "8"
 				SELECT
                             	max( ivtflow.material_uuid ) AS material_uuid,
                             	max( material.material_code ) AS material_code,
-                            	round (sum( ivtflow.change_qty ) ,0)AS in_quantity
+                            	round (sum( ivtflow.change_qty ) ,0)AS in_quantity,
+                            	material.material_name
                             FROM
                             	st_ivt_structIvtFlow ivtflow
                                  left join sch_base_point point on point.point_uuid = ivtflow.struct_uuid
@@ -339,7 +341,8 @@ IF 输入.flag = "8"
         		QUERY
         			SELECT
                     	 sum(1) AS total_quantity,
-                    	 concat(mst.formula,'-',mst.pcsn) as material_ivt_info
+                    	 concat(mst.formula,'-',mst.pcsn) as material_ivt_info,
+                    	 	mst.material_name
                     FROM
                     	st_ivt_structivt ivt
                     	LEFT JOIN sch_base_point point ON point.point_uuid = ivt.struct_uuid
@@ -407,7 +410,8 @@ IF 输入.flag = "8"
                                SELECT
                                	sum( CASE WHEN TIMESTAMPDIFF( HOUR, ivt.instorage_time, now( ) ) >= ivt.stand_hour THEN 1 ELSE 0 END ) AS sewting_quantity,
                                	sum( CASE WHEN TIMESTAMPDIFF( HOUR, ivt.instorage_time, now( ) ) < ivt.stand_hour THEN 1 ELSE 0 END ) AS finish_quantity,
-                               	 concat(mst.formula,'-',mst.pcsn) as material_ivt_info
+                               	 concat(mst.formula,'-',mst.pcsn) as material_ivt_info,
+                               	 mst.material_name
                                FROM
                                	st_ivt_structivt ivt
                                	LEFT JOIN sch_base_point point ON point.point_uuid = ivt.struct_uuid