diff --git a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/receive/controller/AsnController.java b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/receive/controller/AsnController.java index 205db08..775cf41 100644 --- a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/receive/controller/AsnController.java +++ b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/receive/controller/AsnController.java @@ -8,16 +8,12 @@ import java.util.Map; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; - -import org.apache.commons.lang3.StringUtils; import org.cpte.modules.agvTask.entity.AgvTask; import org.cpte.modules.agvTask.mapper.AgvTaskMapper; import org.cpte.modules.base.entity.Stock; import org.cpte.modules.base.mapper.StockMapper; -import org.cpte.modules.constant.GeneralConstant; +import org.cpte.modules.receive.mapper.AsnDetailMapper; import org.cpte.modules.receive.service.processor.ReceiveBackProcessor; -import org.cpte.modules.serialNumber.AsnSerialNumberRule; -import org.cpte.modules.shipping.entity.Task; import org.cpte.modules.tesAgv.request.TesCallbackRequest; import org.cpte.modules.tesAgv.service.ITesAgvService; import org.jeecgframework.poi.excel.ExcelImportUtil; @@ -67,6 +63,8 @@ public class AsnController { @Autowired private StockMapper stockMapper; @Autowired + private AsnDetailMapper asnDetailMapper; + @Autowired private IAsnService asnService; @Autowired private IAsnDetailService asnDetailService; @@ -91,6 +89,12 @@ public class AsnController { @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(asn, req.getParameterMap()); + String stockId = req.getParameter("stockId"); + if (stockId != null) { + List asnDetailList = asnDetailMapper.queryByStockCode(Long.parseLong(stockId), null); + List asnIds = asnDetailList.stream().map(AsnDetail::getAsnId).distinct().toList(); + queryWrapper.in("id", asnIds); + } Page page = new Page(pageNo, pageSize); IPage pageList = asnService.page(page, queryWrapper); return Result.OK(pageList);