Merge branch 'test'

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

@@ -131,4 +131,8 @@ public class WmsPOMaster extends BaseBean {
     @Transient
     @ApiParam("手机")
     private String vendorPhone;
+
+    @Transient
+    @ApiParam("前端信息")
+    private String message;
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -974,6 +974,13 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getOrderNo(), "orderNo", result);
         DdlPreparedPack.getNumEqualPack(wmsMoveMaster.getOrderStatus(), "orderStatus", result);
         DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getTransTypeCode(), "transTypeCode", result);
+        DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getCreateUser(), "createUser", result);
+        DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getModifyUser(), "modifyUser", result);
+
+        DdlPreparedPack.timeBuilder(wmsMoveMaster.getCreateDateTimeStart(),
+                wmsMoveMaster.getCreateDateTimeEnd(),"createDatetime",result,true);
+        DdlPreparedPack.timeBuilder(wmsMoveMaster.getModifyDateTimeStart(),
+                wmsMoveMaster.getModifyDateTimeEnd(),"modifyDatetime",result,true);
         getStringBuilderPack(wmsMoveMaster, result);
 
         return result;
@@ -2103,7 +2110,7 @@ public class WmsHqlPack {
         //查询参数封装
         DdlPreparedPack.getInPackList(statusList,"asnStatus",result);
         DdlPreparedPack.getNumEqualPack(WmsEnumUtil.PRODUCT_INSTOCK_STATUS.CREATE.getValue(),"actionStatus",result);
-        DdlPreparedPack.getStringEqualPack(String.valueOf(WmsEnumUtil.ORDER_TYPE.AMP.getValue()),"asnType",result);
+        DdlPreparedPack.getNumEqualPack(WmsEnumUtil.ORDER_TYPE.AMP.getValue(),"asnType",result);
         DdlPreparedPack.getStringEqualPack(organizeCode,"organizeCode",result);
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isValid", result);
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);