Merge branch 'test' of puxiao.liao/i3plus-pojo-lpx into test

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java

@@ -33,6 +33,7 @@ public class WmsSnOperateRecord extends BaseBean {
 
     @Column(name = "SN")
     @ApiParam(value = "条码")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String sn;
 
     @Column(name = "LINE_CODE")

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) {