From 1e62a6d467407addae8745d8c69454318af56a09 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期六, 18 五月 2024 08:04:09 +0800
Subject: [PATCH] ERP接口

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

diff --git a/src/main/java/com/zy/asrs/controller/AgvMobileController.java b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
index f57a54b..4d3394b 100644
--- a/src/main/java/com/zy/asrs/controller/AgvMobileController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
@@ -2,26 +2,19 @@
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.core.annotations.ManagerAuth;
 import com.core.common.Cools;
 import com.core.common.R;
-import com.zy.asrs.entity.AgvBasDevp;
-import com.zy.asrs.entity.AgvLocDetl;
-import com.zy.asrs.entity.AgvLocMast;
-import com.zy.asrs.entity.LocMast;
-import com.zy.asrs.entity.param.AgvMobileStartPakin;
-import com.zy.asrs.entity.param.AgvMobileStartParam;
-import com.zy.asrs.entity.param.CombParam;
-import com.zy.asrs.entity.param.PickParam;
+import com.core.exception.CoolException;
+import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.param.*;
 import com.zy.asrs.service.*;
 import com.zy.common.web.BaseController;
 import io.swagger.models.auth.In;
 import lombok.Synchronized;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -63,10 +56,10 @@
 
     //    鍐嶆鎷ｆ枡
     @RequestMapping("/pick/again/auth")
-//    @ManagerAuth(memo = "缁勬墭")
+    @ManagerAuth(memo = "鍐嶆鎷ｆ枡")
     public R pickAgain(@RequestBody PickParam pickParams){
         agvMobileService.pickAgain(pickParams, 1l);
-        return R.ok("缁勬墭鎴愬姛");
+        return R.ok("鎷ｆ枡鎴愬姛");
     }
 
     /*
@@ -369,27 +362,64 @@
 
     @PostMapping("/agv/v1/locMove")
     @Transactional
+    @ManagerAuth(memo = "璋冩嫧鍗曚换鍔′笅鍙�")
     public R agvLocMove(@RequestBody HashMap<String,Object> params){
         String fl = String.valueOf(params.get("floor"));
         short floor =(short)Integer.parseInt(fl.substring(0, 1));
         List<HashMap<String,String>> dbList = (List<HashMap<String, String>>) params.get("dbList");
          params.get("dbList");
-        Object moveType = params.get("moveType");
-        if (moveType == "unAuto") {
-            return R.error("鎵嬪姩鍔熻兘鏆傛椂鏃犳硶浣跨敤");
+        Object mT = params.get("moveType");
+        String moveType = "";
+        if (mT.equals("unAuto")) {
+            moveType = "2";
+        } else {
+            moveType = "1";
         }
         for (HashMap<String, String> map : dbList) {
             String locNo = map.get("locNo");
             Wrapper<AgvLocMast> wrapper = new EntityWrapper<AgvLocMast>().eq("loc_no", locNo);
             AgvLocMast agvLocMast = agvLocMastService.selectOne(wrapper);
-            agvLocMast.setLocType("1");
+            agvLocMast.setLocType(moveType);
             agvLocMast.setLocType3(floor);
             agvLocMastService.update(agvLocMast,wrapper);
-            //System.out.println(locNo);
+            // 鍚屾璋冩嫧鍗�
+            List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", locNo));
+            for (AgvLocDetl agvLocDetl : agvLocDetls) {
+                // 鏇存柊璁㈠崟
+                OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("order_no", "DB" + agvLocDetl.getOrderNo()).eq("matnr", agvLocDetl.getMatnr()).eq("three_code",agvLocDetl.getThreeCode()));
+                orderDetl.setQty(orderDetl.getQty() + agvLocDetl.getAnfme());
+                if (!orderDetlService.update(orderDetl,new EntityWrapper<OrderDetl>().eq("order_no","DB" + agvLocDetl.getOrderNo()).eq("matnr", agvLocDetl.getMatnr()).eq("three_code",agvLocDetl.getThreeCode()))){
+                    throw new CoolException("淇敼璁㈠崟鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�"+agvLocDetl.getOrderNo()+agvLocDetl.getMatnr());
+                }
+            }
         }
         return R.ok();
     }
 
+    @PostMapping("/hand/control/locMove")
+    @Transactional
+    @ManagerAuth(memo = "鎵嬪姩搴撲綅杞Щ")
+    public R handControlLocMove(@RequestBody LocMoveParam param){
+        agvMobileService.handControlLocMove(param, getUserId());
+        return R.ok();
+    }
+
+    @PostMapping("/hand/control/allocationOut")
+    @Transactional
+    @ManagerAuth(memo = "璋冩嫧绂诲満")
+    public R allocationOut(@RequestBody AgvMobileStartPakin param){
+        agvMobileService.allocationOut(param, getUserId());
+        return R.ok();
+    }
+
+    @PostMapping("/hand/control/allocationIn")
+    @Transactional
+    @ManagerAuth(memo = "璋冩嫧杩涘満")
+    public R allocationIn(@RequestBody AgvMobileStartPakin param){
+        agvMobileService.allocationIn(param, getUserId());
+        return R.ok();
+    }
+
     public static void main(String[] args) {
         List<AgvLocDetl> agvLocDetls1 = new ArrayList<>();
         List<AgvLocDetl> agvLocDetls2 = new ArrayList<>();

--
Gitblit v1.9.1