From ca8f5a8f133e7f5b00b9d35ff6d15720804569af Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期三, 31 一月 2024 10:15:32 +0800
Subject: [PATCH] Merge branch 'ryzhwcs' of http://47.97.1.152:5880/r/zy-wcs into ryzhwcs
---
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..151707c 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