From a6208289565862e381d52372535d350fce1dadd2 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 27 Feb 2020 08:55:16 +0100 Subject: [PATCH] =?UTF-8?q?=E3=80=907555=20=E9=9C=80=E8=A6=81=E5=9C=A8?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=E7=8A=B6=E6=80=81=E6=8A=A5=E8=A1=A8=E4=B8=AD?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E6=90=9C=E7=B4=A2=E4=BF=9D=E8=B4=A8=E6=9C=9F?= =?UTF-8?q?=E6=97=B6=E9=97=B4=EF=BC=8C=E6=9F=A5=E8=AF=A2=E5=9C=A8=E9=80=89?= =?UTF-8?q?=E4=B8=AD=E5=8C=BA=E9=97=B4=E5=86=85=E8=BF=87=E6=9C=9F=E7=9A=84?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=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/bean/WmsStockSn.java | 8 ++++++++ .../main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 ++ 2 files changed, 10 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 8a53a3d..f72a66b 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 @@ -295,6 +295,14 @@ public class WmsStockSn extends BaseBean { private String parentReturnPart; @Transient + @ApiParam("保质期开始时间") + private String qualityDateTimeStart; + + @Transient + @ApiParam("保质期结束时间") + private String qualityDateTimeEnd; + + @Transient @ApiParam(value = "预计完成时间") private String planCompleteTime; 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 6b4788b..5d86cfd 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,8 @@ public class WmsHqlPack { DdlPreparedPack.getStringRightLikerPack(wmsStockSn.getCustSn(), "custSn", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getDateCode(), "dateCode", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getLotNo(), "lotNo", result); + DdlPreparedPack.timeBuilder(wmsStockSn.getQualityDateTimeStart(), + wmsStockSn.getQualityDateTimeEnd(), "qualityDate", result, false); if (wmsStockSn.getIsValid() != null) { DdlPreparedPack.getNumEqualPack(wmsStockSn.getIsValid(), "isValid", result); }