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

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

@@ -143,4 +143,8 @@ public class IfProductOffLine extends BaseBean  implements Serializable {
     @Column(name = "JIS_BACKFLUSH_STATUS")
     @ApiParam("回冲状态")
     private String jisBackflushStatus;
+
+    @Column(name = "CUST_PROD_LINE_CODE")
+    @ApiParam("客户产线代码")
+    private String custProdLineCode;
 }

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

@@ -47,6 +47,10 @@ public class MesJitIssueCfg extends BaseBean implements Serializable {
     @ApiParam("缓存类型")
     private Integer cfgType;
 
+    @Column(name = "SEQ")
+    @ApiParam("排序号")
+    private Integer seq;
+
     @Transient
     @ApiParam("当前JIT缓存数")
     private Integer currentJitCacheNum;

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

@@ -49,4 +49,8 @@ public class MesJitLockCache extends BaseBean implements Serializable {
     @Column(name = "STATUS")
     @ApiParam("状态")
     private Integer status;
+
+    @Column(name = "JIT_SEQ")
+    @ApiParam("JIT排序号")
+    private String jitSeq;
 }

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

@@ -52,4 +52,8 @@ public class MesJitOrderCache extends BaseBean implements Serializable {
     @Column(name = "SEQ")
     @ApiParam("序号")
     private Integer seq;
+
+    @Column(name = "JIT_SEQ")
+    @ApiParam("JIT排序号")
+    private String jitSeq;
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/GenerateLocateRule.java

@@ -1,6 +1,5 @@
 package cn.estsh.i3plus.pojo.wms.engine.rule;
 
-import cn.estsh.i3plus.pojo.wms.bean.WmsZones;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -54,5 +53,10 @@ public class GenerateLocateRule {
      */
     private boolean orderByAxle;
 
+    /**
+     * 是否空库位
+     */
+    private boolean isEmptyLocate;
+
 
 }