diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/ReceiptApprovalController.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/ReceiptApprovalController.java index 30e3ed19..a739adfa 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/ReceiptApprovalController.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/ReceiptApprovalController.java @@ -37,23 +37,11 @@ public class ReceiptApprovalController { * @param request 请求数据 * @return 操作结果 */ - @PostMapping("/purchase-inventory") + @PostMapping("/purchase-inventory-approved") public R purchaseInventoryApproved(@RequestParam String busNo, HttpServletRequest request) { return receiptApprovalAppService.purchaseInventoryApproved(busNo, request); } - /** - * 商品盘点单据审批通过 - * - * @param busNo 单据号 - * @param request 请求数据 - * @return 操作结果 - */ - @PostMapping("/receipt-approved") - public R approved(@RequestParam String busNo, HttpServletRequest request) { - return receiptApprovalAppService.purchaseInventoryApproved(busNo, request); - } - /** * 审批驳回 * diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/service/impl/SupplyRequestServiceImpl.java b/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/service/impl/SupplyRequestServiceImpl.java index 0eaec557..418a24a3 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/service/impl/SupplyRequestServiceImpl.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/service/impl/SupplyRequestServiceImpl.java @@ -30,8 +30,6 @@ import lombok.extern.slf4j.Slf4j; public class SupplyRequestServiceImpl extends ServiceImpl implements ISupplyRequestService { - private final SupplyRequestMapper supplyRequestMapper; - /** * 通过单据号查询单据信息 * @@ -40,8 +38,7 @@ public class SupplyRequestServiceImpl extends ServiceImpl getSupplyByBusNo(String busNo) { - return supplyRequestMapper - .selectList(new LambdaQueryWrapper().eq(SupplyRequest::getBusNo, busNo)); + return baseMapper.selectList(new LambdaQueryWrapper().eq(SupplyRequest::getBusNo, busNo)); } /**