From a3b57a71be624c98bddbd1f5e3a52c9b9466986e Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 22 八月 2024 10:40:58 +0800
Subject: [PATCH] 流水值调整功能bug修改。历史数据导入多个流水时，最大流水起始值未正确更新bug修复

---
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java
index f4ed16f..cf3caef 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java
@@ -1069,7 +1069,8 @@
 			.eq(CodeBasicSec::getPkCodeRule,codeRuleOid)
 			.in(CodeBasicSec::getOid,codeBasicSecOidList)
 			.eq(CodeBasicSec::getSerialDependFlag,"true")
-			.orderByAsc(CodeBasicSec::getSerialDependOrder);
+			//TODO: SerialDependOrder鏈潵鏄敤鏉ユ祦姘存帓搴忕殑锛屼絾鏄幇鍦ㄧ殑閫昏緫鏄寜鐓rderuNum鎺掑簭鐨�
+			.orderByAsc(CodeBasicSec::getOrderNum); //.orderByAsc(CodeBasicSec::getSerialDependOrder);
 		List<CodeBasicSec> codeBasicSecList = this.list(wrapper);
 
 		//鎸夋祦姘翠緷璧栭『搴忥紝澶勭悊娴佹按渚濊禆鐮佹鐨勫��
@@ -1149,7 +1150,8 @@
 			.eq(CodeBasicSec::getPkCodeRule,codeRuleOid)
 			.in(CodeBasicSec::getOid,codeBasicSecOidList)
 			.eq(CodeBasicSec::getSerialDependFlag,"true")
-			.orderByAsc(CodeBasicSec::getSerialDependOrder);
+			.orderByAsc(CodeBasicSec::getOrderNum); //.orderByAsc(CodeBasicSec::getSerialDependOrder);
+
 		List<CodeBasicSec> codeBasicSecList = this.list(wrapper);
 		//鎸夋祦姘翠緷璧栭『搴忥紝澶勭悊娴佹按渚濊禆鐮佹鐨勫��
 		List<String> serialDependValueList = new ArrayList<>();

--
Gitblit v1.9.3