diff --git a/ruoyi-admin/src/main/java/com/ruoyi/taxInvoice/controller/ErpCompanyCostController.java b/ruoyi-admin/src/main/java/com/ruoyi/financial/controller/CompanyCostController.java
similarity index 57%
rename from ruoyi-admin/src/main/java/com/ruoyi/taxInvoice/controller/ErpCompanyCostController.java
rename to ruoyi-admin/src/main/java/com/ruoyi/financial/controller/CompanyCostController.java
index 1a58d52d..51837640 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/taxInvoice/controller/ErpCompanyCostController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/financial/controller/CompanyCostController.java
@@ -1,4 +1,4 @@
-package com.ruoyi.taxInvoice.controller;
+package com.ruoyi.financial.controller;
 
 import java.util.List;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -12,8 +12,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.taxInvoice.domain.ErpCompanyCost;
-import com.ruoyi.taxInvoice.service.IErpCompanyCostService;
+import com.ruoyi.financial.domain.CompanyCost;
+import com.ruoyi.financial.service.ICompanyCostService;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -23,48 +23,48 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * 公司成本Controller
  * 
  * @author zhang
- * @date 2024-03-05
+ * @date 2024-08-05
  */
 @Controller
-@RequestMapping("/taxInvoice/companyCost")
-public class ErpCompanyCostController extends BaseController
+@RequestMapping("/financial/companyCost")
+public class CompanyCostController extends BaseController
 {
-    private String prefix = "taxInvoice/companyCost";
+    private String prefix = "financial/companyCost";
 
     @Autowired
-    private IErpCompanyCostService erpCompanyCostService;
+    private ICompanyCostService companyCostService;
 
-    @RequiresPermissions("taxInvoice:companyCost:view")
+    @RequiresPermissions("financial:companCost:view")
     @GetMapping()
-    public String companyCost()
+    public String compantCost()
     {
-        return prefix + "/companyCost";
+        return prefix + "/compantCost";
     }
 
     /**
      * 查询公司成本列表
      */
-    @RequiresPermissions("taxInvoice:companyCost:list")
+    @RequiresPermissions("financial:companCost:list")
     @PostMapping("/list")
     @ResponseBody
-    public TableDataInfo list(ErpCompanyCost erpCompanyCost)
+    public TableDataInfo list(CompanyCost companyCost)
     {
         startPage();
-        List<ErpCompanyCost> list = erpCompanyCostService.selectErpCompanyCostList(erpCompanyCost);
+        List<CompanyCost> list = companyCostService.selectCompanyCostList(companyCost);
         return getDataTable(list);
     }
 
     /**
      * 导出公司成本列表
      */
-    @RequiresPermissions("taxInvoice:companyCost:export")
+    @RequiresPermissions("financial:companCost:export")
     @Log(title = "公司成本", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     @ResponseBody
-    public AjaxResult export(ErpCompanyCost erpCompanyCost)
+    public AjaxResult export(CompanyCost companyCost)
     {
-        List<ErpCompanyCost> list = erpCompanyCostService.selectErpCompanyCostList(erpCompanyCost);
-        ExcelUtil<ErpCompanyCost> util = new ExcelUtil<ErpCompanyCost>(ErpCompanyCost.class);
+        List<CompanyCost> list = companyCostService.selectCompanyCostList(companyCost);
+        ExcelUtil<CompanyCost> util = new ExcelUtil<CompanyCost>(CompanyCost.class);
         return util.exportExcel(list, "公司成本数据");
     }
 
@@ -80,13 +80,13 @@ public class ErpCompanyCostController extends BaseController
     /**
      * 新增保存公司成本
      */
-    @RequiresPermissions("taxInvoice:companyCost:add")
+    @RequiresPermissions("financial:companCost:add")
     @Log(title = "公司成本", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     @ResponseBody
-    public AjaxResult addSave(ErpCompanyCost erpCompanyCost)
+    public AjaxResult addSave(CompanyCost companyCost)
     {
-        return toAjax(erpCompanyCostService.insertErpCompanyCost(erpCompanyCost));
+        return toAjax(companyCostService.insertCompanyCost(companyCost));
     }
 
     /**
@@ -95,56 +95,56 @@ public class ErpCompanyCostController extends BaseController
     @GetMapping("/edit/{id}")
     public String edit(@PathVariable("id") Long id, ModelMap mmap)
     {
-        ErpCompanyCost erpCompanyCost = erpCompanyCostService.selectErpCompanyCostById(id);
-        mmap.put("erpCompanyCost", erpCompanyCost);
+        CompanyCost companyCost = companyCostService.selectCompanyCostById(id);
+        mmap.put("companyCost", companyCost);
         return prefix + "/edit";
     }
 
     /**
      * 修改保存公司成本
      */
-    @RequiresPermissions("taxInvoice:companyCost:edit")
+    @RequiresPermissions("financial:companCost:edit")
     @Log(title = "公司成本", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
     @ResponseBody
-    public AjaxResult editSave(ErpCompanyCost erpCompanyCost)
+    public AjaxResult editSave(CompanyCost companyCost)
     {
-        return toAjax(erpCompanyCostService.updateErpCompanyCost(erpCompanyCost));
+        return toAjax(companyCostService.updateCompanyCost(companyCost));
     }
 
     /**
      * 删除公司成本
      */
-    @RequiresPermissions("taxInvoice:companyCost:remove")
+    @RequiresPermissions("financial:companCost:remove")
     @Log(title = "公司成本", businessType = BusinessType.DELETE)
     @PostMapping( "/remove")
     @ResponseBody
     public AjaxResult remove(String ids)
     {
-        return toAjax(erpCompanyCostService.deleteErpCompanyCostByIds(ids));
+        return toAjax(companyCostService.deleteCompanyCostByIds(ids));
     }
 
     /**
      * 作废公司成本
      */
-    @RequiresPermissions("taxInvoice:companyCost:cancel")
+    @RequiresPermissions("financial:companCost:cancel")
     @Log(title = "公司成本", businessType = BusinessType.CANCEL)
     @GetMapping( "/cancel/{id}")
     @ResponseBody
     public AjaxResult cancel(@PathVariable("id") Long id){
-        return toAjax(erpCompanyCostService.cancelErpCompanyCostById(id));
+        return toAjax(companyCostService.cancelCompanyCostById(id));
     }
 
     /**
      * 恢复公司成本
      */
-    @RequiresPermissions("taxInvoice:companyCost:restore")
+    @RequiresPermissions("financial:companCost:restore")
     @Log(title = "公司成本", businessType = BusinessType.RESTORE)
     @GetMapping( "/restore/{id}")
     @ResponseBody
     public AjaxResult restore(@PathVariable("id")Long id)
     {
-        return toAjax(erpCompanyCostService.restoreErpCompanyCostById(id));
+        return toAjax(companyCostService.restoreCompanyCostById(id));
     }
 
 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/financial/domain/CompanyCost.java b/ruoyi-admin/src/main/java/com/ruoyi/financial/domain/CompanyCost.java
new file mode 100644
index 00000000..cee2b4c0
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/financial/domain/CompanyCost.java
@@ -0,0 +1,267 @@
+package com.ruoyi.financial.domain;
+
+import java.math.BigDecimal;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 公司成本对象 financial_company_cost
+ * 
+ * @author zhang
+ * @date 2024-08-05
+ */
+public class CompanyCost extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 索引 */
+    private Long id;
+
+    /** 公司成本ID */
+    @Excel(name = "公司成本ID")
+    private String ctcId;
+
+    /** 年份 */
+    @Excel(name = "年份")
+    private Long year;
+
+    /** 月份 */
+    @Excel(name = "月份")
+    private Long month;
+
+    /** 经营成本 */
+    @Excel(name = "经营成本")
+    private Long operatingCosts;
+
+    /** 工资费用 */
+    @Excel(name = "工资费用")
+    private BigDecimal salaryExpenses;
+
+    /** 厂租费用 */
+    @Excel(name = "厂租费用")
+    private BigDecimal factoryRentalFees;
+
+    /** 税金费用 */
+    @Excel(name = "税金费用")
+    private BigDecimal taxExpenses;
+
+    /** 工厂电费 */
+    @Excel(name = "工厂电费")
+    private BigDecimal factoryElectricityFees;
+
+    /** 其他费用 */
+    @Excel(name = "其他费用")
+    private BigDecimal ohterExpenses;
+
+    /** 业务成本 */
+    @Excel(name = "业务成本")
+    private BigDecimal businessCost;
+
+    /** 运输费用 */
+    @Excel(name = "运输费用")
+    private BigDecimal transportationCosts;
+
+    /** 推广费用 */
+    @Excel(name = "推广费用")
+    private BigDecimal promotionExpenses;
+
+    /** 包装费用 */
+    @Excel(name = "包装费用")
+    private BigDecimal packagingCost;
+
+    /** 业务费用 */
+    @Excel(name = "业务费用")
+    private BigDecimal businessExpenses;
+
+    /** 售后费用 */
+    @Excel(name = "售后费用")
+    private BigDecimal afterSalesExpenses;
+
+    /** 业务提成 */
+    @Excel(name = "业务提成")
+    private BigDecimal businessCommission;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setCtcId(String ctcId) 
+    {
+        this.ctcId = ctcId;
+    }
+
+    public String getCtcId() 
+    {
+        return ctcId;
+    }
+    public void setYear(Long year) 
+    {
+        this.year = year;
+    }
+
+    public Long getYear() 
+    {
+        return year;
+    }
+    public void setMonth(Long month) 
+    {
+        this.month = month;
+    }
+
+    public Long getMonth() 
+    {
+        return month;
+    }
+    public void setOperatingCosts(Long operatingCosts) 
+    {
+        this.operatingCosts = operatingCosts;
+    }
+
+    public Long getOperatingCosts() 
+    {
+        return operatingCosts;
+    }
+    public void setSalaryExpenses(BigDecimal salaryExpenses) 
+    {
+        this.salaryExpenses = salaryExpenses;
+    }
+
+    public BigDecimal getSalaryExpenses() 
+    {
+        return salaryExpenses;
+    }
+    public void setFactoryRentalFees(BigDecimal factoryRentalFees) 
+    {
+        this.factoryRentalFees = factoryRentalFees;
+    }
+
+    public BigDecimal getFactoryRentalFees() 
+    {
+        return factoryRentalFees;
+    }
+    public void setTaxExpenses(BigDecimal taxExpenses) 
+    {
+        this.taxExpenses = taxExpenses;
+    }
+
+    public BigDecimal getTaxExpenses() 
+    {
+        return taxExpenses;
+    }
+    public void setFactoryElectricityFees(BigDecimal factoryElectricityFees) 
+    {
+        this.factoryElectricityFees = factoryElectricityFees;
+    }
+
+    public BigDecimal getFactoryElectricityFees() 
+    {
+        return factoryElectricityFees;
+    }
+    public void setOhterExpenses(BigDecimal ohterExpenses) 
+    {
+        this.ohterExpenses = ohterExpenses;
+    }
+
+    public BigDecimal getOhterExpenses() 
+    {
+        return ohterExpenses;
+    }
+    public void setBusinessCost(BigDecimal businessCost) 
+    {
+        this.businessCost = businessCost;
+    }
+
+    public BigDecimal getBusinessCost() 
+    {
+        return businessCost;
+    }
+    public void setTransportationCosts(BigDecimal transportationCosts) 
+    {
+        this.transportationCosts = transportationCosts;
+    }
+
+    public BigDecimal getTransportationCosts() 
+    {
+        return transportationCosts;
+    }
+    public void setPromotionExpenses(BigDecimal promotionExpenses) 
+    {
+        this.promotionExpenses = promotionExpenses;
+    }
+
+    public BigDecimal getPromotionExpenses() 
+    {
+        return promotionExpenses;
+    }
+    public void setPackagingCost(BigDecimal packagingCost) 
+    {
+        this.packagingCost = packagingCost;
+    }
+
+    public BigDecimal getPackagingCost() 
+    {
+        return packagingCost;
+    }
+    public void setBusinessExpenses(BigDecimal businessExpenses) 
+    {
+        this.businessExpenses = businessExpenses;
+    }
+
+    public BigDecimal getBusinessExpenses() 
+    {
+        return businessExpenses;
+    }
+    public void setAfterSalesExpenses(BigDecimal afterSalesExpenses) 
+    {
+        this.afterSalesExpenses = afterSalesExpenses;
+    }
+
+    public BigDecimal getAfterSalesExpenses() 
+    {
+        return afterSalesExpenses;
+    }
+    public void setBusinessCommission(BigDecimal businessCommission) 
+    {
+        this.businessCommission = businessCommission;
+    }
+
+    public BigDecimal getBusinessCommission() 
+    {
+        return businessCommission;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("ctcId", getCtcId())
+            .append("year", getYear())
+            .append("month", getMonth())
+            .append("operatingCosts", getOperatingCosts())
+            .append("salaryExpenses", getSalaryExpenses())
+            .append("factoryRentalFees", getFactoryRentalFees())
+            .append("taxExpenses", getTaxExpenses())
+            .append("factoryElectricityFees", getFactoryElectricityFees())
+            .append("ohterExpenses", getOhterExpenses())
+            .append("businessCost", getBusinessCost())
+            .append("transportationCosts", getTransportationCosts())
+            .append("promotionExpenses", getPromotionExpenses())
+            .append("packagingCost", getPackagingCost())
+            .append("businessExpenses", getBusinessExpenses())
+            .append("afterSalesExpenses", getAfterSalesExpenses())
+            .append("businessCommission", getBusinessCommission())
+            .append("createTime", getCreateTime())
+            .append("createBy", getCreateBy())
+            .append("updateTime", getUpdateTime())
+            .append("updateBy", getUpdateBy())
+            .append("remark", getRemark())
+            .toString();
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/financial/mapper/CompanyCostMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/financial/mapper/CompanyCostMapper.java
new file mode 100644
index 00000000..2223012e
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/financial/mapper/CompanyCostMapper.java
@@ -0,0 +1,99 @@
+package com.ruoyi.financial.mapper;
+
+import java.util.List;
+import com.ruoyi.financial.domain.CompanyCost;
+
+/**
+ * 公司成本Mapper接口
+ * 
+ * @author zhang
+ * @date 2024-08-05
+ */
+public interface CompanyCostMapper 
+{
+    /**
+     * 查询公司成本
+     *
+     * @param id 公司成本ID
+     * @return 公司成本
+     */
+    public CompanyCost selectCompanyCostById(Long id);
+    /**
+     * 查询公司成本
+     *
+     * @param id 公司成本ID
+     * @return 公司成本
+     */
+    public CompanyCost selectCompanyCostByCtcId(Long id);
+
+    /**
+     * 查询公司成本列表
+     * 
+     * @param companyCost 公司成本
+     * @return 公司成本集合
+     */
+    public List<CompanyCost> selectCompanyCostList(CompanyCost companyCost);
+
+    /**
+     * 新增公司成本
+     * 
+     * @param companyCost 公司成本
+     * @return 结果
+     */
+    public int insertCompanyCost(CompanyCost companyCost);
+
+    /**
+     * 修改公司成本
+     * 
+     * @param companyCost 公司成本
+     * @return 结果
+     */
+    public int updateCompanyCost(CompanyCost companyCost);
+
+    /**
+     * 删除公司成本
+     * 
+     * @param id 公司成本ID
+     * @return 结果
+     */
+    public int deleteCompanyCostById(Long id);
+    /**
+     * 删除公司成本
+     *
+     * @param id 公司成本ID
+     * @return 结果
+     */
+    public int deleteCompanyCostByCtcId(Long id);
+
+    /**
+     * 批量删除公司成本
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteCompanyCostByIds(String[] ids);
+
+    /**
+     * 批量删除公司成本
+     *
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteCompanyCostByCtcIds(String[] ids);
+
+    /**
+     * 作废公司成本
+     *
+     * @param id 公司成本ID
+     * @return 结果
+     */
+    public int cancelCompanyCostById(Long id);
+
+    /**
+     * 恢复公司成本
+     *
+     * @param id 公司成本ID
+     * @return 结果
+     */
+    public int restoreCompanyCostById(Long id);
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/financial/service/ICompanyCostService.java b/ruoyi-admin/src/main/java/com/ruoyi/financial/service/ICompanyCostService.java
new file mode 100644
index 00000000..ac75c70c
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/financial/service/ICompanyCostService.java
@@ -0,0 +1,97 @@
+package com.ruoyi.financial.service;
+
+import java.util.List;
+import com.ruoyi.financial.domain.CompanyCost;
+
+/**
+ * 公司成本Service接口
+ * 
+ * @author zhang
+ * @date 2024-08-05
+ */
+public interface ICompanyCostService 
+{
+    /**
+     * 查询公司成本
+     * 
+     * @param id 公司成本ID
+     * @return 公司成本
+     */
+    public CompanyCost selectCompanyCostById(Long id);
+    /**
+     * 查询公司成本
+     *
+     * @param ctcId 公司成本编号
+     * @return 公司成本
+     */
+    public CompanyCost selectCompanyCostByCtcId(Long ctcId);
+
+    /**
+     * 查询公司成本列表
+     * 
+     * @param companyCost 公司成本
+     * @return 公司成本集合
+     */
+    public List<CompanyCost> selectCompanyCostList(CompanyCost companyCost);
+
+    /**
+     * 新增公司成本
+     * 
+     * @param companyCost 公司成本
+     * @return 结果
+     */
+    public int insertCompanyCost(CompanyCost companyCost);
+
+    /**
+     * 修改公司成本
+     * 
+     * @param companyCost 公司成本
+     * @return 结果
+     */
+    public int updateCompanyCost(CompanyCost companyCost);
+
+    /**
+     * 批量删除公司成本
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteCompanyCostByIds(String ids);
+
+    /**
+     * 删除公司成本信息
+     * 
+     * @param id 公司成本ID
+     * @return 结果
+     */
+    public int deleteCompanyCostById(Long id);
+
+    /**
+     * 批量删除公司成本
+     *
+     * @param ctcIds 需要删除的数据公司成本编号
+     * @return 结果
+     */
+    public int deleteCompanyCostByCtcIds(String ctcIds);
+
+    /**
+     * 删除公司成本信息
+     *
+     * @param ctcId 公司成本编号
+     * @return 结果
+     */
+    public int deleteCompanyCostByCtcId(Long ctcId);
+    /**
+     * 作废公司成本
+     * @param id 公司成本ID
+     * @return
+     */
+    int cancelCompanyCostById(Long id);
+
+    /**
+     * 恢复公司成本
+     * @param id 公司成本ID
+     * @return
+     */
+    int restoreCompanyCostById(Long id);
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/financial/service/impl/CompanyCostServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/financial/service/impl/CompanyCostServiceImpl.java
new file mode 100644
index 00000000..4f8302f0
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/financial/service/impl/CompanyCostServiceImpl.java
@@ -0,0 +1,148 @@
+package com.ruoyi.financial.service.impl;
+
+import java.util.List;
+
+import com.ruoyi.common.core.redis.RedisCache;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.ShiroUtils;
+import com.ruoyi.system.service.ISysUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.financial.mapper.CompanyCostMapper;
+import com.ruoyi.financial.domain.CompanyCost;
+import com.ruoyi.financial.service.ICompanyCostService;
+import com.ruoyi.common.core.text.Convert;
+
+/**
+ * 公司成本Service业务层处理
+ * 
+ * @author zhang
+ * @date 2024-08-05
+ */
+@Service
+public class CompanyCostServiceImpl implements ICompanyCostService 
+{
+    @Autowired
+    private RedisCache redisCache;
+    @Autowired
+    private ISysUserService userService;
+    @Autowired
+    private CompanyCostMapper companyCostMapper;
+
+    /**
+     * 查询公司成本
+     * 
+     * @param id 公司成本ID
+     * @return 公司成本
+     */
+    @Override
+    public CompanyCost selectCompanyCostById(Long id)
+    {
+        return companyCostMapper.selectCompanyCostById(id);
+    }
+
+    @Override
+    public CompanyCost selectCompanyCostByCtcId(Long ctcId) {
+        return companyCostMapper.selectCompanyCostById(ctcId);
+    }
+
+    /**
+     * 查询公司成本列表
+     * 
+     * @param companyCost 公司成本
+     * @return 公司成本
+     */
+    @Override
+    public List<CompanyCost> selectCompanyCostList(CompanyCost companyCost)
+    {
+        return companyCostMapper.selectCompanyCostList(companyCost);
+    }
+
+    /**
+     * 新增公司成本
+     * 
+     * @param companyCost 公司成本
+     * @return 结果
+     */
+    @Override
+    public int insertCompanyCost(CompanyCost companyCost)
+    {
+        companyCost.setCreateTime(DateUtils.getNowDate());
+        String loginName = ShiroUtils.getLoginName();
+        companyCost.setCreateBy(loginName);
+        return companyCostMapper.insertCompanyCost(companyCost);
+    }
+
+    /**
+     * 修改公司成本
+     * 
+     * @param companyCost 公司成本
+     * @return 结果
+     */
+    @Override
+    public int updateCompanyCost(CompanyCost companyCost)
+    {
+        companyCost.setUpdateTime(DateUtils.getNowDate());
+        String loginName = ShiroUtils.getLoginName();
+        companyCost.setUpdateBy(loginName);
+        return companyCostMapper.updateCompanyCost(companyCost);
+    }
+
+    /**
+     * 删除公司成本对象
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    @Override
+    public int deleteCompanyCostByIds(String ids)
+    {
+        return companyCostMapper.deleteCompanyCostByIds(Convert.toStrArray(ids));
+    }
+
+    /**
+     * 删除公司成本信息
+     * 
+     * @param id 公司成本ID
+     * @return 结果
+     */
+    @Override
+    public int deleteCompanyCostById(Long id)
+    {
+        return companyCostMapper.deleteCompanyCostById(id);
+    }
+
+    @Override
+    public int deleteCompanyCostByCtcIds(String ctcIds) {
+        return companyCostMapper.deleteCompanyCostByCtcIds(Convert.toStrArray(ctcIds));
+    }
+
+    @Override
+    public int deleteCompanyCostByCtcId(Long ctcId) {
+        return companyCostMapper.deleteCompanyCostByCtcId(ctcId);
+    }
+
+    /**
+     * 作废公司成本
+     *
+     * @param id 公司成本ID
+     * @return 结果
+     */
+    @Override
+    public int cancelCompanyCostById(Long id)
+    {
+        return companyCostMapper.cancelCompanyCostById(id);
+    }
+
+    /**
+     * 恢复公司成本信息
+     *
+     * @param id 公司成本ID
+     * @return 结果
+     */
+    @Override
+    public int restoreCompanyCostById(Long id)
+    {
+        return companyCostMapper.restoreCompanyCostById(id);
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/purchase/controller/PurchaseOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/purchase/controller/PurchaseOrderController.java
index 40eb94ee..59cb87f1 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/purchase/controller/PurchaseOrderController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/purchase/controller/PurchaseOrderController.java
@@ -185,6 +185,18 @@ public class PurchaseOrderController extends BaseController
     public String edit(@PathVariable("purchaseOrderId") Long purchaseOrderId, ModelMap mmap)
     {
         PurchaseOrder purchaseOrder = purchaseOrderService.selectPurchaseOrderById(purchaseOrderId);
+        //获取子表信息
+        List<PurchaseOrderChild> purchaseOrderChildList = purchaseOrderChildService.selectPurchaseOrderChildByOrderCode(purchaseOrder.getPurchaseOrderCode());
+        //Set<String>子表供应商的信息 供应商编号-供应商名称
+        //Set<String>子表采购计划单信息
+        Set<String> supplierCodes = new HashSet<>();
+        Set<String> purchasePlanCodes = new HashSet<>();
+        for(PurchaseOrderChild purchaseOrderChild : purchaseOrderChildList){
+            supplierCodes.add(purchaseOrderChild.getSupplierCode());
+            purchasePlanCodes.add(purchaseOrderChild.getPurchasePlanCode());
+        }
+        mmap.put("supplierCodes", supplierCodes);
+        mmap.put("purchasePlanCodes", purchasePlanCodes);
         mmap.put("purchaseOrder", purchaseOrder);
         return prefix + "/edit";
     }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/taxInvoice/domain/ErpCompanyCost.java b/ruoyi-admin/src/main/java/com/ruoyi/taxInvoice/domain/ErpCompanyCost.java
deleted file mode 100644
index 2aac98d4..00000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/taxInvoice/domain/ErpCompanyCost.java
+++ /dev/null
@@ -1,113 +0,0 @@
-package com.ruoyi.taxInvoice.domain;
-
-import java.math.BigDecimal;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
-
-/**
- * 公司成本对象 erp_company_cost
- * 
- * @author zhang
- * @date 2024-03-05
- */
-public class ErpCompanyCost extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 索引 */
-    private Long id;
-
-    /** 公司成本ID */
-    @Excel(name = "公司成本ID")
-    private String ctcId;
-
-    /** 年份 */
-    @Excel(name = "年份")
-    private Integer year;
-
-    /** 月份 */
-    @Excel(name = "月份")
-    private Integer month;
-
-    /** 经营成本 */
-    @Excel(name = "经营成本")
-    private BigDecimal opex;
-
-    /** 业务成本 */
-    @Excel(name = "业务成本")
-    private BigDecimal cob;
-
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
-
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setCtcId(String ctcId) 
-    {
-        this.ctcId = ctcId;
-    }
-
-    public String getCtcId() 
-    {
-        return ctcId;
-    }
-    public void setYear(Integer year) 
-    {
-        this.year = year;
-    }
-
-    public Integer getYear() 
-    {
-        return year;
-    }
-    public void setMonth(Integer month) 
-    {
-        this.month = month;
-    }
-
-    public Integer getMonth() 
-    {
-        return month;
-    }
-    public void setOpex(BigDecimal opex) 
-    {
-        this.opex = opex;
-    }
-
-    public BigDecimal getOpex() 
-    {
-        return opex;
-    }
-    public void setCob(BigDecimal cob) 
-    {
-        this.cob = cob;
-    }
-
-    public BigDecimal getCob() 
-    {
-        return cob;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("ctcId", getCtcId())
-            .append("year", getYear())
-            .append("month", getMonth())
-            .append("opex", getOpex())
-            .append("cob", getCob())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateTime", getUpdateTime())
-            .append("updateBy", getUpdateBy())
-            .append("remark", getRemark())
-            .toString();
-    }
-}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/taxInvoice/mapper/ErpCompanyCostMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/taxInvoice/mapper/ErpCompanyCostMapper.java
deleted file mode 100644
index 41aa8554..00000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/taxInvoice/mapper/ErpCompanyCostMapper.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package com.ruoyi.taxInvoice.mapper;
-
-import java.util.List;
-import com.ruoyi.taxInvoice.domain.ErpCompanyCost;
-
-/**
- * 公司成本Mapper接口
- * 
- * @author zhang
- * @date 2024-03-05
- */
-public interface ErpCompanyCostMapper 
-{
-    /**
-     * 查询公司成本
-     * 
-     * @param id 公司成本ID
-     * @return 公司成本
-     */
-    public ErpCompanyCost selectErpCompanyCostById(Long id);
-
-    /**
-     * 查询公司成本列表
-     * 
-     * @param erpCompanyCost 公司成本
-     * @return 公司成本集合
-     */
-    public List<ErpCompanyCost> selectErpCompanyCostList(ErpCompanyCost erpCompanyCost);
-
-    /**
-     * 新增公司成本
-     * 
-     * @param erpCompanyCost 公司成本
-     * @return 结果
-     */
-    public int insertErpCompanyCost(ErpCompanyCost erpCompanyCost);
-
-    /**
-     * 修改公司成本
-     * 
-     * @param erpCompanyCost 公司成本
-     * @return 结果
-     */
-    public int updateErpCompanyCost(ErpCompanyCost erpCompanyCost);
-
-    /**
-     * 删除公司成本
-     * 
-     * @param id 公司成本ID
-     * @return 结果
-     */
-    public int deleteErpCompanyCostById(Long id);
-
-    /**
-     * 批量删除公司成本
-     * 
-     * @param ids 需要删除的数据ID
-     * @return 结果
-     */
-    public int deleteErpCompanyCostByIds(String[] ids);
-
-    /**
-     * 作废公司成本
-     *
-     * @param id 公司成本ID
-     * @return 结果
-     */
-    public int cancelErpCompanyCostById(Long id);
-
-    /**
-     * 恢复公司成本
-     *
-     * @param id 公司成本ID
-     * @return 结果
-     */
-    public int restoreErpCompanyCostById(Long id);
-}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/taxInvoice/service/IErpCompanyCostService.java b/ruoyi-admin/src/main/java/com/ruoyi/taxInvoice/service/IErpCompanyCostService.java
deleted file mode 100644
index 9595db6d..00000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/taxInvoice/service/IErpCompanyCostService.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package com.ruoyi.taxInvoice.service;
-
-import java.util.List;
-import com.ruoyi.taxInvoice.domain.ErpCompanyCost;
-
-/**
- * 公司成本Service接口
- * 
- * @author zhang
- * @date 2024-03-05
- */
-public interface IErpCompanyCostService 
-{
-    /**
-     * 查询公司成本
-     * 
-     * @param id 公司成本ID
-     * @return 公司成本
-     */
-    public ErpCompanyCost selectErpCompanyCostById(Long id);
-
-    /**
-     * 查询公司成本列表
-     * 
-     * @param erpCompanyCost 公司成本
-     * @return 公司成本集合
-     */
-    public List<ErpCompanyCost> selectErpCompanyCostList(ErpCompanyCost erpCompanyCost);
-
-    /**
-     * 新增公司成本
-     * 
-     * @param erpCompanyCost 公司成本
-     * @return 结果
-     */
-    public int insertErpCompanyCost(ErpCompanyCost erpCompanyCost);
-
-    /**
-     * 修改公司成本
-     * 
-     * @param erpCompanyCost 公司成本
-     * @return 结果
-     */
-    public int updateErpCompanyCost(ErpCompanyCost erpCompanyCost);
-
-    /**
-     * 批量删除公司成本
-     * 
-     * @param ids 需要删除的数据ID
-     * @return 结果
-     */
-    public int deleteErpCompanyCostByIds(String ids);
-
-    /**
-     * 删除公司成本信息
-     * 
-     * @param id 公司成本ID
-     * @return 结果
-     */
-    public int deleteErpCompanyCostById(Long id);
-
-    /**
-     * 作废公司成本
-     * @param id 公司成本ID
-     * @return
-     */
-    int cancelErpCompanyCostById(Long id);
-
-    /**
-     * 恢复公司成本
-     * @param id 公司成本ID
-     * @return
-     */
-    int restoreErpCompanyCostById(Long id);
-}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/taxInvoice/service/impl/ErpCompanyCostServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/taxInvoice/service/impl/ErpCompanyCostServiceImpl.java
deleted file mode 100644
index e7112853..00000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/taxInvoice/service/impl/ErpCompanyCostServiceImpl.java
+++ /dev/null
@@ -1,126 +0,0 @@
-package com.ruoyi.taxInvoice.service.impl;
-
-import java.util.List;
-import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.common.utils.ShiroUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.ruoyi.taxInvoice.mapper.ErpCompanyCostMapper;
-import com.ruoyi.taxInvoice.domain.ErpCompanyCost;
-import com.ruoyi.taxInvoice.service.IErpCompanyCostService;
-import com.ruoyi.common.core.text.Convert;
-
-/**
- * 公司成本Service业务层处理
- * 
- * @author zhang
- * @date 2024-03-05
- */
-@Service
-public class ErpCompanyCostServiceImpl implements IErpCompanyCostService 
-{
-    @Autowired
-    private ErpCompanyCostMapper erpCompanyCostMapper;
-
-    /**
-     * 查询公司成本
-     * 
-     * @param id 公司成本ID
-     * @return 公司成本
-     */
-    @Override
-    public ErpCompanyCost selectErpCompanyCostById(Long id)
-    {
-        return erpCompanyCostMapper.selectErpCompanyCostById(id);
-    }
-
-    /**
-     * 查询公司成本列表
-     * 
-     * @param erpCompanyCost 公司成本
-     * @return 公司成本
-     */
-    @Override
-    public List<ErpCompanyCost> selectErpCompanyCostList(ErpCompanyCost erpCompanyCost)
-    {
-        return erpCompanyCostMapper.selectErpCompanyCostList(erpCompanyCost);
-    }
-
-    /**
-     * 新增公司成本
-     * 
-     * @param erpCompanyCost 公司成本
-     * @return 结果
-     */
-    @Override
-    public int insertErpCompanyCost(ErpCompanyCost erpCompanyCost)
-    {
-        String loginName = ShiroUtils.getLoginName();
-        erpCompanyCost.setCreateBy(loginName);
-        erpCompanyCost.setCreateTime(DateUtils.getNowDate());
-        return erpCompanyCostMapper.insertErpCompanyCost(erpCompanyCost);
-    }
-
-    /**
-     * 修改公司成本
-     * 
-     * @param erpCompanyCost 公司成本
-     * @return 结果
-     */
-    @Override
-    public int updateErpCompanyCost(ErpCompanyCost erpCompanyCost)
-    {
-        erpCompanyCost.setUpdateTime(DateUtils.getNowDate());
-        String loginName = ShiroUtils.getLoginName();
-        erpCompanyCost.setUpdateBy(loginName);
-        return erpCompanyCostMapper.updateErpCompanyCost(erpCompanyCost);
-    }
-
-    /**
-     * 删除公司成本对象
-     * 
-     * @param ids 需要删除的数据ID
-     * @return 结果
-     */
-    @Override
-    public int deleteErpCompanyCostByIds(String ids)
-    {
-        return erpCompanyCostMapper.deleteErpCompanyCostByIds(Convert.toStrArray(ids));
-    }
-
-    /**
-     * 删除公司成本信息
-     * 
-     * @param id 公司成本ID
-     * @return 结果
-     */
-    @Override
-    public int deleteErpCompanyCostById(Long id)
-    {
-        return erpCompanyCostMapper.deleteErpCompanyCostById(id);
-    }
-
-    /**
-     * 作废公司成本
-     *
-     * @param id 公司成本ID
-     * @return 结果
-     */
-    @Override
-    public int cancelErpCompanyCostById(Long id)
-    {
-        return erpCompanyCostMapper.cancelErpCompanyCostById(id);
-    }
-
-    /**
-     * 恢复公司成本信息
-     *
-     * @param id 公司成本ID
-     * @return 结果
-     */
-    @Override
-    public int restoreErpCompanyCostById(Long id)
-    {
-        return erpCompanyCostMapper.restoreErpCompanyCostById(id);
-    }
-}
diff --git a/ruoyi-admin/src/main/resources/mapper/financial/CompanyCostMapper.xml b/ruoyi-admin/src/main/resources/mapper/financial/CompanyCostMapper.xml
new file mode 100644
index 00000000..c7eea03a
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/mapper/financial/CompanyCostMapper.xml
@@ -0,0 +1,164 @@
+<?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.ruoyi.financial.mapper.CompanyCostMapper">
+    <resultMap type="CompanyCost" id="CompanyCostResult">
+        <result property="id"    column="id"    />
+        <result property="ctcId"    column="ctc_id"    />
+        <result property="year"    column="year"    />
+        <result property="month"    column="month"    />
+        <result property="operatingCosts"    column="operating_costs"    />
+        <result property="salaryExpenses"    column="salary_expenses"    />
+        <result property="factoryRentalFees"    column="factory_rental_fees"    />
+        <result property="taxExpenses"    column="tax_expenses"    />
+        <result property="factoryElectricityFees"    column="factory_electricity_fees"    />
+        <result property="ohterExpenses"    column="ohter_expenses"    />
+        <result property="businessCost"    column="business_cost"    />
+        <result property="transportationCosts"    column="transportation_costs"    />
+        <result property="promotionExpenses"    column="promotion_expenses"    />
+        <result property="packagingCost"    column="packaging_cost"    />
+        <result property="businessExpenses"    column="business_expenses"    />
+        <result property="afterSalesExpenses"    column="after_sales_expenses"    />
+        <result property="businessCommission"    column="business_commission"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectCompanyCostVo">
+        select id, ctc_id, year, month, operating_costs, salary_expenses,
+            factory_rental_fees, tax_expenses, factory_electricity_fees,
+            ohter_expenses, business_cost, transportation_costs, promotion_expenses,
+            packaging_cost, business_expenses, after_sales_expenses, business_commission,
+            create_time, create_by, update_time, update_by, remark
+        from financial_company_cost
+    </sql>
+
+    <select id="selectCompanyCostList" parameterType="CompanyCost" resultMap="CompanyCostResult">
+        <include refid="selectCompanyCostVo"/>
+        <where>  
+            <if test="ctcId != null  and ctcId != ''"> and ctc_id = #{ctcId}</if>
+            <if test="year != null "> and year = #{year}</if>
+            <if test="month != null "> and month = #{month}</if>
+            <if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and create_time between #{params.beginCreateTime} and #{params.endCreateTime}</if>
+        </where>
+    </select>
+    
+    <select id="selectCompanyCostById" parameterType="Long" resultMap="CompanyCostResult">
+        <include refid="selectCompanyCostVo"/>
+        where id = #{id}
+    </select>
+    <select id="selectCompanyCostByCtcId" parameterType="Long" resultMap="CompanyCostResult">
+        <include refid="selectCompanyCostVo"/>
+        where id = #{id}
+    </select>
+    <insert id="insertCompanyCost" parameterType="CompanyCost">
+        insert into financial_company_cost
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="ctcId != null">ctc_id,</if>
+            <if test="year != null">year,</if>
+            <if test="month != null">month,</if>
+            <if test="operatingCosts != null">operating_costs,</if>
+            <if test="salaryExpenses != null">salary_expenses,</if>
+            <if test="factoryRentalFees != null">factory_rental_fees,</if>
+            <if test="taxExpenses != null">tax_expenses,</if>
+            <if test="factoryElectricityFees != null">factory_electricity_fees,</if>
+            <if test="ohterExpenses != null">ohter_expenses,</if>
+            <if test="businessCost != null">business_cost,</if>
+            <if test="transportationCosts != null">transportation_costs,</if>
+            <if test="promotionExpenses != null">promotion_expenses,</if>
+            <if test="packagingCost != null">packaging_cost,</if>
+            <if test="businessExpenses != null">business_expenses,</if>
+            <if test="afterSalesExpenses != null">after_sales_expenses,</if>
+            <if test="businessCommission != null">business_commission,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="ctcId != null">#{ctcId},</if>
+            <if test="year != null">#{year},</if>
+            <if test="month != null">#{month},</if>
+            <if test="operatingCosts != null">#{operatingCosts},</if>
+            <if test="salaryExpenses != null">#{salaryExpenses},</if>
+            <if test="factoryRentalFees != null">#{factoryRentalFees},</if>
+            <if test="taxExpenses != null">#{taxExpenses},</if>
+            <if test="factoryElectricityFees != null">#{factoryElectricityFees},</if>
+            <if test="ohterExpenses != null">#{ohterExpenses},</if>
+            <if test="businessCost != null">#{businessCost},</if>
+            <if test="transportationCosts != null">#{transportationCosts},</if>
+            <if test="promotionExpenses != null">#{promotionExpenses},</if>
+            <if test="packagingCost != null">#{packagingCost},</if>
+            <if test="businessExpenses != null">#{businessExpenses},</if>
+            <if test="afterSalesExpenses != null">#{afterSalesExpenses},</if>
+            <if test="businessCommission != null">#{businessCommission},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateCompanyCost" parameterType="CompanyCost">
+        update financial_company_cost
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="ctcId != null">ctc_id = #{ctcId},</if>
+            <if test="year != null">year = #{year},</if>
+            <if test="month != null">month = #{month},</if>
+            <if test="operatingCosts != null">operating_costs = #{operatingCosts},</if>
+            <if test="salaryExpenses != null">salary_expenses = #{salaryExpenses},</if>
+            <if test="factoryRentalFees != null">factory_rental_fees = #{factoryRentalFees},</if>
+            <if test="taxExpenses != null">tax_expenses = #{taxExpenses},</if>
+            <if test="factoryElectricityFees != null">factory_electricity_fees = #{factoryElectricityFees},</if>
+            <if test="ohterExpenses != null">ohter_expenses = #{ohterExpenses},</if>
+            <if test="businessCost != null">business_cost = #{businessCost},</if>
+            <if test="transportationCosts != null">transportation_costs = #{transportationCosts},</if>
+            <if test="promotionExpenses != null">promotion_expenses = #{promotionExpenses},</if>
+            <if test="packagingCost != null">packaging_cost = #{packagingCost},</if>
+            <if test="businessExpenses != null">business_expenses = #{businessExpenses},</if>
+            <if test="afterSalesExpenses != null">after_sales_expenses = #{afterSalesExpenses},</if>
+            <if test="businessCommission != null">business_commission = #{businessCommission},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteCompanyCostById" parameterType="Long">
+        delete from financial_company_cost where id = #{id}
+    </delete>
+    <delete id="deleteCompanyCostByIds" parameterType="String">
+        delete from financial_company_cost where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+    <delete id="deleteCompanyCostByCtcId" parameterType="Long">
+        delete from financial_company_cost where ctc_id = #{ctcId}
+    </delete>
+    <delete id="deleteCompanyCostByCtcIds" parameterType="String">
+        delete from financial_company_cost where ctc_id in
+        <foreach item="ctcId" collection="array" open="(" separator="," close=")">
+            #{ctcId}
+        </foreach>
+    </delete>
+    <update id="cancelCompanyCostById" parameterType="Long">
+        update financial_company_cost set del_flag = '1' where id = #{id}
+    </update>
+
+    <update id="restoreCompanyCostById" parameterType="Long">
+        update financial_company_cost set del_flag = '0' where id = #{id}
+    </update>
+
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/mapper/purchase/PurchasePlanChildMapper.xml b/ruoyi-admin/src/main/resources/mapper/purchase/PurchasePlanChildMapper.xml
index b0da17cb..b5566728 100644
--- a/ruoyi-admin/src/main/resources/mapper/purchase/PurchasePlanChildMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/purchase/PurchasePlanChildMapper.xml
@@ -58,6 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="useStatus != null  and useStatus != ''"> and use_status = #{useStatus}</if>
             <if test="auditStatus != null  and auditStatus != ''"> and audit_status = #{auditStatus}</if>
         </where>
+        order by create_time desc
     </select>
     
     <select id="selectPurchasePlanChildById" parameterType="Long" resultMap="PurchasePlanChildResult">
diff --git a/ruoyi-admin/src/main/resources/mapper/purchase/PurchaseQuoteMapper.xml b/ruoyi-admin/src/main/resources/mapper/purchase/PurchaseQuoteMapper.xml
index c8db1196..5394494c 100644
--- a/ruoyi-admin/src/main/resources/mapper/purchase/PurchaseQuoteMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/purchase/PurchaseQuoteMapper.xml
@@ -136,7 +136,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </if>
             <if test="keyword != null and keyword != ''"> and p.purchase_quote_code like concat('%',#{keyword},'%')</if>
         </where>
-        order by p.create_time desc
+        order by p.audit_status asc, p.create_time desc
     </select>
     <select id="selectPurchaseQuoteById" parameterType="Long" resultMap="PurchaseQuoteResult">
         select p.purchase_quote_id, p.purchase_quote_code, p.purchaseBuyer,
diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysCustomerMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysCustomerMapper.xml
index 5e31b7b1..aa066df5 100644
--- a/ruoyi-admin/src/main/resources/mapper/system/SysCustomerMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/system/SysCustomerMapper.xml
@@ -120,7 +120,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and s.first_add_time between #{params.beginCreateTime} and #{params.endCreateTime}</if>
              <if test="customerSign != null  and customerSign != ''"> and s.customer_sign = #{customerSign}</if>
         </where>
-        order by s.create_time desc
+        order by s.audit_status asc, s.create_time desc
     </select>
 
     <select id="selectSysCustomerWithComplaintNotice" resultMap="SysCustomerResult">
diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysSalesOrderMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysSalesOrderMapper.xml
index 4c2b97d4..2e47cbc2 100644
--- a/ruoyi-admin/src/main/resources/mapper/system/SysSalesOrderMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/system/SysSalesOrderMapper.xml
@@ -129,7 +129,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="applyTime != null  and applyTime != ''"> and s.apply_time = #{applyTime}</if>
             <if test="applyTitle != null  and applyTitle != ''"> and s.apply_title = #{applyTitle}</if>
         </where>
-        order by s.create_time desc
+        order by s.audit_status asc, s.create_time desc
     </select>
     
     <select id="selectSysSalesOrderById" parameterType="Long" resultMap="SysSalesOrderResult">
diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysSupplierMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysSupplierMapper.xml
index 0eb10953..87bf0fd7 100644
--- a/ruoyi-admin/src/main/resources/mapper/system/SysSupplierMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/system/SysSupplierMapper.xml
@@ -127,7 +127,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </if>
             <if test="keyword != null and keyword != ''"> and ((sup.supplierCode like concat('%',#{keyword},'%') or sup.suppplierName like concat('%',#{keyword},'%'))</if>
         </where>
-        order by sup.create_time desc
+        order by sup.apply_time asc, sup.create_time desc
     </select>
     <select id="selectSysSupplierById" parameterType="Long" resultMap="SysSupplierResult">
         select sup.supplier_id, sup.supplier_code, sup.supplier_name, sup.export_sales,
diff --git a/ruoyi-admin/src/main/resources/mapper/taxInvoice/ErpCompanyCostMapper.xml b/ruoyi-admin/src/main/resources/mapper/taxInvoice/ErpCompanyCostMapper.xml
deleted file mode 100644
index dfa3128b..00000000
--- a/ruoyi-admin/src/main/resources/mapper/taxInvoice/ErpCompanyCostMapper.xml
+++ /dev/null
@@ -1,106 +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.ruoyi.taxInvoice.mapper.ErpCompanyCostMapper">
-    
-    <resultMap type="ErpCompanyCost" id="ErpCompanyCostResult">
-        <result property="id"    column="id"    />
-        <result property="ctcId"    column="ctc_id"    />
-        <result property="year"    column="year"    />
-        <result property="month"    column="month"    />
-        <result property="opex"    column="opex"    />
-        <result property="cob"    column="cob"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="remark"    column="remark"    />
-    </resultMap>
-
-    <sql id="selectErpCompanyCostVo">
-        select id, ctc_id, year, month, opex, cob, create_by, create_time, update_time, update_by, remark from erp_company_cost
-    </sql>
-
-    <select id="selectErpCompanyCostList" parameterType="ErpCompanyCost" resultMap="ErpCompanyCostResult">
-        <include refid="selectErpCompanyCostVo"/>
-        <where>  
-            <if test="ctcId != null  and ctcId != ''"> and ctc_id = #{ctcId}</if>
-            <if test="year != null "> and year = #{year}</if>
-            <if test="month != null "> and month = #{month}</if>
-            <if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and create_time between #{params.beginCreateTime} and #{params.endCreateTime}</if>
-        </where>
-    </select>
-    
-    <select id="selectErpCompanyCostById" parameterType="Long" resultMap="ErpCompanyCostResult">
-        <include refid="selectErpCompanyCostVo"/>
-        where id = #{id}
-    </select>
-        
-    <insert id="insertErpCompanyCost" parameterType="ErpCompanyCost">
-        insert into erp_company_cost
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id != null">id,</if>
-            <if test="ctcId != null">ctc_id,</if>
-            <if test="year != null">year,</if>
-            <if test="month != null">month,</if>
-            <if test="opex != null">opex,</if>
-            <if test="cob != null">cob,</if>
-            <if test="createBy != null">create_by,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="updateTime != null">update_time,</if>
-            <if test="updateBy != null">update_by,</if>
-            <if test="remark != null">remark,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="id != null">#{id},</if>
-            <if test="ctcId != null">#{ctcId},</if>
-            <if test="year != null">#{year},</if>
-            <if test="month != null">#{month},</if>
-            <if test="opex != null">#{opex},</if>
-            <if test="cob != null">#{cob},</if>
-            <if test="createBy != null">#{createBy},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="updateTime != null">#{updateTime},</if>
-            <if test="updateBy != null">#{updateBy},</if>
-            <if test="remark != null">#{remark},</if>
-         </trim>
-    </insert>
-
-    <update id="updateErpCompanyCost" parameterType="ErpCompanyCost">
-        update erp_company_cost
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="ctcId != null">ctc_id = #{ctcId},</if>
-            <if test="year != null">year = #{year},</if>
-            <if test="month != null">month = #{month},</if>
-            <if test="opex != null">opex = #{opex},</if>
-            <if test="cob != null">cob = #{cob},</if>
-            <if test="createBy != null">create_by = #{createBy},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
-            <if test="updateBy != null">update_by = #{updateBy},</if>
-            <if test="remark != null">remark = #{remark},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteErpCompanyCostById" parameterType="Long">
-        delete from erp_company_cost where id = #{id}
-    </delete>
-
-    <delete id="deleteErpCompanyCostByIds" parameterType="String">
-        delete from erp_company_cost where id in 
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-
-    <update id="cancelErpCompanyCostById" parameterType="Long">
-        update erp_company_cost set del_flag = '1' where id = #{id}
-    </update>
-
-    <update id="restoreErpCompanyCostById" parameterType="Long">
-        update erp_company_cost set del_flag = '0' where id = #{id}
-    </update>
-
-</mapper>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/financial/compantFixedAssets/add.html b/ruoyi-admin/src/main/resources/templates/financial/compantFixedAssets/add.html
index 81fe1b13..a7695515 100644
--- a/ruoyi-admin/src/main/resources/templates/financial/compantFixedAssets/add.html
+++ b/ruoyi-admin/src/main/resources/templates/financial/compantFixedAssets/add.html
@@ -19,9 +19,8 @@
             <div class="form-group">    
                 <label class="col-sm-3 control-label">物料名称：</label>
                 <div class="col-sm-8">
-                    <select id="compant_materialName" name="materialName" class="form-control m-b" >
-                        <option value=""></option>
-                    </select>
+                    <input type="text"  name="materialName" class="form-control m-b" readonly />
+
                 </div>
             </div>
             <div class="form-group">
@@ -129,7 +128,10 @@
             <div class="form-group">    
                 <label class="col-sm-3 control-label">年折旧率：</label>
                 <div class="col-sm-8">
-                    <input name="annualDepreciationRate" class="form-control" type="text">
+                    <div class="input-group">
+                        <input name="annualDepreciationRate" th:field="*{depreciationYears}" class="form-control" type="text">
+                        <span class="input-group-addon">%</span>
+                    </div>
                 </div>
             </div>
             <div class="form-group">    
@@ -192,42 +194,12 @@
                     // minimumInputLength: 1
                 }
             });
-            $("#compant_materialName").select2({
-                theme: "bootstrap",
-                allowClear: true,
-                placeholder: "请选择物料",
-                ajax:{
-                    type: "post",
-                    url:ctx + "erp/material/getMaterialSelList",
-                    dataType:"json",
-                    delay:250,
-                    cache:true,
-                    processResults: function (res, params) {
-                        var resultList = res.data;
-                        var options = [];
-                        for(let i in resultList){
-                            var option = resultList[i];
-                            option.id = resultList[i]["materialName"];
-                            option.text = resultList[i]["materialName"];
-                            option.title = resultList[i]["materialNo"];
-                            options.push(option);
-                        }
-                        return {results: options, pagination: {}};
-                    },escapeMarkup: function (markup) { return markup; },
-                }
-            });
         });
 
         $("#compant_materialCode").on('select2:select', function (e){
             var dataObj = e.params.data;
             console.log(dataObj);
-            $("#compant_materialName").val(dataObj.materialName).trigger('change');
-        });
-
-        $("#compant_materialName").on('select2:select', function (e){
-            var dataObj = e.params.data;
-            console.log(dataObj);
-            $("#compant_materialCode").val(dataObj.materialNo).trigger('change');
+            $("input[name='materialName']").val(dataObj.materialName).trigger('change');
         });
         function submitHandler() {
             if ($.validate.form()) {
diff --git a/ruoyi-admin/src/main/resources/templates/financial/companyCost/add.html b/ruoyi-admin/src/main/resources/templates/financial/companyCost/add.html
new file mode 100644
index 00000000..6cb2e2ee
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/templates/financial/companyCost/add.html
@@ -0,0 +1,127 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('新增公司成本')" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-compantCost-add">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">公司成本ID：</label>
+                <div class="col-sm-8">
+                    <input name="ctcId" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">年份：</label>
+                <div class="col-sm-8">
+                    <input name="year" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">月份：</label>
+                <div class="col-sm-8">
+                    <input name="month" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">经营成本：</label>
+                <div class="col-sm-8">
+                    <input name="operatingCosts" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">工资费用：</label>
+                <div class="col-sm-8">
+                    <input name="salaryExpenses" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">厂租费用：</label>
+                <div class="col-sm-8">
+                    <input name="factoryRentalFees" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">税金费用：</label>
+                <div class="col-sm-8">
+                    <input name="taxExpenses" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">工厂电费：</label>
+                <div class="col-sm-8">
+                    <input name="factoryElectricityFees" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">其他费用：</label>
+                <div class="col-sm-8">
+                    <input name="ohterExpenses" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">业务成本：</label>
+                <div class="col-sm-8">
+                    <input name="businessCost" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">运输费用：</label>
+                <div class="col-sm-8">
+                    <input name="transportationCosts" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">推广费用：</label>
+                <div class="col-sm-8">
+                    <input name="promotionExpenses" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">包装费用：</label>
+                <div class="col-sm-8">
+                    <input name="packagingCost" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">业务费用：</label>
+                <div class="col-sm-8">
+                    <input name="businessExpenses" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">售后费用：</label>
+                <div class="col-sm-8">
+                    <input name="afterSalesExpenses" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">业务提成：</label>
+                <div class="col-sm-8">
+                    <input name="businessCommission" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">备注：</label>
+                <div class="col-sm-8">
+                    <input name="remark" class="form-control" type="text">
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var prefix = ctx + "compantCost/compantCost"
+        $("#form-compantCost-add").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/add", $('#form-compantCost-add').serialize());
+            }
+        }
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/financial/companyCost/compantCost.html b/ruoyi-admin/src/main/resources/templates/financial/companyCost/compantCost.html
new file mode 100644
index 00000000..a2d1bc8d
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/templates/financial/companyCost/compantCost.html
@@ -0,0 +1,117 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('公司成本列表')" />
+</head>
+<body class="gray-bg">
+     <div class="container-div">
+        <div class="row">
+            <div class="col-sm-12 search-collapse">
+                <form id="formId">
+                    <div class="select-list">
+                        <ul>
+                            <li>
+                                <label>公司成本ID：</label>
+                                <input type="text" name="ctcId"/>
+                            </li>
+                            <li>
+                                <label>年份：</label>
+                                <input type="text" name="year"/>
+                            </li>
+                            <li>
+                                <label>月份：</label>
+                                <input type="text" name="month"/>
+                            </li>
+                            <li class="select-time">
+                                <label>录入时间：</label>
+                                <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginCreateTime]"/>
+                                <span>-</span>
+                                <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endCreateTime]"/>
+                            </li>
+                            <li>
+                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                            </li>
+                        </ul>
+                    </div>
+                </form>
+            </div>
+
+            <div class="btn-group-sm" id="toolbar" role="group">
+                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="compantCost:compantCost:add">
+                    <i class="fa fa-plus"></i> 添加
+                </a>
+<!--                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="compantCost:compantCost:edit">-->
+<!--                    <i class="fa fa-edit"></i> 修改-->
+<!--                </a>-->
+<!--                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="compantCost:compantCost:remove">-->
+<!--                    <i class="fa fa-remove"></i> 删除-->
+<!--                </a>-->
+<!--                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="compantCost:compantCost:export">-->
+<!--                    <i class="fa fa-download"></i> 导出-->
+<!--                </a>-->
+            </div>
+            <div class="col-sm-12 select-table table-striped">
+                <table id="bootstrap-table"></table>
+            </div>
+        </div>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var editFlag = [[${@permission.hasPermi('compantCost:compantCost:edit')}]];
+        var removeFlag = [[${@permission.hasPermi('compantCost:compantCost:remove')}]];
+        var cancelFlag = [[${@permission.hasPermi('compantCost:compantCost:cancel')}]];
+        var restoreFlag = [[${@permission.hasPermi('compantCost:compantCost:restore')}]];
+        var prefix = ctx + "compantCost/compantCost";
+
+        $(function() {
+            var options = {
+                url: prefix + "/list",
+                createUrl: prefix + "/add",
+                updateUrl: prefix + "/edit/{id}",
+                removeUrl: prefix + "/remove",
+                cancelUrl: prefix + "/cancel/{id}",
+                restoreUrl: prefix + "/restore/{id}",
+                exportUrl: prefix + "/export",
+                modalName: "公司成本",
+                columns: [
+                    {checkbox: true},
+                    {title: '索引', field: 'id', visible: false},
+                    {title: '公司成本ID', field: 'ctcId',},
+                    {title: '年份', field: 'year',},
+                    {title: '月份', field: 'month',},
+                    {title: '经营成本', field: 'operatingCosts',},
+                    {title: '工资费用', field: 'salaryExpenses'},
+                    {title: '厂租费用', field: 'factoryRentalFees',visible: false},
+                    {title: '税金费用', field: 'taxExpenses',visible: false},
+                    {title: '工厂电费', field: 'factoryElectricityFees',visible: false},
+                    {title: '其他费用', field: 'ohterExpenses',visible: false},
+                    {title: '业务成本', field: 'businessCost',visible: false},
+                    {title: '运输费用', field: 'transportationCosts',visible: false},
+                    {title: '推广费用', field: 'promotionExpenses',visible: false},
+                    {title: '包装费用', field: 'packagingCost',visible: false},
+                    {title: '业务费用', field: 'businessExpenses',visible: false},
+                    {title: '售后费用', field: 'afterSalesExpenses',visible: false},
+                    {title: '业务提成', field: 'businessCommission',visible: false},
+                    {title: '录入时间', field: 'createTime',},
+                    {title: '录入人', field: 'createBy',},
+                    {title: '更新人', field: 'updateBy',},
+                    {title: '上次更新时间', field: 'updateTime',},
+                    {title: '备注', field: 'remark',},
+                    {
+                        title: '操作',
+                        align: 'center',
+                        formatter: function(value, row, index) {
+                            var actions = [];
+                            actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                            actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a> ');
+                            return actions.join('');
+                        }
+                    }
+                ]
+            };
+            $.table.init(options);
+        });
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/financial/companyCost/edit.html b/ruoyi-admin/src/main/resources/templates/financial/companyCost/edit.html
new file mode 100644
index 00000000..cd5bcf8d
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/templates/financial/companyCost/edit.html
@@ -0,0 +1,128 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('修改公司成本')" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-compantCost-edit" th:object="${companyCost}">
+            <input name="id" th:field="*{id}" type="hidden">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">公司成本ID：</label>
+                <div class="col-sm-8">
+                    <input name="ctcId" th:field="*{ctcId}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">年份：</label>
+                <div class="col-sm-8">
+                    <input name="year" th:field="*{year}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">月份：</label>
+                <div class="col-sm-8">
+                    <input name="month" th:field="*{month}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">经营成本：</label>
+                <div class="col-sm-8">
+                    <input name="operatingCosts" th:field="*{operatingCosts}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">工资费用：</label>
+                <div class="col-sm-8">
+                    <input name="salaryExpenses" th:field="*{salaryExpenses}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">厂租费用：</label>
+                <div class="col-sm-8">
+                    <input name="factoryRentalFees" th:field="*{factoryRentalFees}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">税金费用：</label>
+                <div class="col-sm-8">
+                    <input name="taxExpenses" th:field="*{taxExpenses}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">工厂电费：</label>
+                <div class="col-sm-8">
+                    <input name="factoryElectricityFees" th:field="*{factoryElectricityFees}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">其他费用：</label>
+                <div class="col-sm-8">
+                    <input name="ohterExpenses" th:field="*{ohterExpenses}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">业务成本：</label>
+                <div class="col-sm-8">
+                    <input name="businessCost" th:field="*{businessCost}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">运输费用：</label>
+                <div class="col-sm-8">
+                    <input name="transportationCosts" th:field="*{transportationCosts}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">推广费用：</label>
+                <div class="col-sm-8">
+                    <input name="promotionExpenses" th:field="*{promotionExpenses}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">包装费用：</label>
+                <div class="col-sm-8">
+                    <input name="packagingCost" th:field="*{packagingCost}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">业务费用：</label>
+                <div class="col-sm-8">
+                    <input name="businessExpenses" th:field="*{businessExpenses}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">售后费用：</label>
+                <div class="col-sm-8">
+                    <input name="afterSalesExpenses" th:field="*{afterSalesExpenses}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">业务提成：</label>
+                <div class="col-sm-8">
+                    <input name="businessCommission" th:field="*{businessCommission}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">备注：</label>
+                <div class="col-sm-8">
+                    <input name="remark" th:field="*{remark}" class="form-control" type="text">
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var prefix = ctx + "compantCost/compantCost";
+        $("#form-compantCost-edit").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/edit", $('#form-compantCost-edit').serialize());
+            }
+        }
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/taxInvoice/companyCost/add.html b/ruoyi-admin/src/main/resources/templates/taxInvoice/companyCost/add.html
deleted file mode 100644
index a5b55ed6..00000000
--- a/ruoyi-admin/src/main/resources/templates/taxInvoice/companyCost/add.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
-<head>
-    <th:block th:include="include :: header('新增公司成本')" />
-</head>
-<body class="white-bg">
-    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
-        <form class="form-horizontal m" id="form-companyCost-add">
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">公司成本ID：</label>
-                <div class="col-sm-8">
-                    <input name="ctcId" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">年份：</label>
-                <div class="col-sm-8">
-                    <input name="year" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">月份：</label>
-                <div class="col-sm-8">
-                    <input name="month" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">经营成本：</label>
-                <div class="col-sm-8">
-                    <input name="opex" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">业务成本：</label>
-                <div class="col-sm-8">
-                    <input name="cob" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">备注：</label>
-                <div class="col-sm-8">
-                    <input name="remark" class="form-control" type="text">
-                </div>
-            </div>
-        </form>
-    </div>
-    <th:block th:include="include :: footer" />
-    <script th:inline="javascript">
-        var prefix = ctx + "taxInvoice/companyCost"
-        $("#form-companyCost-add").validate({
-            focusCleanup: true
-        });
-
-        function submitHandler() {
-            if ($.validate.form()) {
-                $.operate.save(prefix + "/add", $('#form-companyCost-add').serialize());
-            }
-        }
-    </script>
-</body>
-</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/taxInvoice/companyCost/companyCost.html b/ruoyi-admin/src/main/resources/templates/taxInvoice/companyCost/companyCost.html
deleted file mode 100644
index 9c5d1e1b..00000000
--- a/ruoyi-admin/src/main/resources/templates/taxInvoice/companyCost/companyCost.html
+++ /dev/null
@@ -1,123 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
-<head>
-    <th:block th:include="include :: header('公司成本列表')" />
-</head>
-<body class="gray-bg">
-     <div class="container-div">
-        <div class="row">
-            <div class="col-sm-12 search-collapse">
-                <form id="formId">
-                    <div class="select-list">
-                        <ul>
-                            <li>
-                                <label>公司成本ID：</label>
-                                <input type="text" name="ctcId"/>
-                            </li>
-                            <li>
-                                <label>年份：</label>
-                                <input type="text" name="year"/>
-                            </li>
-                            <li>
-                                <label>月份：</label>
-                                <input type="text" name="month"/>
-                            </li>
-                            <li class="select-time">
-                                <label>录入时间：</label>
-                                <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginCreateTime]"/>
-                                <span>-</span>
-                                <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endCreateTime]"/>
-                            </li>
-                            <li>
-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
-                            </li>
-                        </ul>
-                    </div>
-                </form>
-            </div>
-
-            <div class="btn-group-sm" id="toolbar" role="group">
-                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="taxInvoice:companyCost:add">
-                    <i class="fa fa-plus"></i> 添加成本
-                </a>
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="taxInvoice:companyCost:export">
-                    <i class="fa fa-download"></i> 导出
-                </a>
-            </div>
-            <div class="col-sm-12 select-table table-striped">
-                <table id="bootstrap-table"></table>
-            </div>
-        </div>
-    </div>
-    <th:block th:include="include :: footer" />
-    <script th:inline="javascript">
-        var editFlag = [[${@permission.hasPermi('taxInvoice:companyCost:edit')}]];
-        var removeFlag = [[${@permission.hasPermi('taxInvoice:companyCost:remove')}]];
-        var cancelFlag = [[${@permission.hasPermi('taxInvoice:companyCost:cancel')}]];
-        var restoreFlag = [[${@permission.hasPermi('taxInvoice:companyCost:restore')}]];
-        var prefix = ctx + "taxInvoice/companyCost";
-
-        $(function() {
-            var options = {
-                url: prefix + "/list",
-                createUrl: prefix + "/add",
-                updateUrl: prefix + "/edit/{id}",
-                removeUrl: prefix + "/remove",
-                cancelUrl: prefix + "/cancel/{id}",
-                restoreUrl: prefix + "/restore/{id}",
-                exportUrl: prefix + "/export",
-                modalName: "公司成本",
-                columns: [{
-                    checkbox: true
-                },
-                {
-                    field: 'id',
-                    title: '索引',
-                    visible: false
-                },
-                {
-                    field: 'ctcId',
-                    title: '公司成本ID'
-                },
-                {
-                    field: 'year',
-                    title: '年份'
-                },
-                {
-                    field: 'month',
-                    title: '月份'
-                },
-                {
-                    field: 'opex',
-                    title: '经营成本'
-                },
-                {
-                    field: 'cob',
-                    title: '业务成本'
-                },
-                {
-                    field: 'remark',
-                    title: '备注'
-                },
-                {
-                    title: '操作',
-                    align: 'center',
-                    formatter: function(value, row, index) {
-                        var actions = [];
-                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
-                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a> ');
-                        if(row.delFlag == '0'){
-                            actions.push('<a class="btn btn-danger btn-xs ' + cancelFlag + '" href="javascript:void(0)" onclick="$.operate.cancel(\'' + row.id + '\')"><i class="fa fa-remove"></i>作废</a> ');
-                        }else{
-                            actions.push('<a class="btn btn-success btn-xs ' + restoreFlag + '" href="javascript:void(0)" onclick="$.operate.restore(\'' + row.id + '\')"><i class="fa fa-window-restore"></i>恢复</a> ');
-                        }
-                        return actions.join('');
-                    }
-                }]
-            };
-            $.table.init(options);
-        });
-    </script>
-</body>
-</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/taxInvoice/companyCost/edit.html b/ruoyi-admin/src/main/resources/templates/taxInvoice/companyCost/edit.html
deleted file mode 100644
index 624cc2b8..00000000
--- a/ruoyi-admin/src/main/resources/templates/taxInvoice/companyCost/edit.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
-<head>
-    <th:block th:include="include :: header('修改公司成本')" />
-</head>
-<body class="white-bg">
-    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
-        <form class="form-horizontal m" id="form-companyCost-edit" th:object="${erpCompanyCost}">
-            <input name="id" th:field="*{id}" type="hidden">
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">公司成本ID：</label>
-                <div class="col-sm-8">
-                    <input name="ctcId" th:field="*{ctcId}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">年份：</label>
-                <div class="col-sm-8">
-                    <input name="year" th:field="*{year}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">月份：</label>
-                <div class="col-sm-8">
-                    <input name="month" th:field="*{month}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">经营成本：</label>
-                <div class="col-sm-8">
-                    <input name="opex" th:field="*{opex}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">业务成本：</label>
-                <div class="col-sm-8">
-                    <input name="cob" th:field="*{cob}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">备注：</label>
-                <div class="col-sm-8">
-                    <input name="remark" th:field="*{remark}" class="form-control" type="text">
-                </div>
-            </div>
-        </form>
-    </div>
-    <th:block th:include="include :: footer" />
-    <script th:inline="javascript">
-        var prefix = ctx + "taxInvoice/companyCost";
-        $("#form-companyCost-edit").validate({
-            focusCleanup: true
-        });
-
-        function submitHandler() {
-            if ($.validate.form()) {
-                $.operate.save(prefix + "/edit", $('#form-companyCost-edit').serialize());
-            }
-        }
-    </script>
-</body>
-</html>
\ No newline at end of file