From d417e332b39e7da99f637e94ebacf199fb158a72 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 31 五月 2024 18:16:50 +0800
Subject: [PATCH] #1

---
 src/main/java/com/zy/asrs/controller/AgvMobileController.java |   37 +++++++++++++++++++++++++++++++++++++
 1 files changed, 37 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/AgvMobileController.java b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
index 3d35a72..295a764 100644
--- a/src/main/java/com/zy/asrs/controller/AgvMobileController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
@@ -27,6 +27,8 @@
 @RequestMapping("agvMobile")
 public class AgvMobileController extends BaseController  {
 
+
+
     @Autowired
     private AgvMobileService agvMobileService;
     @Autowired
@@ -219,6 +221,7 @@
      */
     @PostMapping("/check/detl/v1")
     @ManagerAuth(memo = "搴撳瓨鐩樼偣")
+    @Synchronized
     public R checkLocDetl(@RequestBody HashMap<String,String> param){
 
         String locNo = param.get("locNo");
@@ -247,6 +250,7 @@
      */
     @PostMapping("/update/detl/v1")
     @ManagerAuth(memo = "绾犳搴撲綅")
+    @Synchronized
     public R updateLocDetlLocNo(@RequestBody HashMap<String,String> param){
         String locNo = param.get("locNo");
         String containerCode = param.get("containerCode");
@@ -369,6 +373,7 @@
     @PostMapping("/agv/v1/locMove")
     @Transactional
     @ManagerAuth(memo = "璋冩嫧鍗曚换鍔′笅鍙�")
+    @Synchronized
     public R agvLocMove(@RequestBody HashMap<String,Object> params){
         String fl = String.valueOf(params.get("floor"));
         short floor =(short)Integer.parseInt(fl.substring(0, 1));
@@ -405,6 +410,7 @@
     @PostMapping("/agv/v2/locMove")
     @Transactional
     @ManagerAuth(memo = "璋冩嫧鍗曚换鍔′笅鍙�")
+    @Synchronized
     public R agvLocMove2(@RequestBody HashMap<String,Object> params){
         Date now = new Date();
         String fl = String.valueOf(params.get("floor"));
@@ -424,6 +430,14 @@
         for (HashMap<String, String> map : dbList) {
             String locNo = map.get("locNo");
             String barcode = map.get("suppCode");
+            AgvWrkMast source_loc_no = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("source_loc_no", locNo));
+            if (!Cools.isEmpty(source_loc_no)) {
+                throw new CoolException("褰撳墠搴撲綅宸茬敓鎴愪换鍔★紒");
+            }
+            AgvLocMast locMastS = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", locNo).eq("loc_sts","F"));
+            if (Cools.isEmpty(locMastS)) {
+                throw new CoolException("褰撳墠搴撲綅闈炲湪搴撶姸鎬侊紒搴撲綅鍙�="+locNo);
+            }
             AgvWrkMast wrkMast = createWrkMast(ioType, 22L, locNo, "", barcode, now, getUserId(), 30,floor);
             // 鍚屾璋冩嫧鍗�
             List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", locNo));
@@ -458,6 +472,7 @@
     @PostMapping("/hand/control/locMove")
     @Transactional
     @ManagerAuth(memo = "鎵嬪姩搴撲綅杞Щ")
+    @Synchronized
     public R handControlLocMove(@RequestBody LocMoveParam param){
         agvMobileService.handControlLocMove(param, getUserId());
         return R.ok();
@@ -466,6 +481,7 @@
     @PostMapping("/hand/control/allocationOut")
     @Transactional
     @ManagerAuth(memo = "璋冩嫧绂诲満")
+    @Synchronized
     public R allocationOut(@RequestBody AgvMobileStartPakin param){
         agvMobileService.allocationOut(param, getUserId());
         return R.ok();
@@ -474,14 +490,34 @@
     @PostMapping("/hand/control/allocationIn")
     @Transactional
     @ManagerAuth(memo = "璋冩嫧杩涘満")
+    @Synchronized
     public R allocationIn(@RequestBody AgvMobileStartPakin param){
         agvMobileService.allocationIn(param, getUserId());
+        return R.ok();
+    }
+
+    @PostMapping("/hand/control/empOut")
+    @Transactional
+    @ManagerAuth(memo = "绌烘灦绂诲満")
+    @Synchronized
+    public R empOut(@RequestBody AgvMobileStartPakin param){
+        agvMobileService.empOut(param, getUserId());
+        return R.ok();
+    }
+
+    @PostMapping("/hand/control/empIn")
+    @Transactional
+    @ManagerAuth(memo = "绌烘灦杩涘満")
+    @Synchronized
+    public R empIn(@RequestBody AgvMobileStartPakin param){
+        agvMobileService.empIn(param, getUserId());
         return R.ok();
     }
 
     @PostMapping("/hand/control/doBack")
     @Transactional
     @ManagerAuth(memo = "绔欑偣鍥為��")
+    @Synchronized
     public R doBack(@RequestBody AgvMobileStartPakin param){
         agvMobileService.doBack(param, getUserId());
         return R.ok();
@@ -490,6 +526,7 @@
     @PostMapping("/hand/control/handBack")
     @Transactional
     @ManagerAuth(memo = "杞墜鍔ㄥ洖娴�")
+    @Synchronized
     public R handBack(@RequestBody AgvMobileStartPakin param){
         agvMobileService.handBack(param, getUserId());
         return R.ok();

--
Gitblit v1.9.1