Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs

 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
  })
}
}
// //保存最大流水号
// export const saveMaxSerialNum = (data) => {
//     return request({
//       url: '/api/ubcs-code/ubcs-code/codeBasicSecController/getCodeRuleAndBasicSecByRuleOid',
//       method: 'post',
//       data: data
//     })
//   }

 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

 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);

    /***
     * 将集团申请成功的编码存入相关数据之中

 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;

 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>

 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);
}