From 2d836c8b6a270b7007e1a2e1e9962cb9dcd8b6f6 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 01 四月 2024 14:47:36 +0800
Subject: [PATCH] 入库接驳位空板自动出库 全班出库后自动空板入库

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

diff --git a/src/main/java/com/zy/asrs/controller/AgvMobileController.java b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
index 90e71b5..23dd1e1 100644
--- a/src/main/java/com/zy/asrs/controller/AgvMobileController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
@@ -1,19 +1,19 @@
 package com.zy.asrs.controller;
 
 import com.core.common.R;
-import com.core.exception.CoolException;
 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.*;
 import com.zy.common.web.BaseController;
+import lombok.Synchronized;
 import org.springframework.beans.factory.annotation.Autowired;
 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 java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -32,6 +32,10 @@
     private AgvBasDevpService agvBasDevpService;
     @Autowired
     private AgvWorkService workService;
+    @Autowired
+    private AgvLocMastService agvLocMastService;
+    @Autowired
+    private OrderDetlService orderDetlService;
 
 
     /*
@@ -50,7 +54,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(map.get("containerType").toString());
+        agvMobileService.combBinding(barcode,stationCode,containerType);
         return R.ok("鎵樼洏缁戝畾绔欑偣鎴愬姛");
     }
 
@@ -67,24 +72,71 @@
     }
 
     /*
+    鑾峰彇杈撻�佺嚎绔欑偣
+     */
+    @PostMapping("/getBasDevp/noCacheShelves/auth")
+    public R getBasDevpByNoCacheShelves(){
+        return R.ok(agvBasDevpService.getBasDevpByNoCacheShelves());
+    }
+
+    /*
     鍚姩鍏ュ簱锛岀敓鎴愬伐浣滄。
      */
     @PostMapping("/pakin/auth")
+    @Synchronized
     public R pakin(@RequestBody Map<String,Object> map){
         List<String> devNos = (List<String>) map.get("devNo");
 
         List<AgvBasDevp> agvBasDevpList = devNos.stream().map(devNo -> {
-            AgvBasDevp agvBasDevp = agvBasDevpService.selectById(devNo);
-            if (!"F".equals(agvBasDevp.getLocSts())) {
-                throw new CoolException("褰撳墠绔欑偣璐т綅鐘舵�佷笉涓篎.鍦ㄥ簱锛岃閲嶆柊閫夋嫨");
-            }
-            return agvBasDevp;
+            return agvBasDevpService.selectById(devNo);
         }).collect(Collectors.toList());
 
-        workService.createWaitPainWrkMastStart(agvBasDevpList, getUserId());
+        workService.createWaitPainWrkMastStart(agvBasDevpList, getUserId(),false);
         
         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