From 256c59555e2a5dffdd6d127a519d4f0944b80e7f Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 14 五月 2025 16:29:38 +0800
Subject: [PATCH] #物料表动态字段搜索
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/PurchaseController.java | 47 ++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 44 insertions(+), 3 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 946f56a..af7930d 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,21 +10,36 @@
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.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;
+import com.vincent.rsf.server.system.utils.SerialRuleUtils;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.util.*;
+import java.util.stream.Collectors;
@RestController
public class PurchaseController extends BaseController {
@Autowired
private PurchaseService purchaseService;
+
+ @Autowired
+ private AsnOrderItemService asnOrderItemService;
+
+ @Autowired
+ private PurchaseItemService purchaseItemService;
@PreAuthorize("hasAuthority('manager:purchase:list')")
@PostMapping("/purchase/page")
@@ -32,6 +48,17 @@
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.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")
@@ -59,6 +86,11 @@
purchase.setCreateTime(new Date());
purchase.setUpdateBy(getLoginUserId());
purchase.setUpdateTime(new Date());
+ if (StringUtils.isBlank(purchase.getCode())) {
+ String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_ORDER_PO_CODE, purchase);
+ purchase.setCode(ruleCode);
+ }
+
if (!purchaseService.save(purchase)) {
return R.error("Save Fail");
}
@@ -81,10 +113,19 @@
@OperationLog("Delete ERP閲囪喘鍗�")
@PostMapping("/purchase/remove/{ids}")
public R remove(@PathVariable Long[] ids) {
- if (!purchaseService.removeByIds(Arrays.asList(ids))) {
- return R.error("Delete Fail");
+ 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));
+ if (!orderItems.isEmpty()) {
+ return R.error("鍗曟嵁鏈夊凡鐢熸垚鐨勬敹璐у崟鏄庣粏锛屼笉鍙墽琛屽垹闄ゆ搷浣滐紒锛�");
}
- return R.ok("Delete Success").add(ids);
+ if (!purchaseService.removeByIds(Arrays.asList(ids))) {
+ return R.error("涓诲崟鍒犻櫎澶辫触锛侊紒");
+ }
+ 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