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

@@ -6,7 +6,7 @@
import com.vci.ubcs.code.dto.CodeOrderSecDTO;
import com.vci.ubcs.code.entity.CodeAllCode;
import com.vci.ubcs.code.entity.CodeSerialValue;
import com.vci.ubcs.code.entity.CodeWupinEntity;
import com.vci.ubcs.code.entity.CodeWupin;
import com.vci.ubcs.code.enumpack.CodeCutTypeEnum;
import com.vci.ubcs.code.enumpack.CodeGetValueTypeEnum;
import com.vci.ubcs.code.enumpack.CodeLevelTypeEnum;
@@ -20,6 +20,7 @@
import com.vci.ubcs.code.vo.pagemodel.CodeClassifyVO;
import com.vci.ubcs.code.vo.pagemodel.CodeRuleVO;
import com.vci.ubcs.starter.exception.VciBaseException;
import com.vci.ubcs.starter.util.DefaultAttrAssimtUtil;
import com.vci.ubcs.starter.web.constant.QueryOptionConstant;
import com.vci.ubcs.starter.web.constant.RegExpConstant;
import com.vci.ubcs.starter.web.enumpck.OsCodeFillTypeEnum;
@@ -56,7 +57,7 @@
   private ICodeWupinService iCodeWupinService;

   @Override
   public List<String> productCodeAndSaveData(CodeClassifyFullInfoBO classifyFullInfoBO, CodeClassifyTemplateVO templateVO, CodeRuleVO ruleVO, List<CodeOrderSecDTO> secDTOList, List<CodeWupinEntity> dataCBOList) {
   public List<String> productCodeAndSaveData(CodeClassifyFullInfoBO classifyFullInfoBO, CodeClassifyTemplateVO templateVO, CodeRuleVO ruleVO, List<CodeOrderSecDTO> secDTOList, List<CodeWupin> dataCBOList) {
//      BatchCBO batchCBO = new BatchCBO();
//      WebUtil.setPersistence(false);
//      dataCBOList = dataCBOList.stream().sorted(((o1, o2) -> o1.getCreateTime().compareTo(o2.getCreateTime()))).collect(Collectors.toList());
@@ -265,7 +266,7 @@
         Map<String/**码段的主键**/, Map<String, CodeSerialValue>> maxSerialValueMap = new HashMap<>();

         for (int i = 0; i < dataCBOList.size(); i++) {
            CodeWupinEntity cbo = dataCBOList.get(i);
            CodeWupin cbo = dataCBOList.get(i);
            List<String> thisSecValueList = new LinkedList<>();
            for (int j = 0; j < secValueList.size(); j++) {
               thisSecValueList.add(secValueList.get(j));
@@ -304,6 +305,9 @@
            s.setLcStatus(statusMap.get(s.getOid()));

         });
         allCodeDOList.stream().forEach(
            allCode -> {DefaultAttrAssimtUtil.addDefaultAttrAssimt(allCode,"codeallcode");allCode.setLctid("codeAllCodeLC");}
         );
         codeAllCodeService.saveBatch(allCodeDOList);
         iCodeWupinService.saveBatch(dataCBOList);
//         batchCBO.getCreateCbos().stream().filter(s -> StringUtils.equalsIgnoreCase("codeallcode",s.getBtmName())).forEach(s -> {
@@ -328,9 +332,9 @@
    * @param serialUnitList 流水依据的内容
    *                       还需要后续的一个移植将会涉及到其他的服务
    */
   private void switchAttrSecValue(List<CodeBasicSecVO> attrSecVOList,CodeWupinEntity cbo,
                           List<String> thisSecValueList,boolean attrSevIsSerialDepend,
                           List<String> serialUnitList){
   private void switchAttrSecValue(List<CodeBasicSecVO> attrSecVOList, CodeWupin cbo,
                                    List<String> thisSecValueList, boolean attrSevIsSerialDepend,
                                    List<String> serialUnitList){
      if (!CollectionUtils.isEmpty(attrSecVOList)) {
         attrSecVOList.stream().forEach(attrSevVO -> {
            String value = "";
@@ -586,9 +590,9 @@
    * @param templateVO 模板的信息
    * @param allCodeDOList 所有的码值的对象列表
    */
   private void wrapperAllCode(CodeClassifyFullInfoBO classifyFullInfoBO,CodeRuleVO ruleVO,
                        CodeWupinEntity cbo,CodeClassifyTemplateVO templateVO,
                        List<CodeAllCode> allCodeDOList,String serialUnitString,String serialValueString){
   private void wrapperAllCode(CodeClassifyFullInfoBO classifyFullInfoBO, CodeRuleVO ruleVO,
                                CodeWupin cbo, CodeClassifyTemplateVO templateVO,
                                List<CodeAllCode> allCodeDOList, String serialUnitString, String serialValueString){
      CodeAllCode allCodeDO = new CodeAllCode();
      allCodeDO.setCodeClassifyOid(classifyFullInfoBO.getCurrentClassifyVO().getOid());
      allCodeDO.setCodeRuleOid(ruleVO.getOid());