From 552ac762162b3d01744e684234add93effe5b666 Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期三, 23 八月 2023 10:50:28 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmIOService.java | 2 +-
Source/UBCS/ubcs-service-api/ubcs-applyjtcodeservice-api/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feign/IMdmInterJtClient.java | 4 ++--
Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/Scheduling/DockingApplyGroupCodeSyncScheduling.java | 4 ++--
Source/UBCS/ubcs-service/ubcs-code/pom.xml | 7 ++++++-
Source/UBCS-WEB/src/components/code-dialog-page/maxSerialnumDialog.vue | 23 +++++++++++++++++++----
Source/UBCS-WEB/src/api/code/maxSerialNum.js | 13 +++++++++++--
6 files changed, 41 insertions(+), 12 deletions(-)
diff --git a/Source/UBCS-WEB/src/api/code/maxSerialNum.js b/Source/UBCS-WEB/src/api/code/maxSerialNum.js
index e3b2db8..7b0a452 100644
--- a/Source/UBCS-WEB/src/api/code/maxSerialNum.js
+++ b/Source/UBCS-WEB/src/api/code/maxSerialNum.js
@@ -1,9 +1,18 @@
import request from '@/router/axios';
+// 鐮佹
export const getCodePrice = (data) => {
return request({
- url: '/api/ubcs-code/ubcs-code/mdmRule/getCodeRuleAndBasicSecByRuleOid',
+ url: '/api/ubcs-code/ubcs-code/codeBasicSecController/getCodeRuleAndBasicSecByRuleOid',
method: 'get',
params: data
})
-}
\ No newline at end of file
+}
+// //淇濆瓨鏈�澶ф祦姘村彿
+// export const saveMaxSerialNum = (data) => {
+// return request({
+// url: '/api/ubcs-code/ubcs-code/codeBasicSecController/getCodeRuleAndBasicSecByRuleOid',
+// method: 'post',
+// data: data
+// })
+// }
\ No newline at end of file
diff --git a/Source/UBCS-WEB/src/components/code-dialog-page/maxSerialnumDialog.vue b/Source/UBCS-WEB/src/components/code-dialog-page/maxSerialnumDialog.vue
index 9998cb7..d0a25f4 100644
--- a/Source/UBCS-WEB/src/components/code-dialog-page/maxSerialnumDialog.vue
+++ b/Source/UBCS-WEB/src/components/code-dialog-page/maxSerialnumDialog.vue
@@ -1,17 +1,26 @@
<template>
- <el-dialog title="鏈�澶ф祦姘村彿" width="30%" append-to-body="true" :visible.sync="visible">
+ <el-dialog title="鏈�澶ф祦姘村彿" width="30%" append-to-body="true" :visible.sync="dialogVisible">
+ <el-form :label-position="right" label-width="80px" :model="formModel">
+ <el-form-item label="娴佹按鍙�">
+ <el-input v-model="formModel.maxSecNum"></el-input>
+ </el-form-item>
+ </el-form>
<el-tabs v-model="activeName" type="border-card" @tab-click="handleClick">
<el-tab-pane label="鏈�澶ф祦姘村彿" name="codeApply">
- <form-template v-bind="$attrs" type="add" :selfColumnType="selfColumnType" :selfColumnConfig="selfColumnConfig"
- ref="CodeApply" @getFormData="getCodeApplyFormData"
+ <form-template v-bind="$attrs" type="add" :selfColumnType="selfColumnType"
+ :selfColumnConfig="selfColumnConfig" ref="CodeApply" @getFormData="getCodeApplyFormData"
@referConfigDataUpdate="referConfigDataUpdate"></form-template>
</el-tab-pane>
</el-tabs>
+ <div slot="footer" class="dialog-footer">
+ <el-button @click="dialogVisible = false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="dialogVisible = false">纭� 瀹�</el-button>
+ </div>
</el-dialog>
</template>
<script>
import FormTemplate from "@/components/FormTemplate/FormTemplate";
-import { getCodePrice } from "@/api/code/maxSerialNum.js"
+import { getCodePrice ,saveMaxSerialNum} from "@/api/code/maxSerialNum.js"
export default {
name: 'maxSerialnumDialog',
components: {
@@ -51,6 +60,11 @@
activeName: 'codePrice',
codeApplyForm: {},
secVOList: [],
+ formModel: {
+ maxSecNum: '',
+ codeRuleOid: this.ruleOid,
+ secDTOList: []
+ },
selfColumnType: {
codefixedsec: "combox",
codeclassifysec: "refer",
@@ -86,6 +100,7 @@
}
},
methods: {
+ // 鑾峰彇鐮佹
async apiGetCode() {
const response = await getCodePrice({ ruleOid: this.ruleOid })
const res = response.data
diff --git a/Source/UBCS/ubcs-service-api/ubcs-applyjtcodeservice-api/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feign/IMdmInterJtClient.java b/Source/UBCS/ubcs-service-api/ubcs-applyjtcodeservice-api/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feign/IMdmInterJtClient.java
index 7882b0c..9cedde4 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-applyjtcodeservice-api/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feign/IMdmInterJtClient.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-applyjtcodeservice-api/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feign/IMdmInterJtClient.java
@@ -32,7 +32,7 @@
* @return 杩斿洖瀛樺偍鏄惁鎴愬姛淇℃伅
*/
@GetMapping(APPLYGROUPCODE)
- public R applyGroupCode(String oids,String btmName);
+ public R applyGroupCode(@RequestParam("oids")String oids,@RequestParam("btmName")String btmName);
/***
@@ -42,7 +42,7 @@
* @return 杩斿洖瀛樺偍鏄惁鎴愬姛淇℃伅
*/
@PostMapping(RECEIVE_EDITAPPLY)
- public R receiveEditApply(String oids,String btmName);
+ public R receiveEditApply(@RequestParam("oids")String oids,@RequestParam("btmName")String btmName);
/***
* 灏嗛泦鍥㈢敵璇锋垚鍔熺殑缂栫爜瀛樺叆鐩稿叧鏁版嵁涔嬩腑
diff --git a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/Scheduling/DockingApplyGroupCodeSyncScheduling.java b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/Scheduling/DockingApplyGroupCodeSyncScheduling.java
index 4b5b57b..b89743d 100644
--- a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/Scheduling/DockingApplyGroupCodeSyncScheduling.java
+++ b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/Scheduling/DockingApplyGroupCodeSyncScheduling.java
@@ -20,8 +20,8 @@
@Slf4j
public class DockingApplyGroupCodeSyncScheduling {
- @Resource
- private IGroupCodeDuckingSyncService groupCodeDuckingSyncService;
+// @Resource
+ //private IGroupCodeDuckingSyncService groupCodeDuckingSyncService;
@Value("${apply.groupCode.isStart:false}")
public boolean APPLY_GRUPCODE_SYNC_ISSTARE;
diff --git a/Source/UBCS/ubcs-service/ubcs-code/pom.xml b/Source/UBCS/ubcs-service/ubcs-code/pom.xml
index 319b461..ab5623a 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/pom.xml
+++ b/Source/UBCS/ubcs-service/ubcs-code/pom.xml
@@ -154,7 +154,12 @@
<artifactId>ubcs-file-api</artifactId>
<version>3.0.1.RELEASE</version>
</dependency>
-
+ <dependency>
+ <groupId>com.vci.ubcs</groupId>
+ <artifactId>ubcs-applyjtcodeservice-api</artifactId>
+ <version>3.0.1.RELEASE</version>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmIOService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmIOService.java
index 82dab4b..897b2e7 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmIOService.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmIOService.java
@@ -110,5 +110,5 @@
* @param resultDataObjectDetailDOs 閿欒淇℃伅
* @return 鏈夐敊璇俊鎭殑excel
*/
- void batchSyncApplyCode(CodeOrderDTO orderDTO, DataObjectVO dataObjectVO, LinkedList<XMLResultDataObjectDetailDO> resultDataObjectDetailDOs,boolean isCodeOrGroupCode);
+ void batchSyncApplyCode(CodeOrderDTO orderDTO, DataObjectVO dataObjectVO, LinkedList<XMLResultDataObjectDetailDO> resultDataObjectDetailDOs);
}
--
Gitblit v1.9.3