From 07fc18f77a9764bd47857e30d65abc03cc1e439c Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期五, 08 十一月 2024 16:21:56 +0800
Subject: [PATCH] Merge branch 'phyzwms2' into phyzasrs-erp

---
 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