From dfc9552392f9f973ab52e55d58a7ae2acdaeb1f3 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期日, 09 三月 2025 14:19:43 +0800
Subject: [PATCH] 四期
---
src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 56 insertions(+), 2 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 230cf7c..b59aa03 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
@@ -16,6 +16,8 @@
import com.zy.asrs.service.*;
import com.zy.common.service.AgvCommonService;
import com.zy.common.utils.HttpHandler;
+import com.zy.system.entity.Config;
+import com.zy.system.service.ConfigService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -28,6 +30,9 @@
@Service
@Slf4j
public class AgvWrkMastServiceImp extends ServiceImpl<AgvWrkMastMapper, AgvWrkMast> implements AgvWrkMastService {
+
+ @Value("${agv.flag}")
+ private boolean flag;
@Value("${agv.url}")
private String url;
@@ -61,6 +66,8 @@
private AgvCommonService agvCommonService;
@Autowired
private AgvWrkMastService agvWrkMastService;
+ @Autowired
+ private ConfigService configService;
public Boolean updateWrkStsByWrkNo(int wrkNo, long wrkSts) {
@@ -262,15 +269,62 @@
}
break;
default:
- agvTaskCreateParam.setTaskTyp("F01");
+ if (processUseTiShengJi(agvWrkMast.getSourceLocNo(), agvWrkMast.getLocNo())) {
+ agvTaskCreateParam.setTaskTyp("F06");
+ } else {
+ agvTaskCreateParam.setTaskTyp("F01");
+ }
break;
}
-
agvTaskCreateParam.setPositionCodePath(agvTaskParamList);
}
+ // TODO 鍥涙湡
+ private boolean processUseTiShengJi(String sourceLocNo, String locNo) {
+ // 鍒ゆ柇鏄惁鏄彁鍗囨満
+ if (sourceLocNo.startsWith("YZ")) {
+ if (sourceLocNo.endsWith("01F2") && !locNo.startsWith("YZ") && locNo.endsWith("F4")) {
+ // 浠庣敓浜т簩鍘傜殑搴撲綅鍒板惛濉戜簩鍘傜殑鐐逛綅涓�
+ return true;
+ } else if (sourceLocNo.endsWith("01F2") && locNo.startsWith("YZ") && locNo.endsWith("02F1")) {
+ // 浠庣敓浜т簩鍘傜殑搴撲綅鍒板惛濉戜簩鍘傜殑搴撲綅
+ return true;
+ } else if (sourceLocNo.endsWith("02F1") && locNo.startsWith("YZ") && locNo.endsWith("01F2")) {
+ // 鍚稿浜屾ゼ鐨勫簱浣嶅埌鐢熶骇浜屽巶鐨勫簱浣�
+ return true;
+ } else if (sourceLocNo.endsWith("02F1") && !locNo.startsWith("YZ") && locNo.endsWith("F2")) {
+ // 鍚稿浜屾ゼ鐨勫簱浣嶅埌鐢熶骇浜屽巶鐨勭偣浣�
+ return true;
+ } else if (sourceLocNo.endsWith("01F1") && !locNo.startsWith("YZ") && locNo.endsWith("F4")) {
+ // 浠庡惛濉戜竴妤肩殑搴撲綅鍒板惛濉戜簩妤肩殑鐐逛綅涓�
+ return true;
+ }else if (sourceLocNo.endsWith("02F1") && !locNo.startsWith("YZ") && locNo.endsWith("F1")) {
+ // 浠庡惛濉慹r妤肩殑kuwei鍒板惛濉戜竴妤肩殑dianwei
+ return true;
+ }
+ } else {
+ if (sourceLocNo.endsWith("F4") && locNo.startsWith("YZ") && locNo.endsWith("01F2")) {
+ // 浠庡惛濉戜簩妤肩殑鐐逛綅鍒扮敓浜т簩鍘傜殑搴撲綅
+ return true;
+ } else if (sourceLocNo.endsWith("F2") && locNo.startsWith("YZ") && locNo.endsWith("02F1")) {
+ // 浠庣敓浜т簩鍘傜殑鐐逛綅鍒板惛濉戜簩妤肩殑搴撲綅
+ return true;
+ } else if (sourceLocNo.endsWith("F4") && locNo.startsWith("YZ") && locNo.endsWith("01F1")) {
+ // 浠庡惛濉戜簩妤肩殑鐐逛綅鍒板惛濉戜竴妤肩殑搴撲綅
+ return true;
+ }else if (sourceLocNo.endsWith("F1") && locNo.startsWith("YZ") && locNo.endsWith("02F1")) {
+ // 浠庡惛濉戜簩妤肩殑鐐逛綅鍒板惛濉戜竴妤肩殑搴撲綅
+ return true;
+ }
+ }
+ return false;
+ }
+
private int doHttpRequest(Object requestParam, String namespace, String url, String path, String appkey, String ip) {
+ if (!flag) {
+ return 1;
+ }
String response = "";
boolean success = false;
int code = 0;
--
Gitblit v1.9.1