From b61c2d7525bcbdf02db339c1b9865c6032412a8c Mon Sep 17 00:00:00 2001
From: Administrator <1051256694@qq.com>
Date: 星期四, 19 三月 2026 14:10:25 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OpenController.java | 42 +++++++++++++++++++++++++++++++++++++++---
1 files changed, 39 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index be2808f..35c6fe2 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -14,6 +14,8 @@
import com.zy.asrs.service.OpenService;
import com.zy.asrs.service.WaitPakinService;
import com.zy.asrs.service.WrkDetlService;
+import com.zy.asrs.service.WrkMastLogService;
+import com.zy.asrs.service.WrkMastService;
import com.zy.common.model.DetlDto;
import com.zy.common.model.LocDetlDto;
import com.zy.common.model.enums.WorkNoType;
@@ -49,6 +51,10 @@
private WaitPakinService waitPakinService;
@Autowired
private WrkDetlService wrkDetlService;
+ @Autowired
+ private WrkMastService wrkMastService;
+ @Autowired
+ private WrkMastLogService wrkMastLogService;
// @PostMapping("/order/matSync/default/v1")
//// @AppAuth(memo = "鍟嗗搧淇℃伅鍚屾鎺ュ彛")
@@ -427,12 +433,13 @@
List<MesToCombParam> errorComb = Lists.newArrayList();
List<MesToCombParam> validComb = Lists.newArrayList();
for (MesToCombParam mesToCombParam : param) {
-// if (mesToCombParam.getPalletId().length() != 8) {
-// return R.error(mesToCombParam.getPalletId()+"-璇ユ墭鐩樼爜涓嶄负8浣�");
-// }
+ if (Cools.isEmpty(mesToCombParam.getBizNo())) {
+ return R.error("bizNo涓嶈兘鐐虹┖");
+ }
// if (param.getCombMats().size()>1){
// throw new CoolException("涓嶅厑璁告贩鏂�===>>" + param.getBarcode());
// }
+
int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", mesToCombParam.getPalletId()));
int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet", mesToCombParam.getPalletId()));
@@ -466,6 +473,35 @@
@PostMapping("/outOrder")
public synchronized R outOrder (@RequestBody ArrayList<OutTaskParam> params){
+ if (Cools.isEmpty(params)) {
+ return R.error("璇锋眰鍙傛暟涓嶈兘涓虹┖");
+ }
+ Set<String> orderIds = new LinkedHashSet<>();
+ for (OutTaskParam outTaskParam : params) {
+ if (Cools.isEmpty(outTaskParam) || Cools.isEmpty(outTaskParam.getOrderId())) {
+ return R.error("鍑哄簱鍗曞彿涓嶈兘涓虹┖");
+ }
+ orderIds.add(outTaskParam.getOrderId());
+ }
+// if (!orderIds.isEmpty()) {
+// Set<String> existedOrderIds = new LinkedHashSet<>();
+// List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("user_no", orderIds));
+// for (WrkMast wrkMast : wrkMasts) {
+// if (!Cools.isEmpty(wrkMast.getUserNo())) {
+// existedOrderIds.add(wrkMast.getUserNo());
+// }
+// }
+// List<WrkMastLog> wrkMastLogs = wrkMastLogService.selectList(new EntityWrapper<WrkMastLog>().in("user_no", orderIds));
+// for (WrkMastLog wrkMastLog : wrkMastLogs) {
+// if (!Cools.isEmpty(wrkMastLog.getUserNo())) {
+// existedOrderIds.add(wrkMastLog.getUserNo());
+// }
+// }
+// if (!existedOrderIds.isEmpty()) {
+// return R.error("鍑哄簱鍗曞彿宸插瓨鍦ㄤ换鍔℃。鎴栦换鍔″巻鍙叉。锛�" + String.join("锛�", existedOrderIds));
+// }
+// }
+
List<OutTaskParam> errorOutOrders = Lists.newArrayList();
List<OutTaskParam> validOutOrders = Lists.newArrayList();
for (OutTaskParam outTaskParam : params) {
--
Gitblit v1.9.1