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,10 +1,17 @@ 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{ /** 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; /** @@ -221,8 +226,6 @@ return R.data(codeBasicSecService.getSerialNumberDepend(ruleOid)); } /** * 设置æ大æµæ°´å· * @param codeOrderDTO ç¼ç ç³è¯·ä¼ è¾å¯¹è±¡ @@ -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);
