From 50d3de9b772040e905b3e1a6b6aeea89c585cc8e Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Mon, 9 Mar 2020 18:46:54 +0800 Subject: [PATCH] =?UTF-8?q?7600=20=E4=BA=8C=E7=BB=B4=E7=A0=81=E9=9B=B6?= =?UTF-8?q?=E4=BB=B6=E6=A0=87=E7=AD=BE=E6=89=93=E5=8D=B0=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=82=207565=20=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E5=88=86=E7=BB=84=E5=8A=9F=E8=83=BD=E8=A6=81=E6=B1=82=E3=80=82?= =?UTF-8?q?=207633=20=E6=9D=A1=E7=A0=81=E6=98=8E=E7=BB=86=E4=B8=AD?= =?UTF-8?q?=EF=BC=8C=E7=82=B9=E5=87=BB=E5=AF=BC=E5=87=BA=EF=BC=8C=E6=97=A5?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92=E4=BA=A7=E7=94=9F=E7=9A=84?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=E6=97=A0=E6=B3=95=E8=A2=AB=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=EF=BC=8C=E7=95=8C=E9=9D=A2=E4=B8=8A=E7=9A=84=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E5=BA=94=E8=AF=A5=E6=98=AF=E6=9F=A5=E5=88=B0=E4=BB=80=E4=B9=88?= =?UTF-8?q?=E5=B0=B1=E5=AF=BC=E5=87=BA=E4=BB=80=E4=B9=88=EF=BC=8C=E4=B8=8D?= =?UTF-8?q?=E9=9C=80=E8=A6=81=E5=86=8D=E5=8A=A0=E5=85=B6=E4=BB=96=E9=A2=9D?= =?UTF-8?q?=E5=A4=96=E7=9A=84=E6=9D=A1=E4=BB=B6=207628=20=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E8=B0=83=E6=95=B4=E7=9B=98=E7=82=B9=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E6=89=AB=E6=8F=8F=E5=BA=93=E4=BD=8D=E5=90=8E=E7=9A=84=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=B8=AA=E5=BA=93=E4=BD=8D?= =?UTF-8?q?=207640=20=E8=A7=A3=E5=86=BB=E6=89=AB=E6=8F=8F=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=E5=90=8E=E7=9A=84=E6=8F=90=E7=A4=BA=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=9D=A1=E7=A0=81=EF=BC=8C=E5=86=BB=E7=BB=93?= =?UTF-8?q?=E6=98=AF=E6=9C=89=E7=9A=84=E3=80=82=E9=9C=80=E8=A6=81=E7=BB=9F?= =?UTF-8?q?=E4=B8=80=E9=83=BD=E6=98=BE=E7=A4=BA=207536=20=E6=B2=A1?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=97=B6=E9=A2=86=E6=96=99=E4=B8=8E=E5=8F=91?= =?UTF-8?q?=E8=BF=90=E7=9A=84=E6=8F=90=E7=A4=BA=E4=BF=AE=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E4=B8=8B=E5=88=97=207659=20=E5=88=9B=E5=BB=BA=E7=9B=98?= =?UTF-8?q?=E7=82=B9=E5=8D=95=E5=86=BB=E7=BB=93=E6=9D=A1=E7=A0=81=E6=97=B6?= =?UTF-8?q?=E6=9D=A1=E7=A0=81is=5Fvaild=3D2=207617=20=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E5=8D=95=E6=98=8E=E7=BB=86=E4=B8=AD=E7=9A=84=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E5=AE=A2=E6=88=B7=E6=A0=87=E7=AD=BE=E6=8C=89=E9=92=AE=EF=BC=8C?= =?UTF-8?q?=E9=9C=80=E8=A6=81=E6=A3=80=E6=B5=8B=E5=8D=95=E6=8D=AE=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E6=9C=89=E6=B2=A1=E6=9C=89=E6=8F=90=E4=BA=A4=EF=BC=8C?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E4=B8=BA=E5=88=9B=E5=BB=BA=E7=9A=84=E6=89=8D?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E6=89=93=E5=8D=B0=EF=BC=8C=E5=B9=B6=E4=B8=94?= =?UTF-8?q?=E5=8F=AA=E8=83=BD=E6=89=93=E5=8D=B0=E4=B8=80=E6=AC=A1=E3=80=82?= =?UTF-8?q?=207652=20=E5=9C=A8=E6=9D=A1=E7=A0=81=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E4=B8=AD=E5=A2=9E=E5=8A=A0=E7=BB=84=E5=8F=B7?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=98=BE=E7=A4=BA=EF=BC=8C=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=A1=86=E4=B9=9F=E9=9C=80=E8=A6=81=E5=A2=9E=E5=8A=A0=207454?= =?UTF-8?q?=20=E9=9C=80=E8=A6=81=E4=B8=80=E4=B8=AA=E9=85=8D=E6=96=99?= =?UTF-8?q?=E6=92=A4=E9=94=80=EF=BC=88=E9=92=88=E5=AF=B9=E5=8D=95=E4=B8=AA?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=EF=BC=8C=E8=80=8C=E4=B8=8D=E6=98=AF=E5=8D=95?= =?UTF-8?q?=E6=8D=AE=EF=BC=89=E7=9A=84=E5=8A=9F=E8=83=BD=EF=BC=8C=E5=B7=B2?= =?UTF-8?q?=E7=BB=8F=E9=85=8D=E6=96=99=E7=9A=84=E6=9D=A1=E7=A0=81=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E8=A2=AB=E6=92=A4=E5=9B=9E=E5=88=B0=E4=BB=93=E5=BA=93?= =?UTF-8?q?=E4=B8=AD=EF=BC=8C=E9=9C=80=E8=A6=81=E8=80=83=E8=99=91=E5=90=84?= =?UTF-8?q?=E7=A7=8D=E5=BA=93=E5=AD=98=E7=A7=BB=E5=8A=A8=E5=8D=95=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E3=80=82=207631=20=E5=9C=A8=E7=9B=98=E7=82=B9?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E4=B8=AD=E7=9A=84=E7=9B=98=E7=82=B9=E8=8C=83?= =?UTF-8?q?=E5=9B=B4=E7=95=8C=E9=9D=A2=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=8C=E6=8A=8A=E6=95=B0=E6=8D=AE=E5=BA=93?= =?UTF-8?q?=E4=B8=AD=E7=9A=84src=5Forder=5Fno=E6=98=BE=E7=A4=BA=E5=87=BA?= =?UTF-8?q?=E6=9D=A5=EF=BC=8C=E5=AD=97=E6=AE=B5=E5=8F=96=E5=90=8D=E4=B8=BA?= =?UTF-8?q?=E5=8E=9F=E5=A7=8B=E5=8D=95=E5=8F=B7=207526=20=E5=8F=91?= =?UTF-8?q?=E8=BF=90=E5=8D=95=E6=8E=A5=E6=94=B6=E6=97=B6=EF=BC=8C=E5=9C=A8?= =?UTF-8?q?=E4=B8=BB=E8=A1=A8=E4=B8=AD=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=8C=E5=9C=A8=E8=AE=B2=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=86=99=E5=85=A5=E6=95=B0=E6=8D=AE=E5=BA=93?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=A6=82=E6=9E=9C=E8=AF=A5=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=E4=B8=AD=E5=8F=AA=E5=AD=98=E5=9C=A8=E4=B8=80?= =?UTF-8?q?=E6=AD=A5=E6=B3=95=E7=9A=84=E9=9B=B6=E4=BB=B6=E5=8F=B7=EF=BC=8C?= =?UTF-8?q?=E5=88=99=E8=AF=A5=E5=AD=97=E6=AE=B5=E9=9C=80=E8=A6=81=E5=9C=A8?= =?UTF-8?q?=E5=89=8D=E5=8F=B0=E6=98=BE=E7=A4=BA=E4=B8=BA=E4=B8=80=E6=AD=A5?= =?UTF-8?q?=E6=B3=95=EF=BC=8C=E5=A6=82=E6=9E=9C=E5=AD=98=E5=9C=A8=E4=B8=A4?= =?UTF-8?q?=E6=AD=A5=E6=B3=95=E7=9A=84=E9=9B=B6=E4=BB=B6=E5=8F=B7=EF=BC=8C?= =?UTF-8?q?=E5=88=99=E6=98=BE=E7=A4=BA=E4=B8=BA=E4=B8=A4=E6=AD=A5=E6=B3=95?= =?UTF-8?q?=E3=80=82=207617=20=E5=87=BA=E5=BA=93=E5=8D=95=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E4=B8=AD=E7=9A=84=E6=89=93=E5=8D=B0=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=8C=89=E9=92=AE=EF=BC=8C=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E6=A3=80=E6=B5=8B=E5=8D=95=E6=8D=AE=E6=98=8E=E7=BB=86=E6=9C=89?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E6=8F=90=E4=BA=A4=EF=BC=8C=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E4=B8=BA=E5=88=9B=E5=BB=BA=E7=9A=84=E6=89=8D=E5=8F=AF=E4=BB=A5?= =?UTF-8?q?=E6=89=93=E5=8D=B0=EF=BC=8C=E5=B9=B6=E4=B8=94=E5=8F=AA=E8=83=BD?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E4=B8=80=E6=AC=A1=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 3 ++- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index e7b8cd0..57cadad 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -3857,7 +3857,8 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum PRINT_TYPE { - SN(10, "SN"); + SN(10, "SN"), + PACKAGE_NO(20, "PACKAGE_NO"); private int value; private String description; 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 6e717a9..aec24ee 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 @@ -1301,6 +1301,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringRightLikerPack(wmsStockSn.getCustSn(), "custSn", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getDateCode(), "dateCode", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getLotNo(), "lotNo", result); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getPackageNo(), "packageNo", result); DdlPreparedPack.timeBuilder(wmsStockSn.getQualityDateTimeStart()+","+ wmsStockSn.getQualityDateTimeEnd(), "qualityDate", result, false,false); if (wmsStockSn.getIsValid() != null) {