From 2e7a31b3e84c3e7ed0842b913402045ad99f255a Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 30 一月 2024 20:06:19 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/web/WcsController.java | 44 +++++++++++++++++++++++++++++++++-----------
1 files changed, 33 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index b116eb1..574f05e 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -1,5 +1,6 @@
package com.zy.common.web;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.R;
@@ -59,6 +60,8 @@
private AgvWrkMastService agvWrkMastService;
@Autowired
private WrkMastMapper wrkMastMapper;
+ @Autowired
+ private WrkMastLogService wrkMastLogService;
// @Autowired
// private ErpService erpService;
@@ -426,6 +429,11 @@
throw new CoolException(dto.getLocNo() + "鐩爣搴撲綅宸茶鍗犵敤");
}
+ // 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
+ if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
+ throw new CoolException(wrkMast.getWrkNo() + "淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗ｅけ璐�");
+ }
+
//鑾峰彇鍥炲簱鎻愬崌鏈虹洰鏍囩珯
Integer staNo = liftNo * 100 + locMast.getLev1();
// 鏇存柊宸ヤ綔妗ｆ暟鎹姸鎬�
@@ -437,7 +445,7 @@
wrkMast.setShuttleNo(null); // 绌挎杞︽竻绌�
wrkMast.setLiftNo(null);// 鎻愬崌鏈烘竻绌�
wrkMast.setModiTime(new Date());
- if (wrkMastMapper.updateById(wrkMast) > 0) {
+ if (!wrkMastService.updateById(wrkMast)) {
throw new CoolException(wrkMast.getWrkNo() + "鏇存柊宸ヤ綔妗ｆ暟鎹姸鎬佸け璐�");
}
@@ -472,6 +480,9 @@
if (!locMastService.updateById(locMast)) {
throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
}
+
+ List<LocDetl> locDetls1 = locDetlService.selectByLocNo(locMast.getLocNo());
+ log.info("宸ヤ綔鍙凤細" + wrkMast.getWrkNo() + "锛屾墭鐩樼爜锛�" + wrkMast.getBarcode() + "锛屼慨鏀瑰簱浣嶇姸鎬丱=>Q鎴愬姛锛屽簱瀛樻槑缁嗭細" + JSON.toJSONString(locDetls1));
} else {
throw new CoolException(dto.getLocNo() + "鐩爣搴撲綅宸茶鍗犵敤");
}
@@ -486,16 +497,27 @@
}
}
- //娓呯┖婧愬簱浣嶆暟鎹�
+ //妫�鏌ョ洰鏍囧簱浣嶏紝搴撳瓨鏄庣粏鏄惁娣诲姞鎴愬姛
+ List<LocDetl> checkLocDetls = locDetlService.selectByLocNo(dto.getLocNo());
+ if (checkLocDetls.isEmpty()) {
+ throw new CoolException("搴撳瓨鏄庣粏杩佺Щ澶辫触");
+ }
+
+// //娓呯┖婧愬簱浣嶆暟鎹�
LocMast locMast1 = locMastService.selectByLoc(wrkMast.getSourceLocNo());
- if (locMast1.getLocSts().equals("P")) {
- locMast1.setLocSts("O"); // 娓呯┖搴撲綅
- locMast1.setModiTime(new Date());
- if (!locMastService.updateById(locMast1)) {
- throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
- }
- } else {
- throw new CoolException("婧愬簱浣嶇姸鎬佸紓甯�");
+// if (locMast1.getLocSts().equals("P")) {
+// locMast1.setLocSts("O"); // 娓呯┖搴撲綅
+// locMast1.setModiTime(new Date());
+// if (!locMastService.updateById(locMast1)) {
+// throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
+// }
+// } else {
+// throw new CoolException("婧愬簱浣嶇姸鎬佸紓甯�");
+// }
+
+ // 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
+ if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
+ throw new CoolException(wrkMast.getWrkNo() + "淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗ｅけ璐�");
}
//鑾峰彇鍥炲簱鎻愬崌鏈虹洰鏍囩珯
@@ -510,7 +532,7 @@
wrkMast.setShuttleNo(null); // 绌挎杞︽竻绌�
wrkMast.setLiftNo(null);// 鎻愬崌鏈烘竻绌�
wrkMast.setModiTime(new Date());
- if (wrkMastMapper.updateById(wrkMast) > 0) {
+ if (!wrkMastService.updateById(wrkMast)) {
throw new CoolException(wrkMast.getWrkNo() + "鏇存柊宸ヤ綔妗ｆ暟鎹姸鎬佸け璐�");
}
--
Gitblit v1.9.1