From 536ac7042e063ec9b9d370d6cd973d5c0b48e4fc Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 19 十二月 2023 17:15:57 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/task/TaskLogScheduler.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
index 1620332..627c146 100644
--- a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
+++ b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
@@ -72,7 +72,7 @@
                     taskOverToWms.setSourceLocationCode(taskWrk.getOriginStartPoint()); //婧愬簱浣�
                     //鍒ゆ柇鎵樼洏鏄惁璧板埌鍑哄簱绔�
                     BasDevp basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no", taskWrk.getTargetPoint()));
-                    if (!basDevp.getWrkNo().equals(taskWrk.getWrkNo())){
+                    if (!basDevp.getWrkNo().equals(taskWrk.getWrkNo()) && !basDevp.getOutEnable().equals("Y")){
                         continue;
                     }
                 } else if (taskWrk.getIoType() ==3) {
@@ -93,7 +93,7 @@
                     locMast2.setBarcode(taskWrk.getBarcode());//鎵樼洏鐮�
                     locMast2.setModiTime(now);
                     locMast2.setModiUser(9999L);
-                    locMastService.updateById(locMast);
+                    locMastService.updateById(locMast2);
                 }
 
                 taskOverToWms.setTaskStatus("done"); //浠诲姟鐘舵��

--
Gitblit v1.9.1