From f0b35d1d74a1fcac6cb15b0ab204c833af57ebfb Mon Sep 17 00:00:00 2001 From: qianhs Date: Sat, 16 Nov 2019 19:20:53 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90VDA=E7=94=9F=E4=BA=A7=E9=80=80?= =?UTF-8?q?=E6=96=99-=E6=9D=A1=E7=A0=81=E6=89=80=E5=9C=A8=E5=BA=93?= =?UTF-8?q?=E4=BD=8D-=E9=9C=80=E4=B8=BA=E7=BA=BF=E8=BE=B9=E5=BA=93?= =?UTF-8?q?=E4=BD=8D=E3=80=91=E3=80=90bug6442=E3=80=91=20=E3=80=90VDA?= =?UTF-8?q?=E6=94=B6=E8=B4=A7---=E9=80=89=E6=8B=A9ASN=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=EF=BC=8C=E7=82=B9=E5=87=BB=E9=A2=84=E6=94=B6=E8=B4=A7=EF=BC=8C?= =?UTF-8?q?=E9=A2=84=E6=94=B6=E8=B4=A7=E6=88=90=E5=8A=9F=E5=90=8E=EF=BC=8C?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E8=BF=98=E5=8F=AF=E4=BB=A5=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E3=80=82=E5=AF=BC=E8=87=B4=E6=95=B0=E6=8D=AE=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E3=80=91=E3=80=90bug6464=E3=80=91=20=E3=80=90=09VDA=E6=94=B6?= =?UTF-8?q?=E8=B4=A7---=E9=A2=84=E6=94=B6=E8=B4=A7=E7=9A=84=E5=8D=95?= =?UTF-8?q?=E6=8D=AE=EF=BC=8C=E8=A6=81=E5=9C=A8=E9=A1=B5=E9=9D=A2=E4=B8=8A?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E6=9F=A5=E8=AF=A2=E3=80=91=E3=80=90bug6465?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java | 2 +- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java | 2 +- .../main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 10 ++++++++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java index 31153ac..c54315e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java @@ -51,6 +51,6 @@ public class SwebProcurementPlanOrder extends BaseBean { @Column(name = "CONSIGNMENT") @ApiParam(value = "是否寄售") - private Integer consignment; + private Integer consignment=2; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java index b2c81ff..34d1a36 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java @@ -116,7 +116,7 @@ public class WmsPOMaster extends BaseBean { @ApiParam("集装箱号") public String containerNo; - @Column(name = "PRIOR_RC") + @Column(name = "PRIOR_RC",columnDefinition = "int default 2") @ApiParam("预收货") public Integer priorRC; 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 75b3400..2e15592 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 @@ -208,7 +208,13 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsPOMaster.getVendorNo(), "vendorNo", result); DdlPreparedPack.getStringEqualPack(wmsPOMaster.getSrc(), "src", result); DdlPreparedPack.getStringEqualPack(wmsPOMaster.getIsAsn(), "isAsn", result); - DdlPreparedPack.getNumEqualPack(wmsPOMaster.getPriorRC(), "priorRC", result); + if (wmsPOMaster.getPriorRC()!=null&&wmsPOMaster.getPriorRC()==WmsEnumUtil.TRUE_OR_FALSE.FALSE.getValue()){ + DdlPreparedPack.getNumEqualPackOr(wmsPOMaster.getPriorRC(), "priorRC", result); + DdlPreparedPack.getNumEqualPackOr(0, "priorRC", result); + }else{ + DdlPreparedPack.getNumEqualPack(wmsPOMaster.getPriorRC(), "priorRC", result); + } + // 查询计划时间在指定范围的单号，查询这些单号的数据 if (StringUtils.isNotBlank(wmsPOMaster.getPlanDateStart()) && StringUtils.isNotBlank(wmsPOMaster.getPlanDateEnd())) { @@ -1511,7 +1517,7 @@ public class WmsHqlPack { //查询参数封装 DdlPreparedPack.getStringEqualPack(wmsPoSn.getOrderNo(), "orderNo", result); - DdlPreparedPack.getStringEqualPack(wmsPoSn.getSn(), "sn", result); + DdlPreparedPack.getStringEqualPack(wmsPoSn.getSn(), "snOneBarCode", result); DdlPreparedPack.getStringEqualPack(wmsPoSn.getPartNo(), "partNo", result); DdlPreparedPack.getNumEqualPack(wmsPoSn.getQcStatus(), "qcStatus", result); DdlPreparedPack.getStringLikerPack(wmsPoSn.getErpAreaNoAdd(), "erpAreaNoAdd", result);