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

[feat]销售管理 财务管理 

国税发票实体类 新增开票金额美元字段，修改开票金额人民币字段
修改国税发票查询接口：新增开票金额美元字段，修改开票金额人民币字段
修改国税发票修改接口：新增开票金额美元字段，修改开票金额人民币字段
修改国税发票新增接口：新增开票金额美元字段，修改开票金额人民币字段
修改开票-国内公司前端列表：修改开票金额人民币字段
dev
liuxiaoxu 3 months ago
parent
ac8bc4e136
commit
b53dacf7cf
3 changed files with 37 additions and 18 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 37
      ruoyi-admin/src/main/java/com/ruoyi/financial/domain/FinancialTaxInvoice.java
  2. 14
      ruoyi-admin/src/main/resources/mapper/financial/FinancialTaxInvoiceMapper.xml
  3. 4
      ruoyi-admin/src/main/resources/templates/system/salesOrder/makeInvoiceRMB.html

37
ruoyi-admin/src/main/java/com/ruoyi/financial/domain/FinancialTaxInvoice.java
View File

@ -130,8 +130,12 @@ public class FinancialTaxInvoice extends BaseEntity
@Excel(name = "开票额度比例")
private BigDecimal invoiceQuotaRatio;
/** 开票金额 */
private BigDecimal invoiceAmount;
/** 开票金额(RMB) */
private BigDecimal invoiceAmountRmb;
/** 开票金额(美元) */
private BigDecimal invoiceAmountUsd;
/** 实际开票金额 */
@Excel(name = "实际开票金额")
@ -455,16 +459,16 @@ public class FinancialTaxInvoice extends BaseEntity
{
return invoiceQuotaRatio;
}
public void setInvoiceAmount(BigDecimal invoiceAmount)
{
this.invoiceAmount = invoiceAmount;
public BigDecimal getInvoiceAmountRmb() {
return invoiceAmountRmb;
}
public BigDecimal getInvoiceAmount()
{
return invoiceAmount;
public void setInvoiceAmountRmb(BigDecimal invoiceAmountRmb) {
this.invoiceAmountRmb = invoiceAmountRmb;
}
public void setActualInvoiceAmount(BigDecimal actualInvoiceAmount)
public void setActualInvoiceAmount(BigDecimal actualInvoiceAmount)
{
this.actualInvoiceAmount = actualInvoiceAmount;
}
@ -473,7 +477,17 @@ public class FinancialTaxInvoice extends BaseEntity
{
return actualInvoiceAmount;
}
public void setActualInvoiceAmountRmb(BigDecimal actualInvoiceAmountRmb)
public BigDecimal getInvoiceAmountUsd() {
return invoiceAmountUsd;
}
public void setInvoiceAmountUsd(BigDecimal invoiceAmountUsd) {
this.invoiceAmountUsd = invoiceAmountUsd;
}
public void setActualInvoiceAmountRmb(BigDecimal actualInvoiceAmountRmb)
{
this.actualInvoiceAmountRmb = actualInvoiceAmountRmb;
}
@ -597,7 +611,8 @@ public class FinancialTaxInvoice extends BaseEntity
.append("usdTaxSum", getUsdTaxSum())
.append("invoiceEmail", getInvoiceEmail())
.append("invoiceQuotaRatio", getInvoiceQuotaRatio())
.append("invoiceAmount", getInvoiceAmount())
.append("invoiceAmountRmb", getInvoiceAmountRmb())
.append("invoiceAmountUsd", getInvoiceAmountUsd())
.append("actualInvoiceAmount", getActualInvoiceAmount())
.append("actualInvoiceAmountRmb", getActualInvoiceAmountRmb())
.append("actualInvoiceAmountUsd", getActualInvoiceAmountUsd())

14
ruoyi-admin/src/main/resources/mapper/financial/FinancialTaxInvoiceMapper.xml
View File

@ -36,7 +36,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="usdTaxSum" column="usdTaxSum" />
<result property="invoiceEmail" column="invoice_email" />
<result property="invoiceQuotaRatio" column="invoice_quota_ratio" />
<result property="invoiceAmount" column="invoice_amount" />
<result property="invoiceAmountRmb" column="invoice_amount_rmb" />
<result property="invoiceAmountUsd" column="invoice_amount_usd" />
<result property="actualInvoiceAmount" column="actual_invoice_amount" />
<result property="actualInvoiceAmountRmb" column="actual_invoice_amount_rmb" />
<result property="actualInvoiceAmountUsd" column="actual_invoice_amount_usd" />
@ -55,7 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectFinancialTaxInvoiceVo">
select tax_invoice_id, tax_invoice_code, tax_invoice_status, use_status, sales_order_code, sales_order_number, sales_order_type, tax_invoice_type, tax_invoice_class, tax_invoice_title, business_members, apply_user, enterprise_code, enterprise_name, contact_number, enterprise_address, common_currency, invoice_company_name, invoice_company_code, deposit_bank, bank_account, tax_rate, usd_tax, material_sum, enterprise_sum, noRmbSum, rmbTaxSum, noUsdSum, usdTaxSum, invoice_email, invoice_quota_ratio, invoice_amount, actual_invoice_amount, actual_invoice_amount_rmb, actual_invoice_amount_usd, invoice_purpose, business_remark, invoice_remark, invoice_data, invoice_code, invoice_phone, create_by, create_time, update_by, update_time, remark, del_flag from financial_tax_invoice
select tax_invoice_id, tax_invoice_code, tax_invoice_status, use_status, sales_order_code, sales_order_number, sales_order_type, tax_invoice_type, tax_invoice_class, tax_invoice_title, business_members, apply_user, enterprise_code, enterprise_name, contact_number, enterprise_address, common_currency, invoice_company_name, invoice_company_code, deposit_bank, bank_account, tax_rate, usd_tax, material_sum, enterprise_sum, noRmbSum, rmbTaxSum, noUsdSum, usdTaxSum, invoice_email, invoice_quota_ratio, invoice_amount_rmb, invoice_amount_usd, actual_invoice_amount, actual_invoice_amount_rmb, actual_invoice_amount_usd, invoice_purpose, business_remark, invoice_remark, invoice_data, invoice_code, invoice_phone, create_by, create_time, update_by, update_time, remark, del_flag from financial_tax_invoice
</sql>
<select id="selectFinancialTaxInvoiceList" parameterType="FinancialTaxInvoice" resultMap="FinancialTaxInvoiceResult">
@ -113,7 +114,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="usdTaxSum != null">usdTaxSum,</if>
<if test="invoiceEmail != null">invoice_email,</if>
<if test="invoiceQuotaRatio != null">invoice_quota_ratio,</if>
<if test="invoiceAmount != null">invoice_amount,</if>
<if test="invoiceAmountRmb != null">invoice_amount_rmb,</if>
<if test="invoiceAmountUsd != null">invoice_amount_usd,</if>
<if test="actualInvoiceAmount != null">actual_invoice_amount,</if>
<if test="actualInvoiceAmountRmb != null">actual_invoice_amount_rmb,</if>
<if test="actualInvoiceAmountUsd != null">actual_invoice_amount_usd,</if>
@ -161,7 +163,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="usdTaxSum != null">#{usdTaxSum},</if>
<if test="invoiceEmail != null">#{invoiceEmail},</if>
<if test="invoiceQuotaRatio != null">#{invoiceQuotaRatio},</if>
<if test="invoiceAmount != null">#{invoiceAmount},</if>
<if test="invoiceAmountRmb != null">#{invoiceAmountRmb},</if>
<if test="invoiceAmountUsd != null">#{invoiceAmountUsd},</if>
<if test="actualInvoiceAmount != null">#{actualInvoiceAmount},</if>
<if test="actualInvoiceAmountRmb != null">#{actualInvoiceAmountRmb},</if>
<if test="actualInvoiceAmountUsd != null">#{actualInvoiceAmountUsd},</if>
@ -213,7 +216,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="usdTaxSum != null">usdTaxSum = #{usdTaxSum},</if>
<if test="invoiceEmail != null">invoice_email = #{invoiceEmail},</if>
<if test="invoiceQuotaRatio != null">invoice_quota_ratio = #{invoiceQuotaRatio},</if>
<if test="invoiceAmount != null">invoice_amount = #{invoiceAmount},</if>
<if test="invoiceAmountRmb != null">invoice_amount_rmb = #{invoiceAmountRmb},</if>
<if test="invoiceAmountUsd != null">invoice_amount_usd = #{invoiceAmountUsd},</if>
<if test="actualInvoiceAmount != null">actual_invoice_amount = #{actualInvoiceAmount},</if>
<if test="actualInvoiceAmountRmb != null">actual_invoice_amount_rmb = #{actualInvoiceAmountRmb},</if>
<if test="actualInvoiceAmountUsd != null">actual_invoice_amount_usd = #{actualInvoiceAmountUsd},</if>

4
ruoyi-admin/src/main/resources/templates/system/salesOrder/makeInvoiceRMB.html
View File

@ -201,9 +201,9 @@
</div>
<div class="form-group">
<label class="col-sm-5 control-label">开票金额：</label>
<label class="col-sm-5 control-label">开票金额(RMB)：</label>
<div class="col-sm-7">
<input name="invoiceAmount" th:field="*{invoiceAmount}" class="form-control" type="text">
<input name="invoiceAmountUsd" th:field="*{invoiceAmountUsd}" class="form-control" type="text">
</div>
</div>
<div class="form-group">

Write Preview
Loading…
Cancel
Save