2024-05-11 增加报工标识、质检标识，工序状态

win-module-mes/win-module-mes-biz/src/main/java/com/win/module/mes/controller/processroute/vo/ProcessrouteUpdateGraphReqVO.java

@@ -69,6 +69,8 @@ public class ProcessrouteUpdateGraphReqVO  {
                         vo.setNodeSort(Optional.ofNullable(cell.getInteger("zIndex")).orElse(-1));
                         vo.setRouteVersion(routeVersion);
                         vo.setNodeClock(Optional.ofNullable(nodesInfo.get(nodeId).getActionClock()).orElse(new BigDecimal(0.0)));
+                        vo.setCheckFlag(Optional.ofNullable(nodesInfo.get(nodeId).getIsCheck()).orElse("FALSE"));
+                        vo.setReportFlag(Optional.ofNullable(nodesInfo.get(nodeId).getIsReport()).orElse("FALSE"));
                         nodesMap.put(nodeId,vo);
                     }
                 }

win-module-mes/win-module-mes-biz/src/main/java/com/win/module/mes/controller/processroutenodedetail/vo/ProcessrouteNodeDetailBaseVO.java

@@ -9,6 +9,7 @@ import java.time.LocalDateTime;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
 import javax.validation.constraints.*;
+
 import org.springframework.format.annotation.DateTimeFormat;
 
 import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@@ -67,4 +68,15 @@ public class ProcessrouteNodeDetailBaseVO {
     private String routeVersion;
     @Schema(description = "工序节拍")
     private BigDecimal nodeClock;
+    @Schema(description = "是否报工")
+    private String reportFlag;
+    @Schema(description = "是否质检")
+    private String checkFlag;
+    @Schema(description = "报工方式")
+    private String reportType;
+    @Schema(description = "质检规则")
+    private String checkRule;
+    @Schema(description = "质检时长")
+    private String checkClock;
+
 }

win-module-mes/win-module-mes-biz/src/main/java/com/win/module/mes/dal/dataobject/processroutenodedetail/ProcessrouteNodeDetailDO.java

@@ -93,4 +93,15 @@ public class ProcessrouteNodeDetailDO extends BaseDO {
     private String routeVersion;
     /**工序节拍*/
     private BigDecimal nodeClock;
+    /**是否报工	*/
+    private String reportFlag;
+/**是否质检*/
+    private String checkFlag;
+ /**报工方式*/
+    private String reportType;
+ /**质检规则*/
+    private String checkRule;
+ /**质检时长*/
+    private String  checkClock;
+
 }

win-module-mes/win-module-mes-biz/src/main/java/com/win/module/mes/enums/ProcessStatusEnum.java

@@ -4,6 +4,7 @@ public enum ProcessStatusEnum {
     //
     WAITING("0", "待执行"),
     FINISHED("1", "已完工"),
+    WAITREPORTED("2", "待报工"),
     REPORTED("3", "已报工"),
     //QUALITY("3", "质检中"),
     FORQUALITY("4", "待质检"),

win-module-mes/win-module-mes-biz/src/main/java/com/win/module/mes/service/mesworkschedulingdetail/MesWorkSchedulingDetailServiceImpl.java

@@ -296,7 +296,16 @@ public class MesWorkSchedulingDetailServiceImpl implements MesWorkSchedulingDeta
         }
         mesWorkSchedulingDO.setWorkingNode(nextNodeCode);
         mesWorkSchedulingDO.setWorkSort(detailDO.getTaskSort());
-        detailDO.setStatus(ProcessStatusEnum.FINISHED.getCode());
+        if("TRUE".equalsIgnoreCase(detailDO.getCheckFlag())){
+           if("TRUE".equalsIgnoreCase(detailDO.getReportFlag())){
+               //需要质检
+                detailDO.setStatus(ProcessStatusEnum.FORQUALITY.getCode());
+            }else{
+                detailDO.setStatus(ProcessStatusEnum.WAITREPORTED.getCode());
+            }
+        }else{
+            detailDO.setStatus(ProcessStatusEnum.FINISHED.getCode());
+        }
         //更新工单的工序
        int ret = workSchedulingDetailMapper.updateById(detailDO);
         ret=ret+workSchedulingMapper.updateById(mesWorkSchedulingDO);