田源
2023-10-20 583d9ea1e8c3759a7b5ccc3cf5f53b4ebb35543a
Merge remote-tracking branch 'origin/master'
已修改6个文件
已删除4个文件
377 ■■■■ 文件已修改
Source/UBCS-WEB/dist/css/app.11d9e035.css 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS-WEB/dist/css/views.cd3521c3.css 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS-WEB/dist/index.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS-WEB/dist/js/app.a3c1e2a1.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS-WEB/dist/js/views.66ffbeb0.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeOrderSecDTO.java 61 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/attrmap/xxx.json 36 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeBasicSecController.java 267 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS-WEB/dist/css/app.11d9e035.css
ÎļþÒÑɾ³ý
Source/UBCS-WEB/dist/css/views.cd3521c3.css
ÎļþÒÑɾ³ý
Source/UBCS-WEB/dist/index.html
@@ -51,4 +51,4 @@
    .avue-home__sub-title {
      color: #ABABAB;
      font-size: 12px;
    }</style><link href=/css/chunk-7bd25526.7e52be40.css rel=prefetch><link href=/css/page.e84a6fd9.css rel=prefetch><link href=/css/views.cd3521c3.css rel=prefetch><link href=/js/chunk-2d0e4caf.c02e3bd1.js rel=prefetch><link href=/js/chunk-7bd25526.f427459d.js rel=prefetch><link href=/js/page.4509ac44.js rel=prefetch><link href=/js/views.66ffbeb0.js rel=prefetch><link href=/css/app.11d9e035.css rel=preload as=style><link href=/css/chunk-vendors.e41156d0.css rel=preload as=style><link href=/js/app.a3c1e2a1.js rel=preload as=script><link href=/js/chunk-vendors.e37ddf76.js rel=preload as=script><link href=/css/chunk-vendors.e41156d0.css rel=stylesheet><link href=/css/app.11d9e035.css rel=stylesheet></head><body><noscript><strong>很抱歉,如果没有 JavaScript æ”¯æŒï¼ŒSaber å°†ä¸èƒ½æ­£å¸¸å·¥ä½œã€‚请启用浏览器的 JavaScript ç„¶åŽç»§ç»­ã€‚</strong></noscript><div id=app><div class=avue-home><div class=avue-home__main><img class=avue-home__loading src=/svg/loading-spin.svg alt=loading><div class=avue-home__title>正在加载资源</div><div class="avue-home__sub-title d">初次加载资源可能需要较多时间 è¯·è€å¿ƒç­‰å¾…</div></div></div></div><script src=/util/aes.js charset=utf-8></script><script src=/cdn/vue/2.6.10/vue.min.js charset=utf-8></script><script src=/cdn/vuex/3.1.1/vuex.min.js charset=utf-8></script><script src=/cdn/vue-router/3.0.1/vue-router.min.js charset=utf-8></script><script src=/cdn/axios/1.0.0/axios.min.js charset=utf-8></script><script src=/cdn/element-ui/2.15.6/index.js charset=utf-8></script><script src=/cdn/avue/2.9.12/avue.min.js charset=utf-8></script><script src=/cdn/nutflow/wf-design-base/index.umd.min.js charset=utf-8></script><script src=/js/chunk-vendors.e37ddf76.js></script><script src=/js/app.a3c1e2a1.js></script></body></html>
    }</style><link href=/css/chunk-7bd25526.7e52be40.css rel=prefetch><link href=/css/page.e84a6fd9.css rel=prefetch><link href=/css/views.faf96e63.css rel=prefetch><link href=/js/chunk-2d0e4caf.c02e3bd1.js rel=prefetch><link href=/js/chunk-7bd25526.f427459d.js rel=prefetch><link href=/js/page.4509ac44.js rel=prefetch><link href=/js/views.46b2b9f7.js rel=prefetch><link href=/css/app.6a689fef.css rel=preload as=style><link href=/css/chunk-vendors.e41156d0.css rel=preload as=style><link href=/js/app.a6d2752c.js rel=preload as=script><link href=/js/chunk-vendors.e37ddf76.js rel=preload as=script><link href=/css/chunk-vendors.e41156d0.css rel=stylesheet><link href=/css/app.6a689fef.css rel=stylesheet></head><body><noscript><strong>很抱歉,如果没有 JavaScript æ”¯æŒï¼ŒSaber å°†ä¸èƒ½æ­£å¸¸å·¥ä½œã€‚请启用浏览器的 JavaScript ç„¶åŽç»§ç»­ã€‚</strong></noscript><div id=app><div class=avue-home><div class=avue-home__main><img class=avue-home__loading src=/svg/loading-spin.svg alt=loading><div class=avue-home__title>正在加载资源</div><div class="avue-home__sub-title d">初次加载资源可能需要较多时间 è¯·è€å¿ƒç­‰å¾…</div></div></div></div><script src=/util/aes.js charset=utf-8></script><script src=/cdn/vue/2.6.10/vue.min.js charset=utf-8></script><script src=/cdn/vuex/3.1.1/vuex.min.js charset=utf-8></script><script src=/cdn/vue-router/3.0.1/vue-router.min.js charset=utf-8></script><script src=/cdn/axios/1.0.0/axios.min.js charset=utf-8></script><script src=/cdn/element-ui/2.15.6/index.js charset=utf-8></script><script src=/cdn/avue/2.9.12/avue.min.js charset=utf-8></script><script src=/cdn/nutflow/wf-design-base/index.umd.min.js charset=utf-8></script><script src=/js/chunk-vendors.e37ddf76.js></script><script src=/js/app.a6d2752c.js></script></body></html>
Source/UBCS-WEB/dist/js/app.a3c1e2a1.js
ÎļþÒÑɾ³ý
Source/UBCS-WEB/dist/js/views.66ffbeb0.js
ÎļþÒÑɾ³ý
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeOrderSecDTO.java
@@ -1,44 +1,51 @@
package com.vci.ubcs.code.dto;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
 * ç¼–码申请的码段相关信息
 * @author weidy
 * @date 2022-02-28
 */
@Data
@AllArgsConstructor
@NoArgsConstructor
public class CodeOrderSecDTO implements java.io.Serializable{
    /**
     * ç æ®µçš„主键
     */
    private String secOid;
    /**
     * ç æ®µçš„主键
     */
    private String secOid;
    /**
     * ç æ®µåœ¨å‰ç«¯è¾“入的内容
     */
    private String secValue;
    /**
     * ç æ®µåœ¨å‰ç«¯è¾“入的内容
     */
    private String secValue;
    public String getSecOid() {
        return secOid;
    }
    public String getSecOid() {
        return secOid;
    }
    public void setSecOid(String secOid) {
        this.secOid = secOid;
    }
    public void setSecOid(String secOid) {
        this.secOid = secOid;
    }
    public String getSecValue() {
        return secValue;
    }
    public String getSecValue() {
        return secValue;
    }
    public void setSecValue(String secValue) {
        this.secValue = secValue;
    }
    public void setSecValue(String secValue) {
        this.secValue = secValue;
    }
    @Override
    public String toString() {
        return "CodeOrderSecDTO{" +
                "secOid='" + secOid + '\'' +
                ", secValue='" + secValue + '\'' +
                '}';
    }
    @Override
    public String toString() {
        return "CodeOrderSecDTO{" +
            "secOid='" + secOid + '\'' +
            ", secValue='" + secValue + '\'' +
            '}';
    }
}
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/attrmap/xxx.json
@@ -3,34 +3,18 @@
    "classifys": {
      "classify": [
        {
          "classCode": "020201",
          "classCode": "050101",
          "fullclsfNamePath": "",
          "library": "wupin",
          "sections": {
            "section": [
              {
                "name": "固定码段2",
                "value": ""
                "name": "固定码段",
                "value": "A"
              },
              {
                "name": "分类码段父",
                "name": "引用码段",
                "value": "001"
              },
              {
                "name": "分类码段子",
                "value": "0012"
              },
              {
                "name": "可变码段",
                "value": ""
              },
              {
                "name": "test",
                "value": "7E1C92A2-9B6F-4DB3-48C7-F42D1304E36B"
              },
              {
                "name": "流水码段",
                "value": ""
              }
            ]
          },
@@ -42,18 +26,22 @@
                "status": "Released",
                "operate": "create",
                "creator": "weidy",
                "prop": []
                "prop": [{
                  "key": "name",
                  "text": "名称",
                  "value": "半圆头螺钉"
                }]
              }
            ]
          }
        }
      ]
    },
    "systemId": "MPM",
    "systemId": "ERP",
    "user": {
      "ip": "192.168.0.1",
      "trueName": "llz",
      "userName": "llz"
      "trueName": "weidy",
      "userName": "weidy"
    }
  }
}
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java
@@ -55,11 +55,15 @@
                // è®¾ç½®æ‰€æœ‰è€…
                baseModel.setOwner(AuthUtil.getUserId().toString());
            }
            baseModel.setVersionSeq(1);
            baseModel.setVersionRule("0");
            baseModel.setVersionValue("1");
            baseModel.setRevisionOid(VciBaseUtil.getPk());
            baseModel.setLastModifier(userId);
            baseModel.setRevisionValue("1");
            baseModel.setRevisionRule("1");
            baseModel.setTenantId(AuthUtil.getTenantId());
        }catch (VciBaseException e){
            e.printStackTrace();
        }
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeBasicSecController.java
@@ -4,6 +4,7 @@
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.vci.ubcs.code.dto.CodeBasicSecDTO;
import com.vci.ubcs.code.dto.CodeOrderDTO;
import com.vci.ubcs.code.dto.CodeOrderSecDTO;
import com.vci.ubcs.code.dto.CodeRuleDTO;
import com.vci.ubcs.code.entity.CodeBasicSec;
import com.vci.ubcs.code.service.ICodeBasicSecService;
@@ -15,17 +16,21 @@
import com.vci.ubcs.starter.web.util.VciBaseUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.rmi.ServerException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Map;
/**
@@ -39,144 +44,144 @@
@Api(value = "码段基础信息控制器", tags = "码段基础信息控制器")
public class CodeBasicSecController {
    /**
    * ç æ®µåŸºç¡€ä¿¡æ¯ æœåŠ¡
    */
    @Autowired
    private ICodeBasicSecService codeBasicSecService;
    /**
     * ç æ®µåŸºç¡€ä¿¡æ¯ æœåŠ¡
     */
    @Autowired
    private ICodeBasicSecService codeBasicSecService;
    /**
     * ç æ®µåŸºç¡€ä¿¡æ¯åˆ—表
     * @param bladeQueryObject åŸºç¡€æŸ¥è¯¢å¯¹è±¡ï¼ŒåŒ…含查询条件,分页,排序等
     * @return ç æ®µåŸºç¡€ä¿¡æ¯æ˜¾ç¤ºå¯¹è±¡åˆ—表
     */
    @GetMapping("/gridCodeBasicSec")
    /**
     * ç æ®µåŸºç¡€ä¿¡æ¯åˆ—表
     * @param bladeQueryObject åŸºç¡€æŸ¥è¯¢å¯¹è±¡ï¼ŒåŒ…含查询条件,分页,排序等
     * @return ç æ®µåŸºç¡€ä¿¡æ¯æ˜¾ç¤ºå¯¹è±¡åˆ—表
     */
    @GetMapping("/gridCodeBasicSec")
    @ApiOperationSupport(order = 2)
    @ApiOperation(value = "分页 ç æ®µåŸºç¡€ä¿¡æ¯åˆ—表", notes = "传入codeRuleVO")
    public R<IPage<CodeBasicSecVO>> gridCodeBasicSec(BladeQueryObject bladeQueryObject) throws Exception{
    public R<IPage<CodeBasicSecVO>> gridCodeBasicSec(BladeQueryObject bladeQueryObject) throws Exception{
        IPage<CodeBasicSecVO> codeRuleVOIPage = codeBasicSecService.gridCodeBasicSec(bladeQueryObject.getQuery().setAscs("ordernum"),bladeQueryObject.getConditionMap());
        return R.data(codeRuleVOIPage);
    }
    }
    /**
     * å¢žåŠ  ç æ®µåŸºç¡€ä¿¡æ¯
     * @param codeBasicSecDTO ç æ®µåŸºç¡€ä¿¡æ¯æ•°æ®ä¼ è¾“对象
     * @return æ‰§è¡Œç»“果,success为true表示成功,msg是失败的提示信息,obj是添加完成后的显示对象
     */
    @PostMapping( "/addSave")
     * å¢žåŠ  ç æ®µåŸºç¡€ä¿¡æ¯
     * @param codeBasicSecDTO ç æ®µåŸºç¡€ä¿¡æ¯æ•°æ®ä¼ è¾“对象
     * @return æ‰§è¡Œç»“果,success为true表示成功,msg是失败的提示信息,obj是添加完成后的显示对象
     */
    @PostMapping( "/addSave")
    @ApiOperationSupport(order = 3)
    @ApiOperation(value = "增加 ç æ®µåŸºç¡€ä¿¡æ¯", notes = "codeBasicSecDTO")
    public R addSave(@Valid @RequestBody CodeBasicSecDTO codeBasicSecDTO){
    public R addSave(@Valid @RequestBody CodeBasicSecDTO codeBasicSecDTO){
        boolean resBoolean;
        try {
        try {
            resBoolean = codeBasicSecService.addSave(codeBasicSecDTO);
        } catch (VciBaseException e) {
            return R.fail(e.getCode());
        }
        return R.status(resBoolean);
    }
            return R.fail(e.getCode());
        }
        return R.status(resBoolean);
    }
     /** ä¿®æ”¹ ç æ®µåŸºç¡€ä¿¡æ¯
     * @param codeBasicSecDTO ç æ®µåŸºç¡€ä¿¡æ¯æ•°æ®ä¼ è¾“对象
     * @return æ‰§è¡Œç»“果,success为true表示成功,msg是失败的提示信息,obj是添加完成后的显示对象
     */
    @PutMapping("/editSave")
    /** ä¿®æ”¹ ç æ®µåŸºç¡€ä¿¡æ¯
     * @param codeBasicSecDTO ç æ®µåŸºç¡€ä¿¡æ¯æ•°æ®ä¼ è¾“对象
     * @return æ‰§è¡Œç»“果,success为true表示成功,msg是失败的提示信息,obj是添加完成后的显示对象
     */
    @PutMapping("/editSave")
    @ApiOperationSupport(order = 4)
    @ApiOperation(value = "修改 ç æ®µåŸºç¡€ä¿¡æ¯", notes = "codeBasicSecDTO")
    public R editSave(@RequestBody CodeBasicSecDTO codeBasicSecDTO){
    public R editSave(@RequestBody CodeBasicSecDTO codeBasicSecDTO){
        boolean resBoolean;
        try {
        try {
            resBoolean = codeBasicSecService.editSave(codeBasicSecDTO);
        } catch (VciBaseException e) {
            return R.fail(e.getCode());
        }
        return R.status(resBoolean);
    }
    /**
     * åˆ é™¤ç æ®µåŸºç¡€ä¿¡æ¯
     * @param codeBasicSecDTO ç æ®µåŸºç¡€ä¿¡æ¯æ•°æ®ä¼ è¾“对象,oid和ts需要传输
     * @return åˆ é™¤ç»“果反馈::success:成功,fail:失败
     */
    @DeleteMapping( "/deleteData")
    @ApiOperationSupport(order = 5)
    @ApiOperation(value = "删除码段基础信息", notes = "codeBasicSecDTO")
    public R delCodeBasicSec(@Valid @RequestBody CodeBasicSecDTO codeBasicSecDTO) {
        return codeBasicSecService.deleteCodeBasicSec(codeBasicSecDTO);
    }
    /**
    * ä¸»é”®èŽ·å–ç æ®µåŸºç¡€ä¿¡æ¯
    * @param oid ä¸»é”®
    * @return ç æ®µåŸºç¡€ä¿¡æ¯æ˜¾ç¤ºå¯¹è±¡
    */
    @GetMapping("/getObjectByOid")
    @ApiOperationSupport(order = 6)
    @ApiOperation(value = "删除码段基础信息", notes = "codeBasicSecDTO")
    public R<CodeBasicSecVO> getObjectByOid(String oid){
        CodeBasicSecVO codeBasicSecVO = codeBasicSecService.getObjectByOid(oid);
        return R.data(codeBasicSecVO);
    }
            return R.fail(e.getCode());
        }
        return R.status(resBoolean);
    }
    /**
     * ä¸»é”®æ‰¹é‡èŽ·å–ç æ®µåŸºç¡€ä¿¡æ¯
     * @param oids ä¸»é”®ï¼Œå¤šä¸ªä»¥é€—号分隔,但是受性能影响,建议一次查询不超过10000个
     * @return ç æ®µåŸºç¡€ä¿¡æ¯æ˜¾ç¤ºå¯¹è±¡
     */
    @GetMapping("/listDataByOids")
     * åˆ é™¤ç æ®µåŸºç¡€ä¿¡æ¯
     * @param codeBasicSecDTO ç æ®µåŸºç¡€ä¿¡æ¯æ•°æ®ä¼ è¾“对象,oid和ts需要传输
     * @return åˆ é™¤ç»“果反馈::success:成功,fail:失败
     */
    @DeleteMapping( "/deleteData")
    @ApiOperationSupport(order = 5)
    @ApiOperation(value = "删除码段基础信息", notes = "codeBasicSecDTO")
    public R delCodeBasicSec(@Valid @RequestBody CodeBasicSecDTO codeBasicSecDTO) {
        return codeBasicSecService.deleteCodeBasicSec(codeBasicSecDTO);
    }
    /**
     * ä¸»é”®èŽ·å–ç æ®µåŸºç¡€ä¿¡æ¯
     * @param oid ä¸»é”®
     * @return ç æ®µåŸºç¡€ä¿¡æ¯æ˜¾ç¤ºå¯¹è±¡
     */
    @GetMapping("/getObjectByOid")
    @ApiOperationSupport(order = 6)
    @ApiOperation(value = "删除码段基础信息", notes = "codeBasicSecDTO")
    public R<CodeBasicSecVO> getObjectByOid(String oid){
        CodeBasicSecVO codeBasicSecVO = codeBasicSecService.getObjectByOid(oid);
        return R.data(codeBasicSecVO);
    }
    /**
     * ä¸»é”®æ‰¹é‡èŽ·å–ç æ®µåŸºç¡€ä¿¡æ¯
     * @param oids ä¸»é”®ï¼Œå¤šä¸ªä»¥é€—号分隔,但是受性能影响,建议一次查询不超过10000个
     * @return ç æ®µåŸºç¡€ä¿¡æ¯æ˜¾ç¤ºå¯¹è±¡
     */
    @GetMapping("/listDataByOids")
    @ApiOperationSupport(order = 7)
    @ApiOperation(value = "主键批量获取码段基础信息", notes = "oids")
    public R<Collection<CodeBasicSecVO>> listCodeBasicSecByOids(String oids){
    public R<Collection<CodeBasicSecVO>> listCodeBasicSecByOids(String oids){
        Collection<CodeBasicSecVO> voCollection =  codeBasicSecService.listCodeBasicSecByOids(VciBaseUtil.str2List(oids));
        return R.data(voCollection);
    }
    }
    /**
     * å‚照码段基础信息列表
     * @param bladeQueryObject åŸºç¡€æŸ¥è¯¢å¯¹è±¡ï¼ŒåŒ…含查询条件,分页,排序等
     * @return ç æ®µåŸºç¡€ä¿¡æ¯æ˜¾ç¤ºå¯¹è±¡åˆ—表,生效的内容
     */
    @GetMapping("/refDataGrid")
    /**
     * å‚照码段基础信息列表
     * @param bladeQueryObject åŸºç¡€æŸ¥è¯¢å¯¹è±¡ï¼ŒåŒ…含查询条件,分页,排序等
     * @return ç æ®µåŸºç¡€ä¿¡æ¯æ˜¾ç¤ºå¯¹è±¡åˆ—表,生效的内容
     */
    @GetMapping("/refDataGrid")
    @ApiOperationSupport(order = 8)
    @ApiOperation(value = "参照码段基础信息列表", notes = "codeBasicSecVO")
    public R<IPage<CodeBasicSecVO>> refDataGridCodeBasicSec(BladeQueryObject bladeQueryObject){
        return R.data(codeBasicSecService.refDataGridCodeBasicSec(bladeQueryObject.getQuery(), bladeQueryObject.getConditionMap()));
    }
    public R<IPage<CodeBasicSecVO>> refDataGridCodeBasicSec(BladeQueryObject bladeQueryObject){
        return R.data(codeBasicSecService.refDataGridCodeBasicSec(bladeQueryObject.getQuery(), bladeQueryObject.getConditionMap()));
    }
    /**
     * å‚数分类码段基础信息列表
     * @param bladeQueryObject åŸºç¡€æŸ¥è¯¢å¯¹è±¡ï¼ŒåŒ…含查询条件,分页,排序等,必须要有编码规则的主键 pkCodeRule
     * @return ç æ®µçš„信息
     */
    @GetMapping("/refDataGridClassifySec")
    /**
     * å‚数分类码段基础信息列表
     * @param bladeQueryObject åŸºç¡€æŸ¥è¯¢å¯¹è±¡ï¼ŒåŒ…含查询条件,分页,排序等,必须要有编码规则的主键 pkCodeRule
     * @return ç æ®µçš„信息
     */
    @GetMapping("/refDataGridClassifySec")
    @ApiOperationSupport(order = 9)
    @ApiOperation(value = "参数分类码段基础信息列表", notes = "codeBasicSecVO")
    public R<IPage<CodeBasicSecVO>> refDataGridClassifySec(BladeQueryObject bladeQueryObject){
        return R.data(codeBasicSecService.refDataGridClassifySec(bladeQueryObject.getQuery(), bladeQueryObject.getConditionMap()));
    }
    public R<IPage<CodeBasicSecVO>> refDataGridClassifySec(BladeQueryObject bladeQueryObject){
        return R.data(codeBasicSecService.refDataGridClassifySec(bladeQueryObject.getQuery(), bladeQueryObject.getConditionMap()));
    }
    /**
     * å…‹éš†ç æ®µä¿¡æ¯
     * @param codeBasicSecDTO ç æ®µåŸºç¡€ä¿¡æ¯æ•°æ®ä¼ è¾“对象,oidArr:选择源码段主键的集合,pkCodeRule:目标编码规则的主键
     * @return å…‹éš†ç»“果反馈::success:成功,fail:失败
     */
    @PostMapping("/clone")
    /**
     * å…‹éš†ç æ®µä¿¡æ¯
     * @param codeBasicSecDTO ç æ®µåŸºç¡€ä¿¡æ¯æ•°æ®ä¼ è¾“对象,oidArr:选择源码段主键的集合,pkCodeRule:目标编码规则的主键
     * @return å…‹éš†ç»“果反馈::success:成功,fail:失败
     */
    @PostMapping("/clone")
    @ApiOperationSupport(order = 10)
    @ApiOperation(value = "克隆码段信息", notes = "codeBasicSecDTO")
    public R cloneCodeBasicSec(@RequestBody CodeBasicSecDTO codeBasicSecDTO) throws ServerException {
        VciBaseUtil.alertNotNull(codeBasicSecDTO.getOidArr(),"选择码段主键");
        List<String> oidArr = VciBaseUtil.str2List(codeBasicSecDTO.getOidArr());
        if (CollectionUtils.isEmpty(oidArr)){
            return R.fail("选择码段主键不能为空");
        }
        return codeBasicSecService.cloneCodeBasicSec(oidArr,codeBasicSecDTO.getPkCodeRule());
    }
    public R cloneCodeBasicSec(@RequestBody CodeBasicSecDTO codeBasicSecDTO) throws ServerException {
        VciBaseUtil.alertNotNull(codeBasicSecDTO.getOidArr(),"选择码段主键");
        List<String> oidArr = VciBaseUtil.str2List(codeBasicSecDTO.getOidArr());
        if (CollectionUtils.isEmpty(oidArr)){
            return R.fail("选择码段主键不能为空");
        }
        return codeBasicSecService.cloneCodeBasicSec(oidArr,codeBasicSecDTO.getPkCodeRule());
    }
    /**
     * æŸ¥è¯¢ç›®æ ‡åˆ†ç±»ç æ®µæ‰€åœ¨çš„æ ‘结构
     * @param oid ç›®æ ‡åˆ†ç±»ç æ®µä¸»é”®
     * @return åˆ†ç±»ç æ®µæ ‘结构
     */
    /**
     * æŸ¥è¯¢ç›®æ ‡åˆ†ç±»ç æ®µæ‰€åœ¨çš„æ ‘结构
     * @param oid ç›®æ ‡åˆ†ç±»ç æ®µä¸»é”®
     * @return åˆ†ç±»ç æ®µæ ‘结构
     */
    /*@GetMapping("/treeCodeClassifySec")
    @ApiOperationSupport(order = 11)
    @ApiOperation(value = "查询目标分类码段所在的树结构", notes = "oid")
@@ -185,29 +190,29 @@
        return codeBasicSecService.gridCodeClassifySecTree(oid);
    }*/
    /**
     * ä¸Šç§»
     * @param oid ä¸»é”®
     * @return æ‰§è¡Œç»“æžœ
     */
    @PostMapping("/upOrderNum")
    /**
     * ä¸Šç§»
     * @param oid ä¸»é”®
     * @return æ‰§è¡Œç»“æžœ
     */
    @PostMapping("/upOrderNum")
    @ApiOperationSupport(order = 11)
    @ApiOperation(value = "上移", notes = "oid")
    public R upOrderNum(@Valid @RequestParam String oid){
        return R.status(codeBasicSecService.upOrderNum(oid));
    }
    public R upOrderNum(@Valid @RequestParam String oid){
        return R.status(codeBasicSecService.upOrderNum(oid));
    }
    /**
     * ä¸‹ç§»
     * @param oid ä¸»é”®
     * @return æ‰§è¡Œç»“æžœ
     */
    @PostMapping("/downOrderNum")
    /**
     * ä¸‹ç§»
     * @param oid ä¸»é”®
     * @return æ‰§è¡Œç»“æžœ
     */
    @PostMapping("/downOrderNum")
    @ApiOperationSupport(order = 12)
    @ApiOperation(value = "下移", notes = "oid")
    public R downOrderNum(@Valid @RequestParam String oid){
        return R.status(codeBasicSecService.downOrderNum(oid));
    }
    public R downOrderNum(@Valid @RequestParam String oid){
        return R.status(codeBasicSecService.downOrderNum(oid));
    }
    /**
     * æŸ¥è¯¢ç¼–码规则的所有流水依赖的码段
@@ -220,8 +225,6 @@
    public R<CodeRuleVO> getCodeRuleAndBasicSecByRuleOid(String ruleOid){
        return R.data(codeBasicSecService.getSerialNumberDepend(ruleOid));
    }
    /**
     * è®¾ç½®æœ€å¤§æµæ°´å·
@@ -237,13 +240,25 @@
    /***
     *  æ ¹æ®æµæ°´ä¾èµ–获取最大流水号
     * @param codeOrderDTO
     * @param secMap
     * @return
     */
    @GetMapping("/getMaxSerialNumberForCodeRule")
    @ApiOperationSupport(order = 15)
    @ApiOperation(value = "查询编码规则的所有流水依赖的最大流水", notes = "传入oid")
    public R getMaxSerialNumberForCodeRule(CodeOrderDTO codeOrderDTO){
    public R getMaxSerialNumberForCodeRule(@RequestParam Map<String,String> secMap){
        if (secMap.isEmpty() && Func.isBlank(secMap.get("codeRuleOid"))) {
            throw new ServiceException("最大流水号的流水依赖不能为空!");
        }
        CodeOrderDTO codeOrderDTO = new CodeOrderDTO();
        codeOrderDTO.setCodeRuleOid(secMap.get("codeRuleOid"));
        secMap.remove("codeRuleOid");
        List<CodeOrderSecDTO> secDTOList = new ArrayList<>();
        secMap.entrySet().stream().forEach(item->{
            secDTOList.add(new CodeOrderSecDTO(item.getKey(),item.getValue()));
        });
        codeOrderDTO.setSecDTOList(secDTOList);
        return R.data(codeBasicSecService.getMaxSerialNumberForCodeRule(codeOrderDTO));
    }
}
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java
@@ -3747,7 +3747,8 @@
                            }
                        }
                        CodeClassifyFullInfoBO newClassifyFullInfo= classifyFullInfoMap.get(cbo.getAttributeValue(CODE_CLASSIFY_OID_FIELD));
                        List<CodeClassifyVO> classifyVOS = newClassifyFullInfo.getParentClassifyVOs().stream().sorted(((o1, o2) -> o2.getDataLevel().compareTo(o1.getDataLevel()))).collect(Collectors.toList());
                        List<CodeClassifyVO> classifyVOS = newClassifyFullInfo.getParentClassifyVOs().stream().sorted(((o1, o2) -> -o2.getDataLevel().compareTo(o1.getDataLevel()))).collect(Collectors.toList());
                        int level = VciBaseUtil.getInt(attrVO.getClassifyInvokeLevel());
                        if (classifyVOS.size()>=level && level > 0 ) {
                            classifyVO = classifyVOS.get(level-1);