From d19ec15d4398d461f94f62c904f39f8d5e7e5291 Mon Sep 17 00:00:00 2001 From: zf <27208084@qq.com> Date: Wed, 1 Mar 2023 11:46:33 +0800 Subject: [PATCH] pda查询入库明细接口增加物料编码参数 --- huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/controller/ReceiptHeaderController.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/controller/ReceiptHeaderController.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/controller/ReceiptHeaderController.java index e0346ef..20f6108 100644 --- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/controller/ReceiptHeaderController.java +++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/controller/ReceiptHeaderController.java @@ -206,10 +206,12 @@ public class ReceiptHeaderController extends JeecgController<ReceiptHeader, IRec @ApiOperation(value = "入库单详情-查询未收完的明细", notes = "入库单详情-查询未收完的明细") @GetMapping(value = "/listReceiptDetailByCode") - public Result<IPage<ReceiptDetail>> listReceiptDetailByCode(String code, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + public Result<IPage<ReceiptDetail>> listReceiptDetailByCode(String code, String materialCode, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { LambdaQueryWrapper<ReceiptDetail> query = Wrappers.lambdaQuery(); - query.eq(StringUtils.isNotEmpty(code), ReceiptDetail::getReceiptCode, code).lt(ReceiptDetail::getStatus, QuantityConstant.RECEIPT_HEADER_COMPLETED) + query.eq(StringUtils.isNotEmpty(code), ReceiptDetail::getReceiptCode, code) + .eq(StringUtils.isNotEmpty(materialCode), ReceiptDetail::getMaterialCode, materialCode) + .lt(ReceiptDetail::getStatus, QuantityConstant.RECEIPT_HEADER_COMPLETED) .last(" and qty-task_qty>0"); Page<ReceiptDetail> page = new Page<ReceiptDetail>(pageNo, pageSize); IPage<ReceiptDetail> pageList = receiptDetailService.page(page, query); -- libgit2 0.22.2