From cfd507438e9601401e73919f7ac6a5de0456a100 Mon Sep 17 00:00:00 2001 From: Jason Date: Sat, 12 Sep 2020 10:49:27 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC=E7=BA=B3?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java | 4 ++++ .../main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java index eb834de..d6da684 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java +++ b/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 orderNoList; @Column(name = "DOCK", columnDefinition = "varchar(50) default ''") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 73d5512..ef66f02 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/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); } //按创建时间查询单据信息