Finish Task #2236 Cost:8h

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

@@ -6531,7 +6531,7 @@ public class MesEnumUtil {
     public enum JIT_ORDER_CACHE_STATUS {
         CREATE(10, "创建"),
         COMPLETE(20, "完成"),
-        CANCEL(20, "取消");
+        CANCEL(30, "取消");
 
         private Integer value;
         private String description;
@@ -6567,7 +6567,7 @@ public class MesEnumUtil {
     public enum JIT_LOCK_CACHE_STATUS {
         CREATE(10, "创建"),
         RELEASE(20, "下达"),
-        ONLINE_COMPLETE(20, "上线完成");
+        ONLINE_COMPLETE(30, "上线完成");
 
         private Integer value;
         private String description;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitOrderCache.java

@@ -48,4 +48,8 @@ public class MesJitOrderCache extends BaseBean implements Serializable {
     @Column(name = "STATUS")
     @ApiParam("状态")
     private Integer status;
+
+    @Column(name = "SEQ")
+    @ApiParam("序号")
+    private Integer seq;
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java

@@ -126,6 +126,10 @@ public class MesQueueJitActual extends BaseBean implements Serializable {
     @ApiParam("锁定标识")
     private Integer isLock;
 
+    @Column(name = "WO_TYPE")
+    @ApiParam("工单类型")
+    private Integer woType;
+
     @Transient
     @ApiParam("客户需求开始时间")
     private String custPointStartDate;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java

@@ -96,4 +96,8 @@ public class MesQueueJitActualDetail extends BaseBean implements Serializable {
     @Column(name = "ASSY_NO")
     @ApiParam("组件编号")
     private String assyNo;
+
+    @Transient
+    @ApiParam("工单类型")
+    private Integer woType;
 }

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

@@ -25,7 +25,7 @@ public class JitIssueCfgModel {
     private Integer currentJitCacheNum;
 
     @ApiParam("其他工单数")
-    private Integer otherWorkNum;
+    private Integer otherWorkNum = 0;
 
     @ApiParam("缓存类型")
     private String cfgType;