From 4647be24b04e5b1a5ece2aecadcf43afb8cd6eb6 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 03 九月 2025 09:33:52 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 44 ++++++++++++++++++++++++++++++--------------
1 files changed, 30 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 37ca2d9..fe1731c 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -161,6 +161,10 @@
case "3010":
wrapper.in("source_sta_no", "3013", "3014");
break;
+ case "1000":
+ case "1035":
+ wrapper.in("source_sta_no", "1024", "1028");
+ break;
default:
}
int count = wrkMastService.selectCount(wrapper);
@@ -201,8 +205,11 @@
if (jsonObject.getInteger("code").equals(0)) {
success = true;
// 鍏ュ簱鏆傚瓨+1
- basDevp.setInQty(basDevp.getInQty() + 1);
- basDevpMapper.updateById(basDevp);
+ if (!inSta.equals("1000") && !inSta.equals("1035")){
+ basDevp.setInQty(basDevp.getInQty() + 1);
+ basDevpMapper.updateById(basDevp);
+ }
+
} else {
message = jsonObject.getString("message");
log.error("鍏ュ簱鍛煎彨agv澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", ApiInterfaceConstant.AGV_IP + ApiInterfaceConstant.AGV_CALL_IN_PATH, body, response);
@@ -1362,28 +1369,37 @@
}
AgvSite orgAgvSite = agvSiteService.selectOne(new EntityWrapper<AgvSite>().eq("name", orgSite));
- AgvSite tarAgvSite = agvSiteService.selectOne(new EntityWrapper<AgvSite>().eq("name", tarSite));
- if (Cools.isEmpty(orgAgvSite) || Cools.isEmpty(tarAgvSite)) {
+// AgvSite tarAgvSite = agvSiteService.selectOne(new EntityWrapper<AgvSite>().eq("name", tarSite));
+ if (Cools.isEmpty(orgAgvSite)) {
return R.error("绔欑偣鏁版嵁閿欒");
}
//鏇存柊tar绔欑偣鐘舵��
- tarAgvSite.setWorkNo(orgAgvSite.getWorkNo());
- tarAgvSite.setStatus(2);
- if (!agvSiteService.updateById(tarAgvSite)){
- throw new CoolException("鍙枡绔欐洿鏂板け璐�");
+// tarAgvSite.setWorkNo(orgAgvSite.getWorkNo());
+// tarAgvSite.setStatus(2);
+// if (!agvSiteService.updateById(tarAgvSite)){
+// throw new CoolException("鍙枡绔欐洿鏂板け璐�");
+// }
+ WrkMast wrkMast = wrkMastService.selectById(orgAgvSite.getWorkNo());
+ if (!Cools.isEmpty(wrkMast)){
+ wrkMast.setWrkSts(5L);
+ wrkMastService.updateById(wrkMast);
}
+
//鏇存柊org绔欑偣鐘舵��
- orgAgvSite.setStatus(2);
+ orgAgvSite.setStatus(0);
+ orgAgvSite.setWorkNo(null);
if (!agvSiteService.updateById(orgAgvSite)){
throw new CoolException("婧愮珯鏇存柊澶辫触");
}
- //鍛煎彨agv
-// boolean success = sendAgvTask(orgSite, tarSite);
-// if (!success){
-// throw new CoolException("鍛煎彨agv澶辫触");
-// }
+
+
+// 鍛煎彨agv
+ boolean success = sendAgvTask(orgSite, tarSite);
+ if (!success){
+ throw new CoolException("鍛煎彨agv澶辫触");
+ }
return R.ok();
}
--
Gitblit v1.9.1