diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/OutAssistanceSearchQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/OutAssistanceSearchQO.java index df4baf30..a37709e5 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/OutAssistanceSearchQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/OutAssistanceSearchQO.java @@ -1,7 +1,10 @@ package com.nflg.wms.common.pojo.qo; +import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; +import java.util.List; + @Data public class OutAssistanceSearchQO extends SearchBaseQO { @@ -24,4 +27,12 @@ public class OutAssistanceSearchQO extends SearchBaseQO { * 供应商 */ private String lifnr; + + /** + * 物料号 + */ + private String matnr; + + @JsonIgnore + private List ids; } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsOutAssistanceServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsOutAssistanceServiceImpl.java index 2826f03b..b3da7077 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsOutAssistanceServiceImpl.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsOutAssistanceServiceImpl.java @@ -1,10 +1,12 @@ package com.nflg.wms.repository.service.impl; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.nflg.wms.common.pojo.qo.OutAssistanceSearchQO; import com.nflg.wms.repository.entity.WmsOutAssistance; +import com.nflg.wms.repository.entity.WmsOutAssistanceItem; import com.nflg.wms.repository.mapper.WmsOutAssistanceMapper; import com.nflg.wms.repository.service.IWmsOutAssistanceItemService; import com.nflg.wms.repository.service.IWmsOutAssistanceService; @@ -26,6 +28,19 @@ public class WmsOutAssistanceServiceImpl extends ServiceImpl search(OutAssistanceSearchQO request) { + if (StrUtil.isNotBlank(request.getMatnr())) { + request.setIds( + wmsOutAssistanceItemService.lambdaQuery() + .like(WmsOutAssistanceItem::getMatnr, request.getMatnr()) + .or() + .like(WmsOutAssistanceItem::getMatnr1, request.getMatnr()) + .list() + .stream() + .map(WmsOutAssistanceItem::getOrderId) + .toList() + ); + } + return baseMapper.search(request, new Page<>(request.getPage(), request.getPageSize())); } } diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsOutAssistanceMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsOutAssistanceMapper.xml index 76e276eb..251e2378 100644 --- a/nflg-wms-repository/src/main/resources/mapper/WmsOutAssistanceMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/WmsOutAssistanceMapper.xml @@ -6,6 +6,17 @@ SELECT * FROM wms_out_assistance + + + and 1=2 + + + and id in + + #{item} + + + AND "no" ilike CONCAT('%', #{request.no}, '%')