提交代码

 Document/BladeX/BladeX¿ª·¢ÊÖ²á-3.0.1.RELEASE/µÚ6Õ Éú²ú²¿Êð/6.2 Linux²¿Êð/6.2.1 Jar²¿Êð/6.2.1.1 Jar²¿Êð.md

@@ -3,7 +3,7 @@

## éƒ¨ç½²æ‰€éœ€
* java环境
* mysql数据库
* mysql数据库 æˆ– è¾¾æ¢¦
* redis服务
* nacos服务


 Document/BladeX/BladeX¿ª·¢ÊÖ²á-3.0.1.RELEASE/µÚ6Õ Éú²ú²¿Êð/6.2 Linux²¿Êð/6.2.3 Docker²¿Êð/6.2.3.2 DM°²×°.md

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,2 @@
[Docker å®‰è£… | è¾¾æ¢¦æŠ€æœ¯æ–‡æ¡£ (dameng.com)](https://eco.dameng.com/document/dm/zh-cn/start/dm-install-docker.html)


 Document/BladeX/BladeX¿ª·¢ÊÖ²á-3.0.1.RELEASE/µÚ6Õ Éú²ú²¿Êð/6.2 Linux²¿Êð/6.2.3 Docker²¿Êð/6.2.3.2 mysql°²×°.md

ÎļþÒÑɾ³ý

 Document/²¿Êð˵Ã÷Îĵµ/²¿Êð˵Ã÷.zip

Binary files differ

 Source/UBCS-WEB/src/views/code/code.vue

@@ -1253,7 +1253,9 @@
          parentClsParam.classifyDialogLoading = true;
          let oid = this.selectionList.length==0 ? this.form.pkCodeRule:this.selectionList[0].oid;
          let conditionMaps = {};
          
          conditionMaps['conditionMap[pkCodeRule]'] = oid;
          conditionMaps['conditionMap[oid_notequal]'] = this.form.oid;
          refDataGridClassifySec(
            page.currentPage,
            page.pageSize,

 Source/UBCS-WEB/vue.config.js

@@ -26,10 +26,10 @@
    proxy: {
      '/api': {
        //本地服务接口地址
        // target: 'http://localhost:37000',
        target: 'http://localhost:37000',
        // target: 'http://192.168.1.51:37000',
        // target: 'http://192.168.1.46:37000',
        target: 'http://dev.vci-tech.com:37000',
        // target: 'http://dev.vci-tech.com:37000',
        // target: 'http://192.168.1.51:37000/',
        // target: 'http://192.168.1.104:37000',
        // target: 'http://192.168.1.63:37000',

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java

@@ -545,7 +545,7 @@
            return null;
        }
        conditionMap.put("secType",(CodeSecTypeEnum.CODE_CLASSIFY_SEC.getValue()));
        return refDataGridCodeBasicSec(query.setAscs("ordernum"),conditionMap);
        return refDataGridCodeBasicSec(query.setAscs("orderNum"),conditionMap);
    }

    /**

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java

@@ -32,10 +32,7 @@
import com.vci.ubcs.code.mapper.CodeRuleMapper;
import com.vci.ubcs.code.mapper.CodeSerialValueMapper;
import com.vci.ubcs.code.mapper.CommonsMapper;
import com.vci.ubcs.code.service.ICodeAllCodeService;
import com.vci.ubcs.code.service.ICodeBasicSecService;
import com.vci.ubcs.code.service.ICodeClassifyService;
import com.vci.ubcs.code.service.ICodeRuleService;
import com.vci.ubcs.code.service.*;
import com.vci.ubcs.code.vo.pagemodel.CodeBasicSecVO;
import com.vci.ubcs.code.vo.pagemodel.CodeClassifyVO;
import com.vci.ubcs.code.vo.pagemodel.CodeFixedValueVO;
@@ -45,6 +42,7 @@
import com.vci.ubcs.omd.cache.EnumCache;
import com.vci.ubcs.omd.enums.EnumEnum;
import com.vci.ubcs.starter.exception.VciBaseException;
import com.vci.ubcs.starter.revision.model.TreeQueryObject;
import com.vci.ubcs.starter.revision.service.RevisionModelUtil;
import com.vci.ubcs.starter.util.DefaultAttrAssimtUtil;
import com.vci.ubcs.starter.util.UBCSCondition;
@@ -103,6 +101,8 @@
    private ICodeAllCodeService codeAllcodeService;
    @Resource
    private ICodeBasicSecService codeBasicSecService;
    @Resource
    private ICodeClassifyValueService iCodeClassifyValueService;

    /**
     * å¯¹è±¡çš„操作
@@ -516,7 +516,7 @@
        String secTypes = releaseCodeRule.getSecVOList().stream().map(CodeBasicSecVO::getSecType).collect(Collectors.joining(","));
        // æŸ¥è¯¢å‡ºæ‰€æœ‰å·²å‘布的编码规则中码段类型顺序与当前要发布的规则顺序一致的编码规则，此时已近过滤掉大部分规则，运算量减小
        List<CodeRule> codeRuleList = codeRuleMapper.selectList(Wrappers.<CodeRule>query().lambda()
            .eq(CodeRule::getLcStatus, FrameWorkDefaultValueConstant.FRAMEWORK_RELEASE_RELEASED)
            .eq(CodeRule::getLcStatus, CodeRuleLC.RELEASED.getValue())
            .eq(CodeRule::getBasicSecTypes,secTypes)
        );
        // ä¸ºç©ºï¼Œè¯æ˜Žä¸å­˜åœ¨ç±»åŒçš„编码规则直接返回
@@ -596,16 +596,24 @@
                        }
                        break;
                }
                if (flag) {
                    break;
                }
            }
            // æ»¡è¶³æ‰€æœ‰ç æ®µç±»åž‹æ¯”对条件的规则
            if (flag) {
                lastCodeRule.add(item);
            }
        });
        StringBuffer resMsg = new StringBuffer();
        resMsg.append("存在如下相似规则，是否继续发布？\n");
        // æœ€åŽå°†ç»“果进行处理并返回


        return null;
        lastCodeRule.stream().forEach(item->{
            resMsg.append(item.getName());
            resMsg.append(item.getId());
            resMsg.append("编码规则;\n");
        });
        return R.fail(resMsg.toString());
    }

    /**