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

.gitignore

@@ -12,4 +12,5 @@ target
 *.class
 .md
 *.log
-*.properties
+*.properties
+.DS_Store

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/Pager.java

@@ -114,7 +114,7 @@ public class Pager {
     }
 
     public int getCurrentPage() {
-        return currentPage;
+        return currentPage < 1 ? 1 : currentPage;
     }
 
     public void setCurrentPage(int currentPage) {

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

@@ -830,7 +830,8 @@ public class BlockSoftSwitchEnumUtil {
     public enum SUIT_PROCESS_STATUS {
         UNPROCESSED(10, "未处理"),
         PROCESSING(20,  "处理中"),
-        PROCESS(30,  "已处理");
+        PROCESS(30,  "已处理"),
+        PROCESS_FAIL(40,  "处理失败");
 
         private int value;
         private String description;
@@ -878,7 +879,8 @@ public class BlockSoftSwitchEnumUtil {
         REQUEST_ORGIN_PARAM(20,  "请求原始参数"),
         ORIGINAL_MESSAGE(30,  "原始报文"),
         CONVERTED_MESSAGE(40,  "转换报文"),
-        SUIT_SEND_MESSAGE(50,  "适配发送报文");
+        SUIT_SEND_MESSAGE(50,  "适配发送报文"),
+        PROCESS_RESULT(60,  "处理结果");
 
         private int value;
         private String description;
@@ -919,6 +921,52 @@ public class BlockSoftSwitchEnumUtil {
     }
 
     /**
+     * ftp连接模式
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum FTP_CONNECTION_MODE {
+        LOCAL_ACTIVE_MODE(10,  "本地主动模式"),
+        LOCAL_PASSIVE_MODE(20, "本地被动模式"),
+//        REMOTE_ACTIVE_MODE(30, "远程主动模式"),
+        REMOTE_PASSIVE_MODE(40, "远程被动模式");
+
+        private final int value;
+        private final String description;
+
+        FTP_CONNECTION_MODE(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;
+        }
+
+        public static FTP_CONNECTION_MODE valueOf(int val) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    return values()[i];
+                }
+            }
+            return FTP_CONNECTION_MODE.LOCAL_ACTIVE_MODE;
+        }
+    }
+
+    /**
      * 脚本类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
@@ -957,7 +1005,6 @@ public class BlockSoftSwitchEnumUtil {
         }
 
         public static BS_SCRIPT_TYPE valueOf(int val) {
-            String tmp = null;
             for (int i = 0; i < values().length; i++) {
                 if (values()[i].value == val) {
                     return values()[i];
@@ -1003,7 +1050,6 @@ public class BlockSoftSwitchEnumUtil {
         }
 
         public static BS_SCRIPT_LANGUAGE valueOf(int val) {
-            String tmp = null;
             for (int i = 0; i < values().length; i++) {
                 if (values()[i].value == val) {
                     return values()[i];
@@ -1050,7 +1096,6 @@ public class BlockSoftSwitchEnumUtil {
         }
 
         public static BS_SCRIPT_EXECUTE_METHOD valueOf(int val) {
-            String tmp = null;
             for (int i = 0; i < values().length; i++) {
                 if (values()[i].value == val) {
                     return values()[i];

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

@@ -69,16 +69,21 @@ public class MesEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum WORK_MODULE_TYPE {
-        MONITOR_MODULE(10, "监听组件"),
-        REVEAL_MODULE(20, "展示组件"),
-        BUTTON_MODULE(30, "按钮组件"),
-        TIMING_MODULE(40, "定时组件");
+        MONITOR_MODULE(10, "MONITOR_MODULE", "监听组件"),
+        REVEAL_MODULE(20, "REVEAL_MODULE", "展示组件"),
+        BUTTON_MODULE(30, "BUTTON_MODULE", "按钮组件"),
+        TIMING_MODULE(40, "TIMING_MODULE", "定时组件"),
+        PCS_BACK_MODULE(50, "PCS_BACK_MODULE", "工序后台组件"),
+        PLC_CALLBACK_MODULE(60, "PLC_CALLBACK_MODULE", "PLC回调工位参数"),
+        ASSIST_MODULE(70, "ASSIST_MODULE", "辅助组件");
 
         private int value;
+        private String data;
         private String description;
 
-        WORK_MODULE_TYPE(int value, String description) {
+        WORK_MODULE_TYPE(int value, String data, String description) {
             this.value = value;
+            this.data = data;
             this.description = description;
         }
 
@@ -86,6 +91,10 @@ public class MesEnumUtil {
             return value;
         }
 
+        public String getData() {
+            return data;
+        }
+
         public String getDescription() {
             return description;
         }
@@ -708,7 +717,8 @@ public class MesEnumUtil {
         EQU_DEFECT_CAUSE("EQU_DEFECT_CAUSE", "故障原因"),
         EQU_DEFECT_METHOD("EQU_DEFECT_METHOD", "故障处理措施"),
         EQU_DEFECT_PHENOMENON("EQU_DEFECT_PHENOMENON", "故障现象"),
-        BH_PACKAGE_TYPE_VALUE("BH_PACKAGE_TYPE_VALUE", "B&H包装条码赋值样品类型值");
+        BH_PACKAGE_TYPE_VALUE("BH_PACKAGE_TYPE_VALUE", "B&H包装条码赋值样品类型值"),
+        WO_TYPE("WO_TYPE", "客户JIT队列工单类型");
 
         private String value;
         private String description;
@@ -4779,7 +4789,8 @@ public class MesEnumUtil {
     public enum WORK_CELL_MONITOR_TYPE {
         MONITOR(10, "监听组件"),
         SHOW(20, "展示组件"),
-        BUTTON(30, "按钮组件");
+        BUTTON(30, "按钮组件"),
+        PROCESS_MONITOR(40, "工序监听组件");
 
         private int value;
         private String description;

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

@@ -5512,4 +5512,52 @@ public class MesPcnEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 产品位置
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PRODUCE_CATEGORY_NAME {
+
+        FL("FL", "前右"),
+        FR("FR", "前左"),
+        RL("RL", "后左"),
+        RR("RR", "后右");
+
+        private String description;
+        private String value;
+
+        PRODUCE_CATEGORY_NAME(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value.equals(val)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static String descriptionOfValue(String description) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
 }

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

@@ -45,7 +45,7 @@ public class MesDbCheckRecord extends BaseBean implements Serializable {
     //DB复核项：10=物料为空复核。20=零件工单匹对复核。30=过程条码重复复核。40=过程条码为空复核。50=产品二维码重复复核。60=产品二维码为空复核。70=质量关键字段为空复核。80=缺陷类型连续超过设定数复核。
     @Column(name = "DB_CHECK_ITEM")
     @ApiParam("DB复核项")
-    private String dbReview;
+    private String dbCheckItem;
 
     @Column(name = "ERROR_FILED_CODE")
     @ApiParam("异常取值字段")

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

@@ -95,6 +95,10 @@ public class MesDefectRecord extends BaseBean implements Serializable {
     @ApiParam("后移数量")
     private Integer backwardNum;
 
+    @Transient
+    @ApiParam("质量状态")
+    private Integer qcStatus;
+
     public int getRepairStatusVal() {
         return this.repairStatus == null ? 0 : this.repairStatus;
     }

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

@@ -128,6 +128,10 @@ public class MesPart extends BaseBean implements Serializable {
     @ApiParam("是否小尺寸物料")
     private Integer isSmallSize = 1;
 
+    @Column(name = "QTY2")
+    @ApiParam(value = "包装数量")
+    private Double qty2;
+
     @Transient
     @ApiParam("产品类型名称")
     private String produceCategoryName;

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

@@ -170,4 +170,16 @@ public class MesQueueJitActual extends BaseBean implements Serializable {
     @ApiParam(value = "零件号")
     public String partNo;
 
+    @Transient
+    @ApiParam(value = "客户零件号")
+    public String custPartNo;
+
+    @Transient
+    @ApiParam(value = "qty")
+    public Integer qty;
+
+    @Transient
+    @ApiParam("工单类型")
+    private String woTypeName;
+
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProductDataModel.java

@@ -0,0 +1,27 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description:
+ * @CreateDate: 2020/9/22
+ * @Author: simon.song
+ */
+@Data
+public class MesProductDataModel {
+    @ApiParam("生产数据表主键ID")
+    private String id;
+
+    @ApiParam("工位代码")
+    private String workCellCode;
+
+    @ApiParam("工位名称")
+    private String workCellName;
+
+    @ApiParam("产品包装model")
+    private List<ProductDataModel> productDataModelList;
+
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModel.java

@@ -36,6 +36,9 @@ public class QueueJitActualModel {
     public String workTypeName;
 
     @ApiParam("客户产线代码")
+    private String custPlantCode;
+
+    @ApiParam("客户产线代码")
     private String custProdLineCode;
 
     @ApiParam("产品位置代码")
@@ -73,13 +76,13 @@ public class QueueJitActualModel {
 
     }
 
-    public QueueJitActualModel(Long id, String vinCode, String jisActualNo, Integer workType, String custProdLineCode, String produceCtgyCode,
+    public QueueJitActualModel(Long id, String vinCode, String jisActualNo, Integer workType, String custPlantCode, String produceCtgyCode,
                                String productSn, Integer detailStatus, String createUser, String createDatetime) {
         this.id = id;
         this.vinCode = vinCode;
         this.jisActualNo = jisActualNo;
         this.workType = workType;
-        this.custProdLineCode = custProdLineCode;
+        this.custPlantCode = custPlantCode;
         this.produceCtgyCode = produceCtgyCode;
         this.productSn = productSn;
         this.detailStatus = detailStatus;
@@ -94,6 +97,7 @@ public class QueueJitActualModel {
         this.jisActualNo = jisActualNo;
         this.partNo = partNo;
         this.partName = partName;
+        this.produceCtgyCode = produceCtgyCode;
         this.qty = qty;
         this.createUser = createUser;
         this.createDatetime = createDatetime;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java

@@ -44,6 +44,9 @@ public class TJMgnBoardModel extends BaseBean {
     @ApiParam("不良处理类型")
     private String defectType;
 
+    @ApiParam("反喷标识")
+    private String reverseSprayMark;
+
     @ApiParam("列名")
     private List<List<String>> headModelList;
 

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

@@ -341,6 +341,29 @@ public class MesPcnHqlPack {
         return packBean;
     }
 
+    public static DdlPackBean getDbCheckRecord(MesDbCheckRecord dbCheckRecord, String organizeCode) {
+        DdlPackBean packBean = getAllBaseData(organizeCode);
+        if (!StringUtils.isEmpty(dbCheckRecord.getSerialNumber())) {
+            DdlPreparedPack.getStringLikerPack(dbCheckRecord.getSerialNumber(), "serialNumber", packBean);
+        }
+        if (!StringUtils.isEmpty(dbCheckRecord.getDbCheckItem())) {
+            DdlPreparedPack.getStringLikerPack(dbCheckRecord.getDbCheckItem(), "dbCheckItem", packBean);
+        }
+        if (!StringUtils.isEmpty(dbCheckRecord.getErrorFiledCode())) {
+            DdlPreparedPack.getStringLikerPack(dbCheckRecord.getErrorFiledCode(), "errorFiledCode", packBean);
+        }
+        if (!StringUtils.isEmpty(dbCheckRecord.getProductDataId())) {
+            DdlPreparedPack.getStringLikerPack(dbCheckRecord.getProductDataId(), "productDataId", packBean);
+        }
+        if (!StringUtils.isEmpty(dbCheckRecord.getIsStopLine())) {
+            DdlPreparedPack.getNumberBiggerEqualPack(dbCheckRecord.getIsStopLine(), "isStopLine", packBean);
+        }
+        if (!StringUtils.isEmpty(dbCheckRecord.getStatus())) {
+            DdlPreparedPack.getNumberBiggerEqualPack(dbCheckRecord.getStatus(), "status", packBean);
+        }
+        return packBean;
+    }
+
     /**
      * 按条件分页查询产品条码补打印数据
      *

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

@@ -39,4 +39,7 @@ public class WmsStockFifoModel {
 
     @ApiParam("默认规则")
     private String defaultRule;
+
+    @ApiParam("同批次")
+    private boolean fifoSameBatch;
 }

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java

@@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.softswitch.bean;
 
 import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.BlockSoftSwitchEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -66,6 +67,15 @@ public class BsSuitCaseFTP extends BaseBean {
     @ApiParam(value = "ftp编码")
     private Integer encode;
 
+    @Column(name = "CONNECTION_MODE")
+    @ApiParam(value = "ftp连接模式")
+    @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.FTP_CONNECTION_MODE.class)
+    private Integer connectionMode;
+
+    public String getConnectionModeTxt(){
+        return connectionMode == null ? "无" : BlockSoftSwitchEnumUtil.FTP_CONNECTION_MODE.valueOfDescription(connectionMode);
+    }
+
     @Column(name = "IS_READ_AND_EMPTY")
     @ApiParam(value = "读取并清空")
     private Integer isReadAndEmpty;

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java

@@ -138,6 +138,10 @@ public class BsSuitRecord extends BaseBean {
     @ApiParam(value = "脚本结果")
     private String scriptResult;
 
+    @Column(name = "PROCESS_RESULT")
+    @ApiParam(value = "处理结果")
+    private String processResult;
+
     /************************************** 临时属性 ***************************************/
 
     @Transient

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java

@@ -117,6 +117,10 @@ public class SwebPurchaseOrderSn extends BaseBean {
     @ApiParam(value = "重量")
     private Double weight;
 
+    @Column(name = "VEN_PRODUCT_TIME")
+    @ApiParam(value = "供应商生产日期")
+    private String venProductTime;
+
     @Transient
     @ApiParam(value = "合同号")
     private String refNo;

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorStock.java

@@ -65,6 +65,10 @@ public class SwebVendorStock extends BaseBean {
     @ApiParam("周")
     private String countWeek;
 
+    @Column(name = "REMARK")
+    @ApiParam("备注")
+    private String remark;
+
     @Transient
     @ApiParam("日期")
     private String dateStart;

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

@@ -0,0 +1,153 @@
+package cn.estsh.i3plus.pojo.wms.bean.snapshot;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import org.hibernate.annotations.GenericGenerator;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Data
+@MappedSuperclass
+public class SnapshotBean implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @GenericGenerator(name = "generator", strategy = "increment")
+    @GeneratedValue(generator = "generator")
+    @Column(name = "snap_id")
+    private Long snapId;
+
+    //此处使用hibernate的主键策略方式
+    //手动设置,使用iplus-platform-common中的idtool生成
+    //将Long类型系列化成String避免精度丢失
+    @Column(name="ID")
+    @ApiParam(value = "主键",example = "0")
+    @JsonSerialize(using = ToStringSerializer.class)
+    @AnnoOutputColumn(hidden = true)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
+    public Long id;
+
+    //get单独处理
+    public Long getId() {
+        if(id != null) {
+            return id.longValue();
+        }else{
+            return id;
+        }
+    }
+
+    /**
+     * MonogoDB _id映射
+     * @param id
+     */
+    @JSONField(name="_id")
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="ORGANIZE_CODE", nullable = false)
+    @ApiParam(value ="组织代码")
+//    @AnnoOutputColumn(hidden = true)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isQuery = 2, isRequire = 2)
+    public String organizeCode;
+
+    @Column(name="IS_VALID", columnDefinition = "int default 1", nullable = false)
+    @ApiParam(value = "有效性",example = "1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description", hidden = true)
+    public Integer isValid;    //CommonEnumUtil.IS_VAILD;
+
+    @Column(name="IS_DELETED", columnDefinition = "int default 2", nullable = false)
+    @ApiParam(value = "是否已删除",example = "2")
+    @AnnoOutputColumn(hidden = true)
+    //逻辑删除，软删除
+    public Integer isDeleted;    //CommonEnumUtil.TRUE_OR_FALSEA
+
+    @Column(name="CREATE_USER",updatable = false)
+    @ApiParam(value = "创建用户")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL,
+            dataSrc = "/impp/operate/sys-user/query-user-by-pager",
+            searchColumnName = "userName", listColumnName = "userLoginName,userName", explicitColumnName = "userName")
+    public String createUser;
+
+    @Column(name="CREATE_DATE_TIME",updatable = false)
+    @ApiParam(value = "创建日期")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2)
+    public String createDatetime;
+
+    @Column(name="MODIFY_USER")
+    @ApiParam(value = "修改人")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL,
+            dataSrc = "/impp/operate/sys-user/query-user-by-pager",
+            searchColumnName = "userName", listColumnName = "userLoginName,userName", explicitColumnName = "userName")
+    public String modifyUser;
+
+    @Column(name="MODIFY_DATE_TIME")
+    @ApiParam(value = "修改日期")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2)
+    public String modifyDatetime;
+
+    @Transient
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiParam(value="创建日期查询用，查询起始日期",example = "2018-01-01 01:00:00")
+    @AnnoOutputColumn(hidden = true)
+    public String createDateTimeStart;
+
+    @Transient
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiParam(value="创建日期查询用，查询结束日期",example = "2018-12-31 23:59:59")
+    @AnnoOutputColumn(hidden = true)
+    public String createDateTimeEnd;
+
+    @Transient
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiParam(value="修改日期查询用，查询起始日期",example = "2018-01-01 01:00:00")
+    @AnnoOutputColumn(hidden = true)
+    public String modifyDateTimeStart;
+
+    @Transient
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiParam(value = "修改日期查询用，查询结束日期",example = "2018-12-31 23:59:59")
+    @AnnoOutputColumn(hidden = true)
+    public String modifyDateTimeEnd;
+
+    @Transient
+    @ApiParam(value = "排序属性")
+    @AnnoOutputColumn(hidden = true)
+    public String orderByParam = "";
+
+    @Transient
+    @ApiParam(value = "排序类型，1 正序，2 倒序",example = "1")
+    @AnnoOutputColumn(hidden = true)
+    //CommonEnumUtil.ASC_OR_DESC  1 asc,2 desc
+    public transient Integer ascOrDesc = 1;
+
+    public int getIsValidVal() {
+        return this.isValid == null ? 0 : this.isValid.intValue();
+    }
+
+    public int getIsDeletedVal() {
+        return this.isDeleted == null ? 0 : this.isDeleted.intValue();
+    }
+
+    //排序方式
+    public String orderBy(){
+        String result = "";
+        if (orderByParam!=null&&orderByParam.trim().length()>0) {
+            result = " order by " + orderByParam;
+            if(ascOrDesc == CommonEnumUtil.ASC_OR_DESC.ASC.getValue()) {
+                result += " asc";
+            }else{
+                result += " desc";
+            }
+        }
+        return result;
+    }
+}

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

@@ -1,7 +1,8 @@
 package cn.estsh.i3plus.pojo.wms.bean.snapshot;
 
 import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
-import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
@@ -32,7 +33,7 @@ import javax.persistence.*;
         @Index(columnList = "SNAPSHOT_TIME")
 })
 @Api("库存移动单明细信息")
-public class WmsMoveDetailsSnapshot extends BaseBean {
+public class WmsMoveDetailsSnapshot extends SnapshotBean {
 
     private static final long serialVersionUID = -4095410692227226944L;
 
@@ -141,6 +142,31 @@ public class WmsMoveDetailsSnapshot extends BaseBean {
     @Transient
     private Long finishedCounts;
 
+    @Column(name = "BOM_VERSION")
+    @ApiParam(value = "BOM版本号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    private String bomVersion;
+
+    @Column(name = "CONSIGNATION")
+    @ApiParam("是否寄售 1-是 2-否")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE")
+    private Integer consignation = 2;
+
+    @Column(name = "GROUP_NO")
+    @ApiParam("分组号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    public String groupNo;
+
+    @Column(name = "HANDLED_QTY", columnDefinition = "decimal(18,8)", nullable = false)
+    @ApiParam(value = "已处理数量", example = "0")
+    @ColumnDefault("0")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
+    public Double handledQty;
+
+    @Column(name = "QUEUE_GROUP_NO")
+    @ApiParam(value = "jis料架号")
+    private String queueGroupNo;
+
     @Transient
     @ApiParam("交易类型")
     private String transTypeCode;
@@ -182,10 +208,6 @@ public class WmsMoveDetailsSnapshot extends BaseBean {
     @ApiParam("创建时间")
     private String createDateTime;
 
-    @Version
-    @Column(name = "LOCK_VERSION")
-    @ApiParam(value = "乐观锁", example = "1")
-    public transient Integer lockVersion;
    /* @JSONField(name="fPartNo")
     public String getfPartNo() {
         return fPartNo;

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

@@ -1,7 +1,6 @@
 package cn.estsh.i3plus.pojo.wms.bean.snapshot;
 
 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;
@@ -31,7 +30,7 @@ import javax.persistence.*;
         @Index(columnList = "SNAPSHOT_TIME")
 })
 @Api("库存移动单主表信息")
-public class WmsMoveMasterSnapshot extends BaseBean {
+public class WmsMoveMasterSnapshot extends SnapshotBean {
 
     private static final long serialVersionUID = 3569874772643448726L;
 
@@ -150,7 +149,6 @@ public class WmsMoveMasterSnapshot extends BaseBean {
     @ApiParam(value = "设备编号")
     public String fixId;
 
-    @Version
     @Column(name = "LOCK_VERSION")
     @ApiParam(value = "乐观锁", example = "1")
     public transient Integer lockVersion;

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

@@ -1,7 +1,6 @@
 package cn.estsh.i3plus.pojo.wms.bean.snapshot;
 
 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;
@@ -33,7 +32,7 @@ import javax.persistence.*;
         @Index(columnList = "SNAPSHOT_TIME")
 })
 @Api("库存移动单条码信息")
-public class WmsMoveSnSnapshot extends BaseBean {
+public class WmsMoveSnSnapshot extends SnapshotBean {
 
     private static final long serialVersionUID = 2588101374261238353L;
 
@@ -189,11 +188,6 @@ public class WmsMoveSnSnapshot extends BaseBean {
     @ApiParam("交易类型名称")
     private String transTypeName;
 
-    @Version
-    @Column(name = "LOCK_VERSION")
-    @ApiParam(value = "乐观锁", example = "1")
-    public transient Integer lockVersion;
-
     public WmsMoveSnSnapshot() {
     }
 

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

@@ -1,6 +1,5 @@
 package cn.estsh.i3plus.pojo.wms.bean.snapshot;
 
-import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.wms.bean.WmsLocate;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
@@ -33,7 +32,7 @@ import java.util.List;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Api(value = "库存信息", description = "库存信息")
-public class WmsStockQuanSnapshot extends BaseBean {
+public class WmsStockQuanSnapshot extends SnapshotBean {
 
     private static final long serialVersionUID = 8335719859185712904L;
 

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

@@ -1,7 +1,6 @@
 package cn.estsh.i3plus.pojo.wms.bean.snapshot;
 
 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;
@@ -45,7 +44,7 @@ import java.util.List;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Api(value = "库存条码信息", description = "库存条码信息")
-public class WmsStockSnSnapshot extends BaseBean {
+public class WmsStockSnSnapshot extends SnapshotBean {
 
     private static final long serialVersionUID = 8641922373097608315L;
 

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -1375,7 +1375,7 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringEqualPack(wmsStockSn.getLotNo(), "lotNo", result);
         DdlPreparedPack.getStringEqualPack(wmsStockSn.getPackageNo(), "packageNo", result);
         if (wmsStockSn.getCheckQyt() != null && wmsStockSn.getCheckQyt().intValue() == WmsEnumUtil.TRUE_OR_FALSE.TRUE.getValue()) {
-            DdlPreparedPack.getNumberBiggerPack(0, "qty", result);
+            DdlPreparedPack.getNumberBiggerPackContainsZero(0.0, "qty", result);
         }
         if (StringUtil.isEmpty(wmsStockSn.getQualityDateTimeStart())) {
             wmsStockSn.setQualityDateTimeStart("");