From 04406757acdcf5cca2215adc390bca42ccd8bf3a Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期五, 07 二月 2025 14:58:04 +0800
Subject: [PATCH] Merge branch 'phyzasrs-erp' into phyzasrs-erp-4
---
src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
index 41dc775..ddb7f00 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
@@ -876,11 +876,11 @@
agvWrkMast.setModiTime(now);
agvWrkMast.setIoTime(now);
// 鎵撴爣璁帮紝鑻ュ簱浣嶄笉澶燂紝鍏ュ簱鍒板埆鐨勬ゼ灞傦紝閭ｄ箞闇�瑕佽法灞傜Щ搴�
- if (!Cools.isEmpty(factory)){
- if (newLocMast.getLev1() == 1 && factory.equals(AsrsConstants.SANCHANG)) {
- agvWrkMast.setPacked("1");
- } else if (newLocMast.getLev1() == 2 && factory.equals(AsrsConstants.ERCHANG)) {
- agvWrkMast.setPacked("1");
+ if (!Cools.isEmpty(factory)) {
+ if (newLocMast.getLev1() == 1 && !factory.equals(AsrsConstants.SANCHANG)) {
+ agvWrkMast.setCtnNo("1");
+ } else if (newLocMast.getLev1() == 2 && !factory.equals(AsrsConstants.ERCHANG)) {
+ agvWrkMast.setCtnNo("1");
}
}
if (!agvWrkMastService.update(agvWrkMast, new EntityWrapper<AgvWrkMast>().eq("wrk_no", agvWrkMast.getWrkNo()))) {
--
Gitblit v1.9.1