From 5fb5b6883895eed6b79a9b20a8bff748134e9cfb Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期三, 27 十二月 2023 12:38:31 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/WaitPakinController.java | 39 ++++++++++++++++++++++++++++++++++-----
1 files changed, 34 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WaitPakinController.java b/src/main/java/com/zy/asrs/controller/WaitPakinController.java
index 9898dde..fdef1c7 100644
--- a/src/main/java/com/zy/asrs/controller/WaitPakinController.java
+++ b/src/main/java/com/zy/asrs/controller/WaitPakinController.java
@@ -11,21 +11,30 @@
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.entity.WaitPakin;
+import com.zy.asrs.entity.WrkDetl;
+import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.service.OrderDetlService;
+import com.zy.asrs.service.OrderService;
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;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
@RestController
public class WaitPakinController extends BaseController {
@Autowired
private WaitPakinService waitPakinService;
+ @Autowired
+ private OrderDetlService orderDetlService;
+ @Autowired
+ private WrkMastService wrkMastService;
+ @Autowired
+ private OrderService orderService;
@RequestMapping(value = "/waitPakin/{id}/auth")
@ManagerAuth
@@ -82,13 +91,33 @@
@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("鏁版嵁涓虹┖");
}
+ //閫氳繃HashSet鐨勯潪閲嶅鐗规�э紝 瀛樺偍涓嶅悓鐨刼rder缂栧彿锛� 鐒跺悗閬嶅巻锛屽皢绗﹀悎鏉′欢鐨刼rder鐘舵�佹仮澶嶅埌寰呭鐞�
+ HashSet<String> orderNos = new HashSet<>();
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("璁㈠崟鏁版嵁鍥炴粴澶辫触");
+ }else {
+ orderNos.add(entity.getOrderNo());
+ }
+ }
+ }
+
+ for (String orderNo : orderNos) {
+ orderService.BackToInit(orderNo);
}
return R.ok();
}
--
Gitblit v1.9.1