From 138b5fc883c3ccb25f4bed7114a60f93e78aaa9a Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期日, 02 六月 2024 13:30:37 +0800
Subject: [PATCH] #条码检测

---
 src/main/java/com/zy/asrs/controller/AgvMobileController.java |   27 +++++++++++++++++++++++++++
 1 files changed, 27 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 5f00b40..9819e36 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
@@ -432,6 +434,10 @@
             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));
@@ -490,11 +496,32 @@
         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){
+        if (Cools.isEmpty(param)){
+            return R.error("鍙傛暟涓虹┖");
+        }
         agvMobileService.doBack(param, getUserId());
         return R.ok();
     }

--
Gitblit v1.9.1