Jenkins自动合并

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

@@ -925,8 +925,8 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum TASK_INFO_STATUS {
-        CREATE(10, 10, "创建"), FINISH(20, 20, "处理中"),
-        FAIL(30, 30, "已处理"), CLOSE(40, 40, "已关闭");
+        CREATE(10, 10, "创建"), HANDLEING(20, 20, "处理中"),
+        FINISH(30, 30, "已处理"), CLOSE(40, 40, "已关闭");
 
         private int value;
         private int code;

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

@@ -205,6 +205,10 @@ public class WmsDocMovementDetails extends BaseBean {
     @AnnoOutputColumn(refClass = WmsEnumUtil.PRINT_STATUS.class, refForeignKey = "value", value = "description")
     private Integer printStatus;
 
+    @Transient
+    @ApiParam("优先级")
+    private String priority;
+
     public String getRecommondLot() {
         return recommondLot == null ? "无" : this.recommondLot;
     }