root
/
smart-erp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

[fix]销售管理 

按照万材调整：销售估价总经营模板新增：上一年度总经营成本字段，总经验成本模板mapper.xml层所有方法加上totalOperatingCosts字段
实体类新增totalOperatingCosts字段和get、set方法
按照新需求调整总经验成本前端列表页面
dev
liuxiaoxu 3 weeks ago
parent
15700ab18e
commit
6e2bd82e86
3 changed files with 57 additions and 35 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 28
      ruoyi-admin/src/main/java/com/ruoyi/sales/domain/SalesEstimateTemplate.java
  2. 6
      ruoyi-admin/src/main/resources/mapper/sales/SalesEstimateTemplateMapper.xml
  3. 58
      ruoyi-admin/src/main/resources/templates/sales/estimate/addOperatingCostTemplate.html

28
ruoyi-admin/src/main/java/com/ruoyi/sales/domain/SalesEstimateTemplate.java
View File

@ -43,23 +43,23 @@ public class SalesEstimateTemplate extends BaseEntity
@Excel(name = "F挡利润率") @Excel(name = "F挡利润率")
private BigDecimal fProfitRate; private BigDecimal fProfitRate;
/** 不含税人工成本（RMB） */
@Excel(name = "不含税人工成本", readConverterExp = "R=MB") /** 上一年度总经营成本 */
private BigDecimal totalOperatingCosts;
/** 不含税人工成本（RMB）停用 */
private BigDecimal noTaxLaborCosts; private BigDecimal noTaxLaborCosts;
/** 不含税推广成本（RMB） */ /** 不含税推广成本（RMB）停用 */
@Excel(name = "不含税推广成本", readConverterExp = "R=MB")
private BigDecimal noTaxPromotionalCosts; private BigDecimal noTaxPromotionalCosts;
/** 不含税业务成本（RMB） */ /** 不含税业务成本（RMB）停用 */
@Excel(name = "不含税业务成本", readConverterExp = "R=MB")
private BigDecimal noTaxBusinessCosts; private BigDecimal noTaxBusinessCosts;
/** 不含税管理成本（RMB） */ /** 不含税管理成本（RMB）停用 */
@Excel(name = "不含税管理成本", readConverterExp = "R=MB")
private BigDecimal noTaxManagesCosts; private BigDecimal noTaxManagesCosts;
/** 不含税总物料成本（RMB） */ /** 不含税总物料成本（RMB）停用 */
@Excel(name = "不含税总物料成本", readConverterExp = "R=MB") @Excel(name = "不含税总物料成本", readConverterExp = "R=MB")
private BigDecimal noTaxMaterialCosts; private BigDecimal noTaxMaterialCosts;
@ -172,6 +172,15 @@ public class SalesEstimateTemplate extends BaseEntity
return noTaxMaterialCosts; return noTaxMaterialCosts;
} }
public BigDecimal getTotalOperatingCosts() {
return totalOperatingCosts;
}
public void setTotalOperatingCosts(BigDecimal totalOperatingCosts) {
this.totalOperatingCosts = totalOperatingCosts;
}
@Override @Override
public String toString() { public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@ -182,6 +191,7 @@ public class SalesEstimateTemplate extends BaseEntity
.append("dProfitRate", getdProfitRate()) .append("dProfitRate", getdProfitRate())
.append("eProfitRate", geteProfitRate()) .append("eProfitRate", geteProfitRate())
.append("fProfitRate", getfProfitRate()) .append("fProfitRate", getfProfitRate())
.append("totalOperatingCosts", getTotalOperatingCosts())
.append("noTaxLaborCosts", getNoTaxLaborCosts()) .append("noTaxLaborCosts", getNoTaxLaborCosts())
.append("noTaxPromotionalCosts", getNoTaxPromotionalCosts()) .append("noTaxPromotionalCosts", getNoTaxPromotionalCosts())
.append("noTaxBusinessCosts", getNoTaxBusinessCosts()) .append("noTaxBusinessCosts", getNoTaxBusinessCosts())

6
ruoyi-admin/src/main/resources/mapper/sales/SalesEstimateTemplateMapper.xml
View File

@ -12,6 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="dProfitRate" column="D_profit_rate" /> <result property="dProfitRate" column="D_profit_rate" />
<result property="eProfitRate" column="E_profit_rate" /> <result property="eProfitRate" column="E_profit_rate" />
<result property="fProfitRate" column="F_profit_rate" /> <result property="fProfitRate" column="F_profit_rate" />
<result property="totalOperatingCosts" column="total_operating_costs" />
<result property="noTaxLaborCosts" column="no_tax_labor_costs" /> <result property="noTaxLaborCosts" column="no_tax_labor_costs" />
<result property="noTaxPromotionalCosts" column="no_tax_promotional_costs" /> <result property="noTaxPromotionalCosts" column="no_tax_promotional_costs" />
<result property="noTaxBusinessCosts" column="no_tax_business_costs" /> <result property="noTaxBusinessCosts" column="no_tax_business_costs" />
@ -25,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap> </resultMap>
<sql id="selectSalesEstimateTemplateVo"> <sql id="selectSalesEstimateTemplateVo">
select estimate_template_id, A_profit_rate, B_profit_rate, C_profit_rate, D_profit_rate, E_profit_rate, F_profit_rate, no_tax_labor_costs, no_tax_promotional_costs, no_tax_business_costs, no_tax_manages_costs, no_tax_material_costs, create_by, create_time, update_by, update_time, remark from sales_estimate_template select estimate_template_id, A_profit_rate, B_profit_rate, C_profit_rate, D_profit_rate, E_profit_rate, F_profit_rate, total_operating_costs, no_tax_labor_costs, no_tax_promotional_costs, no_tax_business_costs, no_tax_manages_costs, no_tax_material_costs, create_by, create_time, update_by, update_time, remark from sales_estimate_template
</sql> </sql>
<select id="selectSalesEstimateTemplateList" parameterType="SalesEstimateTemplate" resultMap="SalesEstimateTemplateResult"> <select id="selectSalesEstimateTemplateList" parameterType="SalesEstimateTemplate" resultMap="SalesEstimateTemplateResult">
@ -52,6 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="dProfitRate != null">D_profit_rate,</if> <if test="dProfitRate != null">D_profit_rate,</if>
<if test="eProfitRate != null">E_profit_rate,</if> <if test="eProfitRate != null">E_profit_rate,</if>
<if test="fProfitRate != null">F_profit_rate,</if> <if test="fProfitRate != null">F_profit_rate,</if>
<if test="totalOperatingCosts != null">total_operating_costs,</if>
<if test="noTaxLaborCosts != null">no_tax_labor_costs,</if> <if test="noTaxLaborCosts != null">no_tax_labor_costs,</if>
<if test="noTaxPromotionalCosts != null">no_tax_promotional_costs,</if> <if test="noTaxPromotionalCosts != null">no_tax_promotional_costs,</if>
<if test="noTaxBusinessCosts != null">no_tax_business_costs,</if> <if test="noTaxBusinessCosts != null">no_tax_business_costs,</if>
@ -70,6 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="dProfitRate != null">#{dProfitRate},</if> <if test="dProfitRate != null">#{dProfitRate},</if>
<if test="eProfitRate != null">#{eProfitRate},</if> <if test="eProfitRate != null">#{eProfitRate},</if>
<if test="fProfitRate != null">#{fProfitRate},</if> <if test="fProfitRate != null">#{fProfitRate},</if>
<if test="totalOperatingCosts != null">#{totalOperatingCosts},</if>
<if test="noTaxLaborCosts != null">#{noTaxLaborCosts},</if> <if test="noTaxLaborCosts != null">#{noTaxLaborCosts},</if>
<if test="noTaxPromotionalCosts != null">#{noTaxPromotionalCosts},</if> <if test="noTaxPromotionalCosts != null">#{noTaxPromotionalCosts},</if>
<if test="noTaxBusinessCosts != null">#{noTaxBusinessCosts},</if> <if test="noTaxBusinessCosts != null">#{noTaxBusinessCosts},</if>
@ -92,6 +95,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="dProfitRate != null">D_profit_rate = #{dProfitRate},</if> <if test="dProfitRate != null">D_profit_rate = #{dProfitRate},</if>
<if test="eProfitRate != null">E_profit_rate = #{eProfitRate},</if> <if test="eProfitRate != null">E_profit_rate = #{eProfitRate},</if>
<if test="fProfitRate != null">F_profit_rate = #{fProfitRate},</if> <if test="fProfitRate != null">F_profit_rate = #{fProfitRate},</if>
<if test="totalOperatingCosts != null">total_operating_costs = #{totalOperatingCosts},</if>
<if test="noTaxLaborCosts != null">no_tax_labor_costs = #{noTaxLaborCosts},</if> <if test="noTaxLaborCosts != null">no_tax_labor_costs = #{noTaxLaborCosts},</if>
<if test="noTaxPromotionalCosts != null">no_tax_promotional_costs = #{noTaxPromotionalCosts},</if> <if test="noTaxPromotionalCosts != null">no_tax_promotional_costs = #{noTaxPromotionalCosts},</if>
<if test="noTaxBusinessCosts != null">no_tax_business_costs = #{noTaxBusinessCosts},</if> <if test="noTaxBusinessCosts != null">no_tax_business_costs = #{noTaxBusinessCosts},</if>

58
ruoyi-admin/src/main/resources/templates/sales/estimate/addOperatingCostTemplate.html
View File

@ -31,41 +31,49 @@
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<h4 class="font-weight-bold">总经营成本</h4> <h4 class="font-weight-bold">上一年度总经营成本</h4>
</div> </div>
<hr class="underline"> <hr class="underline">
<br> <br>
</div> </div>
<div class="form-group">
<label class="col-sm-7 control-label is-required">不含税人工成本(RMB)：</label>
<div class="col-sm-5">
<input name="noTaxLaborCosts" th:field="*{noTaxLaborCosts}" class="form-control" type="text" required>
</div>
</div>
<div class="form-group">
<label class="col-sm-7 control-label is-required">不含税推广成本(RMB)：</label>
<div class="col-sm-5">
<input name="noTaxPromotionalCosts" th:field="*{noTaxPromotionalCosts}" class="form-control" type="text" required>
</div>
</div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-7 control-label is-required">不含税业务成本(RMB)：</label> <label class="col-sm-7 control-label is-required">不含税总经营成本(RMB)：</label>
<div class="col-sm-5"> <div class="col-sm-5">
<input name="noTaxBusinessCosts" th:field="*{noTaxBusinessCosts}" class="form-control" type="text" required> <input name="totalOperatingCosts" th:field="*{totalOperatingCosts}" class="form-control" type="text" required>
</div>
</div>
<div class="form-group">
<label class="col-sm-7 control-label is-required">不含税管理成本(RMB)：</label>
<div class="col-sm-5">
<input name="noTaxManagesCosts" th:field="*{noTaxManagesCosts}" class="form-control" type="text" required>
</div>
</div> </div>
</div>
<!-- <div class="form-group">-->
<!-- <label class="col-sm-7 control-label is-required">不含税人工成本(RMB)：</label>-->
<!-- <div class="col-sm-5">-->
<!-- <input name="noTaxLaborCosts" th:field="*{noTaxLaborCosts}" class="form-control" type="text" required>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="form-group">-->
<!-- <label class="col-sm-7 control-label is-required">不含税推广成本(RMB)：</label>-->
<!-- <div class="col-sm-5">-->
<!-- <input name="noTaxPromotionalCosts" th:field="*{noTaxPromotionalCosts}" class="form-control" type="text" required>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="form-group">-->
<!-- <label class="col-sm-7 control-label is-required">不含税业务成本(RMB)：</label>-->
<!-- <div class="col-sm-5">-->
<!-- <input name="noTaxBusinessCosts" th:field="*{noTaxBusinessCosts}" class="form-control" type="text" required>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="form-group">-->
<!-- <label class="col-sm-7 control-label is-required">不含税管理成本(RMB)：</label>-->
<!-- <div class="col-sm-5">-->
<!-- <input name="noTaxManagesCosts" th:field="*{noTaxManagesCosts}" class="form-control" type="text" required>-->
<!-- </div>-->
<!-- </div>-->
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<h4 class="font-weight-bold">总物料成本</h4> <h4 class="font-weight-bold">上一年度总物料成本</h4>
</div> </div>
<hr class="underline"> <hr class="underline">
<br> <br>

Write Preview
Loading…
Cancel
Save