From 6e4a1fa5dfb97e2ed07a9598524cead18bf3a3d7 Mon Sep 17 00:00:00 2001
From: wang..123 <brook_w@163.com>
Date: 星期三, 17 十一月 2021 14:24:06 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/LocMastController.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java
index 6aa2027..94a4820 100644
--- a/src/main/java/com/zy/asrs/controller/LocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -96,6 +96,9 @@
return R.error();
}
LocMast oldLocMast = locMastService.selectById(locMast.getLocNo());
+ if (locMast.getLocSts().equals("F") && (oldLocMast.getLocSts().equals("D") || oldLocMast.getLocSts().equals("O"))) {
+ return R.error("褰撳墠鎿嶄綔宸茶闃绘锛岃鑱旂郴绠＄悊鍛�");
+ }
// 鏈変骇鍝佹椂淇敼涓虹┖搴撲綅鎴栬�呯┖鏉垮簱浣嶏紝鍒欏垹闄ゅ簱瀛樻槑缁�
if (oldLocMast.getLocSts().equals("R") || oldLocMast.getLocSts().equals("F")) {
if (locMast.getLocSts().equals("O") || locMast.getLocSts().equals("D")) {
@@ -161,7 +164,7 @@
@RequestMapping(value = "/locMast/init/auth")
@ManagerAuth(memo = "鍒濆鍖栧簱浣�")
// @Transactional
- public R init(LocMastInitParam param) {
+ public synchronized R init(LocMastInitParam param) {
List<LocMast> list = new ArrayList<>();
for (int r=param.getStartRow(); r<=param.getEndRow(); r++){
for (int b=param.getStartBay(); b<=param.getEndBay(); b++) {
--
Gitblit v1.9.1