From 2dbebb137296950a583d826968691ab3be5b550b Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期三, 06 九月 2023 09:29:48 +0800
Subject: [PATCH] # 显示屏
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 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..da6144a 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,17 +208,17 @@
} 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);
+ devpThread.setPakMk(staProtocol.getSiteId(), true);
boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
log.error("url锛歿}锛況equest锛歿}锛況esponse锛歿}", wmsUrl+"/rpc/pakin/loc/v1", JSON.toJSONString(param), response);
}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);
+ devpThread.setPakMk(staProtocol.getSiteId(), true);
boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", wmsUrl+"/rpc/pakin/loc/v1", JSON.toJSONString(param), response);
}
@@ -500,7 +500,7 @@
} else {
staProtocol = staProtocol.clone();
}
- if (staProtocol.isAutoing() && (staProtocol.isLoading()||staProtocol.getSiteId()==109) && (staProtocol.getWorkNo() == 0 || staProtocol.getStaNo() == null)) {
+ if (staProtocol.isAutoing() && (staProtocol.isLoading()||staProtocol.getSiteId()==1000) && (staProtocol.getWorkNo() == 0 || staProtocol.getStaNo() == null)) {
// 鏌ヨ宸ヤ綔妗�
WrkMast wrkMast = wrkMastMapper.selectPakOutStep2(staProtocol.getSiteId());
if (wrkMast == null) {
@@ -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;
}
@@ -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("鐏 ===>> 缁欏爢鍨涙満娓呴浂澶嶄綅鎶ヨ淇″彿澶辫触");
}
}
@@ -2371,14 +2374,16 @@
}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.getFireStatus()!=1&&testMast.getStatus()!=6){
locMast.setPackStatus(3);
testMast.setStatus(4);
testMast.setModiTime(new Date());
- }else if(devpThread.startSignal[i][0]==5){
+ testMastService.insertPackQualified(true,new Date(),testMast.getBarcode());
+ }else if(devpThread.startSignal[i][0]==5 && testMast.getStatus()!=4&&locMast.getFireStatus()!=1&&testMast.getStatus()!=6){
locMast.setPackStatus(4);
testMast.setStatus(4);
testMast.setModiTime(new Date());
+ testMastService.insertPackQualified(false,new Date(),testMast.getBarcode());
}
// 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