diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleBill.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleBill.java index 718e179c1..df57bded3 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleBill.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleBill.java @@ -33,6 +33,7 @@ import lombok.Data; @Data public class EmisSettleBill extends BaseEntity { + private static final long serialVersionUID = 1L; /* id */ @@ -85,6 +86,8 @@ public class EmisSettleBill extends BaseEntity private String openBillStatus; /* 付款状态 0-未付款 1-已付款 2-部分付款 */ private String paymentStatus; + /* 核销状态 0-未核销1-已核销 */ + private String chargeStatus; /* 总票数 */ private Integer sendPieceSum; /* 总件数 */ @@ -99,24 +102,34 @@ public class EmisSettleBill extends BaseEntity private BigDecimal refundAmount; /* 退款金额 */ private BigDecimal refundMoney; + /* 销售回款人 */ + private String payee; + /* 销售联系人 */ + private String salesmen; + /* 推送oms */ + private String blSendOms; /* 财务确认状态 0-待确认 1-已确认 2-驳回 */ - private String blConfirm; + private String blConfirmCenter; /* 财务确认日期 */ - private String confirmDate; - /* 财务确认站点 */ - private String confirmSite; - /* 财务确认人 */ - private String confirmManCode; - /* 站点确认状态 0-待确认 1-已确认 2-驳回 */ - private String blSiteConfirm; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date confirmCenterDate; /* 财务确认备注 */ - private String confirmNote; + private String confirmCenterNote; + /* 财务确认人 */ + private String confirmCenterManCode; + /* 财务确认站点 */ + private String confirmCenterCode; + /* 站点确认状态 0-待确认 1-已确认 2-驳回 */ + private String blConfirmSite; /* 站点确认日期 */ - private String siteConfirmDate; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date confirmSiteDate; /* 站点确认人 */ - private String siteConfirmManCode; + private String confirmSiteManCode; /* 网点确认备注 */ - private String siteConfirmNote; + private String confirmSiteNote; + /* 确认网点代码 */ + private String confirmSiteCode; List subBillList; diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleSubBill.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleSubBill.java index 102f15a0b..8ce992dea 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleSubBill.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleSubBill.java @@ -33,6 +33,7 @@ import lombok.Data; @Data public class EmisSettleSubBill extends BaseEntity { + private static final long serialVersionUID = 1L; /* id */ @@ -56,6 +57,8 @@ public class EmisSettleSubBill extends BaseEntity private String settleType; /* 是否已拆单 0-否 1-是 */ private String blSplit; + /* 是否已合账 */ + private String blMerge; /* 账单月份 202402 */ private String billMonth; /* 月结编号 */ @@ -64,31 +67,42 @@ public class EmisSettleSubBill extends BaseEntity private String customerCode; /* 客户名称 */ private String customerName; + /* 销售回款人 */ + private String payee; + /* 销售联系人 */ + private String salesmen; + /* 是否特殊报价 */ + private String blSpecialQuote; + /* 是否敏感物 */ + private String blSensitive; /* 财务确认状态 0-待确认 1-已确认 2-驳回 */ - private String blConfirm; + private String blConfirmCenter; /* 财务确认日期 */ - private String confirmDate; - /* 财务确认站点 */ - private String confirmSite; - /* 财务确认人 */ - private String confirmManCode; - /* 站点确认状态 0-待确认 1-已确认 2-驳回 */ - private String blSiteConfirm; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date confirmCenterDate; /* 财务确认备注 */ - private String confirmNote; + private String confirmCenterNote; + /* 财务确认人 */ + private String confirmCenterManCode; + /* 财务确认站点 */ + private String confirmCenterCode; + /* 站点确认状态 0-待确认 1-已确认 2-驳回 */ + private String blConfirmSite; /* 站点确认日期 */ - private String siteConfirmDate; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date confirmSiteDate; /* 站点确认人 */ - private String siteConfirmManCode; + private String confirmSiteManCode; /* 网点确认备注 */ - private String siteConfirmNote; - + private String confirmSiteNote; + /* 确认网点代码 */ + private String confirmSiteCode; // 扩展参数 private EmisWaybill waybillDetail; - private String confirmManName; - private String siteConfirmManName; + private String confirmCenterManName; + private String confirmSiteManName; private String confirmSiteName; private List feeitemList; diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java index 80d159717..9083d0c54 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java @@ -272,6 +272,10 @@ public class WaybillOrder implements Serializable { /* 是否特殊报价 */ private String blSpecialQuote; + + /* ext_info */ + private String extInfo; + /* 扩展信息 */ /* 是否生成子单 1-是 0-否 */ private String blGenSubbill; @@ -287,9 +291,6 @@ public class WaybillOrder implements Serializable { private String transLineTypeName; private String productTypeName; - - //扩展信息------- - /* 客户名称 */ private String customerName; @@ -534,6 +535,8 @@ public class WaybillOrder implements Serializable { // voItem.setThirdCode(dbWaybill.getThirdCode()); voItem.setRealValue(dbWaybill.getRealValue()); + + voItem.setExtInfo(dbWaybill.getExtInfo()); // voItem.setBlInsure(dbWaybill.getBlInsure()); // voItem.setInsureValue(dbWaybill.getInsureValue()); // voItem.setInsureValueCurrency(dbWaybill.getInsureValueCurrency()); @@ -824,6 +827,7 @@ public class WaybillOrder implements Serializable { // dbWaybill.setUpdateSite(this.getUpdateSite()); dbWaybill.setOrderRemark(this.getOrderRemark()); + dbWaybill.setExtInfo(this.getExtInfo()); return dbWaybill; diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java index b8641aacf..eeeed257c 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java @@ -966,7 +966,7 @@ public class EmisBaseService { // 已确认的不允许出账 EmisSettleSubBill querySubBill=getSettleSubBillByBillCode(billCode); if(querySubBill!=null) { - if (!"0".equals(querySubBill.getBlConfirm())) { + if (!"0".equals(querySubBill.getBlConfirmCenter())) { log.error("===>账单财务确认不允许出账！"); throw new EmisBizError(EmisBizErrorType.FAIL, "账单财务确认不允许出账"); } @@ -1714,6 +1714,9 @@ public class EmisBaseService { // 货值 order.put("realValue",waybill.getRealValue()); + // 附加信息 + order.put("extInfo",waybill.getExtInfo()); + String paymentType=""; if(!StringUtils.isEmpty(waybill.getPaymentType())){ @@ -2317,7 +2320,7 @@ public class EmisBaseService { // 财务已确认账单不允许修改 EmisSettleSubBill emisSettleSubBill=getSettleSubBillByBillCode(emisWaybill.getBillCode()); if(emisSettleSubBill!=null){ - if("1".equals(emisSettleSubBill.getBlConfirm()) ){ + if("1".equals(emisSettleSubBill.getBlConfirmCenter()) ){ // 财务确认出账明细锁账 return true; } diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java index 59a03bd88..0b672ff71 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java @@ -112,7 +112,7 @@ public class EmisSettleBillServiceImpl extends EmisBaseService implements IEmisS throw new EmisBizError(EmisBizErrorType.FAIL,"合账失败,子账单["+subBllOld.getBillCode()+"]不存在"); } - if(!"1".equals(subBllOld.getBlConfirm()) ){ + if(!"1".equals(subBllOld.getBlConfirmCenter()) ){ throw new EmisBizError(EmisBizErrorType.FAIL,"合账失败,子单号["+subBllOld.getBillCode()+"]未确认"); } diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillAjustApplyServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillAjustApplyServiceImpl.java index 5fdeb8aa5..6d24eaa45 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillAjustApplyServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillAjustApplyServiceImpl.java @@ -180,8 +180,8 @@ public class EmisWaybillAjustApplyServiceImpl extends EmisBaseService implements // 获取账单状态，若账单处于非未确认状态，不允许审核 EmisSettleSubBill emisSettleSubBill=getSettleSubBillByBillCode(emisWaybillAjustApply.getBillCode()); - if("1".equals(emisSettleSubBill.getBlConfirm())){ - throw new EmisBizError(EmisBizErrorType.FAIL,"财务账单已确认，请先取消确认！"); + if("1".equals(emisSettleSubBill.getBlConfirmCenter())){ + throw new EmisBizError(EmisBizErrorType.FAIL,"已确认账单！"); } // 运单更新 diff --git a/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml index 29c37d8b0..49c442e7f 100644 --- a/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml @@ -1,9 +1,9 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -29,6 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -36,49 +37,54 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - - - - - - - - + + + + + + + + + + + + + - select id, settle_bill_no, settle_bill_name, settle_type, settle_start_date, settle_end_date, bill_month, rec_money, reced_money, cust_no, customer_code, customer_name, site_code, site_name, satisfy_money, allowance_money, deduction_money, other_money, satisfy_reason, allowance_reason, deduction_reason, other_reason, open_bill_status, payment_status, send_piece_sum, piece_number, fee_weight, uncollected_amount, send_money_sum, refund_amount, refund_money, bl_confirm, confirm_date, confirm_site, confirm_man_code, bl_site_confirm, confirm_note, site_confirm_date, site_confirm_man_code, site_confirm_note, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_settle_bill + select id, settle_bill_no, settle_bill_name, settle_type, settle_start_date, settle_end_date, bill_month, rec_money, reced_money, cust_no, customer_code, customer_name, site_code, site_name, satisfy_money, allowance_money, deduction_money, other_money, satisfy_reason, allowance_reason, deduction_reason, other_reason, open_bill_status, payment_status, charge_status, send_piece_sum, piece_number, fee_weight, uncollected_amount, send_money_sum, refund_amount, refund_money, payee, salesmen, bl_send_oms, 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, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_settle_bill @@ -134,6 +144,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and other_reason = #{otherReason} and open_bill_status = #{openBillStatus} and payment_status = #{paymentStatus} + and charge_status = #{chargeStatus} and send_piece_sum = #{sendPieceSum} and piece_number = #{pieceNumber} and fee_weight = #{feeWeight} @@ -141,15 +152,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and send_money_sum = #{sendMoneySum} and refund_amount = #{refundAmount} and refund_money = #{refundMoney} - and bl_confirm = #{blConfirm} - and confirm_date = #{confirmDate} - and confirm_site = #{confirmSite} - and confirm_man_code = #{confirmManCode} - and bl_site_confirm = #{blSiteConfirm} - and confirm_note = #{confirmNote} - and site_confirm_date = #{siteConfirmDate} - and site_confirm_man_code = #{siteConfirmManCode} - and site_confirm_note = #{siteConfirmNote} + and payee = #{payee} + and salesmen = #{salesmen} + and bl_send_oms = #{blSendOms} + and bl_confirm_center = #{blConfirmCenter} + and confirm_center_date = #{confirmCenterDate} + and confirm_center_note = #{confirmCenterNote} + and confirm_center_man_code = #{confirmCenterManCode} + and confirm_center_code = #{confirmCenterCode} + and bl_confirm_site = #{blConfirmSite} + and confirm_site_date = #{confirmSiteDate} + and confirm_site_man_code = #{confirmSiteManCode} + and confirm_site_note = #{confirmSiteNote} + and confirm_site_code = #{confirmSiteCode} and remark = #{remark} and del_flag = #{delFlag} and create_by = #{createBy} @@ -160,13 +175,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and update_site = #{updateSite} limit 1 - + - + insert into emis_settle_bill @@ -194,6 +209,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" other_reason, open_bill_status, payment_status, + charge_status, send_piece_sum, piece_number, fee_weight, @@ -201,15 +217,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" send_money_sum, refund_amount, refund_money, - bl_confirm, - confirm_date, - confirm_site, - confirm_man_code, - bl_site_confirm, - confirm_note, - site_confirm_date, - site_confirm_man_code, - site_confirm_note, + payee, + salesmen, + bl_send_oms, + 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, remark, del_flag, create_by, @@ -218,7 +238,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_time, create_site, update_site, - + #{id}, #{settleBillNo}, @@ -244,6 +264,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{otherReason}, #{openBillStatus}, #{paymentStatus}, + #{chargeStatus}, #{sendPieceSum}, #{pieceNumber}, #{feeWeight}, @@ -251,15 +272,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{sendMoneySum}, #{refundAmount}, #{refundMoney}, - #{blConfirm}, - #{confirmDate}, - #{confirmSite}, - #{confirmManCode}, - #{blSiteConfirm}, - #{confirmNote}, - #{siteConfirmDate}, - #{siteConfirmManCode}, - #{siteConfirmNote}, + #{payee}, + #{salesmen}, + #{blSendOms}, + #{blConfirmCenter}, + #{confirmCenterDate}, + #{confirmCenterNote}, + #{confirmCenterManCode}, + #{confirmCenterCode}, + #{blConfirmSite}, + #{confirmSiteDate}, + #{confirmSiteManCode}, + #{confirmSiteNote}, + #{confirmSiteCode}, #{remark}, #{delFlag}, #{createBy}, @@ -268,7 +293,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{updateTime}, #{createSite}, #{updateSite}, - + @@ -297,6 +322,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" other_reason = #{otherReason}, open_bill_status = #{openBillStatus}, payment_status = #{paymentStatus}, + charge_status = #{chargeStatus}, send_piece_sum = #{sendPieceSum}, piece_number = #{pieceNumber}, fee_weight = #{feeWeight}, @@ -304,15 +330,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" send_money_sum = #{sendMoneySum}, refund_amount = #{refundAmount}, refund_money = #{refundMoney}, - bl_confirm = #{blConfirm}, - confirm_date = #{confirmDate}, - confirm_site = #{confirmSite}, - confirm_man_code = #{confirmManCode}, - bl_site_confirm = #{blSiteConfirm}, - confirm_note = #{confirmNote}, - site_confirm_date = #{siteConfirmDate}, - site_confirm_man_code = #{siteConfirmManCode}, - site_confirm_note = #{siteConfirmNote}, + payee = #{payee}, + salesmen = #{salesmen}, + bl_send_oms = #{blSendOms}, + bl_confirm_center = #{blConfirmCenter}, + confirm_center_date = #{confirmCenterDate}, + confirm_center_note = #{confirmCenterNote}, + confirm_center_man_code = #{confirmCenterManCode}, + confirm_center_code = #{confirmCenterCode}, + bl_confirm_site = #{blConfirmSite}, + confirm_site_date = #{confirmSiteDate}, + confirm_site_man_code = #{confirmSiteManCode}, + confirm_site_note = #{confirmSiteNote}, + confirm_site_code = #{confirmSiteCode}, remark = #{remark}, del_flag = #{delFlag}, create_by = #{createBy}, @@ -330,7 +360,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from emis_settle_bill where id in + delete from emis_settle_bill where id in #{id} diff --git a/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml index 72fc20fab..9bb50c22e 100644 --- a/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml @@ -15,19 +15,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - - - - - - - - - + + + + + + + + + + + + + + @@ -45,26 +51,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" fetchType="lazy" /> - - - + + + - select id, bill_no, parent_bill_no, settle_bill_no, bill_code, bill_date, bill_fee, currency, settle_type, bl_split, bill_month, cust_no, customer_code, customer_name, bl_confirm, confirm_date, confirm_site, confirm_man_code, bl_site_confirm, confirm_note, site_confirm_date, site_confirm_man_code, site_confirm_note, 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, 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 - - - + - + + insert into emis_settle_sub_bill @@ -357,19 +374,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" currency, settle_type, bl_split, + bl_merge, bill_month, cust_no, customer_code, customer_name, - bl_confirm, - confirm_date, - confirm_site, - confirm_man_code, - bl_site_confirm, - confirm_note, - site_confirm_date, - site_confirm_man_code, - site_confirm_note, + 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, @@ -377,7 +400,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_time, create_site, update_site, - + #{id}, #{billNo}, @@ -389,19 +412,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{currency}, #{settleType}, #{blSplit}, + #{blMerge}, #{billMonth}, #{custNo}, #{customerCode}, #{customerName}, - #{blConfirm}, - #{confirmDate}, - #{confirmSite}, - #{confirmManCode}, - #{blSiteConfirm}, - #{confirmNote}, - #{siteConfirmDate}, - #{siteConfirmManCode}, - #{siteConfirmNote}, + #{payee}, + #{salesmen}, + #{blSpecialQuote}, + #{blSensitive}, + #{blConfirmCenter}, + #{confirmCenterDate}, + #{confirmCenterNote}, + #{confirmCenterManCode}, + #{confirmCenterCode}, + #{blConfirmSite}, + #{confirmSiteDate}, + #{confirmSiteManCode}, + #{confirmSiteNote}, + #{confirmSiteCode}, #{delFlag}, #{createBy}, #{createTime}, @@ -409,7 +438,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{updateTime}, #{createSite}, #{updateSite}, - + @@ -424,19 +453,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" currency = #{currency}, settle_type = #{settleType}, bl_split = #{blSplit}, + bl_merge = #{blMerge}, bill_month = #{billMonth}, cust_no = #{custNo}, customer_code = #{customerCode}, customer_name = #{customerName}, - bl_confirm = #{blConfirm}, - confirm_date = #{confirmDate}, - confirm_site = #{confirmSite}, - confirm_man_code = #{confirmManCode}, - bl_site_confirm = #{blSiteConfirm}, - confirm_note = #{confirmNote}, - site_confirm_date = #{siteConfirmDate}, - site_confirm_man_code = #{siteConfirmManCode}, - site_confirm_note = #{siteConfirmNote}, + payee = #{payee}, + salesmen = #{salesmen}, + bl_special_quote = #{blSpecialQuote}, + bl_sensitive = #{blSensitive}, + bl_confirm_center = #{blConfirmCenter}, + confirm_center_date = #{confirmCenterDate}, + confirm_center_note = #{confirmCenterNote}, + confirm_center_man_code = #{confirmCenterManCode}, + confirm_center_code = #{confirmCenterCode}, + bl_confirm_site = #{blConfirmSite}, + confirm_site_date = #{confirmSiteDate}, + confirm_site_man_code = #{confirmSiteManCode}, + confirm_site_note = #{confirmSiteNote}, + confirm_site_code = #{confirmSiteCode}, del_flag = #{delFlag}, create_by = #{createBy}, create_time = #{createTime}, @@ -460,7 +495,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} - update emis_settle_sub_bill