From e7eefd68dcb095ddd33321192755116f4d4586d9 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期四, 27 三月 2025 08:13:42 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/enums/SteLocaType.java | 10 ++++++----
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 34 ++++++++++++++++++++++++++++++++++
2 files changed, 40 insertions(+), 4 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 198cc9d..4580319 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -8101,6 +8101,40 @@
}
break;
}
+ } else if (staProtocol.isAutoing()
+ && !staProtocol.isLoading()
+ && staProtocol.getWorkNo() == 0
+ && staProtocol.isPakMk()) {
+ for (DevpSlave.Jar jar : inSta.getJarList()) {
+ SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, jar.getJarNo()<3? 1:2);
+ if (steThread == null) {
+ continue;
+ }
+ SteProtocol steProtocol = steThread.getSteProtocol();
+ if (steProtocol == null) {
+ continue;
+ }
+ if (!Cools.isEmpty(steProtocol.getLocaType()) && !steProtocol.getLocaType().equals(SteLocaType.NONE) && steProtocol.getStatusType().equals(SteStatusType.IDLE)) {
+ // 鍒ゆ柇閲嶅宸ヤ綔妗�
+ List<BasJarMast> basJarMastList = basJarMastService.getJarMastByJarIdAndStatusListB(jar.getBurial(), new ArrayList<Integer>() {{
+ add(9);
+ add(11);
+ }});
+ if (basJarMastList.isEmpty()){
+ continue;
+ }
+ BasJarMast jarMastByWrkNo = basJarMastList.get(0);
+ WrkMastExecute wrkMastExecute = wrkMastExecuteService.selectOne(new EntityWrapper<WrkMastExecute>().eq("wrk_no", jarMastByWrkNo.getWrkNo()));
+ if (Cools.isEmpty(wrkMastExecute)){
+ jarMastByWrkNo.setStatus(jarMastByWrkNo.getStatusComplete(6));
+ if (!basJarMastService.updateById(jarMastByWrkNo)){
+ log.error("纭寲鍖哄煙鍒嗘浠诲姟瀹屾垚寮傚父,BasJarMast={},寮傚父淇℃伅={}",JSON.toJSONString(jarMastByWrkNo),"鏇存柊basJarMast澶辫触");
+// throw new CoolException("鏇存柊basJarMast澶辫触");
+ }
+ }
+ break;
+ }
+ }
}
}
}
diff --git a/src/main/java/com/zy/core/enums/SteLocaType.java b/src/main/java/com/zy/core/enums/SteLocaType.java
index a95cc7c..02cb739 100644
--- a/src/main/java/com/zy/core/enums/SteLocaType.java
+++ b/src/main/java/com/zy/core/enums/SteLocaType.java
@@ -10,6 +10,8 @@
POINT24(24, "姘存ЫA绔�"),
POINT25(25, "姘存ЫB绔�"),
POINT26(26, "B绔緭閫佺嚎"),
+
+// NONE999(999, "鏈煡"),
// A(1, "A鐐�"),
// B(2, "B鐐�"),
// A_WAITING(3, "A寰呮満鐐�"),
@@ -26,25 +28,25 @@
public static SteLocaType get(Short id) {
if (null == id) {
- return null;
+ return NONE;
}
for (SteLocaType type : SteLocaType.values()) {
if (type.id.equals(id.intValue())) {
return type;
}
}
- return null;
+ return NONE;
}
public static SteLocaType get(SteLocaType type) {
if (null == type) {
- return null;
+ return NONE;
}
for (SteLocaType crnStatusType : SteLocaType.values()) {
if (crnStatusType == type) {
return crnStatusType;
}
}
- return null;
+ return NONE;
}
}
--
Gitblit v1.9.1