From 8f584f250b091509eda5d5f255cad763e0dd69fc Mon Sep 17 00:00:00 2001
From: "puxiao.liao" <liaopuxiao@sina.cn>
Date: Fri, 13 Mar 2020 15:29:08 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=907633=20=E6=9D=A1=E7=A0=81=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86=E4=B8=AD=EF=BC=8C=E7=82=B9=E5=87=BB=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=EF=BC=8C=E6=97=A5=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92=E4=BA=A7?=
 =?UTF-8?q?=E7=94=9F=E7=9A=84=E6=9D=A1=E7=A0=81=E6=97=A0=E6=B3=95=E8=A2=AB?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=EF=BC=8C=E7=95=8C=E9=9D=A2=E4=B8=8A=E7=9A=84?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=BA=94=E8=AF=A5=E6=98=AF=E6=9F=A5=E5=88=B0?=
 =?UTF-8?q?=E4=BB=80=E4=B9=88=E5=B0=B1=E5=AF=BC=E5=87=BA=E4=BB=80=E4=B9=88?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E9=9C=80=E8=A6=81=E5=86=8D=E5=8A=A0=E5=85=B6?=
 =?UTF-8?q?=E4=BB=96=E9=A2=9D=E5=A4=96=E7=9A=84=E6=9D=A1=E4=BB=B6=20?=
 =?UTF-8?q?=E3=80=91bug7633?=
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, 7 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 abff614..d03d299 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
@@ -6,6 +6,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.base.tool.HqlPack;
+import cn.estsh.i3plus.pojo.base.util.StringUtil;
 import cn.estsh.i3plus.pojo.wms.bean.*;
 import cn.estsh.i3plus.pojo.wms.bean.dynamictable.WmsFieldInfo;
 import cn.estsh.i3plus.pojo.wms.bean.dynamictable.WmsSearchElementFunction;
@@ -1303,6 +1304,12 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringEqualPack(wmsStockSn.getDateCode(), "dateCode", result);
         DdlPreparedPack.getStringEqualPack(wmsStockSn.getLotNo(), "lotNo", result);
         DdlPreparedPack.getStringEqualPack(wmsStockSn.getPackageNo(), "packageNo", result);
+        if (StringUtil.isEmpty(wmsStockSn.getQualityDateTimeStart())) {
+            wmsStockSn.setQualityDateTimeStart("");
+        }
+        if (StringUtil.isEmpty(wmsStockSn.getQualityDateTimeEnd())) {
+            wmsStockSn.setQualityDateTimeEnd("");
+        }
         DdlPreparedPack.timeBuilder(wmsStockSn.getQualityDateTimeStart()+","+ wmsStockSn.getQualityDateTimeEnd(),
                 "qualityDate", result, false,false);
         if (wmsStockSn.getIsValid() != null) {