解决冲突

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

@@ -1514,14 +1514,43 @@ public class WmsEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum RC_RESPONSE_TIPS {
 
-        OK(10, "正确"),
+        OK(true, "正确"),
-        FAIL(20, "失败"),
+        NG(false, "失败");
-        NO_SKIP(30, "不跳转");
+
+        private boolean codeStatus;
+        private String description;
+
+        RC_RESPONSE_TIPS(boolean codeStatus, String description) {
+            this.codeStatus = codeStatus;
+            this.description = description;
+        }
+
+        public boolean getCodeStatus() {
+            return codeStatus;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
+     * 流程管家中触发源
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ACTION_BUTLER_SOURCE {
+
+        SCANNER(10, "扫描枪"),
+        SUBMIT(20, "提交按钮"),
+        RESET(30, "重置按钮"),
+        CHECK_DETAILS(40, "查看明细"),
+        DELETE_DETAILS(50, "明细(删除)"),
+        CLEAR_DETAILS(60, "明细（清空）");
 
         private int value;
         private String description;
 
-        RC_RESPONSE_TIPS(int value, String description) {
+        ACTION_BUTLER_SOURCE(int value, String description) {
             this.value = value;
             this.description = description;
         }

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

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description : PDA传输到后台的实体bean对象
@@ -36,8 +37,8 @@ public class WmsActionResponseBean {
     public List<String> options;
 
     @ApiParam("选中的明细数据")
-    public String details;
+    public List<Map<String, Object>> details;
 
-    @ApiParam("信息代码")
+    @ApiParam(value = "结果代码")
-    public Integer code;
+    public Boolean codeStatus;
 }

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

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description : PDA传输到后台的实体bean对象
@@ -32,5 +33,5 @@ public class WmsOperationBean {
     public int sourceOwner;
 
     @ApiParam("选中的明细数据")
-    public String details;
+    public List<Map<String, Object>> details;
 }