From 56016861a31cbe8660da384f7893ee669b4c7069 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 14 十一月 2023 11:45:45 +0800
Subject: [PATCH] 编码规则新增界面去掉流水依赖号,最大流水号界面排序按照码段orderNum排序

---
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java |    3 ++-
 Source/UBCS-WEB/src/views/code/code.vue                                                                      |    8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Source/UBCS-WEB/src/views/code/code.vue b/Source/UBCS-WEB/src/views/code/code.vue
index 7621a97..a033f4e 100644
--- a/Source/UBCS-WEB/src/views/code/code.vue
+++ b/Source/UBCS-WEB/src/views/code/code.vue
@@ -669,12 +669,12 @@
                 :disabled="basicSecOnlyRead"
                 style="margin-right: 20px"
               ></el-switch>
-              <el-input-number
+              <!-- <el-input-number
                 v-show="form.serialDependFlag"
                 v-model="form.serialDependOrder"
                 :readonly="basicSecOnlyRead"
                 controls-position="right"
-              ></el-input-number>
+              ></el-input-number> -->
             </el-form-item>
 
             <el-form-item :label-width="leftFormLabelWidth" label="鏄惁涓虹┖:">
@@ -1620,7 +1620,7 @@
         secType: "codefixedsec", //鐮佹绫诲瀷
         description: "", //鎻忚堪
         serialDependFlag: false, //鏄惁娴佹按渚濊禆
-        serialDependOrder: "", //娴佹按渚濊禆椤哄簭
+        //serialDependOrder: "", //娴佹按渚濊禆椤哄簭
         nullableFlag: false, //鏄惁涓虹┖
         prefixCode: "", //鍓嶇紑
         suffixCode: "", //鍚庣紑
@@ -3297,7 +3297,7 @@
         secType: row != null ? row.secType : this.form.secType, //鐮佹绫诲瀷
         description: row != null ? row.description : this.form.description, //鎻忚堪
         serialDependFlag: this.isNullJsonBoolean(row, this.form, 'serialDependFlag'), //鏄惁娴佹按渚濊禆
-        serialDependOrder: row != null ? row.serialDependOrder : this.form.serialDependOrder, //娴佹按渚濊禆椤哄簭
+        //serialDependOrder: row != null ? row.serialDependOrder : this.form.serialDependOrder, //娴佹按渚濊禆椤哄簭
         nullableFlag: this.isNullJsonBoolean(row, this.form, 'nullableFlag'), //鏄惁涓虹┖
         displayFlag: this.isNullJsonBoolean(row, this.form, 'displayFlag'),
         componentCodeFlag: this.isNullJsonBoolean(row, this.form, 'componentCodeFlag'), //鏄惁鍙備笌缂栫爜
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 73162d8..6592961 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
@@ -1024,7 +1024,8 @@
 				wrapper = Wrappers.<CodeBasicSec>query().lambda()
 					.eq(CodeBasicSec::getPkCodeRule,codeRuleVO.getOid())
 					.eq(CodeBasicSec::getSerialDependFlag,"true")
-					.orderByAsc(CodeBasicSec::getSerialDependOrder);
+					.orderByAsc(CodeBasicSec::getOrderNum);
+					//.orderByAsc(CodeBasicSec::getSerialDependOrder);
 				List<CodeBasicSec> codeBasicSecList = this.list(wrapper);
 				if(!CollectionUtils.isEmpty(codeBasicSecList)){
 					List<CodeBasicSecVO> codeBasicSecVOS = codeBasicSecDO2VOs(codeBasicSecList);

--
Gitblit v1.9.3