From c5a29b860b1488cccd64d688a6da57e4102af3bc Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 30 十一月 2023 18:58:03 +0800
Subject: [PATCH] #盘点逻辑修改
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 47a376a..a8d5c32 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -433,7 +433,7 @@
//*********************鍚屽簱浣嶇粍鏍￠獙*********************
boolean flag = false;
String th = "";
- List<String> innerLoc = Utils.getGroupInnerLoc(wrkMast.getLocNo());
+ List<String> innerLoc = Utils.getGroupInnerLoc(wrkMast.getSourceLocNo());
for (String loc : innerLoc) {
LocMast locMast = locMastService.selectById(loc);
if (locMast == null) {
@@ -447,13 +447,15 @@
}
}
if (flag) {
- throw new CoolException(th);
+ News.info(th);
+ continue;
}
//*********************鍚屽簱浣嶇粍鏍￠獙*********************
// 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
if (wrkMastMapper.saveWrkMastLog(wrkMast.getWrkNo()) == 0) {
- throw new CoolException(wrkMast.getWrkNo() + "淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗ｅけ璐�");
+ News.info(wrkMast.getWrkNo() + "淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗ｅけ璐�");
+ continue;
}
String sourceLocNo = wrkMast.getSourceLocNo().trim();
@@ -465,7 +467,7 @@
// 鏇存柊宸ヤ綔妗ｆ暟鎹姸鎬�
wrkMast.setIoType(wrkMast.getIoType() - 50); // 鍏ュ嚭搴撶被鍨�: 103->53,104->54,107->57
wrkMast.setWrkSts(2L); // 宸ヤ綔鐘舵��: 2.璁惧涓婅蛋
- wrkMast.setSourceStaNo(pickSta.getStaNo()); // 婧愮珯
+ wrkMast.setSourceStaNo(pickSta.getBackSta()); // 婧愮珯
// wrkMast.setStaNo(dto.getStaNo()); // 鐩爣绔�
// wrkMast.setCrnNo(dto.getCrnNo());
wrkMast.setStaNo(liftStaProtocol.getStaNo());//鐩爣绔�
@@ -474,10 +476,12 @@
wrkMast.setLiftNo(null);// 鎻愬崌鏈烘竻绌�
wrkMast.setModiTime(new Date());
if (wrkMastMapper.updateById(wrkMast) == 0) {
- throw new CoolException(wrkMast.getWrkNo() + "鏇存柊宸ヤ綔妗ｆ暟鎹姸鎬佸け璐�");
+ News.info(wrkMast.getWrkNo() + "鏇存柊宸ヤ綔妗ｆ暟鎹姸鎬佸け璐�");
+ continue;
}
if (wrkMastMapper.setSteEmpty(wrkMast.getWrkNo()) == 0) {
- throw new CoolException(wrkMast.getWrkNo() + "鏇存柊宸ヤ綔妗ｆ暟鎹姸鎬佸け璐�");
+ News.info(wrkMast.getWrkNo() + "鏇存柊宸ヤ綔妗ｆ暟鎹姸鎬佸け璐�");
+ continue;
}
// 淇敼搴撲綅鐘舵�� Q.鎷ｆ枡/鐩樼偣/骞舵澘鍐嶅叆搴�
@@ -485,9 +489,11 @@
locMast.setLocSts("Q");
locMast.setModiTime(new Date());
if (!locMastService.updateById(locMast)) {
- throw new CoolException("淇敼搴撲綅鐘舵�佸け璐�");
+ News.info("淇敼搴撲綅鐘舵�佸け璐�");
+ continue;
}
+ staProtocol.setWorkNo(wrkMast.getWrkNo().shortValue());//鍐欏叆宸ヤ綔鍙�
staProtocol.setStaNo(pickSta.getBackSta().shortValue());//鍐欏叆鐩爣绔�
MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
}
--
Gitblit v1.9.1