天津麦格纳问题修复

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

@@ -173,6 +173,10 @@ public class WmsPOMaster extends BaseBean {
     private Integer boardStatus;
 
     @Transient
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @Transient
     private List<String> orderNoList;
 
     @Column(name = "DOCK", columnDefinition = "varchar(50) default ''")

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

@@ -18,6 +18,7 @@ import cn.estsh.i3plus.pojo.wms.dto.WmsTmsShipDto;
 import cn.estsh.i3plus.pojo.wms.engine.rule.EngineRulePersistence;
 import com.google.common.base.Strings;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -259,7 +260,6 @@ public class WmsHqlPack {
         DdlPackBean result = new DdlPackBean();
 
         //查询参数封装
-        DdlPreparedPack.getStringRightLikerPack(wmsPOMaster.getOrderNo(), "orderNo", result);
         DdlPreparedPack.getStringEqualPack(wmsPOMaster.getPoType(), "poType", result);
         DdlPreparedPack.getNumEqualPack(wmsPOMaster.getPoStatus(), "poStatus", result);
         DdlPreparedPack.getStringEqualPack(wmsPOMaster.getVendorNo(), "vendorNo", result);
@@ -277,10 +277,10 @@ public class WmsHqlPack {
             DdlPreparedPack.getNumEqualPack(wmsPOMaster.getPriorRC(), "priorRC", result);
         }
 
-
-        //  查询计划时间在指定范围的单号，查询这些单号的数据
-        if (StringUtils.isNotBlank(wmsPOMaster.getPlanDateStart()) && StringUtils.isNotBlank(wmsPOMaster.getPlanDateEnd())) {
+        if (!CollectionUtils.isEmpty(wmsPOMaster.getOrderNoList())) {
             DdlPreparedPack.getInPackList(wmsPOMaster.getOrderNoList(), "orderNo", result);
+        } else {
+            DdlPreparedPack.getStringRightLikerPack(wmsPOMaster.getOrderNo(), "orderNo", result);
         }
 
         //按创建时间查询单据信息