From 50907fb5ac01267870819f2cbd8632f9776835a7 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期一, 17 六月 2024 16:33:25 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OrderController.java | 2 +
src/main/java/com/zy/asrs/controller/AgvLocMastController.java | 40 ++++++++++---------
src/main/java/com/zy/common/service/AgvCommonService.java | 5 ++
src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java | 19 ++++++++-
4 files changed, 43 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvLocMastController.java b/src/main/java/com/zy/asrs/controller/AgvLocMastController.java
index fb407d4..8b9dfd1 100644
--- a/src/main/java/com/zy/asrs/controller/AgvLocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvLocMastController.java
@@ -82,25 +82,27 @@
return R.error("褰撳墠鎿嶄綔宸茶闃绘锛岃鑱旂郴绠＄悊鍛�");
}
int br = 0;
- switch (locMast.getBarcode().substring(0,2)) {
- case "10":
- br = 1;
- break;
- case "20":
- br = 2;
- break;
- case "21":
- br = 4;
- break;
- case "30":
- br = 3;
- break;
- case "40":
- br = 5;
- break;
- }
- if (oldLocMast.getLocType1() != br) {
- return R.error("璐ф灦鍜屽簱浣嶇被鍨嬩笉鍖归厤锛�");
+ if (locMast.getLocSts() == "O" || locMast.getLocSts() == "X"){
+ switch (locMast.getBarcode().substring(0,2)) {
+ case "10":
+ br = 1;
+ break;
+ case "20":
+ br = 2;
+ break;
+ case "21":
+ br = 4;
+ break;
+ case "30":
+ br = 3;
+ break;
+ case "40":
+ br = 5;
+ break;
+ }
+ if (oldLocMast.getLocType1() != br) {
+ return R.error("璐ф灦鍜屽簱浣嶇被鍨嬩笉鍖归厤锛�");
+ }
}
Date now = new Date();
// 鏈夌墿鏂欐椂淇敼涓虹┖搴撲綅鎴栬�呯┖鏉垮簱浣嶏紝鍒欏垹闄ゅ簱瀛樻槑缁�
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 4ff89c0..c11b4ea 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -898,6 +898,7 @@
orderDetl2.setDeadTime(isocode);
orderDetl2.setStatus(1);
orderDetl2.setQty(0.0D);
+ orderDetl2.setProcessSts(proSts);
if (!orderDetlService.insert(orderDetl2)) {
throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃閲嶆柊瀵煎叆锛�");
}
@@ -975,6 +976,7 @@
orderDetl3.setDeadTime(isocode);
orderDetl3.setStatus(1);
orderDetl3.setQty(0.0D);
+ orderDetl3.setProcessSts(proSts);
if (!orderDetlService.insert(orderDetl3)) {
throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃閲嶆柊瀵煎叆锛�");
}
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..51e73eb 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
@@ -224,7 +224,6 @@
switch (agvWrkMast.getIoType()) {
case 108:
case 12:
- case 57:
agvTaskCreateParam.setTaskTyp("F06");
break;
case 109:
@@ -235,13 +234,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:
diff --git a/src/main/java/com/zy/common/service/AgvCommonService.java b/src/main/java/com/zy/common/service/AgvCommonService.java
index f87765f..e7aded0 100644
--- a/src/main/java/com/zy/common/service/AgvCommonService.java
+++ b/src/main/java/com/zy/common/service/AgvCommonService.java
@@ -238,7 +238,10 @@
Boolean orderBy = false;
int levCount = 0;
int times = 1;
- if (floor == 1) {
+ if (floor == 1 || floor >= 4) {
+ if (floor >= 4 ) {
+ floor = 1;
+ }
orderBy = true;
levCount = 2;
} else {
--
Gitblit v1.9.1