Jenkins自动合并

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

@@ -501,7 +501,8 @@ public class WmsEnumUtil {
         LINE_LOCATE(50, "L", "线边库"),
         NC_LOCATE(60, "N", "NC库"),
         SPILLAGE_LOCATE(70, "Y", "溢料库"),
-        TRANSIT_LOCATE(80, "T", "在途库");
+        TRANSIT_LOCATE(80, "T", "在途库"),
+        UTENSIL_LOCATE(90, "U", "器具库");
 
         private int value;
         private String code;
@@ -1350,7 +1351,7 @@ public class WmsEnumUtil {
         FROZEN(30, "已冻结"),
         THAWING(40, "已解冻"),
         RETURN_GOODS(50, "取消冻结"),
-        Unsettled_(60, "取消冻结");
+        UNSETTLED_NCUNFREEZE(60, "未盘解冻");
 
         private int value;
         private String description;
@@ -2987,7 +2988,8 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum WMS_PART_TYPE {
-        RAW_MATERIAL(10, "原材料"), PARTIALLY_PREPARED_PRODUCTS(20, "半成品"), FINISHED_PRODUCT(30, "成品"), CONTAINER_PRODUCT(40, "容器");
+        RAW_MATERIAL(10, "原材料"), PARTIALLY_PREPARED_PRODUCTS(20, "半成品"), FINISHED_PRODUCT(30, "成品"), CONTAINER_PRODUCT(40, "容器"),
+        UTENSIL(50, "器具");
 
         private int value;
         private String description;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java

@@ -136,6 +136,10 @@ public class WmsCSFactTrans extends BaseBean {
     @ApiParam("存储区编号组")
     public String[] zoneNos;
 
+    @Transient
+    @ApiParam("行号")
+    private String item;
+
     public WmsCSFactTrans(){}
 
     public Integer getIsScopeVal() {

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java

@@ -99,7 +99,7 @@ public class WmsCSOrderDetails extends BaseBean {
     public Integer destSnStatus;
 
     /**
-     * 处理状态:10=已创建,20=已盘,30=已冻结,40=已解冻,50=取消冻结 60-未盘解冻
+     * 处理状态:10=已创建,20=已盘,30=已冻结,40=已解冻,50=取消冻结 60=未盘解冻
      */
     @Column(name = "TRANS_STATUS")
     @ApiParam(value = "处理状态", example = "1")

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java

@@ -39,7 +39,7 @@ public class WmsLocate extends BaseBean {
     private String locateName;
 
     /**
-     * 库位类型:10=收货库,20=基础库,30=机动库,40=组合库,50=线边库,60=NC库，70=溢料,80=在途库位
+     * 库位类型:10=收货库,20=基础库,30=机动库,40=组合库,50=线边库,60=NC库，70=溢料,80=在途库位,90=器具库
      */
     @Column(name = "LOCATE_TYPE")
     @ApiParam(value = "库位类型")