费控问题处理

hx-account/src/main/resources/mapper/cost/CostControlDetailMapper.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.fjhx.account.mapper.cost.CostControlDetailMapper">
-    <select id="getList" resultType="com.fjhx.account.entity.cost.vo.CostControlDetailVo">
-        SELECT ccd.*,
-               sui.`name` AS supplierName,
-               shi.`name` AS shopName
-        FROM cost_control_detail ccd
-                 LEFT JOIN supplier_info sui ON ccd.supplier_id = sui.id
-                 LEFT JOIN shop_info shi ON ccd.shop_id = shi.id
-            ${ew.customSqlSegment}
-    </select>
-
-</mapper>

hx-account/src/main/resources/mapper/cost/CostControlMapper.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.fjhx.account.mapper.cost.CostControlMapper">
-    <select id="getPage" resultType="com.fjhx.account.entity.cost.vo.CostControlVo">
-        select cc.*
-        from cost_control cc
-            ${ew.customSqlSegment}
-    </select>
-
-</mapper>

hx-account/src/main/java/com/fjhx/account/controller/cost/CostControlController.java → hx-form/src/main/java/com/fjhx/form/controller/cost/CostControlController.java

@@ -1,11 +1,11 @@
-package com.fjhx.account.controller.cost;
+package com.fjhx.form.controller.cost;
 
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.account.entity.cost.dto.CostControlDto;
-import com.fjhx.account.entity.cost.dto.CostControlSelectDto;
-import com.fjhx.account.entity.cost.vo.CostControlVo;
-import com.fjhx.account.service.cost.CostControlService;
+import com.fjhx.form.entity.cost.dto.CostControlDto;
+import com.fjhx.form.entity.cost.dto.CostControlSelectDto;
+import com.fjhx.form.entity.cost.vo.CostControlVo;
+import com.fjhx.form.service.cost.CostControlService;
 import com.ruoyi.common.core.domain.BaseSelectDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;

hx-account/src/main/java/com/fjhx/account/controller/cost/CostControlDetailController.java → hx-form/src/main/java/com/fjhx/form/controller/cost/CostControlDetailController.java

@@ -1,4 +1,4 @@
-package com.fjhx.account.controller.cost;
+package com.fjhx.form.controller.cost;
 
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;

hx-account/src/main/java/com/fjhx/account/entity/cost/dto/CostControlDetailDto.java → hx-form/src/main/java/com/fjhx/form/entity/cost/dto/CostControlDetailDto.java

@@ -1,8 +1,8 @@
-package com.fjhx.account.entity.cost.dto;
+package com.fjhx.form.entity.cost.dto;
 
 import com.fjhx.account.entity.calculate.po.CalculateItem;
-import com.fjhx.account.entity.cost.po.CostControlDetail;
 import com.fjhx.file.entity.ObsFile;
+import com.fjhx.form.entity.cost.po.CostControlDetail;
 import lombok.Getter;
 import lombok.Setter;
 

hx-account/src/main/java/com/fjhx/account/entity/cost/dto/CostControlDetailSelectDto.java → hx-form/src/main/java/com/fjhx/form/entity/cost/dto/CostControlDetailSelectDto.java

@@ -1,4 +1,4 @@
-package com.fjhx.account.entity.cost.dto;
+package com.fjhx.form.entity.cost.dto;
 
 import com.ruoyi.common.core.domain.BaseSelectDto;
 import lombok.Getter;

hx-account/src/main/java/com/fjhx/account/entity/cost/dto/CostControlDto.java → hx-form/src/main/java/com/fjhx/form/entity/cost/dto/CostControlDto.java

@@ -1,6 +1,6 @@
-package com.fjhx.account.entity.cost.dto;
+package com.fjhx.form.entity.cost.dto;
 
-import com.fjhx.account.entity.cost.po.CostControl;
+import com.fjhx.form.entity.cost.po.CostControl;
 import lombok.Getter;
 import lombok.Setter;
 

hx-account/src/main/java/com/fjhx/account/entity/cost/dto/CostControlSelectDto.java → hx-form/src/main/java/com/fjhx/form/entity/cost/dto/CostControlSelectDto.java

@@ -1,4 +1,4 @@
-package com.fjhx.account.entity.cost.dto;
+package com.fjhx.form.entity.cost.dto;
 
 import com.ruoyi.common.core.domain.BaseSelectDto;
 import lombok.Getter;

hx-account/src/main/java/com/fjhx/account/entity/cost/po/CostControl.java → hx-form/src/main/java/com/fjhx/form/entity/cost/po/CostControl.java

@@ -1,4 +1,4 @@
-package com.fjhx.account.entity.cost.po;
+package com.fjhx.form.entity.cost.po;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;

hx-account/src/main/java/com/fjhx/account/entity/cost/po/CostControlDetail.java → hx-form/src/main/java/com/fjhx/form/entity/cost/po/CostControlDetail.java

@@ -1,4 +1,4 @@
-package com.fjhx.account.entity.cost.po;
+package com.fjhx.form.entity.cost.po;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fjhx.common.controller.Label;

hx-account/src/main/java/com/fjhx/account/entity/cost/vo/CostControlDetailVo.java → hx-form/src/main/java/com/fjhx/form/entity/cost/vo/CostControlDetailVo.java

@@ -1,9 +1,9 @@
-package com.fjhx.account.entity.cost.vo;
+package com.fjhx.form.entity.cost.vo;
 
 import com.fjhx.account.entity.calculate.vo.CalculateItemVo;
-import com.fjhx.account.entity.cost.po.CostControlDetail;
 import com.fjhx.common.controller.Label;
 import com.fjhx.file.entity.ObsFile;
+import com.fjhx.form.entity.cost.po.CostControlDetail;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -80,4 +80,5 @@ public class CostControlDetailVo extends CostControlDetail {
      * 核算项目列表
      */
     private List<CalculateItemVo> calculateItemList;
+
 }

hx-account/src/main/java/com/fjhx/account/entity/cost/vo/CostControlVo.java → hx-form/src/main/java/com/fjhx/form/entity/cost/vo/CostControlVo.java

@@ -1,6 +1,7 @@
-package com.fjhx.account.entity.cost.vo;
+package com.fjhx.form.entity.cost.vo;
 
-import com.fjhx.account.entity.cost.po.CostControl;
+import com.fjhx.form.entity.cost.po.CostControl;
+import com.fjhx.sale.entity.contract.vo.ContractOutboundInfoVo;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -60,4 +61,10 @@ public class CostControlVo extends CostControl {
      */
     private String costTypeName;
 
+    private List<ContractOutboundInfoVo> contractOutboundInfoList;
+
+    private String contractCode;
+    private String contractTaxTransportationWay;
+    private Integer contractBelongType;
+
 }

hx-account/src/main/java/com/fjhx/account/flow/CostControlFlow.java → hx-form/src/main/java/com/fjhx/form/flow/CostControlFlow.java

@@ -1,17 +1,17 @@
-package com.fjhx.account.flow;
+package com.fjhx.form.flow;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
-import com.fjhx.account.entity.cost.dto.CostControlDto;
-import com.fjhx.account.entity.cost.po.CostControl;
-import com.fjhx.account.entity.cost.po.CostControlDetail;
-import com.fjhx.account.service.cost.CostControlDetailService;
-import com.fjhx.account.service.cost.CostControlService;
 import com.fjhx.common.enums.CodingRuleEnum;
 import com.fjhx.common.enums.FlowStatusEnum1;
 import com.fjhx.common.service.coding.CodingRuleService;
 import com.fjhx.flow.core.FlowDelegate;
 import com.fjhx.flow.enums.FlowStatusEnum;
+import com.fjhx.form.entity.cost.dto.CostControlDto;
+import com.fjhx.form.entity.cost.po.CostControl;
+import com.fjhx.form.entity.cost.po.CostControlDetail;
+import com.fjhx.form.service.cost.CostControlDetailService;
+import com.fjhx.form.service.cost.CostControlService;
 import com.fjhx.wms.entity.stock.po.StockJournalDetails;
 import com.fjhx.wms.service.stock.StockJournalDetailsService;
 import com.ruoyi.common.core.domain.BasePo;

hx-account/src/main/java/com/fjhx/account/mapper/cost/CostControlDetailMapper.java → hx-form/src/main/java/com/fjhx/form/mapper/cost/CostControlDetailMapper.java

@@ -1,8 +1,8 @@
-package com.fjhx.account.mapper.cost;
+package com.fjhx.form.mapper.cost;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.fjhx.account.entity.cost.po.CostControlDetail;
-import com.fjhx.account.entity.cost.vo.CostControlDetailVo;
+import com.fjhx.form.entity.cost.po.CostControlDetail;
+import com.fjhx.form.entity.cost.vo.CostControlDetailVo;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import org.apache.ibatis.annotations.Param;
 

hx-account/src/main/java/com/fjhx/account/mapper/cost/CostControlMapper.java → hx-form/src/main/java/com/fjhx/form/mapper/cost/CostControlMapper.java

@@ -1,9 +1,9 @@
-package com.fjhx.account.mapper.cost;
+package com.fjhx.form.mapper.cost;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.account.entity.cost.po.CostControl;
-import com.fjhx.account.entity.cost.vo.CostControlVo;
+import com.fjhx.form.entity.cost.po.CostControl;
+import com.fjhx.form.entity.cost.vo.CostControlVo;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -23,4 +23,6 @@ public interface CostControlMapper extends BaseMapper<CostControl> {
      */
     Page<CostControlVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<CostControl> wrapper);
 
+    CostControlVo detail(@Param("ew") IWrapper<Object> wrapper);
+
 }

hx-account/src/main/java/com/fjhx/account/service/cost/CostControlDetailService.java → hx-form/src/main/java/com/fjhx/form/service/cost/CostControlDetailService.java

@@ -1,7 +1,7 @@
-package com.fjhx.account.service.cost;
+package com.fjhx.form.service.cost;
 
-import com.fjhx.account.entity.cost.po.CostControlDetail;
-import com.fjhx.account.entity.cost.vo.CostControlDetailVo;
+import com.fjhx.form.entity.cost.po.CostControlDetail;
+import com.fjhx.form.entity.cost.vo.CostControlDetailVo;
 import com.ruoyi.common.core.service.BaseService;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 

hx-account/src/main/java/com/fjhx/account/service/cost/CostControlService.java → hx-form/src/main/java/com/fjhx/form/service/cost/CostControlService.java

@@ -1,12 +1,12 @@
-package com.fjhx.account.service.cost;
+package com.fjhx.form.service.cost;
 
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.account.entity.cost.dto.CostControlDto;
-import com.fjhx.account.entity.cost.dto.CostControlSelectDto;
-import com.fjhx.account.entity.cost.po.CostControl;
-import com.fjhx.account.entity.cost.po.CostControlDetail;
-import com.fjhx.account.entity.cost.vo.CostControlVo;
+import com.fjhx.form.entity.cost.dto.CostControlDto;
+import com.fjhx.form.entity.cost.dto.CostControlSelectDto;
+import com.fjhx.form.entity.cost.po.CostControl;
+import com.fjhx.form.entity.cost.po.CostControlDetail;
+import com.fjhx.form.entity.cost.vo.CostControlVo;
 import com.ruoyi.common.core.service.BaseService;
 
 import java.util.List;

hx-account/src/main/java/com/fjhx/account/service/cost/impl/CostControlDetailServiceImpl.java → hx-form/src/main/java/com/fjhx/form/service/cost/impl/CostControlDetailServiceImpl.java

@@ -1,12 +1,12 @@
-package com.fjhx.account.service.cost.impl;
+package com.fjhx.form.service.cost.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fjhx.account.entity.cost.po.CostControlDetail;
-import com.fjhx.account.entity.cost.vo.CostControlDetailVo;
-import com.fjhx.account.mapper.cost.CostControlDetailMapper;
 import com.fjhx.account.service.account.AccountSubjectsService;
-import com.fjhx.account.service.cost.CostControlDetailService;
 import com.fjhx.common.service.logistics.LogisticsCompanyInfoService;
+import com.fjhx.form.entity.cost.po.CostControlDetail;
+import com.fjhx.form.entity.cost.vo.CostControlDetailVo;
+import com.fjhx.form.mapper.cost.CostControlDetailMapper;
+import com.fjhx.form.service.cost.CostControlDetailService;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

hx-account/src/main/java/com/fjhx/account/service/cost/impl/CostControlServiceImpl.java → hx-form/src/main/java/com/fjhx/form/service/cost/impl/CostControlServiceImpl.java

@@ -1,4 +1,4 @@
-package com.fjhx.account.service.cost.impl;
+package com.fjhx.form.service.cost.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
@@ -8,17 +8,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.account.entity.calculate.po.CalculateItem;
 import com.fjhx.account.entity.calculate.vo.CalculateItemVo;
-import com.fjhx.account.entity.cost.dto.CostControlDetailDto;
-import com.fjhx.account.entity.cost.dto.CostControlDto;
-import com.fjhx.account.entity.cost.dto.CostControlSelectDto;
-import com.fjhx.account.entity.cost.po.CostControl;
-import com.fjhx.account.entity.cost.po.CostControlDetail;
-import com.fjhx.account.entity.cost.vo.CostControlDetailVo;
-import com.fjhx.account.entity.cost.vo.CostControlVo;
-import com.fjhx.account.mapper.cost.CostControlMapper;
 import com.fjhx.account.service.calculate.CalculateItemService;
-import com.fjhx.account.service.cost.CostControlDetailService;
-import com.fjhx.account.service.cost.CostControlService;
 import com.fjhx.account.service.payment.PaymentTypeService;
 import com.fjhx.common.controller.Label;
 import com.fjhx.common.enums.FlowStatusEnum1;
@@ -28,6 +18,20 @@ import com.fjhx.file.utils.ObsFileUtil;
 import com.fjhx.flow.entity.flow.po.FlowExample;
 import com.fjhx.flow.enums.FlowStatusEnum;
 import com.fjhx.flow.service.flow.FlowExampleService;
+import com.fjhx.form.entity.cost.dto.CostControlDetailDto;
+import com.fjhx.form.entity.cost.dto.CostControlDto;
+import com.fjhx.form.entity.cost.dto.CostControlSelectDto;
+import com.fjhx.form.entity.cost.po.CostControl;
+import com.fjhx.form.entity.cost.po.CostControlDetail;
+import com.fjhx.form.entity.cost.vo.CostControlDetailVo;
+import com.fjhx.form.entity.cost.vo.CostControlVo;
+import com.fjhx.form.mapper.cost.CostControlMapper;
+import com.fjhx.form.service.cost.CostControlDetailService;
+import com.fjhx.form.service.cost.CostControlService;
+import com.fjhx.sale.entity.contract.po.Contract;
+import com.fjhx.sale.entity.contract.vo.ContractOutboundInfoVo;
+import com.fjhx.sale.service.contract.ContractOutboundInfoService;
+import com.fjhx.sale.service.contract.ContractService;
 import com.fjhx.wms.entity.stock.po.StockJournalDetails;
 import com.fjhx.wms.service.stock.StockJournalDetailsService;
 import com.ruoyi.common.core.domain.BaseIdPo;
@@ -72,6 +76,10 @@ public class CostControlServiceImpl extends ServiceImpl<CostControlMapper, CostC
     private CalculateItemService calculateItemService;
     @Autowired
     private CustomerService customerService;
+    @Autowired
+    private ContractService contractService;
+    @Autowired
+    private ContractOutboundInfoService contractOutboundInfoService;
 
     @Override
     public Page<CostControlVo> getPage(CostControlSelectDto dto) {
@@ -102,8 +110,8 @@ public class CostControlServiceImpl extends ServiceImpl<CostControlMapper, CostC
 
     @Override
     public CostControlVo detail(Long id) {
-        CostControl CostControl = this.getById(id);
-        CostControlVo result = BeanUtil.toBean(CostControl, CostControlVo.class);
+        CostControl costControl = this.getById(id);
+        CostControlVo result = BeanUtil.toBean(costControl, CostControlVo.class);
 
         //赋值详情
         setInfo(Arrays.asList(result));
@@ -111,6 +119,17 @@ public class CostControlServiceImpl extends ServiceImpl<CostControlMapper, CostC
         //赋值明细列表
         setDetailInfo(result);
 
+        //赋值合同信息
+        Contract contract = contractService.getById(result.getContractId());
+        if (ObjectUtil.isNotEmpty(contract)) {
+            result.setContractCode(contract.getCode());
+            result.setContractBelongType(contract.getBelongType());
+            result.setContractTaxTransportationWay(contract.getTaxTransportationWay());
+        }
+
+        //赋值到货信息列表
+        List<ContractOutboundInfoVo> contractOutboundInfoList = contractOutboundInfoService.getList(IWrapper.getWrapper().eq(true, "c.id", costControl.getContractId()));
+        result.setContractOutboundInfoList(contractOutboundInfoList);
 
         return result;
     }

hx-sale/src/main/java/com/fjhx/sale/entity/contract/vo/ContractOutboundInfoVo.java

@@ -29,4 +29,7 @@ public class ContractOutboundInfoVo extends ContractOutboundInfo {
     private String contractCode;
     private Integer modCount;
     private Integer sumQuantity;
+
+    private String contractTaxTransportationWay;
+    private Integer contractBelongType;
 }

hx-sale/src/main/resources/mapper/contract/ContractOutboundInfoMapper.xml

@@ -5,6 +5,8 @@
     <sql id="list">
         SELECT coi.*,
                c.`code`                  AS contractCode,
+               c.tax_transportation_way  as contractTaxTransportationWay,
+               c.belong_type             as contractBelongType,
                IFNULL(t1.modCount, 0)    AS modCount,
                IFNULL(t1.sumQuantity, 0) AS sumQuantity
         FROM contract_outbound_info coi