From 700059de6ffbe956e6546e74aac9a1f0cd6f2663 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 27 三月 2023 11:15:14 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 34 +---------------------------------
1 files changed, 1 insertions(+), 33 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index ebd138e..0ead33d 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -540,39 +540,7 @@
int row = getRow(locNoKong);
int bay = getBay(locNoKong);
int lev = getLev(locNoKong);
- if (!(row==4 || row==5)){
- if (row>5){
- locMasts=locMastService.selectList(new EntityWrapper<LocMast>().ge("row1", 5).le("row1", row)
- .eq("bay1",bay).eq("lev1",lev));
- for (LocMast locMast1:locMasts){
- if (locMast1.getRow1()<row){
- if (!locMast1.getLocSts().equals("O")){
- if (param.getLocNos().contains(locMast1.getLocNo())){
- continue;
- }
- sign=true;
- th="搴撲綅鍙凤細"+locNoKong+" 娴呭簱浣嶆湁闈炵┖搴撲綅锛�";
- break;
- }
- }
- }
- }else {
- locMasts=locMastService.selectList(new EntityWrapper<LocMast>().le("row1", 4).ge("row1", row)
- .eq("bay1",bay).eq("lev1",lev));
- for (LocMast locMast1:locMasts){
- if (locMast1.getRow1()>row){
- if (!locMast1.getLocSts().equals("O")){
- if (param.getLocNos().contains(locMast1.getLocNo())){
- continue;
- }
- sign=true;
- th="搴撲綅鍙凤細"+locNoKong+" 娴呭簱浣嶆湁闈炵┖搴撲綅锛�";
- break;
- }
- }
- }
- }
- }
+
}
if (sign){
throw new CoolException("鍑哄簱澶辫触锛�"+th);
--
Gitblit v1.9.1