From c22edcc5e29212dfa3e7b629c45ba00c30f310f8 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 31 五月 2024 16:01:34 +0800
Subject: [PATCH] #1

---
 src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java |   28 ++++++++--------------------
 1 files changed, 8 insertions(+), 20 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 63ae367..2ddd2f1 100644
--- a/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
@@ -71,14 +71,17 @@
             agvWrkMastService.updateById(agvWrkMast);
             // 绌烘澘鍏ュ簱 璁剧疆搴撲綅鐘舵�佷负D.绌烘《/绌烘爤鏉�
             String locSts = agvWrkMast.getIoType() == 10 ? "D" : "F";
+
+            if (agvWrkMast.getIoType() != 111) {
+                //鐢熸垚AGV宸ヤ綔鍘嗗彶妗�
+                agvWrkMastLogService.save(agvWrkMast);
+                //鐢熸垚AGV宸ヤ綔鏄庣粏鍘嗗彶妗�
+                agvWrkDetlLogService.save(wrkNo);
+            }
+
             switch (agvWrkMast.getIoType()){
                 case 10:
                     agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(),"D",agvWrkMast.getBarcode(),agvWrkMast.getWhsType().shortValue());
-
-                    //鐢熸垚AGV宸ヤ綔鍘嗗彶妗�
-                    agvWrkMastLogService.save(agvWrkMast);
-                    //鐢熸垚AGV宸ヤ綔鏄庣粏鍘嗗彶妗�
-                    agvWrkDetlLogService.save(wrkNo);
                     break;
                 case 109:
                     // 搴撲綅 -- 鎺ラ┏浣� / 搴撲綅
@@ -88,12 +91,6 @@
                     } else {
                         agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(),"D",agvWrkMast.getBarcode(),agvWrkMast.getWhsType().shortValue());
                     }
-
-                    //鐢熸垚AGV宸ヤ綔鍘嗗彶妗�
-                    agvWrkMastLogService.save(agvWrkMast);
-                    //鐢熸垚AGV宸ヤ綔鏄庣粏鍘嗗彶妗�
-                    agvWrkDetlLogService.save(wrkNo);
-
                     // 鎺ラ┏浣� -- 搴撲綅
                     if (agvWrkMast.getSourceLocNo().substring(0,2).equals("DB")) {
                         agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(),"O","",(short)0);
@@ -123,12 +120,6 @@
                     break;
                 case 113:
                     agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(),"D",agvWrkMast.getBarcode(),agvWrkMast.getWhsType().shortValue());
-
-                    //鐢熸垚AGV宸ヤ綔鍘嗗彶妗�
-                    agvWrkMastLogService.save(agvWrkMast);
-                    //鐢熸垚AGV宸ヤ綔鏄庣粏鍘嗗彶妗�
-                    agvWrkDetlLogService.save(wrkNo);
-
                     // 鎺ラ┏浣� -- 搴撲綅
                     if (agvWrkMast.getSourceLocNo().substring(0,2).equals("DB")) {
                         agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(),"O","",(short)0);
@@ -179,9 +170,6 @@
                 default:
                     return null;
             }
-
-
-
             if (agvWrkMast.getIoType() != 111) {
                 //鍒犻櫎AGV宸ヤ綔妗�
                 agvWrkMastService.deleteById(wrkNo);

--
Gitblit v1.9.1