From 224e8d3b57fecf5a904ffa06ef0bb8b646d73a29 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期五, 21 十一月 2025 09:28:14 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 39 +++++++++++++++++++++++++++++++++++++++
src/main/java/com/zy/asrs/controller/MobileController.java | 5 +++++
src/main/java/com/zy/asrs/service/MobileService.java | 2 ++
3 files changed, 46 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 654db88..5b49931 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -119,6 +119,11 @@
public R pdaAgvLineCall(@RequestBody Map<String,Object> map){
return mobileService.lineCall(map);
}
+ @PostMapping("/agv/lineCall2")
+ @ManagerAuth
+ public R pdaAgvLineCall2(@RequestBody Map<String,Object> map){
+ return mobileService.lineCall2(map);
+ }
@GetMapping("/agv/site/list")
@ManagerAuth
diff --git a/src/main/java/com/zy/asrs/service/MobileService.java b/src/main/java/com/zy/asrs/service/MobileService.java
index 435afcc..9829b72 100644
--- a/src/main/java/com/zy/asrs/service/MobileService.java
+++ b/src/main/java/com/zy/asrs/service/MobileService.java
@@ -66,6 +66,8 @@
R lineCall(Map<String, Object> map);
+ R lineCall2(Map<String, Object> map);
+
void AgvStaBind(CombParam combParam,Long userID);
R FinishedCall(Map<String, Object> map);
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 ec4d94a..cb895b1 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -1668,6 +1668,45 @@
return R.ok();
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R lineCall2(Map<String, Object> map) {
+ String orgSite = map.get("orgSite").toString();
+ String tarSite = map.get("tarSite").toString();
+ if (Cools.isEmpty(orgSite) || Cools.isEmpty(tarSite)) {
+ return R.error("鏁版嵁涓虹┖");
+ }
+ AgvSite orgAgvSite = agvSiteService.selectOne(new EntityWrapper<AgvSite>().eq("name", orgSite));
+
+ if (Cools.isEmpty(orgAgvSite)) {
+ return R.error("绔欑偣鏁版嵁閿欒");
+ }
+
+
+ WrkMast wrkMast = wrkMastService.selectById(orgAgvSite.getWorkNo());
+ if (!Cools.isEmpty(wrkMast)){
+ wrkMast.setWrkSts(5L);
+ wrkMastService.updateById(wrkMast);
+ }
+
+ //鏇存柊org绔欑偣鐘舵��
+ orgAgvSite.setStatus(0);
+ orgAgvSite.setWorkNo(null);
+ if (!agvSiteService.updateById(orgAgvSite)){
+ throw new CoolException("婧愮珯鏇存柊澶辫触");
+ }
+
+
+
+// 鍛煎彨agv
+ boolean success = sendAgvTask(orgSite, tarSite,"GT7");
+ if (!success){
+ throw new CoolException("鍛煎彨agv澶辫触");
+ }
+
+ return R.ok();
+ }
+
public void uploadErp(InventoryErpParam param){
String response = "";
--
Gitblit v1.9.1