客户名称(单位名称)字段添加

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

@@ -71,10 +71,10 @@ public class CaxxController {
         CaxxDO caxx = caxxService.getCaxx(id);
         return success(BeanUtils.toBean(caxx, CaxxRespVO.class));
     }
-    @GetMapping("/getByKqBm")
+    @PostMapping("/getByKqBm")
     @Operation(summary = "库区人员获得仓廒信息;分页;")
     @PreAuthorize("@ss.hasPermission('coding:caxx:queryByKqBm')")
-    public CommonResult<PageResult<CaxxRespVO>> getCaxx(@Valid CaxxPageReqVO pageReqVO) {
+    public CommonResult<PageResult<CaxxRespVO>> getCaxx(@Valid @RequestBody CaxxPageReqVO pageReqVO) {
         PageResult<CaxxDO> pageResult = caxxService.getCaxxByKqBm(pageReqVO);
         return success(BeanUtils.toBean(pageResult, CaxxRespVO.class));
     }

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

@@ -4,10 +4,14 @@ import lombok.*;
 
 import java.time.LocalDate;
 import java.util.*;
+
 import io.swagger.v3.oas.annotations.media.Schema;
 import com.unis.framework.common.pojo.PageParam;
+
 import java.math.BigDecimal;
+
 import org.springframework.format.annotation.DateTimeFormat;
+
 import java.time.LocalDateTime;
 
 import static com.unis.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@@ -84,4 +88,7 @@ public class CaxxPageReqVO extends PageParam {
 
     @Schema(description = "已选仓房(0:未选,1:已选)")
     private Integer yxcf;
+
+    @Schema(description = "客户名称(单位名称)")
+    private String khmc;
 }

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

@@ -114,4 +114,9 @@ public class CaxxRespVO {
 
     @Schema(description = "0:备选,1:被认定,2:被选定")
     private Integer bxzt;
+
+    @Schema(description = "客户名称(单位名称)")
+    @ExcelProperty("客户名称(单位名称)")
+    private String khmc;
+
 }

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

@@ -84,4 +84,7 @@ public class CaxxSaveReqVO {
     @Schema(description = "交收库备选状态(0:备选,1:被认定,2:被选定)")
     private Integer bxzt;
 
+    @Schema(description = "客户名称(单位名称)")
+    private String khmc;
+
 }

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

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

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/dal/dataobject/caxx/CaxxDO.java

@@ -102,10 +102,16 @@ public class CaxxDO extends BaseDO {
      * 数据来源
      */
     private Integer sjly;
-    /** 是否空仓(0:否,1:是) */
+    /**
+     * 是否空仓(0:否,1:是)
+     */
     private Integer sfkc;
     /**
      * 仓房代码
      */
     private String cfdm;
+    /**
+     * 客户名称(单位名称)
+     */
+    private String khmc;
 }

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

@@ -25,6 +25,7 @@ import com.unis.module.coding.service.cwxx.CwxxService;
 import com.unis.module.coding.service.cwxxyear.CwxxYearService;
 import com.unis.module.coding.service.dwxx.DwxxService;
 import com.unis.module.coding.service.kqxx.KqxxService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -41,6 +42,7 @@ import static com.unis.module.infra.enums.ErrorCodeConstants.ERROR;
  * @create 2025-01-22 15:28
  */
 @Service
+@Slf4j
 public class DeliveryServiceImpl implements DeliveryService {
     @Resource
     private DwxxService dwxxService;
@@ -79,12 +81,16 @@ public class DeliveryServiceImpl implements DeliveryService {
     public Object createByAll(DeliverySaveVO createReqVO) {
         // 单位信息
         if (ObjectUtils.isNotEmpty(createReqVO.getDwxxReqVO())) {
+            if (ObjectUtils.isEmpty(createReqVO.getDwxxReqVO().getTyxydm())) {
+                throw exception(ERROR, "统一信用编码为空");
+            }
             //根据统一信用编码----添加之前查询是否已经添加过该单位
             List<DwxxDO> tyxydm1 = dwxxMapper.selectList(new QueryWrapper<DwxxDO>().eq("TYXYDM", createReqVO.getDwxxReqVO().getTyxydm()));
             Long dwxx = null;
             if (CollectionUtils.isEmpty(tyxydm1)) {
                 dwxx = dwxxService.createDwxx(createReqVO.getDwxxReqVO());
             } else {
+                log.info("根据统一信用编码查询之前已经添加过该单位({})", tyxydm1.get(0).getId());
                 dwxx = tyxydm1.get(0).getId();
             }
             // 库区信息
@@ -111,21 +117,11 @@ public class DeliveryServiceImpl implements DeliveryService {
                 String kqbm = "";
                 // 单位信息社会统一信用编码
                 String tyxydm = createReqVO.getDwxxReqVO().getTyxydm();
-                if (tyxydm == null) {
-                    throw exception(ERROR, "统一信用编码为空");
-                }
                 tyxydm = tyxydm.length() <= 18 ? tyxydm : tyxydm.substring(0, 18);
                 //企业性质
                 String qyxz = createReqVO.getDwxxReqVO().getQyxz();
                 //企业性质变成两位
                 kqbm = KQBMUtils.createKQBM(qyxz, tyxydm, kqdm);
-/*                if (qyxz == null) {
-                    kqbm = "01" + tyxydm + kqdm;
-                } else if (qyxz < 10) {
-                    kqbm = "0" + qyxz + tyxydm + kqdm;
-                } else {
-                    kqbm = qyxz + tyxydm + kqdm;
-                }*/
                 createReqVO.getKqxxReqVO().setKqbm(kqbm);
                 Long kqxx = kqxxService.createKqxx(createReqVO.getKqxxReqVO());
 
@@ -133,6 +129,7 @@ public class DeliveryServiceImpl implements DeliveryService {
                 // 仓房信息
                 if (CollectionUtils.isNotEmpty(createReqVO.getCaxxReqVOList())) {
                     createReqVO.getCaxxReqVOList().forEach(caxx -> {
+                        caxx.setYxcf(1);
                         caxx.setKqid(kqxx);
                         caxxService.createCaxx(caxx);
                     });