From aa221b6b6c3939130c78e4219207d14ce877ff30 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 06 八月 2025 15:57:34 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/controller/AgvOpenController.java | 34 +++++++++++++++++++++++++++++++---
1 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvOpenController.java b/src/main/java/com/zy/asrs/controller/AgvOpenController.java
index f78f672..86f6fdc 100644
--- a/src/main/java/com/zy/asrs/controller/AgvOpenController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvOpenController.java
@@ -44,7 +44,7 @@
* 飦� robot_reach锛氭満鍣ㄤ汉鍒拌揪宸ヤ綔绔欍��
* 飦� weight锛氱О閲嶄簨浠跺洖璋冦��
* 飦� rfid锛歊FID璇嗗埆浜嬩欢鍥炶皟銆�
- *
+ * <p>
* 浠诲姟鐘舵�侊紙status锛夛細
* 飦� success锛氭垚鍔熴��
* 飦� fail锛氬け璐ャ��
@@ -89,6 +89,15 @@
logPost(param, JSONObject.toJSONString(r), false);
return r;
}
+ }
+ try {
+ if (!Cools.isEmpty(agvWrkMast.getBarcode()) && !Cools.isEmpty(param.getPodCode())) {
+ if (!agvWrkMast.getBarcode().equals(param.getPodCode())) {
+ log.info("AGV鍥炶皟鐨勮繑鍥炵殑鎵樼洏鐮佸拰宸ヤ綔妗ｆ墭鐩樹笉涓�鑷�,{}{}", agvWrkMast.getBarcode(), param.getPodCode());
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
}
if (agvWrkMast.getIoType().equals(121)) {
try {
@@ -174,7 +183,6 @@
@Transactional
public void success(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {
-
//淇敼AGV宸ヤ綔妗ｇ殑宸ヤ綔鐘舵�佷负205.宸ヤ綔瀹屾垚
agvWrkMast.setWrkSts(205L);
@@ -195,6 +203,8 @@
}
agvWrkMast.setModiTime(new Date());
agvWrkMastService.updateById(agvWrkMast);
+
+
}
},
/**
@@ -224,12 +234,20 @@
case 10:
// 鎷ｆ枡鍏ュ簱浠诲姟
case 53:
+ // 绔欑偣閫�鍥�
+ case 58:
// 鐩樼偣鍐嶅叆搴�
case 57:
AgvBasDevp byDevNo = agvBasDevpService.getByDevNo(agvWrkMast.getSourceLocNo());
String locSts = "O";
if (byDevNo != null) {
assert log != null;
+// if (!Cools.isEmpty(agvWrkMast.getBarcode())) {
+// AgvBasDevp agvBasDevp = agvBasDevpService.selectOne(new EntityWrapper<AgvBasDevp>().eq("barcode", agvWrkMast.getBarcode()));
+// if (!Cools.isEmpty(agvBasDevp) && agvBasDevp.getLocSts().equals("F") && !agvBasDevp.getDevNo().equals(byDevNo.getDevNo())) {
+// agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvBasDevp.getDevNo(), locSts, "", null);
+// }
+// }
log.info("鏂欐灦绂诲紑鏃跺綋鍓嶇珯鐐圭姸鎬�:{},{}", byDevNo.getDevNo(), byDevNo.getLocSts());
if ("S".equals(byDevNo.getLocSts()) || "F".equals(byDevNo.getLocSts())) {
log.info("鏂欐灦绂诲紑鏃跺綋鍓嶇珯鐐圭姸鎬佷繚鎸佷笉鍙�1:{},{}", byDevNo.getDevNo(), byDevNo.getLocSts());
@@ -240,13 +258,14 @@
locSts = "O";
agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(), locSts, "", null);
}
+
}
break;
}
if (agvWrkMast.getIoType() == 108 || agvWrkMast.getIoType() == 114) {
//鏇存柊搴撳瓨鏄庣粏
- agvLocDetlService.updateStock(agvWrkMast.getSourceLocNo(), agvWrkMast.getLocNo());
+ agvLocDetlService.updateStock(agvWrkMast.getSourceLocNo(), agvWrkMast.getLocNo(), agvWrkMast.getAppeUser());
//淇敼婧愬簱浣嶇姸鎬佷负O
agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(), "O", "", agvWrkMast.getWhsType().shortValue(), "", (short) 0);
} else if (agvWrkMast.getIoType() == 109 && !agvWrkMast.getSourceLocNo().substring(0, 2).equals("DB")) {
@@ -347,6 +366,15 @@
}
}
+
+ public static void main(String[] args) {
+ try {
+ String s = null;
+ System.out.println(s.equals("1"));
+ }catch (Exception e){
+
+ }
+ }
}
--
Gitblit v1.9.1