From 848891274b568d3c1402da7cb0d568a65130c3a6 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 02 四月 2026 16:17:35 +0800
Subject: [PATCH] 查询功能唯一条件就是任务号；添加条件判断
---
src/main/java/com/zy/asrs/controller/AgvOpenController.java | 51 +++++++++++++++++++++++++++++++++------------------
1 files changed, 33 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvOpenController.java b/src/main/java/com/zy/asrs/controller/AgvOpenController.java
index d531487..9417464 100644
--- a/src/main/java/com/zy/asrs/controller/AgvOpenController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvOpenController.java
@@ -7,6 +7,7 @@
import com.core.common.Cools;
import com.core.common.R;
import com.zy.asrs.entity.AgvBasDevp;
+import com.zy.asrs.entity.AgvLocMast;
import com.zy.asrs.entity.AgvWrkMast;
import com.zy.asrs.entity.WrkMastExecute;
import com.zy.asrs.entity.param.AgvTaskCallBackParam;
@@ -83,12 +84,21 @@
}
AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("wrk_no", wrkNo));
if (Cools.isEmpty(agvWrkMast)) {
- agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("barcode", param.getPodCode()));
- if (Cools.isEmpty(agvWrkMast)) {
+ //agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("barcode", param.getPodCode()));
+ //if (Cools.isEmpty(agvWrkMast)) {
r = R.error("浠诲姟缂栧彿閿欒");
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 {
@@ -173,17 +183,7 @@
end {
@Transactional
public void success(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {
- try {
- if (!Cools.isEmpty(agvWrkMast.getBarcode()) && !Cools.isEmpty(param.getPodCode())) {
- if (!agvWrkMast.getBarcode().equals(param.getPodCode())) {
- agvWrkMast.setTakeNone(agvWrkMast.getBarcode() + "!=" + param.getPodCode());
- log.info("AGV鍥炶皟鐨勮繑鍥炵殑鎵樼洏鐮佸拰宸ヤ綔妗ｆ墭鐩樹笉涓�鑷�,{}{}", agvWrkMast.getBarcode(), param.getPodCode());
- log.error("AGV鍥炶皟鐨勮繑鍥炵殑鎵樼洏鐮佸拰宸ヤ綔妗ｆ墭鐩樹笉涓�鑷�,{}{}", agvWrkMast.getBarcode(), param.getPodCode());
- }
- }
- } catch (Exception e) {
- }
//淇敼AGV宸ヤ綔妗ｇ殑宸ヤ綔鐘舵�佷负205.宸ヤ綔瀹屾垚
agvWrkMast.setWrkSts(205L);
@@ -265,13 +265,19 @@
}
if (agvWrkMast.getIoType() == 108 || agvWrkMast.getIoType() == 114) {
- //鏇存柊搴撳瓨鏄庣粏
- agvLocDetlService.updateStock(agvWrkMast.getSourceLocNo(), agvWrkMast.getLocNo(), agvWrkMast.getAppeUser());
- //淇敼婧愬簱浣嶇姸鎬佷负O
- agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(), "O", "", agvWrkMast.getWhsType().shortValue(), "", (short) 0);
+ AgvLocMast agvLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvWrkMast.getSourceLocNo()));
+ if(agvLocMast.getLocSts().equals("R")){
+ //鏇存柊搴撳瓨鏄庣粏
+ 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")) {
- //淇敼婧愬簱浣嶇姸鎬佷负O
- agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(), "O", "", agvWrkMast.getWhsType().shortValue(), "", (short) 0);
+ AgvLocMast agvLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvWrkMast.getSourceLocNo()));
+ if(agvLocMast.getLocSts().equals("R")){
+ //淇敼婧愬簱浣嶇姸鎬佷负O
+ agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(), "O", "", agvWrkMast.getWhsType().shortValue(), "", (short) 0);
+ }
}
//if(agvWrkMast.getIoType() == 1 || agvWrkMast.getIoType() == 53 || agvWrkMast.getIoType() == 57 || agvWrkMast.getIoType() == 10){
// //淇敼婧愮珯鐐圭姸鎬佷负O.绌猴紝浠ュ強瑙ｇ粦鎵樼洏鏉＄爜
@@ -367,6 +373,15 @@
}
}
+
+ public static void main(String[] args) {
+ try {
+ String s = null;
+ System.out.println(s.equals("1"));
+ }catch (Exception e){
+
+ }
+ }
}
--
Gitblit v1.9.1