新增仓房,仓房选择调整

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/caxx/vo/CaxxSaveReqVO.java

@@ -87,7 +87,6 @@ public class CaxxSaveReqVO {
     @Schema(description = "客户名称(单位名称)")
     private String khmc;
 
-
     @Schema(description = "客户联系电话")
     private String khlxdh;
 

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/cwxx/vo/CwxxSaveReqVO.java

@@ -14,6 +14,9 @@ public class CwxxSaveReqVO {
     @Schema(description = "雪花id", requiredMode = Schema.RequiredMode.REQUIRED, example = "30550")
     private Long id;
 
+    @Schema(description = "库区名称")
+    private String kqmc;
+
     @Schema(description = "是否国有及国有控股(0:是,1不是)")
     private Integer sfgykg;
 

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/delivery/DeliveryController.java

@@ -92,7 +92,7 @@ public class DeliveryController {
     @PostMapping("/createByAll")
     @Operation(summary = "创建单位/库区/仓房/财务/交通运输")
     @PreAuthorize("@ss.hasPermission('coding:kqxx:creat')")
-    public CommonResult<Object> createByAll(@Valid @RequestBody DeliverySaveVO createReqVO) {
+    public CommonResult createByAll(@Valid @RequestBody DeliverySaveVO createReqVO) {
         return success(deliveryService.createByAll(createReqVO));
     }
 

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/delivery/vo/CaxxUpdateReqVO.java

@@ -18,6 +18,9 @@ public class CaxxUpdateReqVO {
     @Schema(description = "仓房id")
     private List<Long> ids;
 
+    @Schema(description = "仓房列表")
+    private List<StoreRespVO> storeRespVOList;
+
     @Schema(description = "库区id")
     private Long kqId;
 

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/delivery/vo/DeliverySaveVO.java

@@ -23,13 +23,11 @@ public class DeliverySaveVO {
     private DwxxSaveReqVO dwxxReqVO;
 
     @Schema(description = "库区信息")
-    private KqxxSaveReqVO kqxxReqVO;
+    private List<KqxxSaveReqVO> kqxxReqVOList;
 
     @Schema(description = "仓房信息")
     private List<CaxxSaveReqVO> caxxReqVOList;
 
     @Schema(description = "财务信息")
-    private CwxxSaveReqVO cwxxReqVO;
-
-    // 交通运输情况
+    private List<CwxxSaveReqVO> cwxxReqVOList;
 }

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/delivery/vo/StoreRespVO.java

@@ -50,4 +50,7 @@ public class StoreRespVO {
     @Schema(description = "储存状态")
     @DictFormat(DictTypeConstants.CC_TYPE)
     private Integer cczt;
+
+    @Schema(description = "数据来源")
+    private Integer sjly;
 }

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/dwxx/DwxxController.java

@@ -102,7 +102,7 @@ public class DwxxController {
     @GetMapping("/getDwAndKq")
     @Operation(summary = "获得单位信息及其下的库区信息")
     @Parameter(name = "tyxydm", description = "统一信用代码", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('coding:dwxx:getDwAndKq')")
+    //@PreAuthorize("@ss.hasPermission('coding:dwxx:getDwAndKq')")
     public CommonResult<DwAndKqRespVO> getDwAndKq(@RequestParam("tyxydm") String tyxydm) {
         return success(dwxxService.getDwAndKq(tyxydm));
     }

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/dwxx/vo/DwAndKqRespVO.java

@@ -2,9 +2,11 @@ package com.unis.module.coding.controller.admin.dwxx.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.unis.module.coding.controller.admin.cwxx.vo.CwxxRespVO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;
@@ -50,6 +52,12 @@ public class DwAndKqRespVO {
     @Schema(description = "单位下库区信息列表")
     private List<Kq> kqList;
 
+    @Schema(description = "库区下仓房信息列表")
+    private List<Cf> cfList;
+
+    @Schema(description = "财务信息列表")
+    private List<Cw> cwList;
+
     // 内部子类，包含单位下库区信息
     @Data
     @Schema(description = "单位下库区信息")
@@ -114,4 +122,82 @@ public class DwAndKqRespVO {
         @Schema(description = "上传库区图id")
         private String resid;
     }
+
+    // 内部子类，包含库区下仓房信息
+    @Data
+    @Schema(description = "库区下仓房信息")
+    public static class Cf {
+        @Schema(description = "仓房id")
+        private Long cfId;
+
+        @Schema(description = "库区名称")
+        private String kqmc;
+
+        @Schema(description = "仓房名称")
+        private String cfmc;
+
+        @Schema(description = "仓房类型")
+        private String cflx;
+
+        @Schema(description = "仓房编号")
+        private String cfbm;
+
+        @Schema(description = "仓房状态")
+        private String cazt;
+
+        @Schema(description = "设计仓容")
+        private BigDecimal sjcr;
+
+        @Schema(description = "其他仓型说明")
+        private String qtcxsm;
+
+        @Schema(description = "客户名称(单位名称)")
+        private String khmc;
+
+        @Schema(description = "客户联系电话")
+        private String khlxdh;
+
+        @Schema(description = "客户身份证号(社会统一信用代码)")
+        private String khbh;
+    }
+
+    // 内部子类，包含库区下财务信息
+    @Data
+    @Schema(description = "库区下财务信息")
+    public static class Cw {
+        @Schema(description = "财务ID")
+        private Long cwId;
+
+        @Schema(description = "库区名称")
+        private String kqmc;
+
+        @Schema(description = "是否国有及国有控股(0:是,1不是)")
+        private String sfgykg;
+
+        @Schema(description = "上一年度总资产(万元)")
+        private String syndzzc;
+
+        @Schema(description = "财年信息")
+        private List<Cwy> cwyList;
+
+        // 内部子类，包含财务下财年信息
+        @Data
+        @Schema(description = "财务下财年信息")
+        public static class Cwy {
+            @Schema(description = "财年ID")
+            private Long cwyId;
+
+            @Schema(description = "财年")
+            private Integer cn;
+
+            @Schema(description = "总负债(万元)")
+            private BigDecimal zfz;
+
+            @Schema(description = "营业收入(万元)")
+            private BigDecimal yysr;
+
+            @Schema(description = "净利润(万元)")
+            private BigDecimal jlr;
+        }
+    }
 }

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/dal/mysql/caxx/CaxxMapper.java

@@ -87,6 +87,7 @@ public interface CaxxMapper extends BaseMapperX<CaxxDO> {
         List<CaxxDO> caxxList = selectList(
                 new LambdaQueryWrapperX<CaxxDO>()
                         .eqIfPresent(CaxxDO::getKqid, kqId)
+                        .eqIfPresent(CaxxDO :: getYxcf,1)
         );
         return caxxList;
     }

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/dal/mysql/fmxx/FmxxMapper.java

@@ -60,10 +60,10 @@ public interface FmxxMapper extends BaseMapperX<FmxxDO> {
                         .eqIfPresent(FmxxDO::getBaseKqxxId, kqId)
         );
     }
-    default List<FmxxDO>  selectListByCaId(List<Long> caIds) {
+    default List<FmxxDO>  selectListByCaId(Long caId) {
         return selectList(
                 new LambdaQueryWrapperX<FmxxDO>()
-                        .inIfPresent(FmxxDO::getBaseCaxxId, caIds)
+                        .eqIfPresent(FmxxDO::getBaseCaxxId, caId)
         );
      }
 

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

@@ -1,5 +1,6 @@
 package com.unis.module.coding.service.delivery;
 
+import com.unis.framework.common.pojo.CommonResult;
 import com.unis.module.coding.controller.admin.delivery.vo.CaxxUpdateReqVO;
 import com.unis.module.coding.controller.admin.delivery.vo.DeliverySaveVO;
 
@@ -13,5 +14,5 @@ import java.util.Map;
 public interface DeliveryService {
     void updateCaxxByIds(CaxxUpdateReqVO updateReqVO);
 
-    Object createByAll(DeliverySaveVO createReqVO);
+    CommonResult createByAll(DeliverySaveVO createReqVO);
 }

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

@@ -3,24 +3,21 @@ 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.github.yitter.idgen.YitIdHelper;
+import com.unis.framework.common.pojo.CommonResult;
 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.controller.admin.kqxx.vo.KqxxSaveReqVO;
 import com.unis.module.coding.controller.admin.province.vo.ProvinceSaveReqVO;
-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.dataobject.province.ProvinceDO;
 import com.unis.module.coding.dal.mysql.cwxx.CwxxMapper;
 import com.unis.module.coding.dal.mysql.cwxxyear.CwxxYearMapper;
 import com.unis.module.coding.dal.mysql.dwxx.DwxxMapper;
 import com.unis.module.coding.dal.mysql.kqxx.KqxxMapper;
-import com.unis.module.coding.dal.mysql.province.ProvinceMapper;
 import com.unis.module.coding.service.caxx.CaxxService;
 import com.unis.module.coding.service.cwxx.CwxxService;
 import com.unis.module.coding.service.cwxxyear.CwxxYearService;
@@ -32,10 +29,10 @@ 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 java.util.stream.Collectors;
 
 import static com.unis.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static com.unis.module.infra.enums.ErrorCodeConstants.ERROR;
@@ -86,11 +83,11 @@ public class DeliveryServiceImpl implements DeliveryService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Object createByAll(DeliverySaveVO createReqVO) {
+    public CommonResult createByAll(DeliverySaveVO createReqVO) {
         // 单位信息
         if (ObjectUtils.isNotEmpty(createReqVO.getDwxxReqVO())) {
             if (ObjectUtils.isEmpty(createReqVO.getDwxxReqVO().getTyxydm())) {
-                throw exception(ERROR, "统一信用编码为空");
+                CommonResult.error(null, "统一信用编码为空");
             }
             //根据统一信用编码----添加之前查询是否已经添加过该单位
             List<DwxxDO> tyxydm1 = dwxxMapper.selectList(
@@ -98,15 +95,15 @@ public class DeliveryServiceImpl implements DeliveryService {
                             .eq("TYXYDM", createReqVO.getDwxxReqVO().getTyxydm()));
 
             log.info("根据统一信用编码查询单位是否存在,存在数量，({})", tyxydm1.size());
-            Long dwxx = null;
+            Long dwId;
 
             if (CollectionUtils.isEmpty(tyxydm1)) {
                 createReqVO.getDwxxReqVO().setSjly(0);
-                dwxx = dwxxService.createDwxx(createReqVO.getDwxxReqVO());
+                dwId = dwxxService.createDwxx(createReqVO.getDwxxReqVO());
             } else {
                 log.info("根据统一信用编码查询之前已经添加过该单位({})", tyxydm1.get(0).getId());
-                dwxx = tyxydm1.get(0).getId();
-                createReqVO.getDwxxReqVO().setId(dwxx);
+                dwId = tyxydm1.get(0).getId();
+                createReqVO.getDwxxReqVO().setId(dwId);
                 //是交收库新建的单位就能更新
                 if (tyxydm1.get(0).getSjly().equals(0)) {
                     dwxxService.updateDwxx(createReqVO.getDwxxReqVO());
@@ -114,101 +111,125 @@ public class DeliveryServiceImpl implements DeliveryService {
                     log.info("该单位信息已经存在,并且是从其他方法导入，{}", tyxydm1);
                 }
             }
-            ///--------库区信息-------------////////////////////////////////////////////////////////
-            if (ObjectUtils.isNotEmpty(createReqVO.getKqxxReqVO())) {
-                // set 单位id
-                createReqVO.getKqxxReqVO().setDwid(dwxx);
-                createReqVO.getKqxxReqVO().setShxydm(createReqVO.getDwxxReqVO().getTyxydm());
-                /*
-                 * 生成库区代码--该单位下有几个库区
-                 */
-                List<KqxxDO> count = kqxxMapper.selectList(
-                        new QueryWrapper<KqxxDO>()
-                                .eq("DWID", dwxx)
-                                .orderByDesc("CREATE_TIME"));
-                String countNum = count.size() == 0 ? "00" : count.get(0).getKqbm();
-                //同一单位(DELIVERY_DWXX)下多个库区,生成规则 01 02 ...
-                String kqdm = OrderNumberUtil.initNum(2, String.valueOf(countNum));
-
-                createReqVO.getKqxxReqVO().setKqdm(kqdm);
-                // 单位信息社会统一信用编码
-                String tyxydm = createReqVO.getDwxxReqVO().getTyxydm();
-
-                //企业性质
-                String qyxz = createReqVO.getDwxxReqVO().getQyxz();
-                //库区编码
-                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);
-                //所属法人企业(单位名称)
-                createReqVO.getKqxxReqVO().setSsfrqy(createReqVO.getDwxxReqVO().getDwmc());
-                //省市县编码获取
-                if (ObjectUtils.isNotEmpty(createReqVO.getKqxxReqVO().getSheng())) {
-                    AreaLevelDO sheng = areaLevelMapper.selectListByAreaCode(createReqVO.getKqxxReqVO().getSheng());
-                    log.info("获取省市县编码对应的地址({})", sheng.getAreaName());
-                    createReqVO.getKqxxReqVO().setShengName(sheng.getAreaName());
-                }
-                if (ObjectUtils.isNotEmpty(createReqVO.getKqxxReqVO().getShi())) {
-                    AreaLevelDO shi = areaLevelMapper.selectListByAreaCode(createReqVO.getKqxxReqVO().getShi());
-                    log.info("获取省市县编码对应的地址({})", shi.getAreaName());
-                    createReqVO.getKqxxReqVO().setShiName(shi.getAreaName());
-                }
-                if (ObjectUtils.isNotEmpty(createReqVO.getKqxxReqVO().getXian())) {
-                    AreaLevelDO xian = areaLevelMapper.selectListByAreaCode(createReqVO.getKqxxReqVO().getXian());
-                    log.info("获取省市县编码对应的地址({})", xian.getAreaName());
-                    createReqVO.getKqxxReqVO().setXianName(xian.getAreaName());
-                }
-                Long kqxx = kqxxService.createKqxx(createReqVO.getKqxxReqVO());
-                // -------仓房信息---------------
-                if (CollectionUtils.isNotEmpty(createReqVO.getCaxxReqVOList())) {
+
+            //库区信息
+            if (ObjectUtils.isNotEmpty(createReqVO.getKqxxReqVOList())) {
+                for (KqxxSaveReqVO kqxxSaveReqVO : createReqVO.getKqxxReqVOList()) {
+
+                    // set 单位id
+                    kqxxSaveReqVO.setDwid(dwId);
+                    kqxxSaveReqVO.setShxydm(createReqVO.getDwxxReqVO().getTyxydm());
+                    /*
+                     * 生成库区代码--该单位下有几个库区
+                     */
+                    List<KqxxDO> count = kqxxMapper.selectList(
+                            new QueryWrapper<KqxxDO>()
+                                    .eq("DWID", dwId)
+                                    .orderByDesc("CREATE_TIME"));
+                    String countNum = count.isEmpty() ? "00" : count.get(0).getKqbm();
+                    //同一单位(DELIVERY_DWXX)下多个库区,生成规则 01 02 ...
+                    String kqdm = OrderNumberUtil.initNum(2, String.valueOf(countNum));
+
+                    kqxxSaveReqVO.setKqdm(kqdm);
+                    // 单位信息社会统一信用编码
+                    String tyxydm = createReqVO.getDwxxReqVO().getTyxydm();
+
+                    //企业性质
+                    String qyxz = createReqVO.getDwxxReqVO().getQyxz();
                     //库区编码
-                    String finalKqbm = kqbm;
-                    createReqVO.getCaxxReqVOList().forEach(caxx -> {
-                        caxx.setYxcf(1);
-                        caxx.setKqid(kqxx);
-                        caxx.setKqmc(createReqVO.getKqxxReqVO().getKqmc());
-                        //仓房代码生成
-                        List cfdnlist = new ArrayList();
-                        cfdnlist.add(finalKqbm);//统一信用编码
-                        cfdnlist.add(caxx.getCfbm());//库区代码
-                        String cfdn = OrderNumberUtil.generateCode(cfdnlist);
-                        caxx.setCfdm(cfdn);
-                        Long caId = caxxService.createCaxx(caxx);
-                        log.info("仓房({})的仓房编码为({})", cfdn);
-                        //创建省已经选的----备选看的是
-                        ProvinceSaveReqVO saveReqVO = new ProvinceSaveReqVO();
-//                        saveReqVO.setId(YitIdHelper.nextId());
-                        saveReqVO.setKqId(kqxx);
-                        saveReqVO.setCaId(caId);
-                        saveReqVO.setHyState(0);
-                        provinceService.createProvince(saveReqVO);
-
-                    });
-                }
-                // --财务信息--------------------
-                CwxxSaveReqVO cwxxReqVO = createReqVO.getCwxxReqVO();
-                if (ObjectUtils.isNotEmpty(cwxxReqVO)) {
-                    cwxxReqVO.setKqid(kqxx);
-                    cwxxReqVO.setDeptId(dwxx);
-                    Long cwxx = cwxxService.createCwxx(cwxxReqVO);
-                    // ---财年信息-------------
-                    if (CollectionUtils.isNotEmpty(cwxxReqVO.getCwxxYearList())) {
-                        for (CwxxYearSaveReqVO cwxxYear : cwxxReqVO.getCwxxYearList()) {
-                            cwxxYear.setCwxxId(cwxx);
-                            cwxxYearService.createCwxxYear(cwxxYear);
-                        }
+                    List<String> kqbmlist = new ArrayList<>();
+                    kqbmlist.add(qyxz);//企业性质
+                    kqbmlist.add(tyxydm);//统一信用编码
+                    kqbmlist.add(kqdm);//库区代码
+                    String kqbm = OrderNumberUtil.generateCode(kqbmlist);
+                    log.info("获取库区编码({})", kqbm);
 
+                    kqxxSaveReqVO.setKqbm(kqbm);
+                    //所属法人企业(单位名称)
+                    kqxxSaveReqVO.setSsfrqy(createReqVO.getDwxxReqVO().getDwmc());
+                    //省市县编码获取
+                    if (ObjectUtils.isNotEmpty(kqxxSaveReqVO.getSheng())) {
+                        AreaLevelDO sheng = areaLevelMapper.selectListByAreaCode(kqxxSaveReqVO.getSheng());
+                        log.info("获取省市县编码对应的地址({})", sheng.getAreaName());
+                        kqxxSaveReqVO.setShengName(sheng.getAreaName());
+                    }
+                    if (ObjectUtils.isNotEmpty(kqxxSaveReqVO.getShi())) {
+                        AreaLevelDO shi = areaLevelMapper.selectListByAreaCode(kqxxSaveReqVO.getShi());
+                        log.info("获取省市县编码对应的地址({})", shi.getAreaName());
+                        kqxxSaveReqVO.setShiName(shi.getAreaName());
+                    }
+                    if (ObjectUtils.isNotEmpty(kqxxSaveReqVO.getXian())) {
+                        AreaLevelDO xian = areaLevelMapper.selectListByAreaCode(kqxxSaveReqVO.getXian());
+                        log.info("获取省市县编码对应的地址({})", xian.getAreaName());
+                        kqxxSaveReqVO.setXianName(xian.getAreaName());
+                    }
+
+                    Long kqId;
+                    if (kqxxSaveReqVO.getId() != null) {
+                         kqId = kqxxSaveReqVO.getId();
+                        kqxxService.updateKqxx(kqxxSaveReqVO);
+                    }else {
+                        kqId = kqxxService.createKqxx(kqxxSaveReqVO);
+                    }
+
+                    //仓房信息
+                    if (CollectionUtils.isNotEmpty(createReqVO.getCaxxReqVOList())) {
+                        List<CaxxSaveReqVO> caxxReqVOList = createReqVO.getCaxxReqVOList().stream()
+                                .filter(caxx -> caxx.getKqmc() != null && caxx.getKqmc().equals(kqxxSaveReqVO.getKqmc()))
+                                .collect(Collectors.toList());
+                        //库区编码
+                        caxxReqVOList.forEach(caxx -> {
+                            caxx.setKqid(kqId);
+                            caxx.setKqmc(kqxxSaveReqVO.getKqmc());
+                            //仓房代码生成
+                            List<String> cfdnlist = new ArrayList<>();
+                            cfdnlist.add(kqbm);//统一信用编码
+                            cfdnlist.add(caxx.getCfbm());//库区代码
+                            String cfdn = OrderNumberUtil.generateCode(cfdnlist);
+                            log.info("仓房({})的仓房编码为({})",caxx.getCfmc(), cfdn);
+                            caxx.setCfdm(cfdn);
+
+                            if (caxx.getId() != null) {
+                                caxxService.updateCaxx(caxx);
+                            }else {
+                                caxxService.createCaxx(caxx);
+                            }
+                        });
+                    }
+
+                    //财务信息
+                    if (CollectionUtils.isNotEmpty(createReqVO.getCwxxReqVOList())) {
+                        CwxxSaveReqVO cwxxReqVO = createReqVO.getCwxxReqVOList().stream()
+                                .filter(cwxx -> cwxx.getKqmc() != null && cwxx.getKqmc().equals(kqxxSaveReqVO.getKqmc()))
+                                .collect(Collectors.toList()).get(0);
+                        if (ObjectUtils.isNotEmpty(cwxxReqVO)) {
+                            cwxxReqVO.setKqid(kqId);
+                            cwxxReqVO.setDeptId(dwId);
+                            Long cwId;
+                            if (cwxxReqVO.getId() != null) {
+                                cwId = cwxxReqVO.getId();
+                                cwxxService.updateCwxx(cwxxReqVO);
+                            }else {
+                                cwId = cwxxService.createCwxx(cwxxReqVO);
+                            }
+                            // ---财年信息-------------
+                            if (CollectionUtils.isNotEmpty(cwxxReqVO.getCwxxYearList())) {
+                                for (CwxxYearSaveReqVO cwxxYear : cwxxReqVO.getCwxxYearList()) {
+                                    cwxxYear.setCwxxId(cwId);
+                                    if (cwxxYear.getId() != null) {
+                                        cwxxYearService.updateCwxxYear(cwxxYear);
+                                    }else {
+                                        cwxxYearService.createCwxxYear(cwxxYear);
+                                    }
+                                }
+                            }
+                        }
                     }
                 }
             }
         }
         // 交通运输情况
-        return null;
+        return CommonResult.success("新增成功");
     }
 
 }

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

@@ -838,31 +838,40 @@ public class DwxxServiceImpl implements DwxxService {
                 dwxxMapper.insert(dwxxDO);
             }
         }
-        if (!ObjectUtils.isEmpty(updateReqVO.getIds())) {
-            List<CodingCaxxDO> codingCaxxDOS = codingCaxxMapper.selectList(CodingCaxxDO::getId, updateReqVO.getIds());
-            if (ObjectUtils.isEmpty(codingCaxxDOS)) {
-                throw exception(ERROR, "所选仓房信息不存在！");
-            }
-            List<FmxxDO> fmxxDOS = fmxxMapper.selectListByCaId(updateReqVO.getIds());
-            if (ObjectUtils.isEmpty(fmxxDOS)) {
-                throw exception(ERROR, "当前所选仓房的赋码信息不存在");
-            }
-            Map<Long, String> dmMap = fmxxDOS.stream().filter(s -> s.getBaseCaxxId() != null).collect(Collectors.toMap(FmxxDO::getBaseCaxxId, FmxxDO::getCfdm, (x, y) -> x));
-            List<CaxxDO> caxxDOSExist = caxxMapper.selectListByKqId(updateReqVO.getKqId());
-            List<CaxxDO> caxxDOS = BeanUtils.toBean(codingCaxxDOS, CaxxDO.class);
-            if (!ObjectUtils.isEmpty(caxxDOS)) {
-                if (!ObjectUtils.isEmpty(caxxDOSExist)) {
-                    List<Long> idsExist = caxxDOSExist.stream().map(CaxxDO::getId).collect(Collectors.toList());
-                    caxxDOS.removeIf(caxxDO -> idsExist.contains(caxxDO.getId()));
-                }
-                if (!ObjectUtils.isEmpty(caxxDOS)) {
-                    caxxDOS.stream().forEach(s -> {
-                        s.setSjly(1);
-                        s.setYxcf(1);
-                        String caDm = dmMap.get(s.getId());
-                        s.setCfdm(caDm);
-                    });
-                    caxxMapper.insertBatch(caxxDOS);
+        if (updateReqVO.getStoreRespVOList() != null) {
+            for (StoreRespVO storeRespVO : updateReqVO.getStoreRespVOList()) {
+                if (storeRespVO.getSjly() == 0) {
+                    CaxxDO caxxDO = new CaxxDO();
+                    caxxDO.setId(storeRespVO.getId());
+                    caxxDO.setYxcf(1);
+                    caxxMapper.updateById(caxxDO);
+                }else {
+                    List<CodingCaxxDO> codingCaxxDOS = codingCaxxMapper.selectList(CodingCaxxDO::getId, storeRespVO.getId());
+                    if (ObjectUtils.isEmpty(codingCaxxDOS)) {
+                        throw exception(ERROR, "所选仓房信息不存在！");
+                    }
+                    List<FmxxDO> fmxxDOS = fmxxMapper.selectListByCaId(storeRespVO.getId());
+                    if (ObjectUtils.isEmpty(fmxxDOS)) {
+                        throw exception(ERROR, "当前所选仓房的赋码信息不存在");
+                    }
+                    Map<Long, String> dmMap = fmxxDOS.stream().filter(s -> s.getBaseCaxxId() != null).collect(Collectors.toMap(FmxxDO::getBaseCaxxId, FmxxDO::getCfdm, (x, y) -> x));
+                    List<CaxxDO> caxxDOSExist = caxxMapper.selectListByKqId(updateReqVO.getKqId());
+                    List<CaxxDO> caxxDOS = BeanUtils.toBean(codingCaxxDOS, CaxxDO.class);
+                    if (!ObjectUtils.isEmpty(caxxDOS)) {
+                        if (!ObjectUtils.isEmpty(caxxDOSExist)) {
+                            List<Long> idsExist = caxxDOSExist.stream().map(CaxxDO::getId).collect(Collectors.toList());
+                            caxxDOS.removeIf(caxxDO -> idsExist.contains(caxxDO.getId()));
+                        }
+                        if (!ObjectUtils.isEmpty(caxxDOS)) {
+                            caxxDOS.forEach(s -> {
+                                s.setSjly(1);
+                                s.setYxcf(1);
+                                String caDm = dmMap.get(s.getId());
+                                s.setCfdm(caDm);
+                            });
+                            caxxMapper.insertBatch(caxxDOS);
+                        }
+                    }
                 }
             }
         }

delivery-module-core/delivery-module-core-biz/src/main/resources/mapper/caxx/CaxxMapper.xml

@@ -24,7 +24,7 @@
                         KQID,
                         count(id) yxcfnum
                 from DELIVERY_CAXX
-                where deleted=0
+                where deleted=0 and yxcf = 1
                 group by  KQID
                 having  count(id)>0
         ) t1 on t1.KQID=ck.id

delivery-module-core/delivery-module-core-biz/src/main/resources/mapper/dwxx/DwxxMapper.xml

@@ -420,6 +420,7 @@
                 cc.cfmc,
                 cc.CAZT,
                 cc.CFLX,
+                10 sjly,
                 TRUNC(cc.SJCR)  sjcr
         from  CODING_CAXX cc
         join CODING_FMXX cf on cc.id=cf.BASE_CAXX_ID
@@ -443,7 +444,35 @@
                         and cc.SJCR <![CDATA[>=]]>  #{pageReqVO.cfStart}
             </if>
         </where>
-        order by cc.KQID desc
+        UNION ALL
+        select
+        cf.ID ,
+        cf.KQMC,
+        cf.CAMC,
+        cf.cfmc,
+        cf.CAZT,
+        cf.CFLX,
+        cf.sjly,
+        TRUNC(cf.SJCR)  sjcr
+        from  DELIVERY_CAXX cf
+        <where>
+            and cf.KQID=#{pageReqVO.kqId} and cf.sjly = 0
+            <if test="pageReqVO.cflx!=null and pageReqVO.cflx!=''">
+                and cf.CFLX=#{pageReqVO.cflx}
+            </if>
+            <if test="pageReqVO.cfzt!=null and pageReqVO.cfzt!=''">
+                and cf.CAZT=#{pageReqVO.cfzt}
+            </if>
+            <if test="pageReqVO.cfStart!=null and pageReqVO.cfStart!='' and pageReqVO.cfEnd!=null and pageReqVO.cfEnd!=''">
+                and cf.SJCR between #{pageReqVO.cfStart} and #{pageReqVO.cfEnd}
+            </if>
+            <if test="(pageReqVO.cfStart == null or pageReqVO.cfStart == '') and pageReqVO.cfEnd != null and pageReqVO.cfEnd != ''">
+                and cf.SJCR <![CDATA[<=]]>  #{pageReqVO.cfEnd}
+            </if>
+            <if test=" pageReqVO.cfStart!=null and pageReqVO.cfStart!='' and (pageReqVO.cfEnd == null or pageReqVO.cfEnd == '') ">
+                and cf.SJCR <![CDATA[>=]]>  #{pageReqVO.cfStart}
+            </if>
+        </where>
     </select>
 
 <delete id="deleteByDwId" >
@@ -481,10 +510,31 @@
             kq.wtbgckj,
             kq.JD,
             kq.WD,
-            kq.RESID
+            kq.RESID,
+            cf.id cfId,
+            cf.CFMC,
+            cf.CFLX,
+            cf.CFBM,
+            cf.CAZT,
+            cf.SJCR,
+            cf.QTCXSM,
+            cf.KHMC,
+            cf.KHLXDH,
+            cf.KHBH,
+            cw.ID cwId,
+            cw.SFGYKG,
+            cw.SYNDZZC,
+            cwy.ID cwyId,
+            cwy.CN,
+            cwy.ZFZ,
+            cwy.YYSR,
+            cwy.JLR
         from
             DELIVERY_DWXX dw
-                LEFT JOIN DELIVERY_KQXX kq on kq.DWID = dw.ID
+        LEFT JOIN DELIVERY_KQXX kq on kq.DWID = dw.ID
+        LEFT JOIN DELIVERY_CAXX cf ON cf.KQID = kq.id
+        LEFT JOIN DELIVERY_CWXX cw ON cw.KQID = kq.id
+        LEFT JOIN DELIVERY_CWXX_YEAR cwy ON cwy.CWXX_ID = cw.id
         WHERE dw.tyxydm = #{tyxydm}
     </select>
 
@@ -522,6 +572,32 @@
             <result property="wd" column="wd"/>
             <result property="resid" column="resid"/>
         </collection>
+        <collection property="cfList" ofType="com.unis.module.coding.controller.admin.dwxx.vo.DwAndKqRespVO$Cf">
+            <id property="cfId" column="cfId"/>
+            <result property="kqmc" column="kqmc"/>
+            <result property="cfmc" column="cfmc"/>
+            <result property="cflx" column="cflx"/>
+            <result property="cfbm" column="cfbm"/>
+            <result property="cazt" column="cazt"/>
+            <result property="sjcr" column="sjcr"/>
+            <result property="qtcxsm" column="qtcxsm"/>
+            <result property="khmc" column="khmc"/>
+            <result property="khlxdh" column="khlxdh"/>
+            <result property="khbh" column="khbh"/>
+        </collection>
+        <collection property="cwList" ofType="com.unis.module.coding.controller.admin.dwxx.vo.DwAndKqRespVO$Cw">
+            <id property="cwId" column="cwId"/>
+            <result property="kqmc" column="kqmc"/>
+            <result property="sfgykg" column="sfgykg"/>
+            <result property="syndzzc" column="syndzzc"/>
+            <collection property="cwyList" ofType="com.unis.module.coding.controller.admin.dwxx.vo.DwAndKqRespVO$Cw$Cwy">
+                <id property="cwyId" column="cwyId"/>
+                <result property="cn" column="SFGYKG"/>
+                <result property="zfz" column="zfz"/>
+                <result property="yysr" column="yysr"/>
+                <result property="jlr" column="jlr"/>
+            </collection>
+        </collection>
     </resultMap>
 
 </mapper>