From 91d05844fa5d170face76455d38a330f24e214bc Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期四, 03 十一月 2022 13:58:26 +0800
Subject: [PATCH] Merge branch 'bfasrs' of http://47.97.1.152:5880/r/zy-asrs into bfasrs
---
src/main/java/com/zy/asrs/controller/LocMastController.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java
index 96adfe8..58a0432 100644
--- a/src/main/java/com/zy/asrs/controller/LocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -107,6 +107,10 @@
return R.error();
}
+ if (!locMast.getLocSts().equals("F") && !Cools.isEmpty(locMast.getFrozen()) && locMast.getFrozen() == 1) {
+ return R.error("搴撳瓨鍦ㄥ簱鐘舵�佹墠鑳藉喕缁�");
+ }
+
WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
.eq("source_loc_no", locMast.getLocNo())
.or().eq("loc_no", locMast.getLocNo()));
--
Gitblit v1.9.1