bugFix 甘特图状态bug

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/GanttServiceImpl.java

@@ -69,9 +69,9 @@ public class GanttServiceImpl implements GanttService {
     public static final String SCHEDULING_TO_BE_PUBLISHED_STR = "%s-排程结束待发布";
     public static final String DEFAULT_SPLIT = "-;-";
     public static final Map<String,String> GANTT_PROCESS_STATUS_MAP=new HashMap<String,String>(){{
-        put(JOBSTATUS_TO_BE_START,COMPLETED);
-        put(JOBSTATUS_TO_BE_STARTING,PROCESSING);
-        put(JOBSTATUS_TO_BE_END,TO_BE_STARTED);
+        put(JOBSTATUS_TO_BE_START,TO_BE_STARTED );
+        put(JOBSTATUS_TO_BE_STARTING,TO_BE_STARTED);
+        put(JOBSTATUS_TO_BE_END,COMPLETED);
     }};
 
     private final Logger log = LoggerFactory.getLogger(this.getClass().getName());

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ReportCheckServiceImpl.java

@@ -40,7 +40,7 @@ public class ReportCheckServiceImpl implements ReportCheckService {
     public static final String PENDING_PLAN_REVIEW = "待计划评审";
     public static final String VERIFIED = "已检验";
     public static final String COMPLETED = "已完工";
-    public static final String REJECTS = "不良品备料";
+    public static final String REJECTS = "不良在制品";
     public static final String SEMIFINISHED_PRODUCTS = "半成品备料";
     public static final String WORK_IN_PROCESS = "在制品";
     private final Logger log = LoggerFactory.getLogger(this.getClass().getName());
@@ -187,8 +187,11 @@ public class ReportCheckServiceImpl implements ReportCheckService {
         /***********************更新 工序作业输出物料的  输出已检验卷数 输出不合格卷数 输出合格卷数****************************************/
         Map<String, List<ApsReportOutputDo>> collect = reportOutputDos.stream().collect(Collectors.groupingBy(ApsReportOutputDo::getOutputid));
         collect.forEach((k, v) -> {
+            // 不合格卷数
             long unqualifiedQty = v.stream().filter(info -> NO.equals(info.getQualified())).count();
+            // 合格卷数
             long passingQty = v.stream().filter(info -> YES.equals(info.getQualified())).count();
+            log.debug("更新输出物料ID:{},不合格卷数:{},合格卷数:{},已检验卷数:{}", k, unqualifiedQty, passingQty, v.size());
             apsProcessOperationOutMaterDao.reportCheckUpdateAboutVolumesNum(k, unqualifiedQty, passingQty, v.size());
         });
         /*********************** 工序作业输出物料 更新结束****************************************/

cx-aps/cx-aps-common/src/main/resources/mybatis/ApsProcessOperationOutMaterDao.xml

@@ -6,14 +6,14 @@
     <update id="reportCheckUpdateAboutVolumesNum">
         update aps_process_operation_out_mater
         <set>
-            <if test="unqualifiedQuantity != 0">
-                INSPECTROLLNUM=INSPECTROLLNUM+#{unqualifiedQuantity},
+            <if test="inspectQuantity != 0">
+                INSPECTROLLNUM=INSPECTROLLNUM+#{inspectQuantity},
             </if>
             <if test="qualifiedQuantity!=0">
                 FAILROLLNUM=FAILROLLNUM+#{qualifiedQuantity},
             </if>
-            <if test="inspectQuantity!=0">
-                GOODROLLNUM=GOODROLLNUM+#{inspectQuantity}
+            <if test="unqualifiedQuantity!=0">
+                GOODROLLNUM=GOODROLLNUM+#{qualifiedQuantity}
             </if>
         </set>
         <where>