From fe02dd7aad196823b16f4153d897ec4eea33c0ee Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期五, 01 九月 2023 16:44:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zjfnwcs' into zjfnwcs
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 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 9569b66..69bd66a 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -849,7 +849,7 @@
if (staProtocol.isAutoing() && !staProtocol.isLoading() && staDetl.getCanouting() !=null && staDetl.getCanouting().equals("Y")
&& staProtocol.getWorkNo() == 0 && staProtocol.isOutEnable()) {
//娴嬭瘯搴撲綅鍑哄簱蹇呴』瑕佹寜鍚姩鎸夐挳鎵嶈兘鍑哄簱
- if(wrkMast.getStaNo()==206 && locMast.getCtnKind()==0){
+ if((wrkMast.getStaNo()==206 || wrkMast.getStaNo()==1000)&& locMast.getCtnKind()==0){
log.error("鍑哄簱 ===>> 绛夊緟鍚姩鍑哄簱鎸夐挳",wrkMast);
continue;
}
@@ -2374,12 +2374,12 @@
}else if(devpThread.startSignal[i][0]==3){
locMast.setPackStatus(7);
testMast.setModiTime(new Date());
- }else if(devpThread.startSignal[i][0]==4){
+ }else if(devpThread.startSignal[i][0]==4 && testMast.getStatus()!=4){
locMast.setPackStatus(3);
testMast.setStatus(4);
testMast.setModiTime(new Date());
testMastService.insertPackQualified(true,new Date());
- }else if(devpThread.startSignal[i][0]==5){
+ }else if(devpThread.startSignal[i][0]==5 && testMast.getStatus()!=4){
locMast.setPackStatus(4);
testMast.setStatus(4);
testMast.setModiTime(new Date());
--
Gitblit v1.9.1