Jenkins自动合并

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

@@ -990,6 +990,7 @@ public class WmsEnumUtil {
         INSTOCKED(40, "入库"),
         PICKED(50, "配料"),
         OUT_STOCK(60, "出库"),
+        SCRAP(70,"报废"),
         COMMING(80, "在途");
 
         private int value;
@@ -4707,4 +4708,40 @@ public class WmsEnumUtil {
         }
     }
 
+    /**
+     * 计划拉动明细表状态创建
+     * 默认为 10
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum VENDOR_TYPE {
+        VENDOR(10, "供应商"), CARRIERS(20, "承运商");
+
+        private int value;
+        private String description;
+
+        VENDOR_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipModel.java

@@ -23,4 +23,10 @@ public class WmsTmsShipModel {
     private Double recQty;
     @ApiParam("单位")
     private String unit;
+
+    @ApiParam("序号")
+    private Integer item;
+
+    @ApiParam("装车时间")
+    private String modifyDatetime;
 }