From 51e993132a1c078912942374fef35cc7d880f28e Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期二, 09 四月 2024 23:09:51 +0800
Subject: [PATCH] # 新增 一键组托 + 启动入库 接口

---
 src/main/java/com/zy/asrs/controller/AgvMobileController.java |   20 +++++++++++++-------
 1 files changed, 13 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 ed483cf..f59f308 100644
--- a/src/main/java/com/zy/asrs/controller/AgvMobileController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
@@ -9,6 +9,7 @@
 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;
@@ -43,10 +44,8 @@
     locno锛熺粍鎵�+缁戝畾鏆傚瓨浣� 锛� 缁勬墭
      */
     @PostMapping("/comb/auth")
-    public R comb(@RequestBody List<CombParam> combParams){
-        combParams.forEach(combParam -> {
-            agvMobileService.comb(combParam, getUserId());
-        });
+    public R comb(@RequestBody CombParam combParam){
+        agvMobileService.comb(combParam, getUserId());
 
         return R.ok();
     }
@@ -105,11 +104,18 @@
     */
     @PostMapping("/start/pakin/auth")
     @Synchronized
+    @Transactional
     public R startPakin(@RequestBody AgvMobileStartPakin params){
         // 缁勬墭
-        params.getCombParams().forEach(combParam -> {
-            agvMobileService.comb(combParam,getUserId());
-        });
+        try {
+            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);
+        } catch (Exception e) {
+            return R.error("鐢熸垚宸ヤ綔妗f垚鍔�");
+        }
 
         return R.ok("鐢熸垚宸ヤ綔妗f垚鍔�");
     }

--
Gitblit v1.9.1