在创建备选交收库接口中修改逻辑（添加时，该单位由交收库添加的单位（单位，财务，财年）不是添加，是修改）

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/service/delivery/DeliveryServiceImpl.java

@@ -3,12 +3,14 @@ package com.unis.module.coding.service.delivery;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
-import com.unis.framework.common.util.kqbm.KQBMUtils;
+import com.unis.framework.common.util.orderNum.OrderNumberUtil;
 import com.unis.module.coding.controller.admin.caxx.vo.CaxxSaveReqVO;
 import com.unis.module.coding.controller.admin.cwxx.vo.CwxxSaveReqVO;
 import com.unis.module.coding.controller.admin.cwxxyear.vo.CwxxYearSaveReqVO;
 import com.unis.module.coding.controller.admin.delivery.vo.CaxxUpdateReqVO;
 import com.unis.module.coding.controller.admin.delivery.vo.DeliverySaveVO;
+import com.unis.module.coding.dal.dataobject.cwxx.CwxxDO;
+import com.unis.module.coding.dal.dataobject.cwxxyear.CwxxYearDO;
 import com.unis.module.coding.dal.dataobject.dwxx.DwxxDO;
 import com.unis.module.coding.dal.dataobject.kqxx.KqxxDO;
 import com.unis.module.coding.dal.mysql.cwxx.CwxxMapper;
@@ -25,8 +27,11 @@ import com.unis.module.system.dal.mysql.arealevel.AreaLevelMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.List;
+
 import static com.unis.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static com.unis.module.infra.enums.ErrorCodeConstants.ERROR;
 
@@ -84,17 +89,19 @@ public class DeliveryServiceImpl implements DeliveryService {
             List<DwxxDO> tyxydm1 = dwxxMapper.selectList(
                     new QueryWrapper<DwxxDO>()
                             .eq("TYXYDM", createReqVO.getDwxxReqVO().getTyxydm()));
+
+            log.info("根据统一信用编码查询单位是否存在,存在数量，({})", tyxydm1.size());
             Long dwxx = null;
-            //数据来源
-            createReqVO.getDwxxReqVO().setSjly(0);
+
             if (CollectionUtils.isEmpty(tyxydm1)) {
+                createReqVO.getDwxxReqVO().setSjly(0);
                 dwxx = dwxxService.createDwxx(createReqVO.getDwxxReqVO());
             } else {
                 log.info("根据统一信用编码查询之前已经添加过该单位({})", tyxydm1.get(0).getId());
                 dwxx = tyxydm1.get(0).getId();
                 createReqVO.getDwxxReqVO().setId(dwxx);
                 //是交收库新建的单位就能更新
-                if (tyxydm1.get(0).getSjly().equals(1)) {
+                if (tyxydm1.get(0).getSjly().equals(0)) {
                     dwxxService.updateDwxx(createReqVO.getDwxxReqVO());
                 } else {
                     log.info("该单位信息已经存在");
@@ -112,18 +119,23 @@ public class DeliveryServiceImpl implements DeliveryService {
                         new QueryWrapper<KqxxDO>()
                                 .eq("DWID", dwxx)
                                 .orderByDesc("CREATE_TIME"));
-                //todo 同一单位(DELIVERY_DWXX)下多个库区,生成规则 01 02 ...
-                String kqdm = "";
+                //同一单位(DELIVERY_DWXX)下多个库区,生成规则 01 02 ...
+                String kqdm = OrderNumberUtil.initNum(2, count.get(0).getKqdm());
+
                 createReqVO.getKqxxReqVO().setKqdm(kqdm);
-                //库区编码
-                String kqbm = "";
                 // 单位信息社会统一信用编码
                 String tyxydm = createReqVO.getDwxxReqVO().getTyxydm();
-                tyxydm = tyxydm.length() <= 18 ? tyxydm : tyxydm.substring(0, 18);
+
                 //企业性质
                 String qyxz = createReqVO.getDwxxReqVO().getQyxz();
                 //todo 库区编码
-                kqbm = KQBMUtils.createKQBM(qyxz, tyxydm, kqdm);
+                List kqbmlist = new ArrayList();
+                kqbmlist.add(qyxz);//企业性质
+                kqbmlist.add(tyxydm);//统一信用编码
+                kqbmlist.add(kqdm);//库区代码
+                String kqbm = OrderNumberUtil.generateCode(kqbmlist);
+                log.info("获取库区编码({})", kqbm);
+
                 createReqVO.getKqxxReqVO().setKqbm(kqbm);
                 //省市县编码获取
                 if (ObjectUtils.isNotEmpty(createReqVO.getKqxxReqVO().getSheng())) {
@@ -150,24 +162,56 @@ public class DeliveryServiceImpl implements DeliveryService {
                         caxx.setYxcf(1);
                         caxx.setKqid(kqxx);
                         caxx.setKqmc(createReqVO.getKqxxReqVO().getKqmc());
-                        //todo 仓房代码生成
-                        String cfdn = KQBMUtils.getCFDM(finalKqbm, caxx.getCfbm());
+                        //仓房代码生成
+                        List cfdnlist = new ArrayList();
+                        cfdnlist.add(finalKqbm);//统一信用编码
+                        cfdnlist.add(caxx.getCfbm());//库区代码
+                        String cfdn = OrderNumberUtil.generateCode(cfdnlist);
                         caxx.setCfdm(cfdn);
                         caxxService.createCaxx(caxx);
+                        log.info("仓房({})的仓房编码为({})", cfdn);
                     });
                 }
-
                 // --财务信息--------------------
                 CwxxSaveReqVO cwxxReqVO = createReqVO.getCwxxReqVO();
                 if (ObjectUtils.isNotEmpty(cwxxReqVO)) {
                     cwxxReqVO.setKqid(kqxx);
                     cwxxReqVO.setDeptId(dwxx);
-                    Long cwxx = cwxxService.createCwxx(cwxxReqVO);
+
+                    Long cwxx = null;
+                    List<CwxxDO> cwxxDOS = cwxxMapper.selectList(new QueryWrapper<CwxxDO>().eq("DEPT_ID", dwxx));
+                    if (CollectionUtils.isEmpty(cwxxDOS)) {
+                        cwxx = cwxxService.createCwxx(cwxxReqVO);
+                    } else {
+                        //更改
+                        cwxx = cwxxDOS.get(0).getId();
+                        cwxxReqVO.setId(cwxxDOS.get(0).getId());
+                        cwxxService.updateCwxx(cwxxReqVO);
+                    }
                     // ---财年信息-------------
                     if (CollectionUtils.isNotEmpty(cwxxReqVO.getCwxxYearList())) {
-                        for (CwxxYearSaveReqVO cwxxYear : cwxxReqVO.getCwxxYearList()) {
-                            cwxxYear.setCwxxId(cwxx);
-                            cwxxYearService.createCwxxYear(cwxxYear);
+                        //以前添加过财年，更改
+                        if (CollectionUtils.isEmpty(cwxxDOS)) {
+                            for (CwxxYearSaveReqVO cwxxYear : cwxxReqVO.getCwxxYearList()) {
+                                cwxxYear.setCwxxId(cwxx);
+                                cwxxYearService.createCwxxYear(cwxxYear);
+                            }
+                        } else {
+                            //更改
+                            for (int i = 0; i < cwxxReqVO.getCwxxYearList().size(); i++) {
+                                CwxxYearSaveReqVO yearSaveReqVO = cwxxReqVO.getCwxxYearList().get(i);
+                                yearSaveReqVO.setCwxxId(cwxx);
+                                List<CwxxYearDO> oldCwxxYearDOS = cwxxYearMapper.selectList(new QueryWrapper<CwxxYearDO>()
+                                        .eq("CWXX_ID", cwxx)
+                                        .eq("CN", cwxxReqVO.getCwxxYearList().get(i).getCn()));
+                                if (CollectionUtils.isEmpty(oldCwxxYearDOS)) {
+                                    cwxxYearService.createCwxxYear(yearSaveReqVO);
+                                } else {
+                                    yearSaveReqVO.setId(oldCwxxYearDOS.get(0).getId());
+                                    cwxxYearService.updateCwxxYear(yearSaveReqVO);
+                                }
+
+                            }
                         }
                     }
                 }
@@ -176,4 +220,6 @@ public class DeliveryServiceImpl implements DeliveryService {
         // 交通运输情况
         return null;
     }
+
 }
+