From 0341dd2f5ee810ae9fd6aada65d2c0af2e15100c Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Mon, 22 Jul 2019 13:49:31 +0800 Subject: [PATCH 1/5] bug #5030 --- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 6116e44..f8c6f5c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -685,9 +685,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 +948,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 +985,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 +1085,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 +1712,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); From b4a538ebb58009a544448b37e941f0d589432648 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Mon, 22 Jul 2019 17:26:48 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=8D=95=E4=BD=8D=E6=8D=A2=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 6116e44..6571144 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/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 From 2045b338016ba75955082eb93e591af6c8306262 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Tue, 23 Jul 2019 13:31:48 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=20=E5=8D=95=E6=8D=AE=E9=94=81=E5=AE=9A=20S?= =?UTF-8?q?apOrderLock=20=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSapOrderLock.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSapOrderLock.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSapOrderLock.java index 8d39279..853d848 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSapOrderLock.java +++ b/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; + } From 792dc0a1907870d80ee63be889b5067a4f2df9fb Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Tue, 23 Jul 2019 16:56:39 +0800 Subject: [PATCH 4/5] =?UTF-8?q?WMS=5FMOVE=5FTO=5FERP=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=B9=B4=E4=BB=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java index d8d2132..496a719 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java @@ -157,6 +157,10 @@ public class WmsMoveToERP extends BaseBean { @ApiParam("关联单据行号") public String refItem; + @Column(name = "YEAR") + @ApiParam("年度") + public String year; + @ApiParam(value = "待出库数量", example = "0") @Transient private Long waitingCounts; From 7811157312f7eb0ccf9d5920c162cf6a3197883e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Tue, 23 Jul 2019 20:30:12 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=AE=9E=E4=BD=93=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java | 22 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 2 ++ 2 files changed, 24 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java index d8d2132..0de9b2a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java @@ -157,6 +157,10 @@ public class WmsMoveToERP extends BaseBean { @ApiParam("关联单据行号") public String refItem; + @Column(name="IS_LOCK") + @ApiParam(value = "是否锁定", example = "2") + public Integer isLock= CommonEnumUtil.FALSE; + @ApiParam(value = "待出库数量", example = "0") @Transient private Long waitingCounts; @@ -168,6 +172,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 +194,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; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index 20e8a9e..c9f016b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/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(); }