From b67bf724fc788cb3b86641c7eb7a35cdbc4c7a93 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期二, 06 五月 2025 20:17:25 +0800 Subject: [PATCH] PO单导入功能优化 --- rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/PurchaseController.java | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/PurchaseController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/PurchaseController.java index 2865546..a47d715 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/PurchaseController.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/PurchaseController.java @@ -11,7 +11,9 @@ import com.vincent.rsf.server.common.domain.PageParam; import com.vincent.rsf.server.manager.entity.AsnOrderItem; import com.vincent.rsf.server.manager.entity.Purchase; +import com.vincent.rsf.server.manager.entity.PurchaseItem; import com.vincent.rsf.server.manager.service.AsnOrderItemService; +import com.vincent.rsf.server.manager.service.PurchaseItemService; import com.vincent.rsf.server.manager.service.PurchaseService; import com.vincent.rsf.server.system.constant.SerialRuleCode; import com.vincent.rsf.server.system.controller.BaseController; @@ -33,6 +35,9 @@ @Autowired private AsnOrderItemService asnOrderItemService; + + @Autowired + private PurchaseItemService purchaseItemService; @PreAuthorize("hasAuthority('manager:purchase:list')") @PostMapping("/purchase/page") @@ -102,9 +107,12 @@ return R.error("鍗曟嵁鏈夊凡鐢熸垚鐨勬敹璐у崟鏄庣粏锛屼笉鍙墽琛屽垹闄ゆ搷浣滐紒锛�"); } if (!purchaseService.removeByIds(Arrays.asList(ids))) { - return R.error("Delete Fail"); + return R.error("涓诲崟鍒犻櫎澶辫触锛侊紒"); } - return R.ok("Delete Success").add(ids); + if (!purchaseItemService.remove(new LambdaQueryWrapper<PurchaseItem>().in(PurchaseItem::getPurchaseId, Arrays.asList(ids)))) { + return R.error("鏄庣粏鍒犻櫎澶辫触锛侊紒"); + } + return R.ok("鍒犻櫎鎴愬姛锛侊紒").add(ids); } @PreAuthorize("hasAuthority('manager:purchase:list')") -- Gitblit v1.9.1