From 693ac2451e36d6f63679043c41b88fb3d912a2ce Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Sat, 16 Nov 2019 12:00:08 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=82=EF=BC=9A1167?= =?UTF-8?q?=EF=BC=8C=E4=BA=A7=E5=93=81=E6=89=B9=E9=87=8F=E6=89=93=E5=8C=85?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java | 16 ++++++++++++++++ .../i3plus/pojo/mes/pcn/bean/MesPackageDetail.java | 8 ++++---- .../i3plus/pojo/mes/pcn/model/ProdPackageModel.java | 15 +++++++++++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesPackage.java | 20 ++++++++++++++++++++ .../estsh/i3plus/pojo/mes/bean/MesPackageDetail.java | 6 +++--- 5 files changed, 58 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java index 4c34404..05f94b1 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java @@ -99,6 +99,22 @@ public class MesPackage extends BaseBean { @ApiParam("打印状态文字") private String printStrStatus; + @Transient + @ApiParam("客户代码名称") + private String custCodeName; + + @Transient + @ApiParam("包装层级名称") + private String packLevelName; + + @Transient + @ApiParam("是否封箱名称") + private String isSealedName; + + @Transient + @ApiParam("过程条码") + private String serialNumber; + diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java index d3864d0..883c12a 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java @@ -24,7 +24,7 @@ import javax.persistence.Table; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PACKAGE_DETAIL") -@Api("包装规格") +@Api("包装规格明细") public class MesPackageDetail extends BaseBean { @Column(name = "PACKAGE_NO") @@ -32,15 +32,15 @@ public class MesPackageDetail extends BaseBean { private String packageNo; @Column(name = "SERIAL_NUMBER") - @ApiParam("产品条码") + @ApiParam("过程条码") private String serialNumber; @Column(name = "PART_NO") - @ApiParam("产品条码") + @ApiParam("物料编号") private String partNo; @Column(name = "PART_NAME_RDD") - @ApiParam("产品条码") + @ApiParam("物料名称") private String partNameRdd; @Column(name = "PACKAGE_NO2") diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProdPackageModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProdPackageModel.java index 9a979a9..3b99952 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProdPackageModel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProdPackageModel.java @@ -64,4 +64,19 @@ public class ProdPackageModel { @ApiParam("工单集合") private List workOrderList; + @ApiParam("打印状态文字") + private String printStrStatus; + + @ApiParam("客户代码名称") + private String custCodeName; + + @ApiParam("包装层级名称") + private String packLevelName; + + @ApiParam("是否封箱名称") + private String isSealedName; + + @ApiParam("过程条码") + private String serialNumber; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java index f6a4b95..451efae 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java @@ -95,4 +95,24 @@ public class MesPackage extends BaseBean { @ApiParam("封箱状态") private String sealStatus; + @Transient + @ApiParam("打印状态文字") + private String printStrStatus; + + @Transient + @ApiParam("客户代码名称") + private String custCodeName; + + @Transient + @ApiParam("包装层级名称") + private String packLevelName; + + @Transient + @ApiParam("是否封箱名称") + private String isSealedName; + + @Transient + @ApiParam("过程条码") + private String serialNumber; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java index a6594ad..95483c1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java @@ -23,8 +23,8 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PACKAGE") -@Api("包装规格") +@Table(name = "MES_PACKAGE_DETAIL") +@Api("包装规格明细") public class MesPackageDetail extends BaseBean { @Column(name = "PACKAGE_NO") @@ -32,7 +32,7 @@ public class MesPackageDetail extends BaseBean { private String packageNo; @Column(name = "SERIAL_NUMBER") - @ApiParam("产品条码") + @ApiParam("过程条码") private String serialNumber; @Column(name = "PART_NO") From f6d50bdfb77660525d14457a851e84ace84e374d Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Sat, 16 Nov 2019 13:56:42 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=82=EF=BC=9A1167?= =?UTF-8?q?=EF=BC=8C=E4=BA=A7=E5=93=81=E6=89=B9=E9=87=8F=E6=89=93=E5=8C=85?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java | 7 ------- .../cn/estsh/i3plus/pojo/mes/pcn/model/ProdPackageModel.java | 9 ++++++--- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java | 4 ---- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java index 05f94b1..ca904d5 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java @@ -111,13 +111,6 @@ public class MesPackage extends BaseBean { @ApiParam("是否封箱名称") private String isSealedName; - @Transient - @ApiParam("过程条码") - private String serialNumber; - - - - public MesPackage() { } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProdPackageModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProdPackageModel.java index 3b99952..abc6f92 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProdPackageModel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProdPackageModel.java @@ -58,6 +58,12 @@ public class ProdPackageModel { @ApiParam("包装规格") private String packSpec; + @ApiParam("数量") + private Double qty; + + @ApiParam("特殊批次") + private String fixLotNo; + @ApiParam("包装集合") private List packageList; @@ -76,7 +82,4 @@ public class ProdPackageModel { @ApiParam("是否封箱名称") private String isSealedName; - @ApiParam("过程条码") - private String serialNumber; - } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java index 451efae..36b3bf6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java @@ -111,8 +111,4 @@ public class MesPackage extends BaseBean { @ApiParam("是否封箱名称") private String isSealedName; - @Transient - @ApiParam("过程条码") - private String serialNumber; - } From 28078287af302ce04156a78eb14ef1b38d20a4a3 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Sat, 16 Nov 2019 13:58:29 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E3=80=90VDA=E6=94=B6=E8=B4=A7=E3=80=91?= =?UTF-8?q?=E3=80=90=E9=A2=84=E6=94=B6=E8=B4=A7=E7=9A=84=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=EF=BC=8C=E8=A6=81=E5=9C=A8=E9=A1=B5=E9=9D=A2=E4=B8=8A=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E6=9F=A5=E8=AF=A2-bug6465=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 1 + 1 file changed, 1 insertion(+) 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 41a0b9e..75b3400 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,6 +208,7 @@ 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 (StringUtils.isNotBlank(wmsPOMaster.getPlanDateStart()) && StringUtils.isNotBlank(wmsPOMaster.getPlanDateEnd())) { From 9e625acc0dbb0dfb7281d475a38d7893dbcd948d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8E=E5=AD=A6=E6=9D=B0?= Date: Sat, 16 Nov 2019 14:05:50 +0800 Subject: [PATCH 4/7] =?UTF-8?q?1.=20MOVE=5FTO=5FERP=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E9=A2=84=E6=94=B6=E8=B4=A7=E5=AD=97=E6=AE=B5?= 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 33d91a3..6342635 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 @@ -179,6 +179,10 @@ public class WmsMoveToERP extends BaseBean { @ApiParam("是否寄售") public Integer isConsignment = 2; + @Column(name = "PRIOR_RC") + @ApiParam("是否预收货") + public Integer priorRC = 2; + @ApiParam(value = "待出库数量", example = "0") @Transient private Long waitingCounts; From 3781713a29cc214ea6a581589528c352e14628fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Sat, 16 Nov 2019 14:54:04 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E5=AE=9E=E6=97=B6=E5=BA=93=E5=AD=98-?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=E6=98=8E=E7=BB=86=E4=BC=98=E5=8C=96=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E9=80=9F=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 33 ++++++++++++++++++++++ 1 file changed, 33 insertions(+) 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 a3e8927..65512b3 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 @@ -325,4 +325,37 @@ public class WmsStockSn extends BaseBean { this.lotNo = lotNo; this.qty = qty; } + + public WmsStockSn(String sn, String partNo, String partNameRdd, String unit, Integer snStatus, + Integer qcStatus, Double qty, String locateNo, String zoneNo, String whNo, String lotNo, + String dateCode, String leftCode, String fixLotNo, String vendorNo, String vendorNameRdd, + String qualityDate, String custNo, String lotCheckRule, String sn2d, + String packageNo, String createDatetime, String createUser, String modifyDatetime, String modifyUser) { + this.sn = sn; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.unit = unit; + this.snStatus = snStatus; + this.qcStatus = qcStatus; + this.qty = qty; + this.locateNo = locateNo; + this.zoneNo = zoneNo; + this.whNo = whNo; + this.lotNo = lotNo; + this.dateCode = dateCode; + this.leftCode = leftCode; + this.fixLotNo = fixLotNo; + this.vendorNo = vendorNo; + this.vendorNameRdd = vendorNameRdd; + this.qualityDate = qualityDate; + this.qualityDay = qualityDay; + this.custNo = custNo; + this.lotCheckRule = lotCheckRule; + this.sn2d = sn2d; + this.packageNo = packageNo; + this.createDatetime = createDatetime; + this.createUser = createUser; + this.modifyDatetime = modifyDatetime; + this.modifyUser = modifyUser; + } } From f0b35d1d74a1fcac6cb15b0ab204c833af57ebfb Mon Sep 17 00:00:00 2001 From: qianhs Date: Sat, 16 Nov 2019 19:20:53 +0800 Subject: [PATCH 6/7] =?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); From a55795d43fff319c594e905f43d8d2b8fe9f134c Mon Sep 17 00:00:00 2001 From: qianhs Date: Sat, 16 Nov 2019 20:43:59 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E3=80=90=09VDA=E6=94=B6=E8=B4=A7---?= =?UTF-8?q?=E9=A2=84=E6=94=B6=E8=B4=A7=E7=9A=84=E5=8D=95=E6=8D=AE=EF=BC=8C?= =?UTF-8?q?=E8=A6=81=E5=9C=A8=E9=A1=B5=E9=9D=A2=E4=B8=8A=E5=8F=AF=E4=BB=A5?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E3=80=91=E3=80=90bug6465=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 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 2e15592..15013e3 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 @@ -209,8 +209,11 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsPOMaster.getSrc(), "src", result); DdlPreparedPack.getStringEqualPack(wmsPOMaster.getIsAsn(), "isAsn", result); if (wmsPOMaster.getPriorRC()!=null&&wmsPOMaster.getPriorRC()==WmsEnumUtil.TRUE_OR_FALSE.FALSE.getValue()){ - DdlPreparedPack.getNumEqualPackOr(wmsPOMaster.getPriorRC(), "priorRC", result); - DdlPreparedPack.getNumEqualPackOr(0, "priorRC", result); + ArrayList numList = new ArrayList<>(); + numList.add(0); + numList.add(wmsPOMaster.getPriorRC()); + numList.add(null); + DdlPreparedPack.getInPackList(numList, "priorRC", result); }else{ DdlPreparedPack.getNumEqualPack(wmsPOMaster.getPriorRC(), "priorRC", result); }