Merge remote-tracking branch 'origin/master'

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);

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
         (
@@ -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

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 + "，为设备状态表记录第一笔数据！");
-        }
+        }*/
 
     }