From dfce0d94a7ed3fa1fe324359a788f0ad2f781803 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期四, 24 十一月 2022 15:37:12 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index e87acc2..496755b 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -130,12 +130,12 @@
curRow = 8;
break;
case 8:
- curRow = 10;
+ curRow = 11;
break;
- case 10:
- curRow = 12;
+ case 11:
+ curRow = 13;
break;
- case 12:
+ case 13:
curRow = 3;
break;
case 3:
@@ -148,12 +148,12 @@
curRow = 9;
break;
case 9:
- curRow = 11;
+ curRow = 12;
break;
- case 11:
- curRow = 13;
+ case 12:
+ curRow = 14;
break;
- case 13:
+ case 14:
curRow = 2;
break;
}
@@ -198,13 +198,13 @@
Integer ruleId = Integer.parseInt(Parameter.get().getFindLocRule());
if (ruleId == 0){//榛樿瑙勫垯
- locMast = locMastService.queryFreeLocMast(1, locTypeDto.getLocType1());
+ locMast = locMastService.queryFreeLocMast(2, locTypeDto.getLocType1());
} else if (ruleId == 1){ //鎸夋祴璇曡澶囨帓搴忥紝浼樺厛鎺掓弧鍗曞彴璁惧
- locMast = locMastService.queryFreeLocMast1(1, locTypeDto.getLocType1());
+ locMast = locMastService.queryFreeLocMast1(2, locTypeDto.getLocType1());
} else if (ruleId == 2){//鎸夐�氶亾鎺掑簭锛屽潎鍖�鍒嗛厤姣忓彴璁惧
- locMast = locMastService.queryFreeLocMast2(1, locTypeDto.getLocType1(), curRow);
+ locMast = locMastService.queryFreeLocMast2(2, locTypeDto.getLocType1(), curRow);
} else {
- locMast = locMastService.queryFreeLocMast(1, locTypeDto.getLocType1());
+ locMast = locMastService.queryFreeLocMast(2, locTypeDto.getLocType1());
}
}
--
Gitblit v1.9.1