From 250a0058820659ebf9c70b9e809374475b5c13e8 Mon Sep 17 00:00:00 2001
From: zpl <pzl_7001@163.com>
Date: Tue, 2 Nov 2021 08:24:17 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BA=A7=E5=89=8D=E5=87=86=E5=A4=87?=
 =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=A0=87=E7=AD=BE=EF=BC=8C=E4=B8=8D=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=E6=A0=87=E7=AD=BE=E8=A1=A8=E4=B8=AD=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mesnac/common/service/impl/ProdReadyTaskServiceImpl.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java
index 5180f137..b79a1c4a 100644
--- a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java
+++ b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java
@@ -466,7 +466,7 @@ public class ProdReadyTaskServiceImpl extends ServiceImpl<ProdReadyTaskMapper, P
         queryWrapper.eq(PrintLog.CATEGORY, type);
         queryWrapper.eq(PrintLog.PRINT_TEMPLATE, type);
         List<PrintLog> printLogList = printLogService.list(queryWrapper);
-        if (printLogList.isEmpty()) {
+        if (printLogList.isEmpty() || !printLogList.isEmpty()) {
             //打印参数
             LabelPrintDto labelPrintDto = new LabelPrintDto();
             labelPrintDto.setPrinter(printName);

From 0851c83ba4b02618abaad98cf41151938167c1a0 Mon Sep 17 00:00:00 2001
From: zpl <pzl_7001@163.com>
Date: Tue, 2 Nov 2021 09:18:10 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=AC=A6=E5=90=88?=
 =?UTF-8?q?=E7=8E=87=E5=8F=8A=E8=AE=BE=E5=A4=87=E7=B1=BB=E5=9E=8B=E7=AC=A6?=
 =?UTF-8?q?=E5=90=88=E7=8E=87=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/common/src/main/resources/mapper/ReportDataMapper.xml b/common/src/main/resources/mapper/ReportDataMapper.xml
index 68d94adc..dd75ecf1 100644
--- a/common/src/main/resources/mapper/ReportDataMapper.xml
+++ b/common/src/main/resources/mapper/ReportDataMapper.xml
@@ -64,7 +64,7 @@
         WITH
             TEMP AS (
         SELECT  ZSD.PLANNED_COMP_DATE ,ZSD.PLANNED_START_DATE ,ZSD.RESRCE ,ZSD.PROD_HOURS , ZSD.DISPATCH_QTY
-        FROM Z_SFC_DISPATCH ZSD WHERE ZSD.SITE = #{site}  AND ZSD.DISPATCH_STATUS IN ('START','COMPLETE','RELEASE') ),
+        FROM Z_SFC_DISPATCH ZSD WHERE ZSD.SITE = #{site}  AND ZSD.DISPATCH_STATUS IN ('START','NEW','RELEASE') ),
             Z_REPORT_DATE_TIME AS (SELECT '1000' SITE ,TO_CHAR(TO_DATE(#{startFromDate},'YYYY-MM-DD') + ROWNUM -1, 'YYYY-MM-DD') DATE_TIME,
         TO_DATE(#{startFromDate} || '00:00:00','yyyy-mm-dd hh24:mi:ss') + rownum -1 AM_START_DATE_TIME,
         TO_DATE(#{startFromDate} || '04:00:00','yyyy-mm-dd hh24:mi:ss') + rownum -1 AM_END_DATE_TIME,
@@ -182,7 +182,7 @@
     <select id="findResourceTypeLoadRateInfo" resultType="java.util.HashMap" parameterType="java.util.HashMap" >
         WITH TEMP AS (
         SELECT  ZSD.PLANNED_COMP_DATE ,ZSD.PLANNED_START_DATE ,ZSD.RESRCE ,ZSD.PROD_HOURS , ZSD.DISPATCH_QTY
-        FROM Z_SFC_DISPATCH ZSD WHERE ZSD.SITE = #{site}  AND ZSD.DISPATCH_STATUS != 'CANCEL'
+        FROM Z_SFC_DISPATCH ZSD WHERE ZSD.SITE = #{site}  AND ZSD.DISPATCH_STATUS  IN ('START','NEW','RELEASE')
             AND ZSD.PLANNED_COMP_DATE IS NOT NULL  AND ZSD.PLANNED_START_DATE IS NOT NULL
         ),
         Z_REPORT_DATE_TIME AS (SELECT '1000' SITE ,TO_CHAR(TO_DATE(#{startFromDate},'YYYY-MM-DD') + ROWNUM -1, 'YYYY-MM-DD') DATE_TIME,
@@ -220,7 +220,7 @@
         </if>
         SELECT M.*,M.RATE_DATA_INT || '%' RATE_DATA FROM (
         SELECT T.SITE,T.RESOURCE_TYPE, T.RESOURCE_TYPE_DESCRIPTION, T.WORK_CENTER, T.WORK_CENTER_DESCRIPTION,T.DATE_TIME,
-                ROUND(SUM(T.PLAN_HOUR) * SUM(T.CAPACITY_MAN_HOUR) / 8 ,4) PLAN_HOUR, SUM(T.CAPACITY_MAN_HOUR) CAPACITY_MAN_HOUR,
+                SUM(T.PLAN_HOUR)  PLAN_HOUR, SUM(T.CAPACITY_MAN_HOUR) CAPACITY_MAN_HOUR,
                CASE WHEN SUM(T.PLAN_HOUR) = 0 OR SUM(T.CAPACITY_MAN_HOUR) = 0 THEN 0 ELSE ROUND(SUM(T.PLAN_HOUR)/SUM(T.CAPACITY_MAN_HOUR),4)*100 END RATE_DATA_INT
             FROM
         (

From a3d01d8a265377ee680f2f13ec8a273339a545d7 Mon Sep 17 00:00:00 2001
From: zpl <pzl_7001@163.com>
Date: Tue, 2 Nov 2021 13:11:33 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=95=85=E9=9A=9C?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=8E=A5=E6=94=B6=E6=8E=A5=E5=8F=A3=E6=94=B6?=
 =?UTF-8?q?=E5=88=B0=E6=95=85=E9=9A=9C=E4=BF=A1=E6=81=AF=E5=90=8E=E4=B8=8D?=
 =?UTF-8?q?=E5=86=8D=E4=BF=AE=E6=94=B9=E8=AE=BE=E5=A4=87=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E6=8E=A5=E6=94=B6=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../equip/service/impl/ResourceFaultReceiveServiceImpl.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceFaultReceiveServiceImpl.java b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceFaultReceiveServiceImpl.java
index 8897c3f2..87dab832 100644
--- a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceFaultReceiveServiceImpl.java
+++ b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceFaultReceiveServiceImpl.java
@@ -112,6 +112,7 @@ public class ResourceFaultReceiveServiceImpl extends ServiceImpl<ResourceFaultRe
 
         resourceFaultReceiveService.save(resourceFaultReceive);
 
+        /** 更新设备状态表的设备状态
         ResourceStatusReceive resourceStatus = resourceStatusReceiveMapper.getOneByMaxCreateDateTime(site,resource);
         if (resourceStatus != null){
             resourceStatus.setStatus("WARN");
@@ -133,7 +134,7 @@ public class ResourceFaultReceiveServiceImpl extends ServiceImpl<ResourceFaultRe
             resourceStatusReceive.setModifiedDateTime(faultDate);
             resourceStatusReceiveMapper.insert(resourceStatusReceive);
             logger.info("设备编号：" + resource + "，为设备状态表记录第一笔数据！");
-        }
+        }*/
 
     }
 

From 71c7f3703ac1a88e15237f7e6d13d6472564cecb Mon Sep 17 00:00:00 2001
From: zpl <pzl_7001@163.com>
Date: Tue, 2 Nov 2021 13:56:11 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E8=B5=84=E6=BA=90=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E7=AC=A6=E5=90=88=E7=8E=87=E6=8A=A5=E8=A1=A8=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/common/src/main/resources/mapper/ReportDataMapper.xml b/common/src/main/resources/mapper/ReportDataMapper.xml
index dd75ecf1..ee52a9a3 100644
--- a/common/src/main/resources/mapper/ReportDataMapper.xml
+++ b/common/src/main/resources/mapper/ReportDataMapper.xml
@@ -287,7 +287,7 @@
         <if test="endRate != null and endRate != ''">
             AND M.RATE_DATA_INT &lt;= #{endRate}
         </if>
-        ORDER BY M.WORK_CENTER,M.RESOURCE_TYPE,M.DATE_TIME
+        ORDER BY M.WORK_CENTER_DESCRIPTION,M.RESOURCE_TYPE_DESCRIPTION,M.DATE_TIME
         <if test="reportType != null and reportType.contains('true')">
             ) TD
             GROUP BY TD.RESOURCE_TYPE ,TD.RESOURCE_TYPE_DESCRIPTION ,TD.WORK_CENTER, TD.WORK_CENTER_DESCRIPTION