From 6cb4e6647b0e2e8c0cafa38a07666e07709bcf54 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期一, 19 一月 2026 13:06:05 +0800
Subject: [PATCH] 物料新增，修改功能 优化
---
src/main/java/com/zy/asrs/controller/MatController.java | 36 ++++++++++++++++++++++++++++++------
1 files changed, 30 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MatController.java b/src/main/java/com/zy/asrs/controller/MatController.java
index 04785d0..f387127 100644
--- a/src/main/java/com/zy/asrs/controller/MatController.java
+++ b/src/main/java/com/zy/asrs/controller/MatController.java
@@ -10,13 +10,16 @@
import com.core.annotations.ManagerAuth;
import com.core.common.*;
import com.core.exception.CoolException;
-import com.zy.asrs.entity.Mat;
-import com.zy.asrs.entity.MatPrint;
-import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.BatchMatsUpdateParam;
import com.zy.asrs.entity.param.EmptyPlateOutParam;
import com.zy.asrs.entity.result.KeyValueVo;
import com.zy.asrs.service.MatService;
+import com.zy.asrs.service.TaskDetlService;
+import com.zy.asrs.service.TaskService;
+import com.zy.asrs.service.impl.TaskDetlServiceImpl;
+import com.zy.asrs.service.impl.WaitPakinServiceImpl;
+import com.zy.asrs.service.impl.WrkDetlServiceImpl;
import com.zy.asrs.utils.MatExcelListener;
import com.zy.common.CodeRes;
import com.zy.common.config.AdminInterceptor;
@@ -43,6 +46,12 @@
private MatService matService;
@Autowired
private SnowflakeIdWorker snowflakeIdWorker;
+ @Autowired
+ private WaitPakinServiceImpl waitPakinService;
+ @Autowired
+ private WrkDetlServiceImpl wrkDetlService;
+ @Autowired
+ private TaskDetlService taskDetlService;
@RequestMapping(value = "/mat/auto/matnr/auth")
public R autoMatnr() {
@@ -149,21 +158,36 @@
return R.ok();
}
- @PostMapping("mat/batch/auth")
@ManagerAuth
+ @PostMapping("mat/batch/auth")
public R batchUpdate(@RequestBody BatchMatsUpdateParam params) {
- return matService.batchInfo(params);
+ return matService.batchInfo(params);
}
- @RequestMapping(value = "/mat/delete/auth")
@ManagerAuth
+ @RequestMapping(value = "/mat/delete/auth")
public R delete(@RequestParam String param) {
List<Mat> list = JSONArray.parseArray(param, Mat.class);
if (Cools.isEmpty(list)) {
return R.error();
}
for (Mat entity : list) {
+ int pakinCount = waitPakinService.selectCount(new EntityWrapper<WaitPakin>()
+ .eq("supp_code", entity.getSuppCode())
+ .eq("matnr", entity.getMatnr()));
+
+ int wrkCount = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>()
+ .eq("supp_code", entity.getSuppCode())
+ .eq("matnr", entity.getMatnr()));
+
+ int taskCount = taskDetlService.selectCount(new EntityWrapper<TaskDetl>()
+ .eq("supp_code", entity.getSuppCode())
+ .eq("matnr", entity.getMatnr()));
+
+ if (pakinCount > 0 || wrkCount > 0 || taskCount > 0) {
+ throw new CoolException(entity.getMatnr() + "鍦ㄤ綔涓氭竻鍗曚腑锛屾棤娉曟墽琛屽垹闄ゆ搷浣滐紒锛�");
+ }
if (!matService.delete(new EntityWrapper<>(entity))) {
throw new CoolException("鍒犻櫎澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
--
Gitblit v1.9.1