From cafc5d7abdb72aa8a0a6a50e04aee509d5fe159a Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 29 八月 2023 10:18:02 +0800
Subject: [PATCH] #合格数记录
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 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 b159090..9569b66 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -130,7 +130,7 @@
} else {
staProtocol = staProtocol.clone();
}
- staProtocol.setPakMk(true);
+ //staProtocol.setPakMk(true);
// // 鍏ュ嚭搴撴ā寮忓垽鏂�
// if ( inSta.getStaNo()==180 && devpThread.ioMode != IoModeType.PAKIN_MODE) { continue; }
// 鍒ゆ柇鏄惁婊¤冻鍏ュ簱鏉′欢
@@ -208,7 +208,7 @@
} else if (jsonObject.getInteger("code").equals(700) && (!barcodeThread.getBarcode().equals("NG"))){
StartupDto dto = jsonObject.getObject("data", StartupDto.class);
barcodeThread.setBarcode("");
- staProtocol.setWorkNo((short)9998);
+ staProtocol.setWorkNo((short)9999);
staProtocol.setStaNo((short)201);
devpThread.setPakMk(staProtocol.getSiteId(), false);
boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
@@ -216,7 +216,7 @@
}else {
StartupDto dto = jsonObject.getObject("data", StartupDto.class);
barcodeThread.setBarcode("");
- staProtocol.setWorkNo((short)9998);
+ staProtocol.setWorkNo((short)9999);
staProtocol.setStaNo((short)201);
devpThread.setPakMk(staProtocol.getSiteId(), false);
boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
@@ -2285,18 +2285,21 @@
public void fierCrn() {
try {
for (CrnSlave crn :slaveProperties.getCrn()) {
+ if(crn.getId()!=1){
+ continue;
+ }
// 鑾峰彇鍫嗗灈鏈轰俊鎭�
CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
CrnProtocol crnProtocol = crnThread.getCrnProtocol();
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("fire_status", 1));
if (!Cools.isEmpty(locMast)){
//鎶ヨ淇″彿鍐欏叆1
- if (!MessageQueue.offer(SlaveType.Crn, 1, new Task(4, "1"))) {
+ if (!MessageQueue.offer(SlaveType.Crn, 1, new Task(4, 1))) {
log.error("鐏 ===>> 缁欏爢鍨涙満鍙戦�佹姤璀︿俊鍙峰け璐�");
}
} else {
//鎶ヨ淇″彿娌℃湁鍚庯紝澶嶄綅鍦板潃
- if (!MessageQueue.offer(SlaveType.Crn, 1, new Task(4, "0"))) {
+ if (!MessageQueue.offer(SlaveType.Crn, 1, new Task(4, 0))) {
log.error("鐏 ===>> 缁欏爢鍨涙満娓呴浂澶嶄綅鎶ヨ淇″彿澶辫触");
}
}
@@ -2375,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