From 963a04b5204e6f7dfe12345d28ab2dccd001e389 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 22 九月 2025 14:22:55 +0800
Subject: [PATCH] 输送线异常日志记录，许可证提醒优化
---
src/main/java/com/zy/asrs/controller/WaitPakinController.java | 37 +++++++++++++++++++++++++++++++++----
1 files changed, 33 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WaitPakinController.java b/src/main/java/com/zy/asrs/controller/WaitPakinController.java
index 2db6de1..9535756 100644
--- a/src/main/java/com/zy/asrs/controller/WaitPakinController.java
+++ b/src/main/java/com/zy/asrs/controller/WaitPakinController.java
@@ -11,9 +11,13 @@
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.entity.WaitPakin;
+import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.service.OrderDetlService;
import com.zy.asrs.service.WaitPakinService;
+import com.zy.asrs.service.WrkMastService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
@@ -26,6 +30,20 @@
@Autowired
private WaitPakinService waitPakinService;
+ @Autowired
+ private OrderDetlService orderDetlService;
+ @Autowired
+ private WrkMastService wrkMastService;
+
+ @RequestMapping(value = "/waitPakin/forBarcode/auth")
+ @ManagerAuth
+ public R forBarcode(@RequestParam("barcode") String barcode) {
+ List<WaitPakin> list = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", barcode));
+ if (Cools.isEmpty(list)){
+ return R.error("鏈壘鍒扮粍鎵樹俊鎭�");
+ }
+ return R.ok(list);
+ }
@RequestMapping(value = "/waitPakin/{id}/auth")
@ManagerAuth
@@ -73,7 +91,7 @@
@RequestMapping(value = "/waitPakin/update/auth")
@ManagerAuth
public R update(WaitPakin waitPakin){
- if (Cools.isEmpty(waitPakin) || null==waitPakin.getId()){
+ if (Cools.isEmpty(waitPakin)){
return R.error();
}
waitPakinService.updateById(waitPakin);
@@ -82,13 +100,24 @@
@RequestMapping(value = "/waitPakin/delete/auth")
@ManagerAuth
+ @Transactional
public R delete(@RequestParam String param){
List<WaitPakin> list = JSONArray.parseArray(param, WaitPakin.class);
if (Cools.isEmpty(list)){
- return R.error();
+ return R.error("鏁版嵁涓虹┖");
}
for (WaitPakin entity : list){
+ List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("barcode", entity.getZpallet()));
+ if(!Cools.isEmpty(wrkMasts) || wrkMasts.size() > 0){
+ return R.error("鏉＄爜宸茬敓鎴愬叆搴撳伐浣滄。锛岀姝㈠垹闄�");
+ }
waitPakinService.delete(new EntityWrapper<>(entity));
+ //璁㈠崟鍏宠仈锛屼慨鏀硅鍗曚綔涓氭暟閲�
+ if (!Cools.isEmpty(entity.getOrderNo())) {
+ if (!orderDetlService.decrease(entity.getOrderNo(), entity.getMatnr(), entity.getBatch(), entity.getAnfme())) {
+ return R.error("璁㈠崟鏁版嵁鍥炴粴澶辫触");
+ }
+ }
}
return R.ok();
}
@@ -113,8 +142,8 @@
List<Map<String, Object>> result = new ArrayList<>();
for (WaitPakin waitPakin : page.getRecords()){
Map<String, Object> map = new HashMap<>();
- map.put("id", waitPakin.getId());
- map.put("value", waitPakin.getId());
+ map.put("id", waitPakin.getZpallet());
+ map.put("value", waitPakin.getZpallet());
result.add(map);
}
return R.ok(result);
--
Gitblit v1.9.1