huojin
/
Cpte-Cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no message

main
HUOJIN\92525 2026-01-29 23:30:56 +08:00
parent 5972988f1f
commit 27dafb919b
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/receive/controller/AsnController.java
View File

@ -8,16 +8,12 @@ import java.util.Map;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import org.apache.commons.lang3.StringUtils;
import org.cpte.modules.agvTask.entity.AgvTask; import org.cpte.modules.agvTask.entity.AgvTask;
import org.cpte.modules.agvTask.mapper.AgvTaskMapper; import org.cpte.modules.agvTask.mapper.AgvTaskMapper;
import org.cpte.modules.base.entity.Stock; import org.cpte.modules.base.entity.Stock;
import org.cpte.modules.base.mapper.StockMapper; 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.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.request.TesCallbackRequest;
import org.cpte.modules.tesAgv.service.ITesAgvService; import org.cpte.modules.tesAgv.service.ITesAgvService;
import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.ExcelImportUtil;
@ -67,6 +63,8 @@ public class AsnController {
@Autowired @Autowired
private StockMapper stockMapper; private StockMapper stockMapper;
@Autowired @Autowired
private AsnDetailMapper asnDetailMapper;
@Autowired
private IAsnService asnService; private IAsnService asnService;
@Autowired @Autowired
private IAsnDetailService asnDetailService; private IAsnDetailService asnDetailService;
@ -91,6 +89,12 @@ public class AsnController {
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) { HttpServletRequest req) {
QueryWrapper<Asn> queryWrapper = QueryGenerator.initQueryWrapper(asn, req.getParameterMap()); QueryWrapper<Asn> queryWrapper = QueryGenerator.initQueryWrapper(asn, req.getParameterMap());
String stockId = req.getParameter("stockId");
if (stockId != null) {
List<AsnDetail> asnDetailList = asnDetailMapper.queryByStockCode(Long.parseLong(stockId), null);
List<Long> asnIds = asnDetailList.stream().map(AsnDetail::getAsnId).distinct().toList();
queryWrapper.in("id", asnIds);
}
Page<Asn> page = new Page<Asn>(pageNo, pageSize); Page<Asn> page = new Page<Asn>(pageNo, pageSize);
IPage<Asn> pageList = asnService.page(page, queryWrapper); IPage<Asn> pageList = asnService.page(page, queryWrapper);
return Result.OK(pageList); return Result.OK(pageList);