xiejun
2023-11-29 e4384663a35646a92871c84fb0960f644fb703ad
1.标准化文件申请,修订测试完善
已修改2个文件
已添加3个文件
119 ■■■■■ 文件已修改
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/attrmap/标准化文件修订.json 37 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/attrmap/标准化文件申请.json 37 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/attrmap/系列变标准.json 34 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/algorithm/CustomRomanSerialAlgorithmExample.java 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/attrmap/±ê×¼»¯ÎļþÐÞ¶©.json
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,37 @@
{
  "operationType": "2",
  "series": false,
  "releaseTime": "2023-11-23",
  "oldCode": "BJJ-23-1",
  "seriesFlow": "",
  "isEditSeries": false,
  "editInProcess": false,
  "codeClassifyOid": "1722159255211085824",
  "templateOid": "1722162284376199170",
  "codeRuleOid": "1729702446013485056",
  "editInProcess": "",
  "secDTOList":[{
    "secOid":"1729702742034878464",
    "secValue": "BJJ"
  },{
    "secOid":"1729702831633600512",
    "secValue": "-"
  },
    {
      "secOid":"1729703035887816704",
      "secValue": "23"
    },{
      "secOid":"1729703108231172096",
      "secValue": "-"
    }
  ],
  "data":{"name":"标准化文件名称",
    "standardFileType":"文件类型",
    "codeStandardEditType":"2",
    "oldcode":"BJJ-23-1",
    "isSeries":"false",
    "reviseSeries":"false",
    "ImplementationDate":"2023-11-23 19:22:33",
    "approveDate":"2023-11-23 19:22:33",
    "releaseDate": "2023-11-23 19:22:33"}
}
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/attrmap/±ê×¼»¯ÎļþÉêÇë.json
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,37 @@
{
  "operationType": "1",
  "series": false,
  "releaseTime": "2023-11-23",
  "oldCode": "",
  "seriesFlow": "",
  "isEditSeries": false,
  "editInProcess": false,
  "codeClassifyOid": "1722159255211085824",
  "templateOid": "1722162284376199170",
  "codeRuleOid": "1729702446013485056",
  "editInProcess": "",
  "secDTOList":[{
    "secOid":"1729702742034878464",
    "secValue": "BJJ"
  },{
    "secOid":"1729702831633600512",
    "secValue": "-"
  },
    {
      "secOid":"1729703035887816704",
      "secValue": "23"
    },{
      "secOid":"1729703108231172096",
      "secValue": "-"
    }
  ],
  "data":{"name":"标准化文件名称",
    "standardFileType":"文件类型",
    "codeStandardEditType":"1",
    "oldcode":"",
    "isSeries":"false",
    "reviseSeries":"false",
    "ImplementationDate":"2023-11-23 19:22:33",
    "approveDate":"2023-11-23 19:22:33",
    "releaseDate": "2023-11-23 19:22:33"}
}
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/attrmap/ϵÁбä±ê×¼.json
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,34 @@
{
  "operationType": "2",
  "series": true,
  "releaseTime": "2023-11-23",
  "oldCode": "Q/3B7.1-2023",
  "seriesFlow": "",
  "isEditSeries": true,
  "editInProcess": false,
  "codeClassifyOid": "1722159168229609472",
  "templateOid": "1722159635358650369",
  "codeRuleOid": "1717377846655193088",
  "editInProcess": "",
  "secDTOList":[{
    "secOid":"1717378065371369472",
    "secValue": "Q/3B"
  },{
    "secOid":"1722497248551636992",
    "secValue": "-"
  },
    {
      "secOid":"1722497450259910656",
      "secValue": "2023"
    }
  ],
  "data":{"name":"系列标准名称",
    "standardFileType":"文件类型",
    "codeStandardEditType":"2",
    "oldcode":"Q/3B7.1-2023",
    "isSeries":"true",
    "reviseSeries":"true",
    "ImplementationDate":"2023-11-23 19:22:33",
    "approveDate":"2023-11-23 19:22:33",
    "releaseDate": "2023-11-23 19:22:33"}
}
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/algorithm/CustomRomanSerialAlgorithmExample.java
@@ -116,7 +116,12 @@
                         int newYear=0;
                            int month=0;
                          if(yearMoths.length>2){
                              newYear=Integer.parseInt(yearMoths[0]);
                              String year=yearMoths[0];
                              if(year.length()>String.valueOf(yearSecValue).length()){//有时候发布时间的年长度大于码段的长度,则需要截取后2位
                                  newYear= Integer.parseInt(year.substring(2));
                              }else {
                                  newYear=Integer.parseInt(year);
                              }
                              month=Integer.parseInt(yearMoths[1]);
                          }
                          if(newYear>yearSecValue&&month>1){
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
@@ -961,14 +961,14 @@
        LinkedList<CodeOrderSecDTO> newSecDTOList=new LinkedList<>();
        changeCodeOrderSecDTO(ruleVO,secDTOS,oldCode,newSecDTOList);//根据要求重新算码段码值
        if(!codeBZApplyDTO.isEditSeries()){//变更为标准
            if(!codeBZApplyDTO.isSeries()){//如果是表准,则需要将系列好流水置为null
            //if(!codeBZApplyDTO.isSeries()){//如果是表准,则需要将系列好流水置为null
                //因为是标准则控制码段中的系列流水码段值为空
                newSecDTOList.stream().forEach(codeOrderSecDTO -> {
                    if(codeCodeBasicSecMap.containsKey(codeOrderSecDTO.getSecOid())&&codeCodeBasicSecMap.get(codeOrderSecDTO.getSecOid()).getName().equals(secName)){
                        codeOrderSecDTO.setSecValue("");
                    }
                });
            }
            //}
            orderDTO.setSecDTOList(newSecDTOList);
            return createDataBZ(orderDTO,ruleVO,authUser);
        }else{//变更为系列.则按照逻辑去处理