Merge branch 'dev'

# Conflicts:
#	modules/i3plus-pojo-andon/pom.xml
#	modules/i3plus-pojo-base/pom.xml
#	modules/i3plus-pojo-form/pom.xml
#	modules/i3plus-pojo-hardswitch/pom.xml
#	modules/i3plus-pojo-jobflow/pom.xml
#	modules/i3plus-pojo-lac/pom.xml
#	modules/i3plus-pojo-mes-pcn/pom.xml
#	modules/i3plus-pojo-mes/pom.xml
#	modules/i3plus-pojo-model/pom.xml
#	modules/i3plus-pojo-platform/pom.xml
#	modules/i3plus-pojo-report/pom.xml
#	modules/i3plus-pojo-softswitch/pom.xml
#	modules/i3plus-pojo-sweb/pom.xml
#	modules/i3plus-pojo-wms/pom.xml
#	modules/i3plus-pojo-workflow/pom.xml
#	pom.xml

modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java

@@ -301,16 +301,9 @@ public class AndonManageQueue extends BaseBean {
     @ApiParam(value = "组织名称")
     private String organizeNameRdd;
 
-    /**
-     * 1 = 是，2 = 否
-     */
-    @Column(name = "IS_RESOLVE")
-    @ApiParam(value = "是否驳回", example = "2")
-    private Integer isResolve;
-
-    @Column(name = "RESOLVE_OPINION")
+    @Column(name = "REJECT_OPINION")
     @ApiParam(value = "驳回意见")
-    private String resolveOpinion;
+    private String rejectOpinion;
 
     @Transient
     @ApiParam(value = "安灯状态集合")

modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageRecord.java

@@ -256,6 +256,14 @@ public class AndonManageRecord extends BaseBean {
     @ApiParam(value = "重要等级名称")
     private String importanceNameRdd;
 
+    @Column(name = "ORGANIZE_NAME_RDD")
+    @ApiParam(value = "组织名称")
+    private String organizeNameRdd;
+
+    @Column(name = "REJECT_OPINION")
+    @ApiParam(value = "驳回意见")
+    private String rejectOpinion;
+
     // 是否转呼
     public Integer getIsShiftCall() {
         return this.isShiftCall == null ? 0 : this.isShiftCall;

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

@@ -570,7 +570,7 @@ public class AndonEnumUtil {
         CANCEL_ACTION("40", "撤销动作"),
         COMMIT_ACTION("50","提交动作"),
         PASS_ACTION("60","审批动作"),
-        SHIFG_CALL_ACTION("70", "转呼动作");
+        REJECT_ACTION("70", "驳回动作");
 
         private String value;
         private String description;

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

@@ -19,6 +19,40 @@ public class WmsEnumUtil {
 
 
     /**
+     * 流程提交校验
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum GROUP_COMMIT_CHECK {
+        DISABLE(1, "禁止提交"), CHECK_MOVE(2, "校验移动单"),
+         NO_CHECK(3, "不校验"),CHECK_OLD_MOVE_NO(4, "校验是否已产生移动单");
+
+        private int value;
+        private String description;
+
+        GROUP_COMMIT_CHECK(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static GROUP_COMMIT_CHECK codeOf(int value) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+    }
+
+    /**
      * 订单明细信息 是否免费
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
@@ -724,6 +758,19 @@ public class WmsEnumUtil {
         public String getValue() {
             return value;
         }
+
+        public static MODULE_METHOD_NAME codeOf(String 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;
+        }
     }
 
 
@@ -1475,14 +1522,13 @@ public class WmsEnumUtil {
             return description;
         }
 
-        public static String valueOf(int val) {
-            String tmp = null;
+        public static ACTION_BUTLER_SOURCE valueOf(Integer val) {
             for (int i = 0; i < values().length; i++) {
                 if (values()[i].value == val) {
-                    tmp = values()[i].description;
+                    return values()[i];
                 }
             }
-            return tmp;
+            return null;
         }
     }
 
@@ -1491,7 +1537,7 @@ public class WmsEnumUtil {
      * 组件类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum COMPONENT_TYPE {
+    public enum AM_TYPE {
 
         PROCESS_HANDLING(10, "流程处理组件"),
         PROCESS_INITIALIZATION(20, "流程初始化组件"),
@@ -1503,7 +1549,7 @@ public class WmsEnumUtil {
         private int value;
         private String description;
 
-        COMPONENT_TYPE(int value, String description) {
+        AM_TYPE(int value, String description) {
             this.value = value;
             this.description = description;
         }
@@ -1526,7 +1572,7 @@ public class WmsEnumUtil {
             return tmp;
         }
 
-        public static COMPONENT_TYPE switchGetValue(int val) {
+        public static AM_TYPE switchGetValue(int val) {
             int tmp = 1;
             for (int i = 0; i < values().length; i++) {
                 if (values()[i].value == val) {
@@ -1578,8 +1624,7 @@ public class WmsEnumUtil {
      * 10=交互动作,20=后台动作,30=提交动作
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum GROUP_VALUE_TYPE {
-
+    public enum AGD_VALUE_TYPE {
         INTERACTIVE_ACTION(10, "交互动作"),
         BACKSTAGE_ACTION(20, "后台动作"),
         SUBMIT_ACTION(30, "提交动作"),
@@ -1588,7 +1633,7 @@ public class WmsEnumUtil {
         private int value;
         private String description;
 
-        GROUP_VALUE_TYPE(int value, String description) {
+        AGD_VALUE_TYPE(int value, String description) {
             this.value = value;
             this.description = description;
         }
@@ -1657,7 +1702,8 @@ public class WmsEnumUtil {
         STEP_SEQ("STEP_SEQ", "步骤调用序号"),
         MOVE_ORDER_NO("MOVE_ORDER_NO", "移库单单号"),
         QC_ORDER_NO("QC_ORDER_NO", "质检单单号"),
-        CHECK_ORDER_NO("CHECK_ORDER_NO", "盘点主表序号");
+        CHECK_ORDER_NO("CHECK_ORDER_NO", "盘点主表序号"),
+        INITIALIZE_SN("INITIALIZE_SN", "库存初始化");
 
         private String code;
         private String description;
@@ -3108,4 +3154,39 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 库存初始化 状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum STOCK_INITIALIZE_STATUS {
+        CREATE(10, "创建"),
+        FINISH(20, "完成");
+
+        private int value;
+        private String description;
+
+        STOCK_INITIALIZE_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        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;
+        }
+    }
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEvent.java

@@ -40,6 +40,10 @@ public class MesEvent extends BaseBean {
     @ApiParam("事件类型")
     private Integer eventType;
 
+    @Column(name="BUTTON_CODE")
+    @ApiParam("按钮代码")
+    private String buttonCode;
+
     public int getEventTypeVal() {
         return this.eventType == null ? 0 : this.eventType;
     }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java

@@ -346,6 +346,23 @@ public class MesHqlPack {
     }
 
     /**
+     * MES 上传文件FastDfs封装
+     * @param mesESOP
+     * @return
+     */
+    public static DdlPackBean getMesESOP(MesESOP mesESOP, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesESOP, organizeCode);
+        if (StringUtils.isNotEmpty(mesESOP.getWorkCenterCode())){
+            DdlPreparedPack.getStringEqualPack(mesESOP.getWorkCenterCode(), "workCenterCode", packBean);
+        }
+        if (StringUtils.isNotEmpty(mesESOP.getPartNo())){
+            DdlPreparedPack.getStringEqualPack(mesESOP.getPartNo(), "partNo", packBean);
+        }
+
+        return packBean;
+    }
+
+    /**
      * MES工序信息查询条件封装
      * @param process
      * @return

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BaseComponetsParam.java

@@ -15,6 +15,7 @@ import java.io.Serializable;
 @Data
 public abstract class BaseComponetsParam implements Serializable {
 
+    private static final long serialVersionUID = -3100983729388764245L;
     @ApiParam(value = "单据号")
     public String orderNo;
 

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/CheckPointModel.java

@@ -2,6 +2,8 @@ package cn.estsh.i3plus.pojo.model.wms;
 
 import lombok.Data;
 
+import java.io.Serializable;
+
 /**
  * @Description : 抽点接收数据model
  * @Reference :
@@ -10,8 +12,9 @@ import lombok.Data;
  * @Modify:
  **/
 @Data
-public class CheckPointModel {
+public class CheckPointModel implements Serializable {
 
+    private static final long serialVersionUID = -563591587968433245L;
     /**
      * 单据类型
      */

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/InStockCOInfoModel.java

@@ -2,6 +2,8 @@ package cn.estsh.i3plus.pojo.model.wms;
 
 import lombok.Data;
 
+import java.io.Serializable;
+
 /**
  * @Description : 入库上架任务回显模型
  * @Reference :
@@ -10,8 +12,9 @@ import lombok.Data;
  * @Modify:
  **/
 @Data
-public class InStockCOInfoModel {
+public class InStockCOInfoModel implements Serializable {
 
+    private static final long serialVersionUID = 8262969076279883816L;
     // 物料编码
     private String partNo;
 

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/InputSnModel.java

@@ -3,6 +3,8 @@ package cn.estsh.i3plus.pojo.model.wms;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
+import java.io.Serializable;
+
 /**
  * @Description : 扫描条码获取参数实体【使用：入库上架】
  * @Reference :
@@ -11,8 +13,9 @@ import lombok.Data;
  * @Modify:
  **/
 @Data
-public class InputSnModel {
+public class InputSnModel implements Serializable {
 
+    private static final long serialVersionUID = -6376845639646427435L;
     @ApiParam(value = "单号")
     public String orderNo;
 

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/OperationDbModle.java

@@ -3,6 +3,8 @@ package cn.estsh.i3plus.pojo.model.wms;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
+import java.io.Serializable;
+
 /**
  * @Description : 操作数据库表数据 参数封装
  * @Reference :
@@ -11,8 +13,9 @@ import lombok.Data;
  * @Modify:
  **/
 @Data
-public class OperationDbModle{
+public class OperationDbModle implements Serializable {
 
+    private static final long serialVersionUID = 4017643923322935222L;
     @ApiParam(value = "DAO名称")
     public String daoName;
 

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/PrintOrderDataModel.java

@@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.wms.bean.WmsPOMaster;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
+import java.io.Serializable;
+
 /**
  * @Description : 订单打印数据封装model
  * @Reference :
@@ -14,8 +16,9 @@ import lombok.Data;
  * @Modify:
  **/
 @Data
-public class PrintOrderDataModel {
+public class PrintOrderDataModel implements Serializable {
 
+    private static final long serialVersionUID = 7658636310926230309L;
     @ApiParam("业务数据类型")
     public Integer busiDataType;
 

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java

@@ -3,6 +3,8 @@ package cn.estsh.i3plus.pojo.model.wms;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
+import java.io.Serializable;
+
 /**
  * @Description : 收货扫描条码组件 参数封装
  * @Reference :
@@ -11,8 +13,9 @@ import lombok.Data;
  * @Modify:
  **/
 @Data
-public class TransSnModle extends BaseComponetsParam{
+public class TransSnModle extends BaseComponetsParam implements Serializable {
 
+    private static final long serialVersionUID = -7655276570647348180L;
     @ApiParam(value = "移动单号")
     public String moveNo;
 

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionGroupDetailsModel.java

@@ -1,11 +1,11 @@
 package cn.estsh.i3plus.pojo.model.wms;
 
-import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.wms.bean.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.util.List;
 
 /**
@@ -17,7 +17,8 @@ import java.util.List;
  **/
 @Data
 @Api("作业流程明细Model")
-public class WmsActionGroupDetailsModel {
+public class WmsActionGroupDetailsModel implements Serializable {
+    private static final long serialVersionUID = -5079293791052814745L;
     @ApiParam("作业流程明细")
     public WmsActionGroupDetails wmsActionGroupDetails;
     @ApiParam("作业步骤")

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionGroupModel.java

@@ -1,13 +1,9 @@
 package cn.estsh.i3plus.pojo.model.wms;
 
-import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.wms.bean.WmsActionGroup;
-import cn.estsh.i3plus.pojo.wms.bean.WmsActionGroupDetails;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
-import javax.persistence.Transient;
 import java.io.Serializable;
 import java.util.List;
 
@@ -21,6 +17,7 @@ import java.util.List;
 @Data
 @Api("作业流程Model")
 public class WmsActionGroupModel implements Serializable {
+    private static final long serialVersionUID = 5322363872992177667L;
     @ApiParam("流程")
     public String agId;
     @ApiParam("工厂代码")

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsAgCacheModel.java

@@ -0,0 +1,29 @@
+package cn.estsh.i3plus.pojo.model.wms;
+
+import cn.estsh.i3plus.pojo.wms.bean.WmsActionGroup;
+import cn.estsh.i3plus.pojo.wms.bean.WmsOptionModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description 作业流程缓存Model
+ * @Reference
+ * @Author dragon
+ * @CreateDate 2019/7/24 22:16
+ * @Modify
+ */
+@Data
+public class WmsAgCacheModel implements Serializable {
+
+    private static final long serialVersionUID = -330934023509433493L;
+    @ApiParam("作业流程")
+    public WmsActionGroup wmsActionGroup;
+    @ApiParam("流程初始化自定义组件")
+    public List<WmsOptionModel> options;
+    @ApiParam("作业流程明细Model集合")
+    public Map<String, WmsAgdCacheModel> wmsAgdCacheModelMap;
+}

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsAgdCacheModel.java

@@ -0,0 +1,28 @@
+package cn.estsh.i3plus.pojo.model.wms;
+
+import cn.estsh.i3plus.pojo.wms.bean.WmsActionGroupDetails;
+import cn.estsh.i3plus.pojo.wms.bean.WmsActionStepCall;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description 作业流程明细缓存Model
+ * @Reference
+ * @Author dragon
+ * @CreateDate 2019/7/24 22:16
+ * @Modify
+ */
+@Data
+public class WmsAgdCacheModel implements Serializable {
+    private static final long serialVersionUID = -3299805919552300963L;
+    @ApiParam("作业流程明细")
+    public WmsActionGroupDetails wmsActionGroupDetails;
+    @ApiParam("作业步骤调用")
+    public List<WmsActionStepCall> wmsActionStepCallList;
+    @ApiParam("作业步骤调用参数")
+    public Map<Object,Object> wmsActionStepCallParamsMap;
+}

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsAmCacheModel.java

@@ -0,0 +1,25 @@
+package cn.estsh.i3plus.pojo.model.wms;
+
+import cn.estsh.i3plus.pojo.wms.bean.WmsActionModule;
+import cn.estsh.i3plus.pojo.wms.bean.WmsActionModuleParam;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description 作业处理组件缓存Model
+ * @Reference
+ * @Author dragon
+ * @CreateDate 2019/7/24 22:17
+ * @Modify
+ */
+@Data
+public class WmsAmCacheModel implements Serializable {
+    private static final long serialVersionUID = 8940535584156105748L;
+    @ApiParam("作业处理组件")
+    public WmsActionModule wmsActionModule;
+    @ApiParam("作业处理组件参数集合")
+    public List<WmsActionModuleParam> wmsActionModuleParamList;
+}

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJOBModel.java

@@ -1,6 +1,5 @@
 package cn.estsh.i3plus.pojo.model.wms;
 
-import cn.estsh.i3plus.pojo.wms.bean.WmsMoveMaster;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -15,6 +14,7 @@ import java.util.List;
  **/
 @Data
 public class WmsJOBModel implements Serializable {
+    private static final long serialVersionUID = -3121529122274741330L;
     private List<WmsMoveMasterModel> wmsMoveMasterModelList;
     private String errorMessage;
 }

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java

@@ -14,6 +14,7 @@ import java.util.List;
  */
 @Data
 public class WmsJobParamModel implements Serializable {
+    private static final long serialVersionUID = 5784492509251527816L;
     private String organizeCode;
     private List<String> zonesNoList;
     private Integer snType;

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsLotQCTransModel.java

@@ -15,6 +15,7 @@ import java.util.List;
  **/
 @Data
 public class WmsLotQCTransModel implements Serializable {
+    private static final long serialVersionUID = -2995643152400039273L;
     private String orderNo;
     private List<WmsStockSn> wmsStockSnList;
 }

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsModel.java

@@ -16,6 +16,7 @@ import java.util.List;
  **/
 @Data
 public class WmsMoveDetailsModel implements Serializable {
+    private static final long serialVersionUID = -6968143574442339454L;
     private WmsMoveDetails details;
     private List<WmsMoveSn> moveSnList;
 }

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveMasterModel.java

@@ -15,6 +15,7 @@ import java.util.List;
  **/
 @Data
 public class WmsMoveMasterModel implements Serializable {
+    private static final long serialVersionUID = -5490167040159056107L;
     private WmsMoveMaster moveMaster;
     private List<WmsMoveDetailsModel> moveDetails;
 }

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsOrderMasterModel.java

@@ -15,6 +15,7 @@ import lombok.Data;
 @Data
 @Api("单据Model")
 public class WmsOrderMasterModel extends BaseBean {
+    private static final long serialVersionUID = -3048991897871809517L;
     @ApiParam("状态")
     public Integer orderStatus;
 

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java

@@ -15,6 +15,7 @@ import java.io.Serializable;
  **/
 @Data
 public class WmsTaskInfoModel implements Serializable {
+    private static final long serialVersionUID = 8755413052807531167L;
     @ApiParam("任务单号")
     public String orderNo;
     @Column(name = "TRANS_TYPE_CODE")

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java

@@ -65,4 +65,13 @@ public class SessionUser implements Serializable {
         this.languageCode = languageCode;
         this.userType = userTypeId;
     }
+
+    /**
+     * 不建议使用， 推荐使用 AuthUtil.getDeviceId(); 方法
+     * @return
+     */
+    @Deprecated
+    public String getDeviceId() {
+        return deviceId;
+    }
 }

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

@@ -29,6 +29,7 @@ import javax.persistence.Table;
 @Api(value="AMP_JIS收货",description = "AMP_JIS收货")
 public class AmpJisRec extends BaseBean{
 
+    private static final long serialVersionUID = 4460727160153551089L;
     @Column(name="ORDER_NO")
     @ApiParam("JIS单号")
     public String orderNo;

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

@@ -28,6 +28,7 @@ import javax.persistence.Table;
 @Api("AMP_物料")
 public class AmpPart extends BaseBean {
 
+    private static final long serialVersionUID = -4332932784803175933L;
     @Column(name = "PART_NO")
     @ApiParam(value = "物料编号")
     private String partNo;

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

@@ -29,6 +29,7 @@ import javax.persistence.Table;
 @Api("AMP_实时库存表")
 public class AmpStockCurrent extends BaseBean {
 
+    private static final long serialVersionUID = 4717329530669998842L;
     @Column(name = "PART_NO")
     @ApiParam(value = "物料编号")
     private String partNo;

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

@@ -28,6 +28,7 @@ import javax.persistence.Table;
 @Api(value="客户信息表",description = "客户信息表")
 public class BasCustomer extends BaseBean {
 
+    private static final long serialVersionUID = -1980207700343546396L;
     @Column(name = "CUST_NO")
     @ApiParam(value = "客户编号")
     private String custNo;

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

@@ -28,6 +28,7 @@ import javax.persistence.Table;
 @Api("供应商")
 public class BasVendor extends BaseBean{
 
+    private static final long serialVersionUID = 9214639813072592779L;
     @Column(name="VENDOR_NO")
     @ApiParam("供应商编号")
     private String vendorNo;

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

@@ -16,6 +16,7 @@ import lombok.Data;
 @Api(value = "ASN计划", description = "ASN计划")
 public class SapAsn extends SapBase {
 
+    private static final long serialVersionUID = -5985369634793872765L;
     @ApiParam(value = "ASN号")
     @AnnoOutputColumn
     private String zasnno;

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

@@ -4,9 +4,9 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.text.SimpleDateFormat;
 import java.util.Date;
-import java.util.Random;
 import java.util.UUID;
 
 /**
@@ -17,8 +17,9 @@ import java.util.UUID;
  * @Modify:
  **/
 @Data
-public class SapBase {
+public class SapBase implements Serializable {
 
+    private static final long serialVersionUID = -3373467948186161102L;
     @ApiParam(value = "处理人", example = "-1")
     private String actusr = "导入";
 

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

@@ -16,6 +16,7 @@ import lombok.Data;
 @Api(value = "委外材料发运", description = "委外材料发运")
 public class SapCgio extends SapBase{
 
+    private static final long serialVersionUID = 6325127966003720947L;
     @ApiParam(value = "编号")
     @AnnoOutputColumn
     private String zinstno;

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

@@ -16,6 +16,7 @@ import lombok.Data;
 @Api(value="盘点",description = "盘点")
 public class SapCyco extends SapBase{
 
+    private static final long serialVersionUID = 2167743108452607620L;
     @ApiParam(value = "盘点凭证号")
     @AnnoOutputColumn
     private String iblnr;

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

@@ -16,6 +16,7 @@ import lombok.Data;
 @Api(value="盘点调差",description = "盘点调差")
 public class SapDifo extends SapBase{
 
+    private static final long serialVersionUID = -7537399948526067205L;
     @ApiParam(value = "工厂")
     @AnnoOutputColumn
     private String werks;

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

@@ -16,6 +16,7 @@ import lombok.Data;
 @Api(value="非JIS发运",description = "非JIS发运")
 public class SapDn extends SapBase{
 
+    private static final long serialVersionUID = -1205193829054736341L;
     @ApiParam(value = "销售交货单号",example = "1")
     @AnnoOutputColumn
     private String vbeln;

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

@@ -1,6 +1,5 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
-import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -34,6 +33,7 @@ import javax.persistence.Transient;
 @Api("SAP_产品报工汇总表")
 public class SapDocFgSum extends BaseBean {
 
+    private static final long serialVersionUID = 6550731177315159003L;
     @Column(name="ORDER_NO")
     @ApiParam("订单号")
     public String orderNo;

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

@@ -16,6 +16,7 @@ import lombok.Data;
 @Api(value="要货计划",description = "要货计划")
 public class SapDspo extends SapBase{
 
+    private static final long serialVersionUID = -4512641994504027062L;
     @ApiParam(value = "SA_PO编号",example = "1")
     @AnnoOutputColumn
     private String ebeln;

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

@@ -16,6 +16,7 @@ import lombok.Data;
 @Api(value="零星领料(退)料结果",description = "零星领料(退)料结果")
 public class SapMiscr extends SapBase{
 
+    private static final long serialVersionUID = -1374809598755138268L;
     @ApiParam(value = "编号",example = "1")
     @AnnoOutputColumn
     private String zinstno;

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

@@ -16,6 +16,7 @@ import lombok.Data;
 @Api(value="库存转储",description = "库存转储")
 public class SapMovo extends SapBase{
 
+    private static final long serialVersionUID = 4494664666984619727L;
     @ApiParam(value = "编号",example = "1")
     @AnnoOutputColumn
     private String refid;

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

@@ -16,6 +16,7 @@ import lombok.Data;
 @Api(value="销售退货",description = "销售退货")
 public class SapRdn extends SapBase{
 
+    private static final long serialVersionUID = -3529901573586946954L;
     @ApiParam(value = "退货交货单",example = "1")
     @AnnoOutputColumn
     private String vbeln;

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

@@ -16,6 +16,7 @@ import lombok.Data;
 @Api(value="供应商退货",description = "供应商退货")
 public class SapReto extends SapBase{
 
+    private static final long serialVersionUID = -2090891348793738914L;
     @ApiParam(value = "业务类型",example = "1")
     @AnnoOutputColumn
     private String zaction;

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

@@ -30,6 +30,7 @@ import java.util.List;
 @Api("工厂仓库信息")
 public class WareHouse extends BaseBean {
 
+    private static final long serialVersionUID = 7914396535326597148L;
     @Column(name="CODE")
     @ApiParam("仓库代码")
     public String code;

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

@@ -30,6 +30,7 @@ import java.util.List;
 @Api("ASN主表信息")
 public class WmsASNMaster extends BaseBean {
 
+    private static final long serialVersionUID = 652057416776991025L;
     @Column(name = "ORDER_NO")
     @ApiParam("订单号")
     public String orderNo;

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

@@ -32,6 +32,7 @@ import javax.persistence.*;
 })
 @Api("ASN订单明细信息")
 public class WmsASNMasterDetails extends BaseBean {
+    private static final long serialVersionUID = -9174994369307078375L;
     @Column(name = "PART_NO")
     @ApiParam("物料编码")
     public String partNo;

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

@@ -28,6 +28,7 @@ import javax.persistence.*;
 @Api("作业流程")
 public class WmsActionGroup extends BaseBean {
 
+    private static final long serialVersionUID = -4169996695337717755L;
     @Column(name = "AG_NAME_E")
     @ApiParam("英文流程名称")
     private String agNameE;
@@ -69,30 +70,27 @@ public class WmsActionGroup extends BaseBean {
     @ApiParam(value = "GOJS位置")
     private String position;
 
-    public Long getInitAmId() {
-        if (initAmId != null) {
-            return initAmId.longValue();
-        } else {
-            return initAmId;
-        }
+    @Transient
+    @ApiParam(value = "提交步骤序号")
+    private Integer submitStepSeq;
+
+    public long getInitAmIdVal() {
+        return this.initAmId == null ? 0 : this.initAmId.intValue();
+    }
+
+    public long getDetailsAmIdVal() {
+        return this.detailsAmId == null ? 0 : this.detailsAmId.intValue();
     }
 
-    public Long getDetailsAmId() {
-        if (detailsAmId != null) {
-            return detailsAmId.longValue();
-        } else {
-            return detailsAmId;
-        }
+    public long getEndAmIdVal() {
+        return this.endAmId == null ? 0 : this.endAmId.intValue();
     }
 
-    public Long getEndAmId() {
-        if (endAmId != null) {
-            return endAmId.longValue();
-        } else {
-            return endAmId;
-        }
+    public int getAutoInitVal() {
+        return this.autoInit == null ? 0 : this.autoInit.intValue();
     }
 
-    public WmsActionGroup() {
+    public int geSubmitStepSeqVal() {
+        return this.submitStepSeq == null ? 0 : this.submitStepSeq.intValue();
     }
 }

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

@@ -31,6 +31,7 @@ import javax.persistence.Transient;
 @Api("作业流程明细")
 public class WmsActionGroupDetails extends BaseBean {
 
+    private static final long serialVersionUID = 544189352378073377L;
     @Column(name = "AG_ID")
     @ApiParam(value = "作业流程ID", example = "0")
     @JsonSerialize(using = ToStringSerializer.class)
@@ -65,6 +66,11 @@ public class WmsActionGroupDetails extends BaseBean {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long asId;
 
+    @Column(name = "AT_ID")
+    @ApiParam(value = "步骤类型编号", example = "0")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long atId;
+
     @Transient
     @ApiParam(value = "作业步骤名称")
     private String asName;
@@ -89,4 +95,44 @@ public class WmsActionGroupDetails extends BaseBean {
     @ApiParam(value = "回显组件方法ID", example = "1")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long showAmId;
+
+    @Column(name = "IS_COMMIT_ABLE")
+    @ApiParam(value = "是否可提交", example = "2")
+    private Integer isCommitAble;
+
+    public int getSeqVal() {
+        return this.seq == null ? 0 : this.seq;
+    }
+
+    public int getNgSeqVal() {
+        return this.ngSeq == null ? 0 : this.ngSeq;
+    }
+
+    public int getOkSeqVal() {
+        return this.okSeq == null ? 0 : this.okSeq;
+    }
+
+    public int getPreShowVal() {
+        return this.preShow == null ? 0 : this.preShow;
+    }
+
+    public long getShowAmIdVal() {
+        return this.showAmId == null ? 0 : this.showAmId;
+    }
+
+    public int getIsCommitAbleVal() {
+        return this.isCommitAble == null ? 0 : this.isCommitAble;
+    }
+
+    public int getValueTypeVal() {
+        return this.valueType == null ? 0 : this.valueType;
+    }
+
+    public int getToUpperVal() {
+        return this.toUpper == null ? 0 : this.toUpper;
+    }
+
+    public int getLenCheckVal() {
+        return this.lenCheck == null ? 0 : this.lenCheck;
+    }
 }

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

@@ -29,30 +29,22 @@ import javax.persistence.Transient;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Table(name="WMS_ACTION_LOG")
-@Api(value="作业记录表",description = "作业记录表")
+@Api(value="作业记录表")
 public class WmsActionLog extends BaseBean {
 
-    @Column(name="TASK_ID")
+    private static final long serialVersionUID = 8664373854844368861L;
+    @Column(name="TASK_NO")
     @ApiParam(value = "作业任务编号", example = "1")
     @JsonSerialize(using = ToStringSerializer.class)
-    public Long taskId;
-
-    //get单独处理
-    public Long getTaskId() {
-        if(taskId != null) {
-            return taskId.longValue();
-        }else{
-            return taskId;
-        }
-    }
+    public String taskNo;
 
     @Column(name="TRANS_TYPE_CODE")
     @ApiParam(value = "交易类型编号")
     public String transTypeCode;
 
-    @Column(name="TRANS_TYPE_NAME")
-    @ApiParam(value = "交易类型名称")
-    public String transTypeName;
+    @Column(name="MOVE_NO")
+    @ApiParam(value = "移动单单号")
+    public String moveNo;
 
     @Column(name="AG_ID")
     @ApiParam(value = "作业流程编号", example = "1")
@@ -76,13 +68,9 @@ public class WmsActionLog extends BaseBean {
     @ApiParam(value = "作业人员")
     public String actionUserName;
 
-    @Column(name="FIX_ID")
+    @Column(name="FIX_NO")
     @ApiParam(value = "设备编号")
-    public String fixId;
-
-    @Column(name="ORDER_NO")
-    @ApiParam(value = "单据编号")
-    public String orderNo;
+    public String fixNo;
 
     @Column(name="START_TIME")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@@ -129,15 +117,15 @@ public class WmsActionLog extends BaseBean {
 
     @Column(name="INIT_AM_ID")
     @ApiParam(value = "初始化组件编号", example = "0")
-    private Long initAmId;
+    public Long initAmId;
 
     @Column(name="DETAILS_AM_ID")
     @ApiParam(value = "明细处理组件编号", example = "0")
-    private Long detailsAmId;
+    public Long detailsAmId;
 
     @Column(name="END_AM_ID")
     @ApiParam(value = "结束组件编号", example = "0")
-    private Long endAmId;
+    public Long endAmId;
 
     public Long getInitAmId() {
         if (initAmId != null) {

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

@@ -32,6 +32,7 @@ import javax.persistence.Table;
 @Api(value="作业记录参数表",description = "作业记录参数表")
 public class WmsActionLogData extends BaseBean {
 
+    private static final long serialVersionUID = -8150713013135101134L;
     @Column(name = "ALD_ID")
     @ApiParam(value = "记录明细编号")
     @JsonSerialize(using = ToStringSerializer.class)
@@ -74,7 +75,7 @@ public class WmsActionLogData extends BaseBean {
     private String outParams;
 
     @Lob
-    @Column(name = "OUT_RESULT")
-    @ApiParam(value = "执行结果")
-    private String outResult;
+    @Column(name = "ERROR_MSG")
+    @ApiParam(value = "异常信息")
+    private String errorMsg;
 }

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

@@ -30,8 +30,9 @@ import javax.persistence.Table;
 @Api(value = "作业记录明细表", description = "作业记录表")
 public class WmsActionLogDetails extends BaseBean {
 
+    private static final long serialVersionUID = 680681221361042296L;
     @Column(name = "AL_ID")
-    @ApiParam(value = "作业流程ID", example = "1")
+    @ApiParam(value = "作业记录ID", example = "1")
     @JsonSerialize(using = ToStringSerializer.class)
     public Long alId;
 
@@ -75,6 +76,11 @@ public class WmsActionLogDetails extends BaseBean {
     @JsonSerialize(using = ToStringSerializer.class)
     public Long asId;
 
+    @Column(name = "AT_ID")
+    @ApiParam(value = "步骤类型编号", example = "0")
+    @JsonSerialize(using = ToStringSerializer.class)
+    public Long atId;
+
     @Column(name = "ALD_STATUS")
     @ApiParam(value = "执行状态", example = "1")
     public Integer aldStatus;
@@ -89,23 +95,23 @@ public class WmsActionLogDetails extends BaseBean {
 
     @Column(name = "GOTO_BTN_CODE")
     @ApiParam(value = "跳转按钮代码")
-    private String goToBtnCode;
+    public String goToBtnCode;
 
     @Column(name = "GOTO_BTN_NAME")
     @ApiParam(value = "跳转按钮名称")
-    private String goToBtnName;
+    public String goToBtnName;
 
     @Column(name = "PRE_SHOW")
     @ApiParam(value = "是否预显示", example = "1")
-    private Integer preShow;
+    public Integer preShow;
 
     @Column(name = "SHOW_AM_ID")
     @ApiParam(value = "回显组件方法ID", example = "1")
-    private Long showAmId;
+    public Long showAmId;
 
     @Column(name = "AGD_ID")
     @ApiParam(value = "作业流程明细ID", example = "1")
-    private Long agdId;
+    public Long agdId;
 
     public Long getAsId() {
         if (asId != null) {

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

@@ -28,6 +28,7 @@ import javax.persistence.Table;
 @Api("作业步骤处理组件")
 public class WmsActionModule extends BaseBean {
 
+    private static final long serialVersionUID = 9117362998863937579L;
     @Column(name = "AM_NAME")
     @ApiParam("组件名称")
     public String amName;

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

@@ -30,6 +30,7 @@ import javax.persistence.Table;
 @Api("作业步骤处理组参数")
 public class WmsActionModuleParam extends BaseBean {
 
+    private static final long serialVersionUID = 8099621042858629818L;
     @Column(name = "AM_ID")
     @ApiParam(value = "组件ID", example = "0")
     @JsonSerialize(using = ToStringSerializer.class)
@@ -54,4 +55,9 @@ public class WmsActionModuleParam extends BaseBean {
     @Column(name = "PARAM_TYPE")
     @ApiParam(value = "参数类型【1=可选列表,10=数字,20=字符串,30=出参】", example = "0")
     public Integer paramType;
+
+    public int getParamTypeVal() {
+        return this.paramType == null ? 0 : this.paramType;
+    }
+
 }

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

@@ -26,6 +26,7 @@ import java.util.Map;
 @Api("返回前端数据实体")
 public class WmsActionResponseBean<Obj> implements Serializable {
 
+    private static final long serialVersionUID = 201974065997991407L;
     @ApiParam("回显BARCODE值")
     public Map<String, Obj> barCode;
 

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

@@ -30,6 +30,7 @@ import javax.persistence.Table;
 @Api(value="作业步骤信息",description = "作业步骤信息")
 public class WmsActionStep extends BaseBean {
 
+    private static final long serialVersionUID = 6460096995982059959L;
     @Column(name = "AS_NAME_E")
     @ApiParam(value = "英文类型名称")
     private String asNameE;

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

@@ -24,7 +24,7 @@ import javax.persistence.*;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name="WMS_ACTION_STEP_CALL", indexes = {
+@Table(name = "WMS_ACTION_STEP_CALL", indexes = {
         @Index(columnList = "ORGANIZE_CODE"),
         @Index(columnList = "AS_ID"),
         @Index(columnList = "AM_ID")
@@ -32,17 +32,18 @@ import javax.persistence.*;
 @Api("作业步骤调用信息")
 public class WmsActionStepCall extends BaseBean {
 
-    @Column(name="AS_ID")
-    @ApiParam(value = "作业步骤ID",example = "0")
+    private static final long serialVersionUID = -6013283534745803464L;
+    @Column(name = "AS_ID")
+    @ApiParam(value = "作业步骤ID", example = "0")
     @JsonSerialize(using = ToStringSerializer.class)
     public Long asId;
 
-    @Column(name="SEQ")
-    @ApiParam(value = "序号",example = "0")
+    @Column(name = "SEQ")
+    @ApiParam(value = "序号", example = "0")
     public Integer seq;
 
-    @Column(name="AM_ID")
-    @ApiParam(value = "处理组件ID",example = "0")
+    @Column(name = "AM_ID")
+    @ApiParam(value = "处理组件ID", example = "0")
     @JsonSerialize(using = ToStringSerializer.class)
     public Long amId;
 
@@ -54,11 +55,19 @@ public class WmsActionStepCall extends BaseBean {
     @ApiParam(value = "组件描述")
     public String amDesc;
 
-    @Column(name="AM_TYPE")
+    @Column(name = "AM_TYPE")
     @ApiParam(value = "组件类型", example = "0")
     public Integer amType;
 
-    @Column(name="OK_VALUE")
+    @Column(name = "OK_VALUE")
     @ApiParam(value = "成功标志", example = "10")
     public Integer okValue;
+
+    public int getAmTypeVal() {
+        return this.amType == null ? 0 : this.amType;
+    }
+
+    public int getOkValueVal() {
+        return this.okValue == null ? 0 : this.okValue;
+    }
 }

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

@@ -31,6 +31,7 @@ import javax.persistence.Transient;
 @Api(value="作业步骤调用参数表",description = "作业步骤调用参数表")
 public class WmsActionStepCallParam extends BaseBean {
 
+    private static final long serialVersionUID = -2813779192436803301L;
     @Column(name = "AGD_ID")
     @ApiParam(value = "流程明细编号")
     @JsonSerialize(using = ToStringSerializer.class)

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

@@ -28,6 +28,7 @@ import javax.persistence.Table;
 @Api(value="作业步骤类型信息",description = "作业步骤类型信息")
 public class WmsActionStepType extends BaseBean {
 
+    private static final long serialVersionUID = -8019644718382990603L;
     @Column(name = "AT_NAME_E")
     @ApiParam(value = "英文类型名称")
     private String atNameE;

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

@@ -29,6 +29,7 @@ import javax.persistence.Transient;
 @Api(value="责任区域分配信息",description = "责任区域分配信息")
 public class WmsAreaOwner extends BaseBean {
 
+    private static final long serialVersionUID = -5772266802563087135L;
     @Column(name = "WH_NO")
     @ApiParam(value = "仓库代码")
     private String whNo;

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

@@ -30,6 +30,7 @@ import javax.persistence.Table;
 @Api(value = "物料清单", description = "物料清单")
 public class WmsBom extends BaseBean {
 
+    private static final long serialVersionUID = 5555657644784074446L;
     @Column(name = "PART_NO")
     @ApiParam(value = "父物料号")
     private String partNo;

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

@@ -27,6 +27,7 @@ import javax.persistence.Table;
 @Table(name = "WMS_BOM_TOTAL")
 @Api("全量BOM")
 public class WmsBomTotal extends BaseBean {
+    private static final long serialVersionUID = 8196235268344152723L;
     @Column(name = "PART_NO")
     @ApiParam("父物料号")
     private String partNo;

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

@@ -28,6 +28,7 @@ import javax.persistence.Table;
 @Api("业务类型信息")
 public class WmsBusiType extends BaseBean {
 
+    private static final long serialVersionUID = -5401677317639542934L;
     @Column(name = "BUSI_TYPE_CODE")
     @ApiParam(value = "类型编号")
     private Integer busiTypeCode;

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

@@ -29,6 +29,7 @@ import javax.persistence.Transient;
 @Api("盘点调差范围信息")
 public class WmsCSAdjustRange extends BaseBean {
 
+    private static final long serialVersionUID = 5841868297132948238L;
     @Column(name="ORDER_NO")
     @ApiParam("单号")
     public String orderNo;

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

@@ -30,6 +30,7 @@ import javax.persistence.Transient;
 @Api("盘点实盘信息")
 public class WmsCSFactTrans extends BaseBean {
 
+    private static final long serialVersionUID = 4187069750607177519L;
     @Column(name="ORDER_NO")
     @ApiParam("单号")
     public String orderNo;

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

@@ -28,6 +28,7 @@ import javax.persistence.Table;
 @Api("盘点库位信息")
 public class WmsCSLocate extends BaseBean {
 
+    private static final long serialVersionUID = 438495180402632954L;
     @Column(name="ORDER_NO")
     @ApiParam("单号")
     public String orderNo;

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

@@ -29,6 +29,7 @@ import javax.persistence.Transient;
 @Table(name = "WMS_DOC_CS_DETAILS")
 @Api("盘点单冻结信息")
 public class WmsCSOrderDetails extends BaseBean {
+    private static final long serialVersionUID = 1054153436116196360L;
     @Column(name = "PART_NO")
     @ApiParam("物料编码")
     public String partNo;

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

@@ -30,6 +30,7 @@ import java.util.List;
 @Api("盘点单主表信息")
 public class WmsCSOrderMaster extends BaseBean {
 
+    private static final long serialVersionUID = 3685205378778986296L;
     @Column(name = "ORDER_NO")
     @ApiParam("单号")
     public String orderNo;

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

@@ -28,6 +28,7 @@ import javax.persistence.Table;
 @Api("盘点区物料信息")
 public class WmsCSPart extends BaseBean {
 
+    private static final long serialVersionUID = 7094084677645492387L;
     @Column(name="ORDER_NO")
     @ApiParam("单号")
     public String orderNo;

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

@@ -28,6 +28,7 @@ import javax.persistence.Table;
 @Api("盘点范围信息")
 public class WmsCSRange extends BaseBean {
 
+    private static final long serialVersionUID = 7429676886975711828L;
     @Column(name="ORDER_NO")
     @ApiParam("单号")
     public String orderNo;

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

@@ -29,6 +29,7 @@ import javax.persistence.Transient;
 @Api("盘点存储区信息")
 public class WmsCSZone extends BaseBean {
 
+    private static final long serialVersionUID = -900178775079668694L;
     @Column(name="ORDER_NO")
     @ApiParam("单号")
     public String orderNo;

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

@@ -29,6 +29,7 @@ import javax.persistence.Transient;
 @Api("抽点记录信息")
 public class WmsCheckFactRecord extends BaseBean {
 
+    private static final long serialVersionUID = 1580654885527050552L;
     @Column(name = "REF_TYPE")
     @ApiParam(value = "关联单据类型")
     private String refType;

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

@@ -28,6 +28,7 @@ import javax.persistence.Table;
 @Api(value="系统配置",description = "WMS系统配置")
 public class WmsConfig extends BaseBean {
 
+    private static final long serialVersionUID = 8998024716940590623L;
     @Column(name="NAME")
     @ApiParam(value ="名称")
     private String name;

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

@@ -29,6 +29,7 @@ import javax.persistence.Transient;
 @Api(value="客户零件关系表",description = "客户零件关系表")
 public class WmsCustomerPart extends BaseBean {
 
+    private static final long serialVersionUID = 3903166651913139058L;
     @Column(name = "CUSTOMER_CODE")
     @ApiParam(value = "客户代码")
     private String customerCode;

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

@@ -28,6 +28,7 @@ import javax.persistence.Table;
 @Api(value="数据权限信息",description = "数据权限信息")
 public class WmsDataAuth extends BaseBean {
 
+    private static final long serialVersionUID = -6695149147049055125L;
     @Column(name = "ROLE_CODE")
     @ApiParam(value = "角色编号")
     private String roleCode;

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

@@ -29,6 +29,7 @@ import javax.persistence.Table;
 @Api("WMS_产品报工明细信息")
 public class WmsDocFgDetail extends BaseBean {
 
+    private static final long serialVersionUID = -7720818516623685424L;
     @Column(name="ORDER_NO")
     @ApiParam("订单号")
     public String orderNo;

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

@@ -31,6 +31,7 @@ import javax.persistence.*;
 })
 @Api("移库单明细表")
 public class WmsDocMovementDetails extends BaseBean {
+    private static final long serialVersionUID = -4800308354250386102L;
     @Column(name = "PART_NO")
     @ApiParam("物料编码")
     public String partNo;

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

@@ -34,6 +34,7 @@ import java.util.List;
 @Api("移库单表")
 @ToString
 public class WmsDocMovementMaster extends BaseBean {
+    private static final long serialVersionUID = -4459803926536024325L;
     @Column(name = "ORDER_NO")
     @ApiParam(value = "移库单单号")
     private String orderNo;

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

@@ -33,6 +33,7 @@ import javax.persistence.*;
 @Api("移库条码信息")
 public class WmsDocMovementSn extends BaseBean {
 
+    private static final long serialVersionUID = 5704546384179442907L;
     @Column(name="ORDER_NO")
     @ApiParam("订单号")
     public String orderNo;

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

@@ -29,6 +29,7 @@ import javax.persistence.Table;
 @Api("产品入库信息")
 public class WmsFGInStock extends BaseBean {
 
+    private static final long serialVersionUID = 5337952801731230326L;
     @Column(name="ORDER_NO")
     @ApiParam("订单号")
     public String orderNo;

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

@@ -10,7 +10,6 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
-import javax.persistence.Index;
 import javax.persistence.Table;
 
 /**
@@ -29,6 +28,7 @@ import javax.persistence.Table;
 @Api("WMS设备信息")
 public class WmsFix extends BaseBean{
 
+    private static final long serialVersionUID = 740758621658888395L;
     @Column(name = "FIX_ID")
     @ApiParam("设备编号")
     public String fixId;

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

@@ -4,7 +4,6 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
-import io.swagger.models.auth.In;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
@@ -31,6 +30,7 @@ import javax.persistence.Transient;
 @Api(value="抽点比例表",description = "抽点比例表")
 public class WmsIbCheckPlan extends BaseBean{
 
+    private static final long serialVersionUID = 3557978060450659460L;
     @Column(name="PART_NO")
     @ApiParam(value ="物料编码")
     private String partNo;

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

@@ -30,6 +30,7 @@ import javax.persistence.Table;
 @Deprecated
 public class WmsLineLocatePart extends BaseBean {
 
+    private static final long serialVersionUID = -3234516001954145902L;
     @Column(name="LOCATE_NO")
     @ApiParam(value ="库位代码")
     private String locateNo;

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

@@ -28,6 +28,7 @@ import javax.persistence.Table;
 @Api(value = "库位表", description = "库位表")
 public class WmsLocate extends BaseBean {
 
+    private static final long serialVersionUID = -8425904594036746967L;
     @Column(name = "LOCATE_NO")
     @ApiParam(value = "库位代码")
     private String locateNo;

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

@@ -29,6 +29,7 @@ import javax.persistence.Transient;
 @Api(value = "库位物料表", description = "库位物料表")
 public class WmsLocatePart extends BaseBean {
 
+    private static final long serialVersionUID = 9134745988014340144L;
     @Column(name = "LOCATE_NO")
     @ApiParam(value = "库位代码")
     private String locateNo;

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

@@ -30,6 +30,7 @@ import javax.persistence.*;
 @Api("库存移动单明细信息")
 public class WmsMoveDetails extends BaseBean {
 
+    private static final long serialVersionUID = -5898637337319011710L;
     @Column(name="ORDER_NO")
     @ApiParam("单号")
     public String orderNo;

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

@@ -30,6 +30,7 @@ import javax.persistence.*;
 @Api("库存移动单主表信息")
 public class WmsMoveMaster extends BaseBean {
 
+    private static final long serialVersionUID = 6007513013224444498L;
     @Column(name = "ORDER_NO")
     @ApiParam("单号")
     public String orderNo;

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

@@ -32,6 +32,7 @@ import javax.persistence.*;
 @Api("库存移动单条码信息")
 public class WmsMoveSn extends BaseBean {
 
+    private static final long serialVersionUID = 1490715681910614399L;
     @Column(name="ORDER_NO")
     @ApiParam("单号")
     public String orderNo;

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

@@ -32,6 +32,7 @@ import javax.persistence.*;
 @Api("库存移动单主表信息")
 public class WmsMoveToERP extends BaseBean {
 
+    private static final long serialVersionUID = -6223527594941733060L;
     @Column(name = "ORDER_NO")
     @ApiParam("单号")
     public String orderNo;

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

@@ -31,6 +31,7 @@ import javax.persistence.Transient;
 @Api("作业类型")
 public class WmsOpType extends BaseBean {
 
+    private static final long serialVersionUID = -5751852067398288165L;
     @Column(name = "OP_TYPE_CODE")
     @ApiParam("类型编号")
     private String opTypeCode;

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

@@ -18,17 +18,21 @@ import java.util.List;
 @Api("接受前端数据实体")
 public class WmsOperationBean<Obj> extends BaseBean {
 
+    private static final long serialVersionUID = -7387560917258478191L;
     @ApiParam("扫描内容")
     public String barCode;
 
     @ApiParam("可选项的值")
-    public List<Obj> options;
+    public List<WmsOptionModel> options;
 
     @ApiParam("设备编号")
     public String fixNo;
 
-    @ApiParam("作业记录编号")
-    public String alId;
+    @ApiParam("交易类型")
+    public String transTypeCode;
+
+    @ApiParam("任务单号")
+    public String taskNo;
 
     /**
      * 触发源:

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

@@ -5,6 +5,8 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.io.Serializable;
+
 /**
  * @Description : 可选项模型
  * @Reference :
@@ -18,8 +20,9 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
-public class WmsOptionModel {
+public class WmsOptionModel implements Serializable {
 
+    private static final long serialVersionUID = -4282021744536667534L;
     private String code;
 
     private String name;

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

@@ -30,6 +30,7 @@ import java.util.List;
 @Api("PO主表信息")
 public class WmsPOMaster extends BaseBean {
 
+    private static final long serialVersionUID = -5439534283717671648L;
     @Column(name = "ORDER_NO")
     @ApiParam("订单号")
     public String orderNo;

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

@@ -28,6 +28,7 @@ import javax.persistence.Table;
 @Api(value="包装箱条码表",description = "包装箱条码表")
 public class WmsPackSn extends BaseBean {
 
+    private static final long serialVersionUID = -4768071470722776160L;
     @Column(name = "ORDER_NO")
     @ApiParam(value = "订单号")
     private String orderNo;

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

@@ -28,6 +28,7 @@ import javax.persistence.Table;
 @Api("物理包装信息")
 public class WmsPackage extends BaseBean {
 
+    private static final long serialVersionUID = -8009404275658985601L;
     @Column(name="PACKAGE_NO")
     @ApiParam("包装编号")
     public String packageNo;

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

@@ -29,6 +29,7 @@ import javax.persistence.Transient;
 @Table(name = "WMS_PART")
 @Api("物料表")
 public class WmsPart extends BaseBean {
+    private static final long serialVersionUID = 4849044986767609346L;
     @Column(name = "PART_NO")
     @ApiParam(value = "物料编码")
     private String partNo;

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

@@ -34,6 +34,7 @@ import javax.persistence.*;
 @Api("PO条码信息")
 public class WmsPoSn extends BaseBean {
 
+    private static final long serialVersionUID = -5493787929463992199L;
     @Column(name="ORDER_NO")
     @ApiParam("订单号")
     public String orderNo;

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

@@ -11,8 +11,6 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
-import javax.persistence.Transient;
-import java.util.List;
 
 /**
  * @Description : 产品项目
@@ -30,6 +28,7 @@ import java.util.List;
 @Api("项目信息")
 public class WmsProdCfgType extends BaseBean {
 
+    private static final long serialVersionUID = -131043081244530896L;
     @Column(name="PROD_CFG_TYPE_CODE")
     @ApiParam("项目代码")
     public String prodCfgTypeCode;

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

@@ -28,6 +28,7 @@ import javax.persistence.Table;
 @Api("生产版本")
 public class WmsProductVersion extends BaseBean {
 
+    private static final long serialVersionUID = -1708833666516164791L;
     @Column(name = "ERP_WORK_CENTER")
     @ApiParam("ERP工作中心")
     private String erpWorkCenter;

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

@@ -29,6 +29,7 @@ import javax.persistence.Version;
 @Table(name = "WMS_QC_DETAILS")
 @Api("质检单明细信息")
 public class WmsQCDetails extends BaseBean {
+    private static final long serialVersionUID = 7442224593652923072L;
     @Column(name = "PART_NO")
     @ApiParam("物料编码")
     public String partNo;

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

@@ -29,6 +29,7 @@ import javax.persistence.Transient;
 @Api("质检单主表信息")
 public class WmsQCMaster extends BaseBean {
 
+    private static final long serialVersionUID = 2701710669030092148L;
     @Column(name = "ORDER_NO")
     @ApiParam("单号")
     public String orderNo;