From bd96ecd68841a7115231131bce5ba874914b89b5 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期五, 03 一月 2025 15:33:58 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 32 ++++++++++++++++++++++++++++----
1 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 6878aec..8036cd6 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -160,7 +160,13 @@
throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�");
}
// ===============>>>> 寮�濮嬫墽琛�
- curRow = rowLastno.getCurrentRow();
+ if (sourceStaNo == 118 || sourceStaNo == 122){
+ curRow = rowLastno.getCurrentRow1();
+ } else if (sourceStaNo == 120 || sourceStaNo == 121 || sourceStaNo == 123 || sourceStaNo == 171){
+ curRow = rowLastno.getCurrentRow2();
+ } else {
+ curRow = rowLastno.getCurrentRow();
+ }
if (!Cools.isEmpty(moveCrnNo) && moveCrnNo!=0){
crnNumber = moveCrnNo;
@@ -330,7 +336,13 @@
// 鏇存柊搴撲綅鎺掑彿
if (Utils.BooleanWhsTypeSta(whsType, staDescId) && Cools.isEmpty(locMast)) {
- rowLastno.setCurrentRow(curRow);
+ if (sourceStaNo == 118 || sourceStaNo == 122){
+ rowLastno.setCurrentRow1(curRow);
+ } else if (sourceStaNo == 120 || sourceStaNo == 121 || sourceStaNo == 123 || sourceStaNo == 171){
+ rowLastno.setCurrentRow2(curRow);
+ } else {
+ rowLastno.setCurrentRow(curRow);
+ }
rowLastnoService.updateById(rowLastno);
}
@@ -427,7 +439,13 @@
throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�");
}
// ===============>>>> 寮�濮嬫墽琛�
- curRow = rowLastno.getCurrentRow();
+ if (sourceStaNo == 118 || sourceStaNo == 122){
+ curRow = rowLastno.getCurrentRow1();
+ } else if (sourceStaNo == 120 || sourceStaNo == 121 || sourceStaNo == 123 || sourceStaNo == 171){
+ curRow = rowLastno.getCurrentRow2();
+ } else {
+ curRow = rowLastno.getCurrentRow();
+ }
if (!Cools.isEmpty(moveCrnNo) && moveCrnNo!=0){
crnNumber = moveCrnNo;
@@ -601,7 +619,13 @@
// 鏇存柊搴撲綅鎺掑彿
if (Utils.BooleanWhsTypeSta(whsType, staDescId) && Cools.isEmpty(locMast)) {
- rowLastno.setCurrentRow(curRow);
+ if (sourceStaNo == 118 || sourceStaNo == 122){
+ rowLastno.setCurrentRow1(curRow);
+ } else if (sourceStaNo == 120 || sourceStaNo == 121 || sourceStaNo == 123 || sourceStaNo == 171){
+ rowLastno.setCurrentRow2(curRow);
+ } else {
+ rowLastno.setCurrentRow(curRow);
+ }
rowLastnoService.updateById(rowLastno);
}
--
Gitblit v1.9.1