From e90dba0edc93be26e1509cfb2ec1d0681eb86e48 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 27 八月 2025 08:37:04 +0800
Subject: [PATCH] 合并出库添加日志

---
 src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java b/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
index b59aa03..bce6969 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
@@ -276,6 +276,18 @@
                 }
                 break;
         }
+        try {
+            Config config = configService.selectOne(new EntityWrapper<Config>().eq("code", "BARCODE"));
+            boolean flag = false;
+            if (!Cools.isEmpty(config)) {
+                flag = config.getValue().equals("Y");
+            }
+            if (!Cools.isEmpty(agvWrkMast.getBarcode()) && flag) {
+                agvTaskCreateParam.setPodCode(agvWrkMast.getBarcode());
+            }
+        }catch (Exception e){
+
+        }
         agvTaskCreateParam.setPositionCodePath(agvTaskParamList);
 
     }
@@ -299,7 +311,7 @@
             } else if (sourceLocNo.endsWith("01F1") && !locNo.startsWith("YZ") && locNo.endsWith("F4")) {
                 // 浠庡惛濉戜竴妤肩殑搴撲綅鍒板惛濉戜簩妤肩殑鐐逛綅涓�
                 return true;
-            }else if (sourceLocNo.endsWith("02F1") && !locNo.startsWith("YZ") && locNo.endsWith("F1")) {
+            } else if (sourceLocNo.endsWith("02F1") && !locNo.startsWith("YZ") && locNo.endsWith("F1")) {
                 // 浠庡惛濉慹r妤肩殑kuwei鍒板惛濉戜竴妤肩殑dianwei
                 return true;
             }
@@ -313,7 +325,7 @@
             } else if (sourceLocNo.endsWith("F4") && locNo.startsWith("YZ") && locNo.endsWith("01F1")) {
                 // 浠庡惛濉戜簩妤肩殑鐐逛綅鍒板惛濉戜竴妤肩殑搴撲綅
                 return true;
-            }else if (sourceLocNo.endsWith("F1") && locNo.startsWith("YZ") && locNo.endsWith("02F1")) {
+            } else if (sourceLocNo.endsWith("F1") && locNo.startsWith("YZ") && locNo.endsWith("02F1")) {
                 // 浠庡惛濉戜簩妤肩殑鐐逛綅鍒板惛濉戜竴妤肩殑搴撲綅
                 return true;
             }

--
Gitblit v1.9.1