From 0cdbbb60b9549be1c99ff7d5a37936dadac61649 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期三, 27 三月 2024 10:50:30 +0800
Subject: [PATCH] AGV任务下发

---
 src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java |   72 ++++++++++++++++--------------------
 1 files changed, 32 insertions(+), 40 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 0134534..9ecfc10 100644
--- a/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
@@ -146,55 +146,47 @@
     }
 
     @Transactional
-    public ReturnT<String> startPutWayWrk(List<AgvWrkMast> agvWrkMastList) throws IOException {
+    public ReturnT<String> startPutWayWrk(AgvWrkMast agvWrkMast) throws IOException {
 
         //涓嬪彂浠诲姟
-        int startWrkCode = agvWrkMastService.startWrk(agvWrkMastList,"putaway");
+        int startWrkCode = agvWrkMastService.startWrk(agvWrkMast);
         if(startWrkCode != 0){
             throw new CoolException("浠诲姟涓嬪彂澶辫触");
         }
 
-        //涓嬪彂瀹瑰櫒鍏ュ満鎸囦护 锛堢紦瀛樿揣鏋讹級
-        int code = agvWrkMastService.containerMoveIn(agvWrkMastList);
-
-        if(code == 0){
-            for(AgvWrkMast agvWrkMast : agvWrkMastList){
-                //202.RCS鍙栬揣涓�
-                agvWrkMast.setWrkSts(202L);
-                agvWrkMastService.updateById(agvWrkMast);
-                if(agvWrkMast.getIoType() == 1){
-                    //淇敼AGV鍏ュ簱閫氱煡妗g姸鎬佸叆鍑虹姸鎬佷负Y
-                    agvWaitPakinService.updateIoStatus(agvWrkMast.getWrkNo(),"Y");
-                }
-            }
-            return SUCCESS;
+        agvWrkMast.setWrkSts(202L);
+        agvWrkMastService.updateById(agvWrkMast);
+        if(agvWrkMast.getIoType() == 1){
+            //淇敼AGV鍏ュ簱閫氱煡妗g姸鎬佸叆鍑虹姸鎬佷负Y
+            agvWaitPakinService.updateIoStatus(agvWrkMast.getWrkNo(),"Y");
         }
-        return FAIL;
+        return SUCCESS;
+
     }
 
-    @Transactional
-    public ReturnT<String> startCarryWrk(List<AgvWrkMast> agvWrkMastList) throws IOException {
-        //log.info(agvWrkMastList.toString());
-        //浠诲姟杩囨护锛岃繃婊ゆ帀宸插瓨鍦ㄧ浉鍚岀洰鏍囧簱浣嶇殑宸ヤ綔妗�
-        //agvWrkMastList = filter(agvWrkMastList);
-        int code = agvWrkMastService.startWrk(agvWrkMastList,"carry");
-        //log.info(agvWrkMastList.toString());
-        if (Cools.isEmpty(agvWrkMastList)){
-            return SUCCESS;
-        }
-        if(code == 0){
-            agvWrkMastList.forEach(agvWrkMast -> {
-                //202.RCS鍙栬揣涓�
-                agvWrkMast.setWrkSts(202L);
-                agvWrkMastService.updateById(agvWrkMast);
-            });
-            //agvWrkMastService.updateBatchById(agvWrkMastList);
-
-            return SUCCESS;
-        }
-
-        return FAIL;
-    }
+//    @Transactional
+//    public ReturnT<String> startCarryWrk(AgvWrkMast agvWrkMast) throws IOException {
+//        //log.info(agvWrkMastList.toString());
+//        //浠诲姟杩囨护锛岃繃婊ゆ帀宸插瓨鍦ㄧ浉鍚岀洰鏍囧簱浣嶇殑宸ヤ綔妗�
+//        //agvWrkMastList = filter(agvWrkMastList);
+//        int code = agvWrkMastService.startWrk(agvWrkMast);
+//        //log.info(agvWrkMastList.toString());
+//        if (Cools.isEmpty(agvWrkMastList)){
+//            return SUCCESS;
+//        }
+//        if(code == 0){
+//            agvWrkMastList.forEach(agvWrkMast -> {
+//                //202.RCS鍙栬揣涓�
+//                agvWrkMast.setWrkSts(202L);
+//                agvWrkMastService.updateById(agvWrkMast);
+//            });
+//            //agvWrkMastService.updateBatchById(agvWrkMastList);
+//
+//            return SUCCESS;
+//        }
+//
+//        return FAIL;
+//    }
 
     @Synchronized
     @Transactional

--
Gitblit v1.9.1