From aa2d520a06c371e76ef26c78d426a01fca76a2fc Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期五, 07 二月 2025 14:56:35 +0800
Subject: [PATCH] 1

---
 src/main/java/com/zy/asrs/controller/LocRuleController.java |    4 ++--
 1 files changed, 2 insertions(+), 2 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..a3daed4 100644
--- a/src/main/java/com/zy/asrs/controller/LocRuleController.java
+++ b/src/main/java/com/zy/asrs/controller/LocRuleController.java
@@ -106,7 +106,7 @@
 	@ManagerAuth
     public R update(LocRule locRule){
         if (Cools.isEmpty(locRule) || null==locRule.getId()){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         if ((locRule.getRowEnd() < locRule.getRowBeg()) || locRule.getRowBeg() <= 0 || locRule.getRowEnd() <= 0) {
             return R.error("鎺掑尯闂撮敊璇�");
@@ -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