From 03bc25bac2967decb8c20b01803b210349716e58 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期日, 11 八月 2024 21:09:20 +0800
Subject: [PATCH] # 192.168.103.12:8182
---
src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java b/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
index ae86e2c..ce05dd6 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
@@ -108,6 +108,7 @@
AgvLocMast locMast = agvCommonService.getLocNo(basDevp.getLocType1(),basDevp.getFloor(),false,true);
agvWrkMast.setLocNo(locMast.getLocNo());
agvWrkMast.setWrkSts(201L);
+ agvWrkMast.setLogErrMemo("startAllcationIn");
agvWrkMastService.updateById(agvWrkMast);
// 鏇寸洰鏍囧簱浣�
locMast.setLocSts("S");
@@ -224,7 +225,6 @@
switch (agvWrkMast.getIoType()) {
case 108:
case 12:
- case 57:
agvTaskCreateParam.setTaskTyp("F06");
break;
case 109:
@@ -235,13 +235,27 @@
}
break;
case 1:
+ case 57:
// 鍏ュ簱浠诲姟鏄彧鏈� 鎺ラ┏浣� -- > 搴撲綅
AgvLocMast loc = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvWrkMast.getLocNo()));
String locSub = loc.getLocNo().substring(loc.getLocNo().length() - 4).substring(0, 2).substring(0, 2);
+ AgvBasDevp agvBasDevp = agvBasDevpService.selectByDevNo(agvWrkMast.getSourceLocNo());
if ("02".equals(locSub)) {
- agvTaskCreateParam.setTaskTyp("F06");
+ if (agvBasDevp.getFloor() == 4) {
+ agvTaskCreateParam.setTaskTyp("F01");
+ } else {
+ agvTaskCreateParam.setTaskTyp("F06");
+ }
+
} else {
- agvTaskCreateParam.setTaskTyp("F01");
+ // 鐩爣妤煎眰浣�1妤� 浣嗘簮搴撲綅锛堟帴椹充綅锛夊湪鍚稿浜屾ゼ
+ if (agvBasDevp.getFloor() == 4) {
+ agvTaskCreateParam.setTaskTyp("F06");
+ } else {
+ agvTaskCreateParam.setTaskTyp("F01");
+ }
+
+
}
break;
default:
--
Gitblit v1.9.1