Merge remote-tracking branch 'origin/master'

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

@@ -279,7 +279,7 @@
                    wrapper.eq("CREATECODEBTM",addCodeDOs.get(0).getCreateCodeBtm());
                    wrapper.in("ID",addCodeDOs.stream().map(CodeAllCode::getId).collect(Collectors.toList()));
                    if(codeAllCodeService.count(wrapper)>0){
                        throw new ServiceException("生成编码数据ID已有历史记录请确认！！");
                        throw new ServiceException("生成编码数据ID已有历史记录,请确认如下生成的ID数据："+ addCodeDOs.stream().map(CodeAllCode::getId).collect(Collectors.toList()));
                    }
                    codeAllCodeService.saveBatch(addCodeDOs);
                }
@@ -366,7 +366,7 @@
            wrapper.eq("CREATECODEBTM",allCodeDOList.get(0).getCreateCodeBtm());
            wrapper.in("ID",allCodeDOList.stream().map(CodeAllCode::getId).collect(Collectors.toList()));
            if(codeAllCodeService.count(wrapper)>0){
                throw new ServiceException("生成编码数据ID已有历史记录请确认！！");
                throw new ServiceException("生成编码数据ID已有历史记录,请确认如下生成的ID数据："+ allCodeDOList.stream().map(CodeAllCode::getId).collect(Collectors.toList()));
            }
            codeAllCodeService.saveBatch(allCodeDOList);
//            iCodeWupinService.saveBatch(dataCBOList);