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

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

@@ -157,6 +157,14 @@ public class WmsMoveToERP extends BaseBean {
     @ApiParam("关联单据行号")
     public String refItem;
 
+    @Column(name="IS_LOCK")
+    @ApiParam(value = "是否锁定", example = "2")
+    public Integer isLock= CommonEnumUtil.FALSE;
+
+    @Column(name = "YEAR")
+    @ApiParam("年度")
+    public String year;
+
     @ApiParam(value = "待出库数量", example = "0")
     @Transient
     private Long waitingCounts;
@@ -168,6 +176,13 @@ public class WmsMoveToERP extends BaseBean {
     @Transient
     private Long shippingId;
 
+    @Transient
+    private Double transQtySum;
+
+    public Double getTransQtySumVal() {
+        return this.transQtySum == null ? 0 : this.transQtySum.doubleValue();
+    }
+
     public Double getRejectQty(){
         return this.rejectQty == null ? 0 : this.rejectQty.doubleValue();
     }
@@ -183,4 +198,15 @@ public class WmsMoveToERP extends BaseBean {
     public Long getFinishedCounts() {
         return finishedCounts == null ? 0L : this.finishedCounts;
     }
+
+    public WmsMoveToERP() {}
+
+    public WmsMoveToERP(String partNo, String partNameRdd, String vendorNo, String unit, String destAreaNo, Double transQtySum) {
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.vendorNo = vendorNo;
+        this.unit = unit;
+        this.destAreaNo = destAreaNo;
+        this.transQtySum = transQtySum;
+    }
 }

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

@@ -44,4 +44,8 @@ public class WmsSapOrderLock extends BaseBean {
     @ApiParam("锁定标识")
     public String lockFlag;
 
+    @Column(name = "IS_SYNC")
+    @ApiParam("同步标识")
+    public Integer isSync = 10;
+
 }

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

@@ -240,6 +240,8 @@ public class WmsStockSn extends BaseBean {
         this.partNo = partNo;
     }
 
+    public Integer getSnType() { return snType == null ? 0 : snType.intValue();}
+
     public Double getQty() {
         return qty == null ? 0L : qty.doubleValue();
     }

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

@@ -48,6 +48,23 @@ public class WmsHqlPack {
     }
 
     /**
+     * 单位换算 分页查询
+     * @return
+     */
+    public static DdlPackBean packHqlWmsUnitConvertByPager(WmsUnitConvert wmsUnitConvert){
+        DdlPackBean result = new DdlPackBean();
+
+        //查询参数封装
+        DdlPreparedPack.getStringEqualPack(wmsUnitConvert.getUnitCode(), "unitCode", result);
+        DdlPreparedPack.getStringEqualPack(wmsUnitConvert.getDestUnitCode(), "destUnitCode", result);
+
+        getStringBuilderPack(wmsUnitConvert, result);
+
+        return result;
+    }
+
+
+    /**
      * PO订单明细表 分页查询
      *
      * @param wmsPOMasterDetails
@@ -685,9 +702,9 @@ public class WmsHqlPack {
         // 来源单据类型
         DdlPreparedPack.getStringEqualPack(wmsSnPrint.getRefType(), "refType", result);
         // 来源单据号
-        DdlPreparedPack.getStringEqualPack(wmsSnPrint.getRefNo(), "refNo", result);
+        DdlPreparedPack.getStringLikerPack(wmsSnPrint.getRefNo(), "refNo", result);
         // 打印机
-        DdlPreparedPack.getStringEqualPack(wmsSnPrint.getPrinter(), "printer", result);
+        DdlPreparedPack.getStringLikerPack(wmsSnPrint.getPrinter(), "printer", result);
         // 打印机状态
         DdlPreparedPack.getNumEqualPack(wmsSnPrint.getPrintStatus(), "printStatus", result);
 
@@ -948,8 +965,8 @@ public class WmsHqlPack {
         DdlPackBean result = new DdlPackBean();
 
         //查询参数封装
-        DdlPreparedPack.getStringEqualPack(wmsPackage.getPackageNo(), "packageNo", result);
-        DdlPreparedPack.getStringEqualPack(wmsPackage.getParentPackageNo(), "parentPackageNo", result);
+        DdlPreparedPack.getStringLikerPack(wmsPackage.getPackageNo(), "packageNo", result);
+        DdlPreparedPack.getStringLikerPack(wmsPackage.getParentPackageNo(), "parentPackageNo", result);
         DdlPreparedPack.getNumEqualPack(wmsPackage.getPackTypeId(), "packTypeId", result);
 
         getStringBuilderPack(wmsPackage, result);
@@ -985,11 +1002,11 @@ public class WmsHqlPack {
     public static DdlPackBean packHqlWmsMoveMaster(WmsMoveMaster wmsMoveMaster) {
         DdlPackBean result = new DdlPackBean();
 
-        DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getOrderNo(), "orderNo", result);
+        DdlPreparedPack.getStringLikerPack(wmsMoveMaster.getOrderNo(), "orderNo", result);
         DdlPreparedPack.getNumEqualPack(wmsMoveMaster.getOrderStatus(), "orderStatus", result);
         DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getTransTypeCode(), "transTypeCode", result);
-        DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getCreateUser(), "createUser", result);
-        DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getModifyUser(), "modifyUser", result);
+        DdlPreparedPack.getStringLikerPack(wmsMoveMaster.getCreateUser(), "createUser", result);
+        DdlPreparedPack.getStringLikerPack(wmsMoveMaster.getModifyUser(), "modifyUser", result);
 
         DdlPreparedPack.timeBuilder(wmsMoveMaster.getCreateDateTimeStart(),
                 wmsMoveMaster.getCreateDateTimeEnd(), "createDatetime", result, true);
@@ -1085,13 +1102,13 @@ public class WmsHqlPack {
         DdlPackBean result = new DdlPackBean();
 
         //单号
-        DdlPreparedPack.getStringEqualPack(wmsQCMaster.getOrderNo(), "orderNo", result);
+        DdlPreparedPack.getStringLikerPack(wmsQCMaster.getOrderNo(), "orderNo", result);
         //业务类型
         DdlPreparedPack.getNumEqualPack(wmsQCMaster.getOrderType(), "orderType", result);
         //关联单据类型
         DdlPreparedPack.getStringEqualPack(wmsQCMaster.getRefType(), "refType", result);
         //关联单据号
-        DdlPreparedPack.getStringEqualPack(wmsQCMaster.getRefSrc(), "refSrc", result);
+        DdlPreparedPack.getStringLikerPack(wmsQCMaster.getRefSrc(), "refSrc", result);
 
         getStringBuilderPack(wmsQCMaster, result);
 
@@ -1712,10 +1729,10 @@ public class WmsHqlPack {
     public static DdlPackBean packHqlWmsTransModule(WmsTransModule wmsTransModule) {
         DdlPackBean packBean = new DdlPackBean();
         if (!Strings.isNullOrEmpty(wmsTransModule.getTmName())) {
-            DdlPreparedPack.getStringEqualPack(wmsTransModule.getTmName(), "tmName", packBean);
+            DdlPreparedPack.getStringLikerPack(wmsTransModule.getTmName(), "tmName", packBean);
         }
         if (!Strings.isNullOrEmpty(wmsTransModule.getCallClass())) {
-            DdlPreparedPack.getStringEqualPack(wmsTransModule.getCallClass(), "callClass", packBean);
+            DdlPreparedPack.getStringLikerPack(wmsTransModule.getCallClass(), "callClass", packBean);
         }
         if (!Strings.isNullOrEmpty(wmsTransModule.getTmDesc())) {
             DdlPreparedPack.getStringLikerPack(wmsTransModule.getTmDesc(), "tmDesc", packBean);