From bbc31545c8fdcf21adb7ebf227d5b62db45b4e95 Mon Sep 17 00:00:00 2001
From: czkh <czkh@163.com>
Date: 星期三, 11 二月 2026 19:00:55 +0800
Subject: [PATCH] #1
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 19 ++++++++++++-------
1 files changed, 12 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 9264357..4c90ae8 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -486,9 +486,10 @@
try {
// 淇濆瓨宸ヤ綔鏄庣粏妗ｅ巻鍙叉。
+ if (wrkMast.getIoType() != 104){
if (wrkMastMapper.saveWrkDetlLog(wrkMast.getWrkNo()) == 0) {
throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏妗ｅ巻鍙叉。澶辫触");
- }
+ }}
// 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
if (wrkMastMapper.saveWrkMastLog(wrkMast.getWrkNo()) == 0) {
throw new CoolException("淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗ｅけ璐�");
@@ -924,11 +925,13 @@
if (wrkMast.getIoType() >= 100) {
WrkMast wrkMast1 = wrkMastMapper.selectPakOutStep1(crn.getId(), wrkMast.getSourceStaNo());
if (wrkMast1 != null) {
- if (Integer.parseInt(wrkMast1.getSourceLocNo().substring(2,5)) == 1 || (staProtocol.isAutoing()&&staProtocol.isLoading())){
+ if (Integer.parseInt(wrkMast1.getSourceLocNo().substring(3,5)) == 1 || (staProtocol.isAutoing() && staProtocol.isLoading())){
this.outPut(crn, crnProtocol, mark);
- continue;
+ //continue;
+ }else {
+ this.outTake(crn, crnProtocol, 2, mark);
}
- this.outTake(crn, crnProtocol, 2, mark);
+ //this.outTake(crn, crnProtocol, 2, mark);
} else {
this.outPut(crn, crnProtocol, mark);
}
@@ -953,11 +956,13 @@
if (wrkMast.getIoType() >= 100) {
WrkMast wrkMast1 = wrkMastMapper.selectPakOutStep1(crn.getId(), wrkMast.getSourceStaNo());
if (wrkMast1 != null) {
- if (Integer.parseInt(wrkMast1.getSourceLocNo().substring(2,5)) == 29 || (staProtocol.isAutoing()&&staProtocol.isLoading())){
+ if (Integer.parseInt(wrkMast1.getSourceLocNo().substring(3,5)) == 29 || (staProtocol.isAutoing() && staProtocol.isLoading())){
this.outPut(crn, crnProtocol, mark);
- continue;
+ //continue;
+ }else {
+ this.outTake(crn, crnProtocol, 1, mark);
}
- this.outTake(crn, crnProtocol, 1, mark);
+ //this.outTake(crn, crnProtocol, 1, mark);
} else {
this.outPut(crn, crnProtocol, mark);
}
--
Gitblit v1.9.1