From 076611c29cfbe624a5ee4d21c454785bc5c79021 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期六, 18 五月 2024 08:13:51 +0800
Subject: [PATCH] #

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

diff --git a/src/main/java/com/zy/asrs/controller/AgvMobileController.java b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
index de60dca..6dd8c54 100644
--- a/src/main/java/com/zy/asrs/controller/AgvMobileController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
@@ -16,10 +16,7 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -42,6 +39,8 @@
     private OrderDetlService orderDetlService;
     @Autowired
     private AgvLocDetlService agvLocDetlService;
+    @Autowired
+    private AgvWrkMastService agvWrkMastService;
 
 
     /*
@@ -368,15 +367,18 @@
         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);
             // 鍚屾璋冩嫧鍗�
@@ -393,6 +395,70 @@
         return R.ok();
     }
 
+    @PostMapping("/agv/v2/locMove")
+    @Transactional
+    @ManagerAuth(memo = "璋冩嫧鍗曚换鍔′笅鍙�")
+    public R agvLocMove2(@RequestBody HashMap<String,Object> params){
+        Date now = new Date();
+        String fl = String.valueOf(params.get("floor"));
+        Integer floor = Integer.parseInt(fl.substring(0, 1));
+        List<HashMap<String,String>> dbList = (List<HashMap<String, String>>) params.get("dbList");
+        params.get("dbList");
+        Object mT = params.get("moveType");
+        String moveType = "";
+        Integer ioType = 0;
+        if (mT.equals("unAuto")) {
+            moveType = "2";
+            ioType = 111;
+        } else {
+            moveType = "1";
+            ioType = 108;
+        }
+        for (HashMap<String, String> map : dbList) {
+            String locNo = map.get("locNo");
+            String barcode = map.get("barcode");
+            //鐢熸垚宸ヤ綔妗�
+            AgvWrkMast mast = new AgvWrkMast();
+            //宸ヤ綔鐘舵��
+            mast.setWrkSts(22L);
+            //鍏ュ嚭搴撶被鍨�
+            mast.setIoType(ioType);
+            mast.setIoTime(now);
+            //浼樺厛绾�
+            mast.setIoPri(300.0);
+            //婧愮珯鐐�
+            mast.setSourceLocNo(locNo);
+            //鐩爣绔欑偣
+            mast.setLocNo("");
+            //瀹瑰櫒缂栫爜
+            mast.setBarcode(barcode);
+            //瀹瑰櫒绫诲瀷
+            mast.setWhsType(30);
+            // 鐩爣妤煎眰
+            mast.setCrnNo(floor);
+            mast.setAppeUser(getUserId());
+            mast.setAppeTime(now);
+            mast.setModiUser(getUserId());
+            mast.setModiTime(now);
+            if (!agvWrkMastService.insertByIncrease(mast)) {
+                throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
+            }
+            // 鍚屾璋冩嫧鍗�
+            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 = "鎵嬪姩搴撲綅杞Щ")
@@ -401,6 +467,22 @@
         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