From a0abdbc0b19c855fa53e47a9196dfa2cd41e8e9d Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期六, 23 十二月 2023 19:56:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzskasrs-1' into tzskasrs-1
---
src/main/java/com/zy/common/web/WcsController.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 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..bab4eb4 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -59,6 +59,8 @@
private AgvWrkMastService agvWrkMastService;
@Autowired
private WrkMastMapper wrkMastMapper;
+ @Autowired
+ private WrkMastLogService wrkMastLogService;
// @Autowired
// private ErpService erpService;
@@ -426,6 +428,11 @@
throw new CoolException(dto.getLocNo() + "鐩爣搴撲綅宸茶鍗犵敤");
}
+ // 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
+ if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
+ throw new CoolException(wrkMast.getWrkNo() + "淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗ｅけ璐�");
+ }
+
//鑾峰彇鍥炲簱鎻愬崌鏈虹洰鏍囩珯
Integer staNo = liftNo * 100 + locMast.getLev1();
// 鏇存柊宸ヤ綔妗ｆ暟鎹姸鎬�
@@ -437,7 +444,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() + "鏇存柊宸ヤ綔妗ｆ暟鎹姸鎬佸け璐�");
}
@@ -498,6 +505,11 @@
throw new CoolException("婧愬簱浣嶇姸鎬佸紓甯�");
}
+ // 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
+ if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
+ throw new CoolException(wrkMast.getWrkNo() + "淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗ｅけ璐�");
+ }
+
//鑾峰彇鍥炲簱鎻愬崌鏈虹洰鏍囩珯
Integer staNo = liftNo * 100 + locMast1.getLev1();
@@ -510,7 +522,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