Merge branch 'test' into ext-dev

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

@@ -1,7 +1,9 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
 import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
@@ -124,6 +126,11 @@ public class WmsCSOrderDetails extends BaseBean {
     @ApiParam("收货批次")
     public String lotNo = "";
 
+    @Column(name = "package_no")
+    @ApiParam(value = "包装编号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String packageNo;
+
     @Transient
     @ApiParam(value = "实盘数量", example = "1")
     @AnnoOutputColumn(hidden = true)

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

@@ -1481,6 +1481,7 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getOrderNo(), "orderNo", result);
         DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getPartNo(), "partNo", result);
         DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getLocateNo(), "locateNo", result);
+        DdlPreparedPack.getStringLikeEqualPack(wmsCSOrderDetails.getPackageNo(), "packageNo", result);
         DdlPreparedPack.getNumEqualPack(wmsCSOrderDetails.getTransStatus(), "transStatus", result);
         DdlPreparedPack.getInPackArray(wmsCSOrderDetails.getZoneNos(), "zoneNo", result);
         DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getSn(), "sn", result);
@@ -1507,6 +1508,7 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringEqualPack(wmsCSFactTrans.getLocateNo(), "locateNo", result);
         DdlPreparedPack.getInPackArray(wmsCSFactTrans.getZoneNos(), "zoneNo", result);
         DdlPreparedPack.getStringEqualPack(wmsCSFactTrans.getSn(), "sn", result);
+        DdlPreparedPack.getStringLikeEqualPack(wmsCSFactTrans.getPackageNo(), "packageNo", result);
 
         getStringBuilderPack(wmsCSFactTrans, result);