Merge remote-tracking branch 'origin/test' into test

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java

@@ -3543,6 +3543,36 @@ public class MesPcnEnumUtil {
         }
     }
 
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum STEP_RESULT_CMD {
+        JUMP_STEP(10, "JUMP_STEP", "跳过工步"),
+        REDO_PROCESS(20, "REDO_PROCESS", "重做工序"),
+        JUMP_PROCESS(30, "JUMP_PROCESS", "跳过工序"),
+        NORMAL_COMPLETE(40, "NORMAL_COMPLETE", "正常完成");
+
+        private int value;
+        private String code;
+        private String description;
+
+        STEP_RESULT_CMD(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
 
     /**
      * 容器使用状态

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java

@@ -134,6 +134,9 @@ public class StationRequestBean implements Serializable {
     @ApiParam("当前流程状态")
     private MesStateMachineStatus curFsmState;
 
+    @ApiParam("是否重选进入")
+    private boolean isRechoose;
+
     @JsonIgnore
     @ApiParam("展示组件")
     private Object moduleService;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepResult.java

@@ -23,6 +23,8 @@ public class StepResult<T> {
 
     private StationRequestBean stationRequestBean;
 
+    private MesPcnEnumUtil.STEP_RESULT_CMD cmd;
+
     public static StepResult getNonComplete() {
         return new StepResult(false, "");
     }
@@ -69,6 +71,10 @@ public class StepResult<T> {
         return new StepResult(true, msg);
     }
 
+    public static StepResult getSuccessComplete(MesPcnEnumUtil.STEP_RESULT_CMD cmd) {
+        return new StepResult(true, cmd);
+    }
+
     public static StepResult getSuccessComplete() {
         return new StepResult(true, "");
     }
@@ -101,6 +107,11 @@ public class StepResult<T> {
         this.msg = msg;
     }
 
+    private StepResult(boolean isCompleted, MesPcnEnumUtil.STEP_RESULT_CMD cmd) {
+        this.isCompleted = isCompleted;
+        this.cmd = cmd;
+    }
+
 
     public StepResult(boolean isCompleted, StationRequestBean stationRequestBean) {
         this.isCompleted = isCompleted;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TorqueReviewModel.java

@@ -27,4 +27,7 @@ public class TorqueReviewModel {
     @ApiParam("显示颜色")
     private String showColor;
 
+    @ApiParam("是否大枪")
+    private Integer isPf;
+
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java

@@ -1908,9 +1908,6 @@ public class MesHqlPack {
             DdlPreparedPack.getStringLikerPack(mesLabelTemplate.getTemplateCode(), "templateCode", packBean);
         }
         if (!StringUtils.isEmpty(mesLabelTemplate.getTemplateName())) {
-            DdlPreparedPack.getStringLikerPack(mesLabelTemplate.getTemplateName(), "codeType", packBean);
-        }
-        if (!StringUtils.isEmpty(mesLabelTemplate.getTemplateName())) {
             DdlPreparedPack.getStringLikerPack(mesLabelTemplate.getTemplateName(), "templateName", packBean);
         }
         return packBean;