From 5edbc95f689813cee37ee573af48e59175ddff92 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期二, 21 一月 2025 13:37:28 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java | 63 +++++++++++++++++++++++++------
1 files changed, 50 insertions(+), 13 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 d8d63ba..d65682c 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
@@ -29,6 +29,9 @@
@Slf4j
public class AgvWrkMastServiceImp extends ServiceImpl<AgvWrkMastMapper, AgvWrkMast> implements AgvWrkMastService {
+ @Value("${agv.flag}")
+ private boolean flag;
+
@Value("${agv.url}")
private String url;
@@ -63,13 +66,13 @@
private AgvWrkMastService agvWrkMastService;
- public void updateWrkStsByWrkNo(int wrkNo, long wrkSts) {
+ public Boolean updateWrkStsByWrkNo(int wrkNo, long wrkSts) {
AgvWrkMast agvWrkMast = this.selectById(wrkNo);
//鍒ゆ柇瑕佷慨鏀圭殑宸ヤ綔妗ｇ姸鎬佹槸鍚﹀悎鐞嗭紝濡傛灉涓嶅悎鐞嗗垯鎶涘嚭寮傚父
checkWrkSts(agvWrkMast, wrkSts);
agvWrkMast.setWrkSts(wrkSts);
agvWrkMast.setModiTime(new Date());
- this.updateById(agvWrkMast);
+ return this.updateById(agvWrkMast);
}
public void updateWrkStsByWrkNo(int wrkNo, long wrkSts, String manuType, long userId) {
@@ -270,9 +273,42 @@
}
+ // TODO 鍥涙湡
+ private boolean processUseTiShengJi(String sourceLocNo, String locNo) {
+ // 鍒ゆ柇鏄惁鏄彁鍗囨満
+ if (sourceLocNo.startsWith("YZ")) {
+ if (sourceLocNo.endsWith("01F2") && !locNo.startsWith("YZ") && locNo.endsWith("F4") && locNo.startsWith("Q")) {
+ // 浠庣敓浜т簩鍘傜殑搴撲綅鍒板惛濉戜簩鍘傜殑鐐逛綅涓�
+ 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("F4") && locNo.startsWith("YZ") && locNo.endsWith("01F2")) {
+ // 浠庡惛濉戜簩妤肩殑鐐逛綅鍒扮敓浜т簩鍘傜殑搴撲綅
+ return true;
+ } else if (sourceLocNo.endsWith("F2") && 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;
try {
response = new HttpHandler.Builder()
.setUri(url)
@@ -283,7 +319,7 @@
.doPost();
JSONObject jsonObject = JSON.parseObject(response);
- int code = Integer.parseInt(jsonObject.get("code").toString());
+ code = Integer.parseInt(jsonObject.get("code").toString());
if (code != 0) {
if (code == 6) {
log.info("AGV浠诲姟鍗曞彿宸蹭笂鎶�:{}", response);
@@ -300,19 +336,20 @@
return code;
} catch (Exception e) {
log.error(e.getMessage());
- //TODO 寮犺秴
throw new CoolException("璋冪敤AGV鍝嶅簲閿欒");
//return 1;
} finally {
- apiLogService.save(
- namespace,
- url + path,
- appkey,
- ip,
- JSON.toJSONString(JSONObject.toJSONString(requestParam)),
- response,
- success
- );
+ if (code != 6) {
+ apiLogService.save(
+ namespace,
+ url + path,
+ appkey,
+ ip,
+ JSON.toJSONString(JSONObject.toJSONString(requestParam)),
+ response,
+ success
+ );
+ }
}
}
--
Gitblit v1.9.1