Jenkins自动合并

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/PrintOrderDataModel.java

@@ -69,6 +69,10 @@ public class PrintOrderDataModel implements Serializable {
     @Transient
     public String vendorEmail;
 
+    @ApiParam(value = "集装箱号")
+    @Transient
+    public String containerNo;
+
     public int getBusiDataType() {
         if (busiDataType != null) {
             return busiDataType.intValue();

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

@@ -253,7 +253,7 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringEqualPack(wmsPOMaster.getVendorNo(), "vendorNo", result);
         DdlPreparedPack.getStringEqualPack(wmsPOMaster.getSrc(), "src", result);
         DdlPreparedPack.getStringEqualPack(wmsPOMaster.getIsAsn(), "isAsn", result);
-        DdlPreparedPack.getStringEqualPack(wmsPOMaster.getContainerNo(), "containerNo", result);
+        DdlPreparedPack.getStringRightLikerPack(wmsPOMaster.getContainerNo(), "containerNo", result);
         if (wmsPOMaster.getPriorRC() != null && wmsPOMaster.getPriorRC() == WmsEnumUtil.TRUE_OR_FALSE.FALSE.getValue()) {
             ArrayList<Integer> numList = new ArrayList<>();
             numList.add(0);
@@ -657,6 +657,7 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringEqualPack(wmsASNMaster.getVersion(), "version", result);
         DdlPreparedPack.getStringLikerPack(wmsASNMaster.getSrc(), "src", result);
         DdlPreparedPack.getStringEqualPack(wmsASNMaster.getPoNo(), "poNo", result);
+        DdlPreparedPack.getStringRightLikerPack(wmsASNMaster.getContainerNo(), "containerNo", result);
 
         //  查询计划时间在指定范围的单号，查询这些单号的数据
         if (StringUtils.isNotBlank(wmsASNMaster.getPlanDateStart()) && StringUtils.isNotBlank(wmsASNMaster.getPlanDateEnd())) {
@@ -2458,6 +2459,9 @@ public class WmsHqlPack {
 
         DdlPreparedPack.getStringLikerPack(wmsRouting.getRoutingCode(), "routingCode", result);
         DdlPreparedPack.getStringLikerPack(wmsRouting.getRoutingName(), "routingName", result);
+        DdlPreparedPack.getNumEqualPack(wmsRouting.getForProduct(), "forProduct", result);
+        DdlPreparedPack.getNumEqualPack(wmsRouting.getForWareHouse(), "forWareHouse", result);
+        DdlPreparedPack.getNumEqualPack(wmsRouting.getForProductClass(), "forProductClass", result);
         // DdlPreparedPack.getInPack(wmsRouting.getIsValid(), "isValid", result);
         DdlPreparedPack.getInPack(wmsRouting.getIsDeleted(), "isDeleted", result);
         getStringBuilderPack(wmsRouting, result);