From e95cc36944a886ccf63f90ccdf883aaf6ab81f90 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期六, 20 七月 2024 16:51:25 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/StaEscalationHandler.java | 2 +-
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 27 ++++++++++++++++++++++++++-
src/main/java/com/zy/asrs/entity/WrkMast.java | 8 ++++++++
3 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkMast.java b/src/main/java/com/zy/asrs/entity/WrkMast.java
index aaef397..18c3ff5 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMast.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMast.java
@@ -515,4 +515,12 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.logErrTime);
}
+ public Integer getIoTypeMes$(){
+ if (this.ioType != 101){
+ return 3;
+ } else {
+ return 1;
+ }
+ }
+
}
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 22150b9..b07a549 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -5491,6 +5491,11 @@
if (Cools.isEmpty(jarMastByJarIdMin)){
return false;
}
+
+ int count = basJarMastService.selectCount(new EntityWrapper<BasJarMast>().eq("jar_regin", jarMastByJarIdMin.getJarRegin()).lt("status", 17).gt("status", 10));
+ if (count>0){
+ return false;
+ }
// //鍒ゆ柇灏忚溅鐘舵��
// if (!jarWrkMastExecuteGenerateSteStatus(jarSlave.getJarOutSte().get(0).getSteNo(),2,SteStatusType.IDLE)){
// return false;
@@ -6512,6 +6517,26 @@
return false;
}
+ // 鑾峰彇纭寲缃愪俊鎭�
+ JarThread jarThreadOther = (JarThread) SlaveConnection.get(SlaveType.Jar, SteAndJarUtil.getRgvJarNo(wrkMastExecute.getJarId()));
+ JarProtocol jarProtocolOther = jarThreadOther.getJarProtocol();
+ if (jarProtocolOther == null) {
+ return false;
+ }
+ if (jarProtocolOther.modeType != JarModeType.AUTO){
+ return false;
+ }
+
+ BasJar basJarOther = basJarMapper.selectById(jarProtocolOther.getJarNo());
+ if (Cools.isEmpty(basJarOther)){
+ log.error("{}鍙风～鍖栫綈鏌ヨ璁惧妗ｆ鏃犱俊鎭紒锛侊紒",jarProtocolOther.getJarNo());
+ return false;
+ }
+
+ if (!jarProtocolOther.isRightDoor()){
+ return false;
+ }
+
DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, 2);
StaProtocol staProtocolRGV = devpThread.getStation().get(basJar.getEnterRgvNo());
if (staProtocolRGV == null) {
@@ -6704,7 +6729,7 @@
}
} else {
//璋冭溅 == > endRow
- if (!jarRgvMoveTake(wrkMastExecute,SteAndJarUtil.getJarNoEndRow(jarProtocolOther.getJarNo()))){
+ if (!jarRgvMoveTake(wrkMastExecute,SteAndJarUtil.getJarNoEndRow(basJar.getBurial()))){
log.error("骞宠 杞GV鍛戒护涓嬪彂澶辫触锛宺gv鍙�={},浠诲姟鏁版嵁={},纭寲缃愭暟鎹�={},sign={}",
wrkMastExecute.getJarId(), JSON.toJSONString(wrkMastExecute), JSON.toJSONString(jarProtocol),sign);
}
diff --git a/src/main/java/com/zy/asrs/task/handler/StaEscalationHandler.java b/src/main/java/com/zy/asrs/task/handler/StaEscalationHandler.java
index a584cca..d719f26 100644
--- a/src/main/java/com/zy/asrs/task/handler/StaEscalationHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/StaEscalationHandler.java
@@ -88,7 +88,7 @@
log.error("2妤肩炕杞�掓枡淇℃伅涓婁紶鏃讹紝宸ヤ綔鍙凤細"+JSON.toJSONString(wrkMast));
StaEscalationParam staEscalationParam = new StaEscalationParam();
staEscalationParam.setDevNo(staNo);
- staEscalationParam.setIoType(wrkMast.getIoType()==101? 1:3);
+ staEscalationParam.setIoType(wrkMast.getIoTypeMes$());
staEscalationParam.setMatnr(wrkDetl.getMatnr());
staEscalationParam.setBatch(wrkDetl.getBatch());
staEscalationParam.setOrderNo(wrkDetl.getSpecs());
--
Gitblit v1.9.1