From 21ab1f8baf606876f3be2cfee7df8c103fc4c280 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 15 九月 2025 13:45:43 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 38 ++++++++++++++++++++++++--------------
1 files changed, 24 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 3bd3470..4babf62 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -208,6 +208,7 @@
if (!inSta.equals("1000") && !inSta.equals("1035")){
basDevp.setInQty(basDevp.getInQty() + 1);
basDevpMapper.updateById(basDevp);
+ log.info("鍏ュ簱鍛煎彨锛�"+basDevp.getDevNo()+"+1");
}
} else {
@@ -287,12 +288,12 @@
return success ? R.ok("瑙ｇ粦鎴愬姛") : R.parse(message);
}
- public boolean sendAgvTask(String org,String tar){
+ public boolean sendAgvTask(String org,String tar,String type){
ForwardAGVTaskParam forwardAGVTaskParam = new ForwardAGVTaskParam();
forwardAGVTaskParam.setReqCode(UUID.randomUUID().toString().replace("-", ""));
forwardAGVTaskParam.setClientCode("IWMS");
- forwardAGVTaskParam.setTaskTyp("GT3");
+ forwardAGVTaskParam.setTaskTyp(type);
forwardAGVTaskParam.setCtnrTyp("2");
forwardAGVTaskParam.setPriority("1");
List<ForwardAGVTaskParam.PositionCodePaths> positionCodePathsList = new ArrayList<>();
@@ -1369,28 +1370,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,"GT6");
+ if (!success){
+ throw new CoolException("鍛煎彨agv澶辫触");
+ }
return R.ok();
}
--
Gitblit v1.9.1