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/AgvBasDevpController.java |   49 ++++++++++++++++++++++++++++---------------------
 1 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java b/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java
index 66f5101..1d493bc 100644
--- a/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java
@@ -6,7 +6,10 @@
 import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.core.annotations.ManagerAuth;
-import com.core.common.*;
+import com.core.common.BaseRes;
+import com.core.common.Cools;
+import com.core.common.DateUtils;
+import com.core.common.R;
 import com.core.exception.CoolException;
 import com.zy.asrs.entity.*;
 import com.zy.asrs.entity.param.LocMastInitParam;
@@ -15,7 +18,6 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.io.IOException;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -238,26 +240,31 @@
 //            return agvWrkMast;
 //        }).collect(Collectors.toList());
 
-        try {
-           int code = agvWrkMastService.containerMoveOut(agvWrkMastList);
-           if(code == 0){
-               //灏嗗伐浣滃厷鐘舵�佹敼涓哄鍣ㄧ鍦�
-               agvWrkMastList.forEach(agvWrkMast -> {
-                   agvWrkMast.setWrkSts(206L);
-                   agvWrkMastService.updateById(agvWrkMast);
-               });
-               //淇敼绔欑偣鐘舵��
-//               devNos.forEach(devNo -> {
-//                   AgvBasDevp agvBasDevp = agvBasDevpService.selectById(devNo);
-//                   agvBasDevp.setBarcode("");
-//                   agvBasDevp.setLocSts("O");
-//                   agvBasDevpService.updateById(agvBasDevp);
+        agvWrkMastList.forEach(agvWrkMast -> {
+            agvWrkMast.setWrkSts(206L);
+            agvWrkMastService.updateById(agvWrkMast);
+        });
+
+//        try {
+//           int code = agvWrkMastService.containerMoveOut(agvWrkMastList);
+//           if(code == 0){
+//               //灏嗗伐浣滃厷鐘舵�佹敼涓哄鍣ㄧ鍦�
+//               agvWrkMastList.forEach(agvWrkMast -> {
+//                   agvWrkMast.setWrkSts(206L);
+//                   agvWrkMastService.updateById(agvWrkMast);
 //               });
-           }
-        } catch (IOException e) {
-            e.printStackTrace();
-            return R.error("瀹瑰櫒绂诲満澶辫触");
-        }
+//               //淇敼绔欑偣鐘舵��
+////               devNos.forEach(devNo -> {
+////                   AgvBasDevp agvBasDevp = agvBasDevpService.selectById(devNo);
+////                   agvBasDevp.setBarcode("");
+////                   agvBasDevp.setLocSts("O");
+////                   agvBasDevpService.updateById(agvBasDevp);
+////               });
+//           }
+//        } catch (IOException e) {
+//            e.printStackTrace();
+//            return R.error("瀹瑰櫒绂诲満澶辫触");
+//        }
 
         return R.ok("瀹瑰櫒绂诲満鎴愬姛");
     }

--
Gitblit v1.9.1