From e7949c7f0b4f66802003721d2e6c46797973d91b Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期五, 29 三月 2024 09:20:15 +0800
Subject: [PATCH] 初始化库位和站点

---
 src/main/java/com/zy/asrs/controller/AgvMobileController.java |   84 ++++++++++++++++++++++++++++++++++++-----
 1 files changed, 73 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 2ee810a..cc87a8f 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,22 +32,36 @@
     private AgvBasDevpService agvBasDevpService;
     @Autowired
     private AgvWorkService workService;
+    @Autowired
+    private AgvLocMastService agvLocMastService;
+    @Autowired
+    private OrderDetlService orderDetlService;
 
 
+    /*
+    locno锛熺粍鎵�+缁戝畾鏆傚瓨浣� 锛� 缁勬墭
+     */
     @PostMapping("/comb/auth")
     public R comb(@RequestBody CombParam combParam){
         String message = agvMobileService.comb(combParam, 1l);
         return R.ok(message);
     }
 
+    /*
+    缁戝畾鎵樼洏鏉＄爜涓庢殏瀛樹綅
+     */
     @PostMapping("/combBinging/auth")
     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("鎵樼洏缁戝畾绔欑偣鎴愬姛");
     }
 
+    /*
+    鑾峰彇褰撳墠宸茬粦瀹氱殑杩樻病鐢熸垚宸ヤ綔妗ｇ殑鏆傚瓨浣�
+     */
     @PostMapping("/getBasDevp/auth")
     public R getBasDevpByFloor(@RequestBody Map<String,Object> map){
         String floor = map.get("floor").toString();
@@ -57,22 +71,70 @@
         return R.error("鍙傛暟閿欒");
     }
 
+    /*
+    鑾峰彇杈撻�佺嚎绔欑偣
+     */
+    @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());
+        }
+
+        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){
+
+        Short locType = Short.valueOf(params.get("locType"));
+
+        return R.ok(agvLocMastService.queryContainerTypeByLocType1(locType));
+
+    }
 
 }

--
Gitblit v1.9.1