From bd96ecd68841a7115231131bce5ba874914b89b5 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期五, 03 一月 2025 15:33:58 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/RowLastnoMapper.xml | 2 +
src/main/java/com/zy/asrs/entity/RowLastno.java | 29 ++++++++++++++
src/main/java/com/zy/common/service/CommonService.java | 32 ++++++++++++++--
3 files changed, 59 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/RowLastno.java b/src/main/java/com/zy/asrs/entity/RowLastno.java
index 292294b..7af6058 100644
--- a/src/main/java/com/zy/asrs/entity/RowLastno.java
+++ b/src/main/java/com/zy/asrs/entity/RowLastno.java
@@ -40,6 +40,19 @@
@ApiModelProperty(value= "褰撳墠鎺掑彿")
@TableField("current_row")
private Integer currentRow;
+ /**
+ * 褰撳墠鎺掑彿
+ */
+ @ApiModelProperty(value= "褰撳墠鎺掑彿")
+ @TableField("current_row1")
+ private Integer currentRow1;
+
+ /**
+ * 褰撳墠鎺掑彿
+ */
+ @ApiModelProperty(value= "褰撳墠鎺掑彿")
+ @TableField("current_row2")
+ private Integer currentRow2;
/**
* 璧峰鎺掑彿
@@ -150,6 +163,22 @@
return currentRow;
}
+ public Integer getCurrentRow1() {
+ return currentRow1;
+ }
+
+ public void setCurrentRow1(Integer currentRow1) {
+ this.currentRow1 = currentRow1;
+ }
+
+ public Integer getCurrentRow2() {
+ return currentRow2;
+ }
+
+ public void setCurrentRow2(Integer currentRow2) {
+ this.currentRow2 = currentRow2;
+ }
+
public void setCurrentRow(Integer currentRow) {
this.currentRow = currentRow;
}
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);
}
diff --git a/src/main/resources/mapper/RowLastnoMapper.xml b/src/main/resources/mapper/RowLastnoMapper.xml
index fd58a60..a81ff99 100644
--- a/src/main/resources/mapper/RowLastnoMapper.xml
+++ b/src/main/resources/mapper/RowLastnoMapper.xml
@@ -16,6 +16,8 @@
<result column="appe_user" property="appeUser" />
<result column="appe_time" property="appeTime" />
<result column="limint_loc" property="limintLoc" />
+ <result column="current_row1" property="currentRow1" />
+ <result column="current_row2" property="currentRow2" />
</resultMap>
--
Gitblit v1.9.1