purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

给零售增加找零字段

Browse Source
This commit is contained in:
季圣华
2021-12-12 23:32:34 +08:00
parent c2c9a465b6
commit 628ead90f8
5 changed files with 128 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/DepotHead.java
View File

@@ -26,6 +26,8 @@ public class DepotHead {
private BigDecimal changeAmount;
private BigDecimal backAmount;
private BigDecimal totalPrice;
private String payType;
@@ -146,6 +148,14 @@ public class DepotHead {
this.changeAmount = changeAmount;
}
public BigDecimal getBackAmount() {
return backAmount;
}
public void setBackAmount(BigDecimal backAmount) {
this.backAmount = backAmount;
}
public BigDecimal getTotalPrice() {
return totalPrice;
}

60
jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/DepotHeadExample.java
View File

@@ -806,6 +806,66 @@ public class DepotHeadExample {
return (Criteria) this;
}
public Criteria andBackAmountIsNull() {
addCriterion("back_amount is null");
return (Criteria) this;
}
public Criteria andBackAmountIsNotNull() {
addCriterion("back_amount is not null");
return (Criteria) this;
}
public Criteria andBackAmountEqualTo(BigDecimal value) {
addCriterion("back_amount =", value, "backAmount");
return (Criteria) this;
}
public Criteria andBackAmountNotEqualTo(BigDecimal value) {
addCriterion("back_amount <>", value, "backAmount");
return (Criteria) this;
}
public Criteria andBackAmountGreaterThan(BigDecimal value) {
addCriterion("back_amount >", value, "backAmount");
return (Criteria) this;
}
public Criteria andBackAmountGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("back_amount >=", value, "backAmount");
return (Criteria) this;
}
public Criteria andBackAmountLessThan(BigDecimal value) {
addCriterion("back_amount <", value, "backAmount");
return (Criteria) this;
}
public Criteria andBackAmountLessThanOrEqualTo(BigDecimal value) {
addCriterion("back_amount <=", value, "backAmount");
return (Criteria) this;
}
public Criteria andBackAmountIn(List<BigDecimal> values) {
addCriterion("back_amount in", values, "backAmount");
return (Criteria) this;
}
public Criteria andBackAmountNotIn(List<BigDecimal> values) {
addCriterion("back_amount not in", values, "backAmount");
return (Criteria) this;
}
public Criteria andBackAmountBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("back_amount between", value1, value2, "backAmount");
return (Criteria) this;
}
public Criteria andBackAmountNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("back_amount not between", value1, value2, "backAmount");
return (Criteria) this;
}
public Criteria andTotalPriceIsNull() {
addCriterion("total_price is null");
return (Criteria) this;

49
jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapper.xml
View File

@@ -13,6 +13,7 @@
<result column="creator" jdbcType="BIGINT" property="creator" />
<result column="account_id" jdbcType="BIGINT" property="accountId" />
<result column="change_amount" jdbcType="DECIMAL" property="changeAmount" />
<result column="back_amount" jdbcType="DECIMAL" property="backAmount" />
<result column="total_price" jdbcType="DECIMAL" property="totalPrice" />
<result column="pay_type" jdbcType="VARCHAR" property="payType" />
<result column="bill_type" jdbcType="VARCHAR" property="billType" />
@@ -90,9 +91,9 @@
</sql>
<sql id="Base_Column_List">
id, type, sub_type, default_number, number, create_time, oper_time, organ_id, creator,
account_id, change_amount, total_price, pay_type, bill_type, remark, file_name, sales_man,
account_id_list, account_money_list, discount, discount_money, discount_last_money,
other_money, status, link_number, tenant_id, delete_flag
account_id, change_amount, back_amount, total_price, pay_type, bill_type, remark,
file_name, sales_man, account_id_list, account_money_list, discount, discount_money,
discount_last_money, other_money, status, link_number, tenant_id, delete_flag
</sql>
<select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.DepotHeadExample" resultMap="BaseResultMap">
select
@@ -128,23 +129,23 @@
insert into jsh_depot_head (id, type, sub_type,
default_number, number, create_time,
oper_time, organ_id, creator,
account_id, change_amount, total_price,
pay_type, bill_type, remark,
file_name, sales_man, account_id_list,
account_money_list, discount, discount_money,
discount_last_money, other_money, status,
link_number, tenant_id, delete_flag
)
account_id, change_amount, back_amount,
total_price, pay_type, bill_type,
remark, file_name, sales_man,
account_id_list, account_money_list, discount,
discount_money, discount_last_money, other_money,
status, link_number, tenant_id,
delete_flag)
values (#{id,jdbcType=BIGINT}, #{type,jdbcType=VARCHAR}, #{subType,jdbcType=VARCHAR},
#{defaultNumber,jdbcType=VARCHAR}, #{number,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP},
#{operTime,jdbcType=TIMESTAMP}, #{organId,jdbcType=BIGINT}, #{creator,jdbcType=BIGINT},
#{accountId,jdbcType=BIGINT}, #{changeAmount,jdbcType=DECIMAL}, #{totalPrice,jdbcType=DECIMAL},
#{payType,jdbcType=VARCHAR}, #{billType,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR},
#{fileName,jdbcType=VARCHAR}, #{salesMan,jdbcType=VARCHAR}, #{accountIdList,jdbcType=VARCHAR},
#{accountMoneyList,jdbcType=VARCHAR}, #{discount,jdbcType=DECIMAL}, #{discountMoney,jdbcType=DECIMAL},
#{discountLastMoney,jdbcType=DECIMAL}, #{otherMoney,jdbcType=DECIMAL}, #{status,jdbcType=VARCHAR},
#{linkNumber,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR}
)
#{accountId,jdbcType=BIGINT}, #{changeAmount,jdbcType=DECIMAL}, #{backAmount,jdbcType=DECIMAL},
#{totalPrice,jdbcType=DECIMAL}, #{payType,jdbcType=VARCHAR}, #{billType,jdbcType=VARCHAR},
#{remark,jdbcType=VARCHAR}, #{fileName,jdbcType=VARCHAR}, #{salesMan,jdbcType=VARCHAR},
#{accountIdList,jdbcType=VARCHAR}, #{accountMoneyList,jdbcType=VARCHAR}, #{discount,jdbcType=DECIMAL},
#{discountMoney,jdbcType=DECIMAL}, #{discountLastMoney,jdbcType=DECIMAL}, #{otherMoney,jdbcType=DECIMAL},
#{status,jdbcType=VARCHAR}, #{linkNumber,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT},
#{deleteFlag,jdbcType=VARCHAR})
</insert>
<insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.DepotHead">
insert into jsh_depot_head
@@ -182,6 +183,9 @@
<if test="changeAmount != null">
change_amount,
</if>
<if test="backAmount != null">
back_amount,
</if>
<if test="totalPrice != null">
total_price,
</if>
@@ -265,6 +269,9 @@
<if test="changeAmount != null">
#{changeAmount,jdbcType=DECIMAL},
</if>
<if test="backAmount != null">
#{backAmount,jdbcType=DECIMAL},
</if>
<if test="totalPrice != null">
#{totalPrice,jdbcType=DECIMAL},
</if>
@@ -357,6 +364,9 @@
<if test="record.changeAmount != null">
change_amount = #{record.changeAmount,jdbcType=DECIMAL},
</if>
<if test="record.backAmount != null">
back_amount = #{record.backAmount,jdbcType=DECIMAL},
</if>
<if test="record.totalPrice != null">
total_price = #{record.totalPrice,jdbcType=DECIMAL},
</if>
@@ -423,6 +433,7 @@
creator = #{record.creator,jdbcType=BIGINT},
account_id = #{record.accountId,jdbcType=BIGINT},
change_amount = #{record.changeAmount,jdbcType=DECIMAL},
back_amount = #{record.backAmount,jdbcType=DECIMAL},
total_price = #{record.totalPrice,jdbcType=DECIMAL},
pay_type = #{record.payType,jdbcType=VARCHAR},
bill_type = #{record.billType,jdbcType=VARCHAR},
@@ -476,6 +487,9 @@
<if test="changeAmount != null">
change_amount = #{changeAmount,jdbcType=DECIMAL},
</if>
<if test="backAmount != null">
back_amount = #{backAmount,jdbcType=DECIMAL},
</if>
<if test="totalPrice != null">
total_price = #{totalPrice,jdbcType=DECIMAL},
</if>
@@ -539,6 +553,7 @@
creator = #{creator,jdbcType=BIGINT},
account_id = #{accountId,jdbcType=BIGINT},
change_amount = #{changeAmount,jdbcType=DECIMAL},
back_amount = #{backAmount,jdbcType=DECIMAL},
total_price = #{totalPrice,jdbcType=DECIMAL},
pay_type = #{payType,jdbcType=VARCHAR},
bill_type = #{billType,jdbcType=VARCHAR},