From 60d14252f4951b1229e5699a0aa3c993f4ad173d Mon Sep 17 00:00:00 2001
From: tzsk <Administrator@qq.com>
Date: 星期四, 25 四月 2024 23:10:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzskasrs-2' into tzskasrs-2
---
src/main/java/com/zy/asrs/controller/LocRuleController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocRuleController.java b/src/main/java/com/zy/asrs/controller/LocRuleController.java
index 234fed0..4d75e61 100644
--- a/src/main/java/com/zy/asrs/controller/LocRuleController.java
+++ b/src/main/java/com/zy/asrs/controller/LocRuleController.java
@@ -121,7 +121,7 @@
locRule.setUpdateTime(new Date());
locRuleService.updateById(locRule);
Integer locType2 = 1;//鍗曞搧鍖哄煙
- if (locRule.getMixed() == 0) {
+ if (Cools.isEmpty(locRule.getMixed()) || locRule.getMixed() == 0) {
locRuleService.updateKeepGoByMatnr(locRule.getMatnr(), locRule.getKeepGo());
}else {//娣疯浇
locRuleService.updateKeepGoByMixed(locRule.getKeepGo());
--
Gitblit v1.9.1