Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test

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

@@ -8146,16 +8146,16 @@ public class WmsEnumUtil {
 
     /**
      * 动作类型
-     * 10-锁定库存，20-解锁库存、30-锁定库位、40-解锁库位、50-锁定料车、60-解锁料车、70-生成任务、
+     * 10-锁定库位，20-锁定库存、30-锁定料车、40-解锁库存、50-解锁库位、60-解锁料车、70-生成任务、
      * 80-取消任务、90-递进交换
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum STRATEGY_ACTION_TYPE {
-        LOCKING_IN_STOCK(10, "LOCKING_IN_STOCK", "锁定库存"),
-        UNLOCK_IN_STOCK(20, "UNLOCK_IN_STOCK", "解锁库存"),
-        LOCKING_LOCATE(30, "LOCKING_LOCATE", "锁定库位"),
-        UNLOCK_LOCATE(40, "UNLOCK_LOCATE", "解锁库位"),
-        LOCKING_FEED_CAR(50, "LOCKING_FEED_CAR", "锁定料车"),
+        LOCKING_LOCATE(10, "LOCKING_LOCATE", "锁定库位"),
+        LOCKING_IN_STOCK(20, "LOCKING_IN_STOCK", "锁定库存"),
+        LOCKING_FEED_CAR(30, "LOCKING_FEED_CAR", "锁定料车"),
+        UNLOCK_IN_STOCK(40, "UNLOCK_IN_STOCK", "解锁库存"),
+        UNLOCK_LOCATE(50, "UNLOCK_LOCATE", "解锁库位"),
         UNLOCK_FEED_CAR(60, "UNLOCK_FEED_CAR", "解锁料车"),
         GENERATE_TASK(70, "GENERATE_TASK", "生成任务"),
         CANCEL_TASK(80, "CANCEL_TASK", "取消任务"),
@@ -8374,4 +8374,83 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 自动化日志记录-操作类型
+     * 10-单据生成，20-策略动作、30-任务生成、40-START、50-END、60-其它
+     *
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum OPERATE_TYPE {
+        ORDER_GENERATE(10, "ORDER_GENERATE", "单据生成"),
+        STRATEGIC_ACTION(20, "STRATEGIC_ACTION", "策略动作"),
+        TASK_GENERATE(30, "TASK_GENERATE", "任务生成"),
+        START(40, "START", "START"),
+        END(50, "END", "END"),
+        OTHER(60, "OTHER", "其它");
+
+        private int value;
+        private String code;
+        private String description;
+
+        OPERATE_TYPE(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
+        public static int descriptionOfValue(String desc) {
+            return descOf(desc);
+        }
+
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static OPERATE_TYPE codeOf(Integer value) {
+            if (value == null) {
+                return null;
+            } else {
+                for (int i = 0; i < values().length; i++) {
+                    if (values()[i].value == value) {
+                        return values()[i];
+                    }
+                }
+            }
+            return null;
+        }
+    }
 }

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

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -45,6 +47,11 @@ public class WmsAutoTaskLog extends BaseBean {
     @ApiParam("策略动作")
     public String strategyAction;
 
+    @Column(name = "OPERATE_TYPE")
+    @ApiParam("操作类型")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.OPERATE_TYPE.class)
+    public String operateType;
+
     @Column(name = "ERROR_MSG")
     @ApiParam("错误信息")
     public String errorMsg;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoTaskModel.java

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.wms.modelbean;
 
+import cn.estsh.i3plus.pojo.wms.bean.WmsAutoTaskLog;
 import cn.estsh.i3plus.pojo.wms.bean.WmsDocMovementDetails;
 import cn.estsh.i3plus.pojo.wms.bean.WmsStockSn;
 import io.swagger.annotations.ApiParam;
@@ -64,6 +65,9 @@ public class WmsAutoTaskModel {
     @ApiParam("锁定条码")
     private List<WmsStockSn> lockStockSnList;
 
+    @ApiParam("动作日志记录")
+    private WmsAutoTaskLog wmsAutoTaskLog;
+
     @ApiParam("任务生成数量")
     private Double taskQty;