From ebdfa825c07189b5f8e89f147d96d1bc612589db Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 15 七月 2025 08:32:17 +0800
Subject: [PATCH] 代码优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/PurchaseController.java | 30 ++++++++++++++++++++++++++----
1 files changed, 26 insertions(+), 4 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..ae34794 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
@@ -1,6 +1,7 @@
package com.vincent.rsf.server.manager.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
@@ -9,9 +10,12 @@
import com.vincent.rsf.server.common.domain.BaseParam;
import com.vincent.rsf.server.common.domain.KeyValVo;
import com.vincent.rsf.server.common.domain.PageParam;
-import com.vincent.rsf.server.manager.entity.AsnOrderItem;
+import com.vincent.rsf.server.manager.entity.WkOrderItem;
import com.vincent.rsf.server.manager.entity.Purchase;
+import com.vincent.rsf.server.manager.entity.PurchaseItem;
+import com.vincent.rsf.server.manager.enums.POExceStatus;
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;
@@ -34,6 +38,9 @@
@Autowired
private AsnOrderItemService asnOrderItemService;
+ @Autowired
+ private PurchaseItemService purchaseItemService;
+
@PreAuthorize("hasAuthority('manager:purchase:list')")
@PostMapping("/purchase/page")
public R page(@RequestBody Map<String, Object> map) {
@@ -41,6 +48,18 @@
PageParam<Purchase, BaseParam> pageParam = new PageParam<>(baseParam, Purchase.class);
return R.ok().add(purchaseService.page(pageParam, pageParam.buildWrapper(true)));
}
+
+ @PreAuthorize("hasAuthority('manager:purchase:list')")
+ @PostMapping("/purchase/filters/page")
+ public R filterPage(@RequestBody Map<String, Object> map) {
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<Purchase, BaseParam> pageParam = new PageParam<>(baseParam, Purchase.class);
+ QueryWrapper<Purchase> wrapper = pageParam.buildWrapper(true);
+ wrapper.apply("anfme > qty");
+ wrapper.ne("exce_status", POExceStatus.PO_EXCE_STATUS_ALL_DONE.val);
+ return R.ok().add(purchaseService.page(pageParam, wrapper));
+ }
+
@PreAuthorize("hasAuthority('manager:purchase:list')")
@PostMapping("/purchase/list")
@@ -97,14 +116,17 @@
public R remove(@PathVariable Long[] ids) {
List<Purchase> purchases = purchaseService.listByIds(Arrays.asList(ids));
Set<String> stringSet = purchases.stream().map(Purchase::getCode).collect(Collectors.toSet());
- List<AsnOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().in(AsnOrderItem::getPoCode, stringSet));
+ List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().in(WkOrderItem::getPoCode, stringSet));
if (!orderItems.isEmpty()) {
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