md
This commit is contained in:
linfso
parent
4bde47c509
commit
d0c9dc80b7
@ -79,6 +79,34 @@ public class EmisSettleSubBill extends BaseEntity
|
||||
private String customerCode;
|
||||
/* 客户名称 */
|
||||
private String customerName;
|
||||
|
||||
/* 已开票金额 */
|
||||
private BigDecimal invoicedMoney;
|
||||
/* 已收款金额 */
|
||||
private BigDecimal recedMoney;
|
||||
/* 安全金额 */
|
||||
private BigDecimal satisfyMoney;
|
||||
/* 允许金额 */
|
||||
private BigDecimal allowanceMoney;
|
||||
/* 抵扣金额 */
|
||||
private BigDecimal deductionMoney;
|
||||
/* 其他金额 */
|
||||
private BigDecimal otherMoney;
|
||||
/* 安全原因 */
|
||||
private String satisfyReason;
|
||||
/* 允许原因 */
|
||||
private String allowanceReason;
|
||||
/* 抵扣原因 */
|
||||
private String deductionReason;
|
||||
/* 其他原因 */
|
||||
private String otherReason;
|
||||
/* 开票状态 0-未开票 1-已开票 2-部分开票 3-不开票 */
|
||||
private String openBillStatus;
|
||||
/* 付款状态 0-未付款 1-已付款 2-部分付款 */
|
||||
private String paymentStatus;
|
||||
/* 核销状态 0-未核销1-已核销 */
|
||||
private String chargeStatus;
|
||||
|
||||
/* 销售回款人 */
|
||||
@DataAuditField(fieldComment = "回款联系人")
|
||||
private String payee;
|
||||
|
||||
@ -21,6 +21,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<result property="custName" column="cust_name" />
|
||||
<result property="customerCode" column="customer_code" />
|
||||
<result property="customerName" column="customer_name" />
|
||||
<result property="invoicedMoney" column="invoiced_money" />
|
||||
<result property="recedMoney" column="reced_money" />
|
||||
<result property="satisfyMoney" column="satisfy_money" />
|
||||
<result property="allowanceMoney" column="allowance_money" />
|
||||
<result property="deductionMoney" column="deduction_money" />
|
||||
<result property="otherMoney" column="other_money" />
|
||||
<result property="satisfyReason" column="satisfy_reason" />
|
||||
<result property="allowanceReason" column="allowance_reason" />
|
||||
<result property="deductionReason" column="deduction_reason" />
|
||||
<result property="otherReason" column="other_reason" />
|
||||
<result property="openBillStatus" column="open_bill_status" />
|
||||
<result property="paymentStatus" column="payment_status" />
|
||||
<result property="chargeStatus" column="charge_status" />
|
||||
<result property="payee" column="payee" />
|
||||
<result property="salesmen" column="salesmen" />
|
||||
<result property="blSpecialQuote" column="bl_special_quote" />
|
||||
@ -46,36 +59,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
/>
|
||||
|
||||
|
||||
<!-- <result property="waybillDetail.billCode" column="bill_code"/>-->
|
||||
<!-- <result property="waybillDetail.sendSiteName" column="send_site_name"/>-->
|
||||
<!-- <result property="waybillDetail.dispatchUnderlingSiteName" column="dispatch_underling_site_name"/>-->
|
||||
<!-- <result property="waybillDetail.transLineTypeName" column="trans_line_type_name"/>-->
|
||||
<!-- <result property="waybillDetail.productTypeName" column="product_type_name"/>-->
|
||||
<!-- <result property="waybillDetail.problemTypeName" column="problem_type_name"/>-->
|
||||
<!-- <result property="waybillDetail.blSpecialQuote" column="bl_special_quote"/>-->
|
||||
<!-- <result property="waybillDetail.calcFeeType" column="calc_fee_type"/>-->
|
||||
<!-- <result property="waybillDetail.sendDate" column="send_date"/>-->
|
||||
<!-- <result property="waybillDetail.sendCompany" column="send_company"/>-->
|
||||
<!-- <result property="waybillDetail.custName" column="cust_no"/>-->
|
||||
<!-- <result property="waybillDetail.custName" column="cust_name"/>-->
|
||||
<!-- <result property="waybillDetail.paymentType" column="payment_type"/>-->
|
||||
<!-- <result property="waybillDetail.timeType" column="time_type"/>-->
|
||||
<!-- <result property="waybillDetail.sendName" column="send_name"/>-->
|
||||
<!-- <result property="waybillDetail.parcelQty" column="parcel_qty"/>-->
|
||||
<!-- <result property="waybillDetail.billWeight" column="bill_weight"/>-->
|
||||
<!-- <result property="waybillDetail.totalVolume" column="total_volume"/>-->
|
||||
<!-- <result property="waybillDetail.volumeWeight" column="volume_weight"/>-->
|
||||
<!-- <result property="waybillDetail.settlementWeight" column="settlement_weight"/>-->
|
||||
<!-- <result property="waybillDetail.freight" column="freight"/>-->
|
||||
<!-- <result property="waybillDetail.realFee" column="real_fee"/>-->
|
||||
<!-- <result property="waybillDetail.feeRemark" column="fee_remark"/>-->
|
||||
<!-- <result property="waybillDetail.paymentType" column="payment_type"/>-->
|
||||
<!-- <result property="waybillDetail.remark" column="remark"/>-->
|
||||
<!-- <result property="waybillDetail.payee" column="payee"/>-->
|
||||
<!-- <result property="waybillDetail.salesmen" column="salesmen"/>-->
|
||||
<!-- <result property="waybillDetail.blIsQuestion" column="bl_is_question"/>-->
|
||||
<!-- <result property="waybillDetail.problemCause" column="problem_cause"/>-->
|
||||
|
||||
<association property="feeitemList"
|
||||
column="bill_no"
|
||||
select="com.xdadan.erp.emis.mapper.EmisSettleSubBillFeeitemMapper.selectFeeitemListBySubBillNo"
|
||||
@ -111,13 +94,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
|
||||
|
||||
<sql id="selectEmisSettleSubBillVo">
|
||||
select id, bill_no, parent_bill_no, settle_bill_no, bill_code, bill_date, bill_fee, currency, settle_type, bl_split, bl_merge, bill_month, cust_no, cust_name, customer_code, customer_name, payee, salesmen, bl_special_quote, bl_sensitive, bl_confirm_center, confirm_center_date, confirm_center_note, confirm_center_man_code, confirm_center_code, bl_confirm_site, confirm_site_date, confirm_site_man_code, confirm_site_note, confirm_site_code, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_settle_sub_bill
|
||||
select id, bill_no, parent_bill_no, settle_bill_no, bill_code, bill_date, bill_fee, currency, settle_type, bl_split, bl_merge, bill_month, cust_no, cust_name, customer_code, customer_name, invoiced_money, reced_money, satisfy_money, allowance_money, deduction_money, other_money, satisfy_reason, allowance_reason, deduction_reason, other_reason, open_bill_status, payment_status, charge_status, payee, salesmen, bl_special_quote, bl_sensitive, bl_confirm_center, confirm_center_date, confirm_center_note, confirm_center_man_code, confirm_center_code, bl_confirm_site, confirm_site_date, confirm_site_man_code, confirm_site_note, confirm_site_code, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_settle_sub_bill
|
||||
</sql>
|
||||
|
||||
<select id="selectEmisSettleSubBillList" parameterType="EmisSettleSubBill" resultMap="EmisSettleSubBillListResult">
|
||||
select b.id, b.bill_no, b.parent_bill_no, b.settle_bill_no, b.bill_code, b.bill_date,
|
||||
b.bill_fee, b.currency, b.settle_type, b.bl_split, b.bl_merge, b.bill_month, b.cust_no,b.cust_name,
|
||||
b.customer_code, b.customer_name, b.payee, b.salesmen, b.bl_special_quote, b.bl_sensitive,
|
||||
b.customer_code, b.customer_name,
|
||||
b.invoiced_money, b.reced_money,
|
||||
b.satisfy_money, b.allowance_money, b.deduction_money, b.other_money,
|
||||
b.satisfy_reason, b.allowance_reason, b.deduction_reason, b.other_reason,
|
||||
b.open_bill_status, b.payment_status, b.charge_status,
|
||||
|
||||
b.payee, b.salesmen, b.bl_special_quote, b.bl_sensitive,
|
||||
b.bl_confirm_center, b.confirm_center_date, b.confirm_center_note, b.confirm_center_man_code,
|
||||
b.confirm_center_code, b.bl_confirm_site, b.confirm_site_date, b.confirm_site_man_code,
|
||||
b.confirm_site_note, b.confirm_site_code, b.del_flag, b.create_by, b.create_time, b.update_by,
|
||||
@ -592,13 +581,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
|
||||
|
||||
<select id="selectEmisSettleSubBillById" parameterType="Long" resultMap="EmisSettleSubBillResult">
|
||||
select id, bill_no, parent_bill_no, settle_bill_no, bill_code, bill_date, bill_fee, currency, settle_type, bl_split, bl_merge, bill_month, cust_no, cust_name, customer_code, customer_name, payee, salesmen, bl_special_quote, bl_sensitive, bl_confirm_center, confirm_center_date, confirm_center_note, confirm_center_man_code, confirm_center_code, bl_confirm_site, confirm_site_date, confirm_site_man_code, confirm_site_note, confirm_site_code, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
|
||||
select id, bill_no, parent_bill_no, settle_bill_no, bill_code, bill_date, bill_fee, currency, settle_type, bl_split, bl_merge, bill_month, cust_no, cust_name, customer_code, customer_name, invoiced_money, reced_money, satisfy_money, allowance_money, deduction_money, other_money, satisfy_reason, allowance_reason, deduction_reason, other_reason, open_bill_status, payment_status, charge_status, payee, salesmen, bl_special_quote, bl_sensitive, bl_confirm_center, confirm_center_date, confirm_center_note, confirm_center_man_code, confirm_center_code, bl_confirm_site, confirm_site_date, confirm_site_man_code, confirm_site_note, confirm_site_code, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
|
||||
from emis_settle_sub_bill a
|
||||
where a.id = #{id}
|
||||
</select>
|
||||
|
||||
<select id="selectSettleSubBillListByBillCode" parameterType="String" resultMap="EmisSettleSubBillResult">
|
||||
select id, bill_no, parent_bill_no, settle_bill_no, bill_code, bill_date, bill_fee, currency, settle_type, bl_split, bl_merge, bill_month, cust_no, cust_name, customer_code, customer_name, payee, salesmen, bl_special_quote, bl_sensitive, bl_confirm_center, confirm_center_date, confirm_center_note, confirm_center_man_code, confirm_center_code, bl_confirm_site, confirm_site_date, confirm_site_man_code, confirm_site_note, confirm_site_code, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
|
||||
select id, bill_no, parent_bill_no, settle_bill_no, bill_code, bill_date, bill_fee, currency, settle_type, bl_split, bl_merge, bill_month, cust_no, cust_name, customer_code, customer_name, invoiced_money, reced_money, satisfy_money, allowance_money, deduction_money, other_money, satisfy_reason, allowance_reason, deduction_reason, other_reason, open_bill_status, payment_status, charge_status, payee, salesmen, bl_special_quote, bl_sensitive, bl_confirm_center, confirm_center_date, confirm_center_note, confirm_center_man_code, confirm_center_code, bl_confirm_site, confirm_site_date, confirm_site_man_code, confirm_site_note, confirm_site_code, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
|
||||
from emis_settle_sub_bill a
|
||||
where a.del_flag='0' and a.bill_code = #{billCode}
|
||||
</select>
|
||||
@ -607,14 +596,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
|
||||
|
||||
<select id="selectSubBillListBySettleBillNo" parameterType="String" resultMap="EmisSettleSubBillResult">
|
||||
select id, bill_no, parent_bill_no, settle_bill_no, bill_code, bill_date, bill_fee, currency, settle_type, bl_split, bl_merge, bill_month, cust_no, cust_name, customer_code, customer_name, payee, salesmen, bl_special_quote, bl_sensitive, bl_confirm_center, confirm_center_date, confirm_center_note, confirm_center_man_code, confirm_center_code, bl_confirm_site, confirm_site_date, confirm_site_man_code, confirm_site_note, confirm_site_code, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
|
||||
select id, bill_no, parent_bill_no, settle_bill_no, bill_code, bill_date, bill_fee, currency, settle_type, bl_split, bl_merge, bill_month, cust_no, cust_name, customer_code, customer_name, invoiced_money, reced_money, satisfy_money, allowance_money, deduction_money, other_money, satisfy_reason, allowance_reason, deduction_reason, other_reason, open_bill_status, payment_status, charge_status, payee, salesmen, bl_special_quote, bl_sensitive, bl_confirm_center, confirm_center_date, confirm_center_note, confirm_center_man_code, confirm_center_code, bl_confirm_site, confirm_site_date, confirm_site_man_code, confirm_site_note, confirm_site_code, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
|
||||
from emis_settle_sub_bill a
|
||||
where a.settle_bill_no = #{settleBillNo} and del_flag='0'
|
||||
</select>
|
||||
|
||||
|
||||
<select id="selectSettleSubBillBySubBillNo" parameterType="String" resultMap="EmisSettleSubBillResult">
|
||||
select id, bill_no, parent_bill_no, settle_bill_no, bill_code, bill_date, bill_fee, currency, settle_type, bl_split, bl_merge, bill_month, cust_no, cust_name, customer_code, customer_name, payee, salesmen, bl_special_quote, bl_sensitive, bl_confirm_center, confirm_center_date, confirm_center_note, confirm_center_man_code, confirm_center_code, bl_confirm_site, confirm_site_date, confirm_site_man_code, confirm_site_note, confirm_site_code, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
|
||||
select id, bill_no, parent_bill_no, settle_bill_no, bill_code, bill_date, bill_fee, currency, settle_type, bl_split, bl_merge, bill_month, cust_no, cust_name, customer_code, customer_name, invoiced_money, reced_money, satisfy_money, allowance_money, deduction_money, other_money, satisfy_reason, allowance_reason, deduction_reason, other_reason, open_bill_status, payment_status, charge_status, payee, salesmen, bl_special_quote, bl_sensitive, bl_confirm_center, confirm_center_date, confirm_center_note, confirm_center_man_code, confirm_center_code, bl_confirm_site, confirm_site_date, confirm_site_man_code, confirm_site_note, confirm_site_code, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
|
||||
from emis_settle_sub_bill a
|
||||
where a.del_flag='0' and a.bill_no = #{subBillNo} limit 1
|
||||
</select>
|
||||
@ -623,7 +612,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<insert id="insertEmisSettleSubBill" parameterType="EmisSettleSubBill" useGeneratedKeys="true" keyProperty="id">
|
||||
insert into emis_settle_sub_bill
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="id != null">id,</if>
|
||||
<if test="billNo != null and billNo != ''">bill_no,</if>
|
||||
<if test="parentBillNo != null and parentBillNo != ''">parent_bill_no,</if>
|
||||
<if test="settleBillNo != null and settleBillNo != ''">settle_bill_no,</if>
|
||||
@ -639,6 +627,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="custName != null and custName != ''">cust_name,</if>
|
||||
<if test="customerCode != null and customerCode != ''">customer_code,</if>
|
||||
<if test="customerName != null and customerName != ''">customer_name,</if>
|
||||
<if test="invoicedMoney != null">invoiced_money,</if>
|
||||
<if test="recedMoney != null">reced_money,</if>
|
||||
<if test="satisfyMoney != null">satisfy_money,</if>
|
||||
<if test="allowanceMoney != null">allowance_money,</if>
|
||||
<if test="deductionMoney != null">deduction_money,</if>
|
||||
<if test="otherMoney != null">other_money,</if>
|
||||
<if test="satisfyReason != null and satisfyReason != ''">satisfy_reason,</if>
|
||||
<if test="allowanceReason != null and allowanceReason != ''">allowance_reason,</if>
|
||||
<if test="deductionReason != null and deductionReason != ''">deduction_reason,</if>
|
||||
<if test="otherReason != null and otherReason != ''">other_reason,</if>
|
||||
<if test="openBillStatus != null and openBillStatus != ''">open_bill_status,</if>
|
||||
<if test="paymentStatus != null and paymentStatus != ''">payment_status,</if>
|
||||
<if test="chargeStatus != null and chargeStatus != ''">charge_status,</if>
|
||||
<if test="payee != null and payee != ''">payee,</if>
|
||||
<if test="salesmen != null and salesmen != ''">salesmen,</if>
|
||||
<if test="blSpecialQuote != null and blSpecialQuote != ''">bl_special_quote,</if>
|
||||
@ -662,7 +663,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="updateSite != null and updateSite != ''">update_site,</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="id != null">#{id},</if>
|
||||
<if test="billNo != null and billNo != ''">#{billNo},</if>
|
||||
<if test="parentBillNo != null and parentBillNo != ''">#{parentBillNo},</if>
|
||||
<if test="settleBillNo != null and settleBillNo != ''">#{settleBillNo},</if>
|
||||
@ -678,6 +678,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="custName != null and custName != ''">#{custName},</if>
|
||||
<if test="customerCode != null and customerCode != ''">#{customerCode},</if>
|
||||
<if test="customerName != null and customerName != ''">#{customerName},</if>
|
||||
<if test="invoicedMoney != null">#{invoicedMoney},</if>
|
||||
<if test="recedMoney != null">#{recedMoney},</if>
|
||||
<if test="satisfyMoney != null">#{satisfyMoney},</if>
|
||||
<if test="allowanceMoney != null">#{allowanceMoney},</if>
|
||||
<if test="deductionMoney != null">#{deductionMoney},</if>
|
||||
<if test="otherMoney != null">#{otherMoney},</if>
|
||||
<if test="satisfyReason != null and satisfyReason != ''">#{satisfyReason},</if>
|
||||
<if test="allowanceReason != null and allowanceReason != ''">#{allowanceReason},</if>
|
||||
<if test="deductionReason != null and deductionReason != ''">#{deductionReason},</if>
|
||||
<if test="otherReason != null and otherReason != ''">#{otherReason},</if>
|
||||
<if test="openBillStatus != null and openBillStatus != ''">#{openBillStatus},</if>
|
||||
<if test="paymentStatus != null and paymentStatus != ''">#{paymentStatus},</if>
|
||||
<if test="chargeStatus != null and chargeStatus != ''">#{chargeStatus},</if>
|
||||
<if test="payee != null and payee != ''">#{payee},</if>
|
||||
<if test="salesmen != null and salesmen != ''">#{salesmen},</if>
|
||||
<if test="blSpecialQuote != null and blSpecialQuote != ''">#{blSpecialQuote},</if>
|
||||
@ -705,7 +718,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<update id="updateEmisSettleSubBill" parameterType="EmisSettleSubBill">
|
||||
update emis_settle_sub_bill
|
||||
<trim prefix="SET" suffixOverrides=",">
|
||||
<if test="billNo != null and billNo != ''">bill_no = #{billNo},</if>
|
||||
<if test="parentBillNo != null and parentBillNo != ''">parent_bill_no = #{parentBillNo},</if>
|
||||
<if test="settleBillNo != null and settleBillNo != ''">settle_bill_no = #{settleBillNo},</if>
|
||||
<if test="billCode != null and billCode != ''">bill_code = #{billCode},</if>
|
||||
@ -720,6 +732,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="custName != null and custName != ''">cust_name = #{custName},</if>
|
||||
<if test="customerCode != null and customerCode != ''">customer_code = #{customerCode},</if>
|
||||
<if test="customerName != null and customerName != ''">customer_name = #{customerName},</if>
|
||||
<if test="invoicedMoney != null">invoiced_money = #{invoicedMoney},</if>
|
||||
<if test="recedMoney != null">reced_money = #{recedMoney},</if>
|
||||
<if test="satisfyMoney != null">satisfy_money = #{satisfyMoney},</if>
|
||||
<if test="allowanceMoney != null">allowance_money = #{allowanceMoney},</if>
|
||||
<if test="deductionMoney != null">deduction_money = #{deductionMoney},</if>
|
||||
<if test="otherMoney != null">other_money = #{otherMoney},</if>
|
||||
<if test="satisfyReason != null and satisfyReason != ''">satisfy_reason = #{satisfyReason},</if>
|
||||
<if test="allowanceReason != null and allowanceReason != ''">allowance_reason = #{allowanceReason},</if>
|
||||
<if test="deductionReason != null and deductionReason != ''">deduction_reason = #{deductionReason},</if>
|
||||
<if test="otherReason != null and otherReason != ''">other_reason = #{otherReason},</if>
|
||||
<if test="openBillStatus != null and openBillStatus != ''">open_bill_status = #{openBillStatus},</if>
|
||||
<if test="paymentStatus != null and paymentStatus != ''">payment_status = #{paymentStatus},</if>
|
||||
<if test="chargeStatus != null and chargeStatus != ''">charge_status = #{chargeStatus},</if>
|
||||
<if test="payee != null and payee != ''">payee = #{payee},</if>
|
||||
<if test="salesmen != null and salesmen != ''">salesmen = #{salesmen},</if>
|
||||
<if test="blSpecialQuote != null and blSpecialQuote != ''">bl_special_quote = #{blSpecialQuote},</if>
|
||||
@ -742,7 +767,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="createSite != null and createSite != ''">create_site = #{createSite},</if>
|
||||
<if test="updateSite != null and updateSite != ''">update_site = #{updateSite},</if>
|
||||
</trim>
|
||||
where id = #{id} and del_flag='0'
|
||||
where id = #{id}
|
||||
</update>
|
||||
|
||||
<!-- 更新合账单 -->
|
||||
|
||||
Loading…
Reference in New Issue
Block a user