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 9b42dc9..8bcea73 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 @@ -1,6 +1,8 @@ package org.jeecg.modules.wms.receipt.receiptHeader.controller; import com.aliyun.oss.ServiceException; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.jeecg.common.system.query.QueryGenerator; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -195,6 +197,24 @@ public class ReceiptHeaderController extends JeecgController<ReceiptHeader, IRec return Result.OK(pageList); } + @ApiOperation(value = "入库单详情-通过多个明细id查询", notes = "入库单详情-通过多个明细id查询") + @PostMapping(value = "/listReceiptDetailByIds") + public Result<List<ReceiptDetail>> listReceiptDetailByIds(@RequestBody List<Integer> ids ) { + return Result.ok(receiptDetailService.listByIds(ids)); + } + + @ApiOperation(value = "入库单详情-查询未收完的明细", notes = "入库单详情-查询未收完的明细") + @GetMapping(value = "/listReceiptDetailByCode") + public Result<IPage<ReceiptDetail>> listReceiptDetailByCode(String code, @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); + Page<ReceiptDetail> page = new Page<ReceiptDetail>(pageNo, pageSize); + IPage<ReceiptDetail> pageList = receiptDetailService.page(page, query); + return Result.ok(pageList); + } + /** * 添加 * @param receiptDetail