From 539d9ffc477d28a23a923b41fdeabc8c37c99ce6 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 23 九月 2024 14:43:31 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/WaitPakinController.java | 17 +++++++++++++----
1 files changed, 13 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 7d994d8..fdef1c7 100644
--- a/src/main/java/com/zy/asrs/controller/WaitPakinController.java
+++ b/src/main/java/com/zy/asrs/controller/WaitPakinController.java
@@ -14,6 +14,7 @@
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;
@@ -21,10 +22,7 @@
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 {
@@ -35,6 +33,8 @@
private OrderDetlService orderDetlService;
@Autowired
private WrkMastService wrkMastService;
+ @Autowired
+ private OrderService orderService;
@RequestMapping(value = "/waitPakin/{id}/auth")
@ManagerAuth
@@ -97,6 +97,8 @@
if (Cools.isEmpty(list)){
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){
@@ -106,10 +108,17 @@
//璁㈠崟鍏宠仈锛屼慨鏀硅鍗曚綔涓氭暟閲�
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