From b885f63a2990ece741fc6db5c55aeeae673062b3 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期二, 24 十月 2023 17:22:31 +0800
Subject: [PATCH] 输送线到AGV流程

---
 src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java |   25 +++++++++++++++++++------
 1 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
index 3a59dba..a616b3d 100644
--- a/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
@@ -3,6 +3,7 @@
 import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.core.common.Cools;
+import com.core.exception.CoolException;
 import com.zy.asrs.entity.AgvLocDetl;
 import com.zy.asrs.entity.AgvWaitPakin;
 import com.zy.asrs.entity.AgvWrkDetl;
@@ -139,12 +140,26 @@
     @Transactional
     public ReturnT<String> startPutWayWrk(List<AgvWrkMast> agvWrkMastList) throws IOException {
 
-        int startWwrkCode = agvWrkMastService.startWrk(agvWrkMastList,"putaway");
+        //涓嬪彂浠诲姟
+        int startWrkCode = agvWrkMastService.startWrk(agvWrkMastList,"putaway");
+        if(startWrkCode != 0){
+            throw new CoolException("浠诲姟涓嬪彂澶辫触");
+        }
 
-        int code = agvWrkMastService.containerMove(agvWrkMastList);
+        //涓嬪彂瀹瑰櫒鍏ュ満鎸囦护 锛堢紦瀛樿揣鏋讹級
+        int code = agvWrkMastService.containerMoveIn(agvWrkMastList);
 
         if(code == 0){
-            agvWrkMastList.forEach(agvWrkMast -> {
+            for(AgvWrkMast agvWrkMast : agvWrkMastList){
+                //涓嬪彂瀹瑰櫒杈惧埌閫氱煡 锛堣緭閫佺嚎锛�
+                if("Y".equals(agvWrkMast.getMk())){
+                    int containerArrivedCode = agvWrkMastService.containerArrived(agvWrkMast);
+                    if(containerArrivedCode != 0){
+                        log.error("瀹瑰櫒鍒拌揪鎸囦护涓嬪彂澶辫触");
+                        continue;
+                    }
+                }
+
                 //202.RCS鍙栬揣涓�
                 agvWrkMast.setWrkSts(202L);
                 agvWrkMastService.updateById(agvWrkMast);
@@ -152,9 +167,7 @@
                     //淇敼AGV鍏ュ簱閫氱煡妗g姸鎬佸叆鍑虹姸鎬佷负Y
                     agvWaitPakinService.updateIoStatus(agvWrkMast.getWrkNo(),"Y");
                 }
-
-            });
-            //agvWrkMastService.updateBatchById(agvWrkMastList);
+            }
 
             return SUCCESS;
         }

--
Gitblit v1.9.1