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/SwebEnumUtil.java

@@ -136,6 +136,63 @@ public class SwebEnumUtil {
     }
 
     /**
+     * PO订单来源
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ORDER_SOURCE {
+        WMS(10, "WMS", "WMS"),
+        SWEB(20, "SWEB", "SWEB");
+
+        private int value;
+        private String code;
+        private String description;
+
+        ORDER_SOURCE(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 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 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 int codeOf(String code) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(code)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
      * 包装类型枚举
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)

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

@@ -72,6 +72,10 @@ public class MesCellFeed extends BaseBean implements Serializable {
     @ApiParam("供应商代码")
     private String supplierCode;
 
+    @Column(name = "RACK_NO")
+    @ApiParam("料箱编号")
+    private String rackNo;
+
     @Transient
     @ApiParam(value = "原料类型名称")
     private String rawTypeName;

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

@@ -71,6 +71,10 @@ public class MesCellFeedRecord extends BaseBean implements Serializable {
     @ApiParam("供应商代码")
     private String supplierCode;
 
+    @Column(name = "RACK_NO")
+    @ApiParam("料箱编号")
+    private String rackNo;
+
     public double getRawQtyVal() {
         return this.rawQty == null ? 0l : this.rawQty;
     }

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

@@ -0,0 +1,61 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+import java.io.Serializable;
+
+/**
+ * @Description :MES_库位信息
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-12
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_LOCATION")
+@Api("MES_库位信息")
+public class MesLocation extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -896118285166769048L;
+    @Column(name = "LOCATION_CODE")
+    @ApiParam("库位代码")
+    private String locationCode;
+
+    @Column(name = "LOCATION_NAME")
+    @ApiParam("库位名称")
+    private String locationName;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @Column(name = "QTY")
+    @ApiParam("数量")
+    private Double qty = 0d;
+
+    @Column(name = "MAX_QTY")
+    @ApiParam("最大存储量")
+    private Integer maxQty = 0;
+
+    @Transient
+    @ApiParam("物料名称")
+    private String partNameRdd;
+}

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

@@ -132,6 +132,14 @@ public class MesPackage extends BaseBean implements Serializable {
     @ApiParam("包装二维码")
     private String qrCode;
 
+    @Column(name = "LOCATION_CODE")
+    @ApiParam("库位代码")
+    private String locationCode;
+
+    @Transient
+    @ApiParam("目标库位代码")
+    private String destLocationCode;
+
     public MesPackage() {
     }
 

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

@@ -44,10 +44,6 @@ public class MesProdWorkCenter extends BaseBean implements Serializable {
     @ApiParam("是否默认")
     private Integer isDefault;
 
-    @Column(name = "PART_SN")
-    @ApiParam("料箱条码")
-    private String partSn;
-
     @Column(name = "RACK_NO")
     @ApiParam("料箱编号")
     private String rackNo;

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

@@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.mes.model;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
 
@@ -13,7 +14,7 @@ import java.util.Map;
  * @Modify:
  */
 @Data
-public class BiModel {
+public class BiModel implements Serializable {
     @ApiParam("工作中心代码")
     private String workCenterCode;
 
@@ -30,7 +31,7 @@ public class BiModel {
     private String partName;
 
     @ApiParam(value = "计划数量")
-    private double planQty;
+    private double planQty = 0;
 
     @ApiParam(value = "合格数量")
     private double passQty = 0;
@@ -92,6 +93,11 @@ public class BiModel {
     @ApiParam("末检")
     private Integer endCheck;//首件、30中件、40末件
 
+    private double qty;
+
+    @ApiParam("比率")
+    private double rate;
+
     @ApiParam("x坐标内容")
     private List<String> xAxis;
 
@@ -103,4 +109,11 @@ public class BiModel {
 
     @ApiParam("列名")
     private Map<String, String> colMap;
+
+    public BiModel() {}
+
+    public BiModel(Double qty, String partNo) {
+        this.qty = qty;
+        this.partNo = partNo;
+    }
 }

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

@@ -0,0 +1,41 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @author wangjie
+ * @date 2020/4/9 18:00
+ * @desc TJ注塑上料展示组件顶部数据集合model
+ */
+@Data
+public class InjectionFeedingDetailModel {
+
+    @ApiParam("是否选中：1=是，2=否")
+    private Integer isCheck = 2;
+
+    @ApiParam("机台编号")
+    private String workCenterCode;
+
+    @ApiParam("机台名称")
+    private String workCenterName;
+
+    @ApiParam("工单号")
+    private String workOrderNo;
+
+    @ApiParam("工单状态")
+    private Integer workOrderStatus;
+
+    @ApiParam("工单状态名称")
+    private String workOrderStatusName;
+
+    @ApiParam("工单计划数量")
+    private String qty;
+
+    @ApiParam("颜色")
+    private String color;
+
+    @ApiParam("错误信息")
+    private String error;
+
+}

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

@@ -0,0 +1,38 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author wangjie
+ * @date 2020/4/9 18:00
+ * @desc TJ注塑上料展示组件顶部数据model
+ */
+@Data
+public class InjectionFeedingModel {
+
+    @ApiParam("料箱")
+    private String rackNo;
+
+    @ApiParam("原材料物料号")
+    private String partNo;
+
+    @ApiParam("是否锁定：1=是，2=否")
+    private Integer lockFlag;
+
+    @ApiParam("机台工单集合")
+    private List<InjectionFeedingDetailModel> detailModelList = new ArrayList<>();
+
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @ApiParam("组织代码")
+    private String organizeCode;
+
+}

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

@@ -27,4 +27,7 @@ public class TorqueReviewModel {
     @ApiParam("显示颜色")
     private String showColor;
 
+    @ApiParam("是否大枪")
+    private Integer isPf;
+
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLocationRepository.java

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.IfProductOffLine;
+import cn.estsh.i3plus.pojo.mes.bean.MesLocation;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\11\18 10:32
+ * @Modify:
+ **/
+public interface MesLocationRepository extends BaseRepository<MesLocation, Long> {
+}

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

@@ -3174,6 +3174,9 @@ public class MesHqlPack {
         if (!StringUtils.isEmpty(prodWorkCenter.getPartNo())) {
             DdlPreparedPack.getStringLikerPack(prodWorkCenter.getPartNo(), "partNo", packBean);
         }
+        if (!StringUtils.isEmpty(prodWorkCenter.getRackNo())) {
+            DdlPreparedPack.getStringLikerPack(prodWorkCenter.getRackNo(), "rackNo", packBean);
+        }
         if (!StringUtils.isEmpty(prodWorkCenter.getWorkCenterCode())) {
             DdlPreparedPack.getStringLikerPack(prodWorkCenter.getWorkCenterCode(), "workCenterCode", packBean);
         }

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

@@ -221,6 +221,7 @@ public class MesPcnHqlPack {
                     mesWorkOrder.getCreateDateTimeEnd(),
                     "createDatetime", packBean, true);
         }
+        DdlPreparedPack.getStringEqualPack(mesWorkOrder.getAreaCode(), "areaCode", packBean);
         return packBean;
     }
 
@@ -667,4 +668,25 @@ public class MesPcnHqlPack {
 
         return packBean;
     }
+
+    /**
+     * 产品工作中心配置
+     *
+     * @param prodWorkCenter
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesProdWorkCenter(MesProdWorkCenter prodWorkCenter, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(prodWorkCenter, organizeCode);
+        if (!StringUtils.isEmpty(prodWorkCenter.getPartNo())) {
+            DdlPreparedPack.getStringLikerPack(prodWorkCenter.getPartNo(), "partNo", packBean);
+        }
+        if (!StringUtils.isEmpty(prodWorkCenter.getRackNo())) {
+            DdlPreparedPack.getStringLikerPack(prodWorkCenter.getRackNo(), "rackNo", packBean);
+        }
+        if (!StringUtils.isEmpty(prodWorkCenter.getWorkCenterCode())) {
+            DdlPreparedPack.getStringLikerPack(prodWorkCenter.getWorkCenterCode(), "workCenterCode", packBean);
+        }
+        return packBean;
+    }
 }

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

@@ -71,6 +71,10 @@ public class SwebDocMovementDetails extends BaseBean {
     @ApiParam("行号")
     public String item;
 
+    @Column(name = "SNP")
+    @ApiParam(value = "标准包装", example = "1")
+    private Double snp;
+
     /**
      * 是否免费:0=计费,1=免费
      */

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

@@ -0,0 +1,118 @@
+package cn.estsh.i3plus.pojo.sweb.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.ColumnDefault;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-10
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "SWEB_PO_SN_TO_WMS")
+@Api("库存移动单处理成功后的记录")
+public class SwebPoSnToWms extends BaseBean {
+
+    private static final long serialVersionUID = 746409789382994374L;
+    @Column(name = "ORDER_NO")
+    @ApiParam("单号")
+    public String orderNo;
+
+    @ApiParam("供应商编号")
+    @Column(name = "VENDOR_CODE")
+    private String vendorCode;
+
+    @ApiParam("供应商名称")
+    @Column(name = "VENDOR_NAME")
+    private String vendorName;
+
+    @Column(name = "PART_NO")
+    @ApiParam(value = "零件号")
+    private String partNo;
+
+    @Column(name = "PART_NAME")
+    @ApiParam(value = "零件名称")
+    private String partName;
+
+    @ApiParam("零件类型")
+    @Column(name = "PART_TYPE")
+    private Integer partType;
+
+    @ApiParam(value = "单位")
+    @Column(name = "UNIT")
+    private String unit;
+
+    @Column(name = "BOX_QTY")
+    @ColumnDefault("0")
+    @ApiParam(value = "箱数", example = "0")
+    private Integer boxQty;
+
+    @Column(name = "SERIAL_NO")
+    @ApiParam(value = "序列号")
+    private String serialNo;
+
+    @Column(name = "SN")
+    @ApiParam(value = "箱条码")
+    private String sn;
+
+    @Column(name = "ERP_WAREHOUSE")
+    @ApiParam("库存地")
+    private String erpWarehouse;
+
+    @Column(name = "PRODUCTION_TIME")
+    @ApiParam(value = "产生时间")
+    private String productionTime;
+
+    @Column(name = "PRINT_TIME")
+    @ApiParam(value = "打印时间")
+    private String printTime;
+
+    @Column(name = "PRINTS")
+    @ApiParam("打印次数")
+    private Integer prints;
+
+    @Column(name = "CHECK_CODE")
+    @ApiParam(value = "检验编号")
+    private String checkCode;
+
+    @Column(name = "STOVE_NO")
+    @ApiParam(value = "特殊批号")
+    private String stoveNo;
+
+    @Column(name = "BATCH_NO")
+    @ApiParam(value = "批次号")
+    private String batchNo;
+
+    @ApiParam("是否同步")
+    @Column(name = "IS_SYN")
+    private String isSyn;
+
+    @Column(name = "REC_TIME")
+    @ApiParam(value = "收货时间")
+    private String recTime;
+
+    @Column(name = "PACKAGE_NO")
+    @ApiParam(value = "包装编号")
+    private String packageNo;
+
+    @ColumnDefault("0")
+    @Column(name = "WEIGHT")
+    @ApiParam(value = "重量")
+    private Double weight;
+}

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

@@ -104,6 +104,11 @@ public class SwebPurchaseOrder extends BaseBean {
     @ApiParam(value = "合同号")
     private String refNo;
 
+    // SwebEnumUtil.ORDER_SOURCE
+    @Column(name = "ORDER_SOURCE")
+    @ApiParam(value = "订单来源")
+    private Integer orderSource;
+
     @Transient
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @ApiParam(value = "预计到货时间 开始时间")

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

@@ -55,9 +55,9 @@ public class SwebPurchaseOrderDetails extends BaseBean {
     @ApiParam(value = "零件名称")
     private String partName;
 
-    @ApiParam(value = "订单类型", example = "1")
+    /*@ApiParam(value = "订单类型", example = "1")
     @Column(name = "ORDER_TYPE")
-    public Integer orderType;
+    public Integer orderType;*/
 
     @ApiParam("零件类型")
     @Column(name = "PART_TYPE")
@@ -105,6 +105,7 @@ public class SwebPurchaseOrderDetails extends BaseBean {
     @ApiParam("库存地")
     private String erpWarehouse;
 
+    // 停用
     @Column(name = "REF_QTY")
     @ColumnDefault("0")
     @ApiParam(value = "订单数量", example = "0")

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebMovementModel.java

@@ -17,4 +17,10 @@ public class SwebMovementModel {
 
     @ApiParam(value = "需求数量")
     private Double qty;
+
+    @ApiParam("计划日期")
+    private String planDate;
+
+    @ApiParam("计划时间")
+    private String planTime;
 }

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java

@@ -11,6 +11,8 @@ import cn.estsh.i3plus.pojo.sweb.bean.*;
 import cn.estsh.i3plus.pojo.sweb.modelbean.SwebPOForPubListEnterModel;
 import org.apache.commons.lang3.StringUtils;
 
+import java.util.List;
+
 /**
  * @Description : hql 封装
  * @Reference :
@@ -45,15 +47,21 @@ public class SwebHqlPack {
         return hqlStr;
     }
 
-    public static DdlPackBean getPurchaseOrderWhereHql(SwebPurchaseOrder purchaseOrder) {
+    public static DdlPackBean getPurchaseOrderWhereHql(SwebPurchaseOrder purchaseOrder, List<String> vendorNos) {
         DdlPackBean result = new DdlPackBean();
-        DdlPreparedPack.getStringEqualPack(purchaseOrder.getOrderNo(), "orderNo", result);
-        DdlPreparedPack.getStringEqualPack(purchaseOrder.getVendorCode(), "vendorCode", result);
+        DdlPreparedPack.getStringLikerPack(purchaseOrder.getOrderNo(), "orderNo", result);
+        DdlPreparedPack.getNumEqualPack(purchaseOrder.getOrderSource(), "orderSource", result);
+        if (StringUtil.isEmpty(purchaseOrder.getVendorCode())) {
+            DdlPreparedPack.getInPackList(vendorNos, "vendorCode", result);
+        } else {
+            DdlPreparedPack.getStringEqualPack(purchaseOrder.getVendorCode(), "vendorCode", result);
+        }
         if (!StringUtil.isEmpty(purchaseOrder.getExpectedTimeStart()) && !StringUtil.isEmpty(purchaseOrder.getExpectedTimeEnd())) {
             DdlPreparedPack.timeBuilder(purchaseOrder.getExpectedTimeStart(),
                     purchaseOrder.getExpectedTimeEnd(), "expectedTime", result, false);
         }
         DdlPreparedPack.getNumEqualPack(purchaseOrder.getOrderType(), "orderType", result);
+        DdlPreparedPack.getNumEqualPack(purchaseOrder.getPoStatus(), "poStatus", result);
         DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
         return buildHql(purchaseOrder, result);
     }
@@ -118,6 +126,8 @@ public class SwebHqlPack {
     public static DdlPackBean getProcurementPlanOrderDeatilsWhereHql(SwebProcurementPlanOrderDetails swebProcurementPlanOrderDetails) {
         DdlPackBean result = new DdlPackBean();
         DdlPreparedPack.getStringLikerPack(swebProcurementPlanOrderDetails.getOrderNo(), "orderNo", result);
+        DdlPreparedPack.getStringLikerPack(swebProcurementPlanOrderDetails.getPartNo(), "partNo", result);
+        DdlPreparedPack.getStringLikerPack(swebProcurementPlanOrderDetails.getPartName(), "partName", result);
         DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
         return buildHql(swebProcurementPlanOrderDetails, result);
     }
@@ -136,7 +146,7 @@ public class SwebHqlPack {
         DdlPreparedPack.getStringEqualPack(details.getVendorCode(), "vendorCode", result);
         DdlPreparedPack.getStringEqualPack(details.getPartNo(), "partNo", result);
         DdlPreparedPack.getNumEqualPack(details.getItemStatus(), "itemStatus", result);
-        DdlPreparedPack.getNumEqualPack(details.getOrderType(), "orderType", result);
+        //DdlPreparedPack.getNumEqualPack(details.getOrderType(), "orderType", result);
         return buildHql(details, result);
     }
 
@@ -145,7 +155,7 @@ public class SwebHqlPack {
         DdlPreparedPack.getStringEqualPack(details.getOrderNo(), "orderNo", result);
         DdlPreparedPack.getStringEqualPack(details.getVendorCode(), "vendorCode", result);
         DdlPreparedPack.getStringEqualPack(details.getPartNo(), "partNo", result);
-        DdlPreparedPack.getNumEqualPack(details.getOrderType(), "orderType", result);
+        //DdlPreparedPack.getNumEqualPack(details.getOrderType(), "orderType", result);
         return buildHql(details, result);
     }
 
@@ -158,7 +168,7 @@ public class SwebHqlPack {
         DdlPackBean result = new DdlPackBean();
         DdlPreparedPack.getStringEqualPack(details.getOrderNo(), "orderNo", result);
         DdlPreparedPack.getStringEqualPack(details.getVendorCode(), "vendorCode", result);
-        DdlPreparedPack.getNumEqualPack(details.getOrderType(), "orderType", result);
+        //DdlPreparedPack.getNumEqualPack(details.getOrderType(), "orderType", result);
 //        DdlPreparedPack.getNumEqualPack(SwebEnumUtil.ORDER_DETAILS_STATUS.CREATE.getValue(), "itemStatus", result);
         return buildHql(details, result);
     }

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

@@ -74,9 +74,9 @@ public class WmsCSRange extends BaseBean {
     @ApiParam(value = "库存数量", example = "0")
     public Double qty;
 
-    @Column(name = "LOT_NO", nullable = false)
+    @Column(name = "LOT_NO")
     @ApiParam("收货批次")
-    public String lotNo = "";
+    public String lotNo;
 
     @Transient
     @ApiParam("存储区编号组")

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

@@ -240,7 +240,6 @@ public class WmsDocMovementDetails extends BaseBean {
     @ApiParam(value = "父位置号")
     private String seqNo;
 
-
     @Transient
     @ApiParam(value = "客户编号")
     private String custNo;
@@ -466,4 +465,13 @@ public class WmsDocMovementDetails extends BaseBean {
         this.custNo = custNo;
     }
 
+    public WmsDocMovementDetails (String orderNo, String srcZoneNo, String destZoneNo, String destLocateNo,Integer priority,String createDatetime) {
+        this.orderNo = orderNo;
+        this.srcZoneNo = srcZoneNo;
+        this.destZoneNo = destZoneNo;
+        this.destLocateNo = destLocateNo;
+        this.priority = priority;
+        this.createDatetime = createDatetime;
+    }
+
 }