From 44f960fa6fb40a422e7a1095322939771c262ccd Mon Sep 17 00:00:00 2001
From: zpl <pzl_7001@163.com>
Date: Tue, 14 Sep 2021 09:06:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=AF=8F=E6=97=A5=E7=94=9F=E4=BA=A7=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E6=8A=A5=E8=A1=A8=E6=96=B0=E5=A2=9E=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E5=88=97=E6=A3=80=E9=AA=8C=E4=BA=BA=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/src/main/resources/mapper/ReportDataMapper.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/common/src/main/resources/mapper/ReportDataMapper.xml b/common/src/main/resources/mapper/ReportDataMapper.xml
index 53768bf4..95d74bc7 100644
--- a/common/src/main/resources/mapper/ReportDataMapper.xml
+++ b/common/src/main/resources/mapper/ReportDataMapper.xml
@@ -275,7 +275,7 @@
     <!--每日生产状态报表-->
     <select id="findProductStateInfo" resultType="java.util.HashMap" parameterType="java.util.HashMap" >
         SELECT CFB.VALUE ITEM_NUMBER , ZSD.SHOP_ORDER , I.ITEM , IT.DESCRIPTION ITEM_DESCRIPTION , S.QTY PLAN_QTY ,CFA.VALUE WORK_ORDER ,
-               ZSD.SFC , ZSD.WORK_CENTER , WCT.DESCRIPTION  WORK_CENTER_DESCRIPTION , RU.ROUTER_TYPE , ZSD.STEP_ID , ZSD.OPERATION ,
+               ZSD.SFC , ZSD.WORK_CENTER , WCT.DESCRIPTION  WORK_CENTER_DESCRIPTION , RU.ROUTER_TYPE , ZSD.STEP_ID , ZSD.OPERATION ,CF.VALUE CHECK_USR,
                OT.DESCRIPTION OPERATION_DESCRIPTION, ZSD.RESRCE , R.DESCRIPTION RESOURCE_DESCRIPTION , ZSD.DISPATCH_STATUS OPERATION_STATUS ,
                ZSD.PROD_HOURS ,ZSD.ACTUAL_PROD_HOURS , ZSD.PLANNED_START_DATE , ZSD.PLANNED_COMP_DATE , ZSD.ACTUAL_START_DATE , ZSD.ACTUAL_COMPLETE_DATE
         FROM Z_SFC_DISPATCH ZSD
@@ -353,6 +353,7 @@
         <if test="actualStartToDate != null and actualStartToDate != ''" >
             AND ZSD.ACTUAL_COMPLETE_DATE &lt;= TO_DATE(#{actualStartToDate}|| '15:59:59', 'YYYY-MM-DD HH24:MI:SS')
         </if>
+        ORDER BY CFA.VALUE, CFB.VALUE, ZSD.SHOP_ORDER, I.ITEM
     </select>