From 37281ae5fa9e93d27252fd99f7afec74a23e666c Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期四, 31 八月 2023 15:43:43 +0800
Subject: [PATCH] # 显示屏
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 4 +++-
1 files changed, 3 insertions(+), 1 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 000c375..972d127 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;
}
@@ -2378,10 +2378,12 @@
locMast.setPackStatus(3);
testMast.setStatus(4);
testMast.setModiTime(new Date());
+ testMastService.insertPackQualified(true,new Date());
}else if(devpThread.startSignal[i][0]==5){
locMast.setPackStatus(4);
testMast.setStatus(4);
testMast.setModiTime(new Date());
+ testMastService.insertPackQualified(false,new Date());
}
// else if(devpThread.startSignal[i][0]==6||devpThread.startSignal[i][0]==7||devpThread.startSignal[i][0]==8){
// locMast.setPackStatus(devpThread.startSignal[i][0]+3);
--
Gitblit v1.9.1