From 0a4ea7cdbed12150e567ffb44add77a717c80f60 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期三, 10 四月 2024 23:41:45 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/controller/AgvMobileController.java |   91 ++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 84 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/AgvMobileController.java b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
index d7b10ae..621356c 100644
--- a/src/main/java/com/zy/asrs/controller/AgvMobileController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
@@ -2,17 +2,20 @@
 
 import com.core.common.R;
 import com.zy.asrs.entity.AgvBasDevp;
+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.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.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 java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -31,6 +34,10 @@
     private AgvBasDevpService agvBasDevpService;
     @Autowired
     private AgvWorkService workService;
+    @Autowired
+    private AgvLocMastService agvLocMastService;
+    @Autowired
+    private OrderDetlService orderDetlService;
 
 
     /*
@@ -38,8 +45,9 @@
      */
     @PostMapping("/comb/auth")
     public R comb(@RequestBody CombParam combParam){
-        String message = agvMobileService.comb(combParam, 1l);
-        return R.ok(message);
+        agvMobileService.comb(combParam, getUserId());
+
+        return R.ok();
     }
 
     /*
@@ -49,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("鎵樼洏缁戝畾绔欑偣鎴愬姛");
     }
 
@@ -66,9 +75,18 @@
     }
 
     /*
+    鑾峰彇杈撻�佺嚎绔欑偣
+     */
+    @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");
 
@@ -76,10 +94,69 @@
             return agvBasDevpService.selectById(devNo);
         }).collect(Collectors.toList());
 
-        workService.createWaitPainWrkMastStart(agvBasDevpList, getUserId());
+        workService.createWaitPainWrkMastStart(agvBasDevpList, getUserId(),false);
         
         return R.ok("鐢熸垚宸ヤ綔妗ｆ垚鍔�");
     }
 
+    /*
+    鍚姩鍏ュ簱锛岀粍鎵� + 鐢熶骇宸ヤ綔妗�
+    */
+    @PostMapping("/start/pakin/auth")
+    @Synchronized
+    @Transactional
+    public R startPakin(@RequestBody AgvMobileStartPakin params){
+        // 缁勬墭
+        params.getCombParams().forEach(combParam -> {
+            agvMobileService.comb(combParam,getUserId());
+        });
+        params.setContainerType(Short.valueOf(params.getContainerCode().substring(0,2)));
+        workService.emptyPlateIn(params.getDevNo(),params.getContainerCode(),params.getContainerType(), 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