Commit d19ec15d4398d461f94f62c904f39f8d5e7e5291
1 parent
5f7f8a3d
pda查询入库明细接口增加物料编码参数
Showing
1 changed file
with
4 additions
and
2 deletions
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 |
206 | 206 | |
207 | 207 | @ApiOperation(value = "入库单详情-查询未收完的明细", notes = "入库单详情-查询未收完的明细") |
208 | 208 | @GetMapping(value = "/listReceiptDetailByCode") |
209 | - public Result<IPage<ReceiptDetail>> listReceiptDetailByCode(String code, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, | |
209 | + public Result<IPage<ReceiptDetail>> listReceiptDetailByCode(String code, String materialCode, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, | |
210 | 210 | @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { |
211 | 211 | LambdaQueryWrapper<ReceiptDetail> query = Wrappers.lambdaQuery(); |
212 | - query.eq(StringUtils.isNotEmpty(code), ReceiptDetail::getReceiptCode, code).lt(ReceiptDetail::getStatus, QuantityConstant.RECEIPT_HEADER_COMPLETED) | |
212 | + query.eq(StringUtils.isNotEmpty(code), ReceiptDetail::getReceiptCode, code) | |
213 | + .eq(StringUtils.isNotEmpty(materialCode), ReceiptDetail::getMaterialCode, materialCode) | |
214 | + .lt(ReceiptDetail::getStatus, QuantityConstant.RECEIPT_HEADER_COMPLETED) | |
213 | 215 | .last(" and qty-task_qty>0"); |
214 | 216 | Page<ReceiptDetail> page = new Page<ReceiptDetail>(pageNo, pageSize); |
215 | 217 | IPage<ReceiptDetail> pageList = receiptDetailService.page(page, query); |
... | ... |