From c3cc244261362fc29db1da839086e7f4478151f7 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期二, 09 四月 2024 11:14:09 +0800
Subject: [PATCH] 多订单组托

---
 src/main/java/com/zy/asrs/controller/AgvMobileController.java |   71 +++++++++++++++++++++++++++++++----
 1 files changed, 63 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 dd32cc8..558660f 100644
--- a/src/main/java/com/zy/asrs/controller/AgvMobileController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
@@ -2,11 +2,9 @@
 
 import com.core.common.R;
 import com.zy.asrs.entity.AgvBasDevp;
+import com.zy.asrs.entity.param.AgvMobileStartParam;
 import com.zy.asrs.entity.param.CombParam;
-import com.zy.asrs.service.AgvBasDevpService;
-import com.zy.asrs.service.AgvMobileService;
-import com.zy.asrs.service.AgvWorkService;
-import com.zy.asrs.service.OrderDetlService;
+import com.zy.asrs.service.*;
 import com.zy.common.web.BaseController;
 import lombok.Synchronized;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -15,6 +13,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -34,6 +33,8 @@
     @Autowired
     private AgvWorkService workService;
     @Autowired
+    private AgvLocMastService agvLocMastService;
+    @Autowired
     private OrderDetlService orderDetlService;
 
 
@@ -41,9 +42,12 @@
     locno锛熺粍鎵�+缁戝畾鏆傚瓨浣� 锛� 缁勬墭
      */
     @PostMapping("/comb/auth")
-    public R comb(@RequestBody CombParam combParam){
-        String message = agvMobileService.comb(combParam, 1l);
-        return R.ok(message);
+    public R comb(@RequestBody List<CombParam> combParams){
+        combParams.forEach(combParam -> {
+            agvMobileService.comb(combParam, getUserId());
+        });
+
+        return R.ok();
     }
 
     /*
@@ -53,7 +57,8 @@
     public R combBinding(@RequestBody Map<String,Object> map){
         String barcode = map.get("barcode").toString();
         String stationCode = map.get("stationCode").toString();
-        agvMobileService.combBinding(barcode,stationCode);
+        Short containerType = Short.valueOf(barcode.substring(0,2));
+        agvMobileService.combBinding(barcode,stationCode,containerType);
         return R.ok("鎵樼洏缁戝畾绔欑偣鎴愬姛");
     }
 
@@ -67,6 +72,14 @@
             return R.ok(agvMobileService.getAgvBasDevpByFloor(Integer.parseInt(floor)));
         }
         return R.error("鍙傛暟閿欒");
+    }
+
+    /*
+    鑾峰彇杈撻�佺嚎绔欑偣
+     */
+    @PostMapping("/getBasDevp/noCacheShelves/auth")
+    public R getBasDevpByNoCacheShelves(){
+        return R.ok(agvBasDevpService.getBasDevpByNoCacheShelves());
     }
 
     /*
@@ -86,5 +99,47 @@
         return R.ok("鐢熸垚宸ヤ綔妗ｆ垚鍔�");
     }
 
+    /*
+    鍏ュ簱
+     */
+    @PostMapping("/pakin/empty/auth")
+    @Synchronized
+    public R pakinEmpty(@RequestBody AgvMobileStartParam params){
+
+        for (AgvMobileStartParam.Pda pda : params.getPad()) {
+            pda.setContainerType(Short.valueOf(pda.getContainerCode().substring(0,2)));
+            workService.emptyPlateIn(pda.getDevNo(),pda.getContainerCode(),pda.getContainerType(), getUserId(),false);
+        }
+
+        return R.ok();
+    }
+
+    /*
+    绌烘澘鍑哄簱
+     */
+    @PostMapping("/pakout/empty/auth")
+    @Synchronized
+    public R pakoutEmpty(@RequestBody AgvMobileStartParam params){
+
+        for (AgvMobileStartParam.Pda pda : params.getPad()) {
+            workService.emptyPlateOut(pda.getDevNo(),pda.getContainerType(), getUserId());
+        }
+
+        return R.ok();
+    }
+
+    /*
+    绌烘澘鍑哄簱瀹瑰櫒鐮侀�夋嫨
+     */
+    @PostMapping("/pakout/empty/container/selector/auth")
+    public R containerType(@RequestBody HashMap<String,String> params){
+
+        String devNo = params.get("devNo");
+        AgvBasDevp agvBasDevp = agvBasDevpService.selectById(devNo);
+
+        return R.ok(agvLocMastService.queryContainerTypeByLocType1(agvBasDevp.getLocType1()));
+
+    }
+
 
 }

--
Gitblit v1.9.1