aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-07-10 06:42:16 +08:00
parent ee49266905
commit 47ce9581d3
8 changed files with 302 additions and 204 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleBill.java
View File

@ -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<EmisSettleSubBill> subBillList;

44
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleSubBill.java
View File

@ -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<EmisSettleSubBillFeeitem> feeitemList;

10
emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java
View File

@ -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;

7
emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
View File

@ -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;
}

2
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java
View File

@ -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()+"]未确认");
}

4
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillAjustApplyServiceImpl.java
View File

@ -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,"已确认账单！");
}
// 运单更新

192
emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml
View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.xdadan.erp.emis.mapper.EmisSettleBillMapper">
<resultMap type="EmisSettleBill" id="EmisSettleBillResult">
<result property="id" column="id" />
<result property="settleBillNo" column="settle_bill_no" />
@ -29,6 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<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="sendPieceSum" column="send_piece_sum" />
<result property="pieceNumber" column="piece_number" />
<result property="feeWeight" column="fee_weight" />
@ -36,49 +37,54 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="sendMoneySum" column="send_money_sum" />
<result property="refundAmount" column="refund_amount" />
<result property="refundMoney" column="refund_money" />
<result property="blConfirm" column="bl_confirm" />
<result property="confirmDate" column="confirm_date" />
<result property="confirmSite" column="confirm_site" />
<result property="confirmManCode" column="confirm_man_code" />
<result property="blSiteConfirm" column="bl_site_confirm" />
<result property="confirmNote" column="confirm_note" />
<result property="siteConfirmDate" column="site_confirm_date" />
<result property="siteConfirmManCode" column="site_confirm_man_code" />
<result property="siteConfirmNote" column="site_confirm_note" />
<result property="payee" column="payee" />
<result property="salesmen" column="salesmen" />
<result property="blSendOms" column="bl_send_oms" />
<result property="blConfirmCenter" column="bl_confirm_center" />
<result property="confirmCenterDate" column="confirm_center_date" />
<result property="confirmCenterNote" column="confirm_center_note" />
<result property="confirmCenterManCode" column="confirm_center_man_code" />
<result property="confirmCenterCode" column="confirm_center_code" />
<result property="blConfirmSite" column="bl_confirm_site" />
<result property="confirmSiteDate" column="confirm_site_date" />
<result property="confirmSiteManCode" column="confirm_site_man_code" />
<result property="confirmSiteNote" column="confirm_site_note" />
<result property="confirmSiteCode" column="confirm_site_code" />
</resultMap>
<sql id="selectEmisSettleBillVo">
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
</sql>
<select id="selectEmisSettleBillList" parameterType="EmisSettleBill" resultMap="EmisSettleBillResult">
<include refid="selectEmisSettleBillVo"/>
<where>
del_flag='0'
<where>
del_flag='0'
<if test="id != null "> and id = #{id}</if>
<if test="settleBillNo != null and settleBillNo != ''"> and settle_bill_no like concat('%', #{settleBillNo}, '%')</if>
<if test="settleBillName != null and settleBillName != ''"> and settle_bill_name like concat('%', #{settleBillName}, '%')</if>
<if test="settleType != null and settleType != ''"> and settle_type like concat('%', #{settleType}, '%')</if>
<if test="settleStartDate != null "> and settle_start_date = #{settleStartDate}</if>
<if test="settleEndDate != null "> and settle_end_date = #{settleEndDate}</if>
<if test="billMonth != null and billMonth != ''"> and bill_month like concat('%', #{billMonth}, '%')</if>
<if test="billMonth != null and billMonth != ''"> and bill_month = #{billMonth}</if>
<if test="recMoney != null "> and rec_money = #{recMoney}</if>
<if test="recedMoney != null "> and reced_money = #{recedMoney}</if>
<if test="custNo != null and custNo != ''"> and cust_no like concat('%', #{custNo}, '%')</if>
<if test="customerCode != null and customerCode != ''"> and customer_code like concat('%', #{customerCode}, '%')</if>
<if test="custNo != null and custNo != ''"> and cust_no = #{custNo}</if>
<if test="customerCode != null and customerCode != ''"> and customer_code = #{customerCode}</if>
<if test="customerName != null and customerName != ''"> and customer_name like concat('%', #{customerName}, '%')</if>
<if test="siteCode != null and siteCode != ''"> and site_code like concat('%', #{siteCode}, '%')</if>
<if test="siteCode != null and siteCode != ''"> and site_code = #{siteCode}</if>
<if test="siteName != null and siteName != ''"> and site_name like concat('%', #{siteName}, '%')</if>
<if test="satisfyMoney != null "> and satisfy_money = #{satisfyMoney}</if>
<if test="allowanceMoney != null "> and allowance_money = #{allowanceMoney}</if>
<if test="deductionMoney != null "> and deduction_money = #{deductionMoney}</if>
<if test="otherMoney != null "> and other_money = #{otherMoney}</if>
<if test="satisfyReason != null and satisfyReason != ''"> and satisfy_reason like concat('%', #{satisfyReason}, '%')</if>
<if test="allowanceReason != null and allowanceReason != ''"> and allowance_reason like concat('%', #{allowanceReason}, '%')</if>
<if test="deductionReason != null and deductionReason != ''"> and deduction_reason like concat('%', #{deductionReason}, '%')</if>
<if test="otherReason != null and otherReason != ''"> and other_reason like concat('%', #{otherReason}, '%')</if>
<if test="openBillStatus != null and openBillStatus != ''"> and open_bill_status like concat('%', #{openBillStatus}, '%')</if>
<if test="paymentStatus != null and paymentStatus != ''"> and payment_status like concat('%', #{paymentStatus}, '%')</if>
<if test="satisfyReason != null and satisfyReason != ''"> and satisfy_reason = #{satisfyReason}</if>
<if test="allowanceReason != null and allowanceReason != ''"> and allowance_reason = #{allowanceReason}</if>
<if test="deductionReason != null and deductionReason != ''"> and deduction_reason = #{deductionReason}</if>
<if test="otherReason != null and otherReason != ''"> and other_reason = #{otherReason}</if>
<if test="openBillStatus != null and openBillStatus != ''"> and open_bill_status = #{openBillStatus}</if>
<if test="paymentStatus != null and paymentStatus != ''"> and payment_status = #{paymentStatus}</if>
<if test="chargeStatus != null and chargeStatus != ''"> and charge_status = #{chargeStatus}</if>
<if test="sendPieceSum != null "> and send_piece_sum = #{sendPieceSum}</if>
<if test="pieceNumber != null "> and piece_number = #{pieceNumber}</if>
<if test="feeWeight != null "> and fee_weight = #{feeWeight}</if>
@ -86,23 +92,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="sendMoneySum != null "> and send_money_sum = #{sendMoneySum}</if>
<if test="refundAmount != null "> and refund_amount = #{refundAmount}</if>
<if test="refundMoney != null "> and refund_money = #{refundMoney}</if>
<if test="blConfirm != null and blConfirm != ''"> and bl_confirm like concat('%', #{blConfirm}, '%')</if>
<if test="confirmDate != null and confirmDate != ''"> and confirm_date like concat('%', #{confirmDate}, '%')</if>
<if test="confirmSite != null and confirmSite != ''"> and confirm_site like concat('%', #{confirmSite}, '%')</if>
<if test="confirmManCode != null and confirmManCode != ''"> and confirm_man_code like concat('%', #{confirmManCode}, '%')</if>
<if test="blSiteConfirm != null and blSiteConfirm != ''"> and bl_site_confirm like concat('%', #{blSiteConfirm}, '%')</if>
<if test="confirmNote != null and confirmNote != ''"> and confirm_note like concat('%', #{confirmNote}, '%')</if>
<if test="siteConfirmDate != null and siteConfirmDate != ''"> and site_confirm_date like concat('%', #{siteConfirmDate}, '%')</if>
<if test="siteConfirmManCode != null and siteConfirmManCode != ''"> and site_confirm_man_code like concat('%', #{siteConfirmManCode}, '%')</if>
<if test="siteConfirmNote != null and siteConfirmNote != ''"> and site_confirm_note like concat('%', #{siteConfirmNote}, '%')</if>
<if test="payee != null and payee != ''"> and payee = #{payee}</if>
<if test="salesmen != null and salesmen != ''"> and salesmen = #{salesmen}</if>
<if test="blSendOms != null and blSendOms != ''"> and bl_send_oms = #{blSendOms}</if>
<if test="blConfirmCenter != null and blConfirmCenter != ''"> and bl_confirm_center = #{blConfirmCenter}</if>
<if test="confirmCenterDate != null "> and confirm_center_date = #{confirmCenterDate}</if>
<if test="confirmCenterNote != null and confirmCenterNote != ''"> and confirm_center_note = #{confirmCenterNote}</if>
<if test="confirmCenterManCode != null and confirmCenterManCode != ''"> and confirm_center_man_code = #{confirmCenterManCode}</if>
<if test="confirmCenterCode != null and confirmCenterCode != ''"> and confirm_center_code = #{confirmCenterCode}</if>
<if test="blConfirmSite != null and blConfirmSite != ''"> and bl_confirm_site = #{blConfirmSite}</if>
<if test="confirmSiteDate != null "> and confirm_site_date = #{confirmSiteDate}</if>
<if test="confirmSiteManCode != null and confirmSiteManCode != ''"> and confirm_site_man_code = #{confirmSiteManCode}</if>
<if test="confirmSiteNote != null and confirmSiteNote != ''"> and confirm_site_note like concat('%', #{confirmSiteNote}, '%')</if>
<if test="confirmSiteCode != null and confirmSiteCode != ''"> and confirm_site_code = #{confirmSiteCode}</if>
<if test="remark != null and remark != ''"> and remark like concat('%', #{remark}, '%')</if>
<if test="delFlag != null and delFlag != ''"> and del_flag like concat('%', #{delFlag}, '%')</if>
<if test="createBy != null and createBy != ''"> and create_by like concat('%', #{createBy}, '%')</if>
<if test="delFlag != null and delFlag != ''"> and del_flag = #{delFlag}</if>
<if test="createBy != null and createBy != ''"> and create_by = #{createBy}</if>
<if test="createTime != null "> and create_time = #{createTime}</if>
<if test="updateBy != null and updateBy != ''"> and update_by like concat('%', #{updateBy}, '%')</if>
<if test="updateBy != null and updateBy != ''"> and update_by = #{updateBy}</if>
<if test="updateTime != null "> and update_time = #{updateTime}</if>
<if test="createSite != null and createSite != ''"> and create_site like concat('%', #{createSite}, '%')</if>
<if test="updateSite != null and updateSite != ''"> and update_site like concat('%', #{updateSite}, '%')</if>
<if test="createSite != null and createSite != ''"> and create_site = #{createSite}</if>
<if test="updateSite != null and updateSite != ''"> and update_site = #{updateSite}</if>
</where>
order by create_time desc
</select>
@ -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
</select>
<select id="selectEmisSettleBillById" parameterType="Long" resultMap="EmisSettleBillResult">
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
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 a
where a.id = #{id}
</select>
<insert id="insertEmisSettleBill" parameterType="EmisSettleBill" useGeneratedKeys="true" keyProperty="id">
insert into emis_settle_bill
<trim prefix="(" suffix=")" suffixOverrides=",">
@ -194,6 +209,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<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="sendPieceSum != null">send_piece_sum,</if>
<if test="pieceNumber != null">piece_number,</if>
<if test="feeWeight != null">fee_weight,</if>
@ -201,15 +217,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="sendMoneySum != null">send_money_sum,</if>
<if test="refundAmount != null">refund_amount,</if>
<if test="refundMoney != null">refund_money,</if>
<if test="blConfirm != null and blConfirm != ''">bl_confirm,</if>
<if test="confirmDate != null and confirmDate != ''">confirm_date,</if>
<if test="confirmSite != null and confirmSite != ''">confirm_site,</if>
<if test="confirmManCode != null and confirmManCode != ''">confirm_man_code,</if>
<if test="blSiteConfirm != null and blSiteConfirm != ''">bl_site_confirm,</if>
<if test="confirmNote != null and confirmNote != ''">confirm_note,</if>
<if test="siteConfirmDate != null and siteConfirmDate != ''">site_confirm_date,</if>
<if test="siteConfirmManCode != null and siteConfirmManCode != ''">site_confirm_man_code,</if>
<if test="siteConfirmNote != null and siteConfirmNote != ''">site_confirm_note,</if>
<if test="payee != null and payee != ''">payee,</if>
<if test="salesmen != null and salesmen != ''">salesmen,</if>
<if test="blSendOms != null and blSendOms != ''">bl_send_oms,</if>
<if test="blConfirmCenter != null and blConfirmCenter != ''">bl_confirm_center,</if>
<if test="confirmCenterDate != null">confirm_center_date,</if>
<if test="confirmCenterNote != null and confirmCenterNote != ''">confirm_center_note,</if>
<if test="confirmCenterManCode != null and confirmCenterManCode != ''">confirm_center_man_code,</if>
<if test="confirmCenterCode != null and confirmCenterCode != ''">confirm_center_code,</if>
<if test="blConfirmSite != null and blConfirmSite != ''">bl_confirm_site,</if>
<if test="confirmSiteDate != null">confirm_site_date,</if>
<if test="confirmSiteManCode != null and confirmSiteManCode != ''">confirm_site_man_code,</if>
<if test="confirmSiteNote != null and confirmSiteNote != ''">confirm_site_note,</if>
<if test="confirmSiteCode != null and confirmSiteCode != ''">confirm_site_code,</if>
<if test="remark != null and remark != ''">remark,</if>
<if test="delFlag != null and delFlag != ''">del_flag,</if>
<if test="createBy != null and createBy != ''">create_by,</if>
@ -218,7 +238,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateTime != null">update_time,</if>
<if test="createSite != null and createSite != ''">create_site,</if>
<if test="updateSite != null and updateSite != ''">update_site,</if>
</trim>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
<if test="settleBillNo != null and settleBillNo != ''">#{settleBillNo},</if>
@ -244,6 +264,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<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="sendPieceSum != null">#{sendPieceSum},</if>
<if test="pieceNumber != null">#{pieceNumber},</if>
<if test="feeWeight != null">#{feeWeight},</if>
@ -251,15 +272,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="sendMoneySum != null">#{sendMoneySum},</if>
<if test="refundAmount != null">#{refundAmount},</if>
<if test="refundMoney != null">#{refundMoney},</if>
<if test="blConfirm != null and blConfirm != ''">#{blConfirm},</if>
<if test="confirmDate != null and confirmDate != ''">#{confirmDate},</if>
<if test="confirmSite != null and confirmSite != ''">#{confirmSite},</if>
<if test="confirmManCode != null and confirmManCode != ''">#{confirmManCode},</if>
<if test="blSiteConfirm != null and blSiteConfirm != ''">#{blSiteConfirm},</if>
<if test="confirmNote != null and confirmNote != ''">#{confirmNote},</if>
<if test="siteConfirmDate != null and siteConfirmDate != ''">#{siteConfirmDate},</if>
<if test="siteConfirmManCode != null and siteConfirmManCode != ''">#{siteConfirmManCode},</if>
<if test="siteConfirmNote != null and siteConfirmNote != ''">#{siteConfirmNote},</if>
<if test="payee != null and payee != ''">#{payee},</if>
<if test="salesmen != null and salesmen != ''">#{salesmen},</if>
<if test="blSendOms != null and blSendOms != ''">#{blSendOms},</if>
<if test="blConfirmCenter != null and blConfirmCenter != ''">#{blConfirmCenter},</if>
<if test="confirmCenterDate != null">#{confirmCenterDate},</if>
<if test="confirmCenterNote != null and confirmCenterNote != ''">#{confirmCenterNote},</if>
<if test="confirmCenterManCode != null and confirmCenterManCode != ''">#{confirmCenterManCode},</if>
<if test="confirmCenterCode != null and confirmCenterCode != ''">#{confirmCenterCode},</if>
<if test="blConfirmSite != null and blConfirmSite != ''">#{blConfirmSite},</if>
<if test="confirmSiteDate != null">#{confirmSiteDate},</if>
<if test="confirmSiteManCode != null and confirmSiteManCode != ''">#{confirmSiteManCode},</if>
<if test="confirmSiteNote != null and confirmSiteNote != ''">#{confirmSiteNote},</if>
<if test="confirmSiteCode != null and confirmSiteCode != ''">#{confirmSiteCode},</if>
<if test="remark != null and remark != ''">#{remark},</if>
<if test="delFlag != null and delFlag != ''">#{delFlag},</if>
<if test="createBy != null and createBy != ''">#{createBy},</if>
@ -268,7 +293,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateTime != null">#{updateTime},</if>
<if test="createSite != null and createSite != ''">#{createSite},</if>
<if test="updateSite != null and updateSite != ''">#{updateSite},</if>
</trim>
</trim>
</insert>
<update id="updateEmisSettleBill" parameterType="EmisSettleBill">
@ -297,6 +322,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<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="sendPieceSum != null">send_piece_sum = #{sendPieceSum},</if>
<if test="pieceNumber != null">piece_number = #{pieceNumber},</if>
<if test="feeWeight != null">fee_weight = #{feeWeight},</if>
@ -304,15 +330,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="sendMoneySum != null">send_money_sum = #{sendMoneySum},</if>
<if test="refundAmount != null">refund_amount = #{refundAmount},</if>
<if test="refundMoney != null">refund_money = #{refundMoney},</if>
<if test="blConfirm != null and blConfirm != ''">bl_confirm = #{blConfirm},</if>
<if test="confirmDate != null and confirmDate != ''">confirm_date = #{confirmDate},</if>
<if test="confirmSite != null and confirmSite != ''">confirm_site = #{confirmSite},</if>
<if test="confirmManCode != null and confirmManCode != ''">confirm_man_code = #{confirmManCode},</if>
<if test="blSiteConfirm != null and blSiteConfirm != ''">bl_site_confirm = #{blSiteConfirm},</if>
<if test="confirmNote != null and confirmNote != ''">confirm_note = #{confirmNote},</if>
<if test="siteConfirmDate != null and siteConfirmDate != ''">site_confirm_date = #{siteConfirmDate},</if>
<if test="siteConfirmManCode != null and siteConfirmManCode != ''">site_confirm_man_code = #{siteConfirmManCode},</if>
<if test="siteConfirmNote != null and siteConfirmNote != ''">site_confirm_note = #{siteConfirmNote},</if>
<if test="payee != null and payee != ''">payee = #{payee},</if>
<if test="salesmen != null and salesmen != ''">salesmen = #{salesmen},</if>
<if test="blSendOms != null and blSendOms != ''">bl_send_oms = #{blSendOms},</if>
<if test="blConfirmCenter != null and blConfirmCenter != ''">bl_confirm_center = #{blConfirmCenter},</if>
<if test="confirmCenterDate != null">confirm_center_date = #{confirmCenterDate},</if>
<if test="confirmCenterNote != null and confirmCenterNote != ''">confirm_center_note = #{confirmCenterNote},</if>
<if test="confirmCenterManCode != null and confirmCenterManCode != ''">confirm_center_man_code = #{confirmCenterManCode},</if>
<if test="confirmCenterCode != null and confirmCenterCode != ''">confirm_center_code = #{confirmCenterCode},</if>
<if test="blConfirmSite != null and blConfirmSite != ''">bl_confirm_site = #{blConfirmSite},</if>
<if test="confirmSiteDate != null">confirm_site_date = #{confirmSiteDate},</if>
<if test="confirmSiteManCode != null and confirmSiteManCode != ''">confirm_site_man_code = #{confirmSiteManCode},</if>
<if test="confirmSiteNote != null and confirmSiteNote != ''">confirm_site_note = #{confirmSiteNote},</if>
<if test="confirmSiteCode != null and confirmSiteCode != ''">confirm_site_code = #{confirmSiteCode},</if>
<if test="remark != null and remark != ''">remark = #{remark},</if>
<if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
<if test="createBy != null and createBy != ''">create_by = #{createBy},</if>
@ -330,7 +360,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete>
<delete id="deleteEmisSettleBillByIds" parameterType="String">
delete from emis_settle_bill where id in
delete from emis_settle_bill where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>

210
emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml
View File

@ -15,19 +15,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="currency" column="currency" />
<result property="settleType" column="settle_type" />
<result property="blSplit" column="bl_split" />
<result property="blMerge" column="bl_merge" />
<result property="billMonth" column="bill_month" />
<result property="custNo" column="cust_no" />
<result property="customerCode" column="customer_code" />
<result property="customerName" column="customer_name" />
<result property="blConfirm" column="bl_confirm" />
<result property="confirmDate" column="confirm_date" />
<result property="confirmSite" column="confirm_site" />
<result property="confirmManCode" column="confirm_man_code" />
<result property="blSiteConfirm" column="bl_site_confirm" />
<result property="confirmNote" column="confirm_note" />
<result property="siteConfirmDate" column="site_confirm_date" />
<result property="siteConfirmManCode" column="site_confirm_man_code" />
<result property="siteConfirmNote" column="site_confirm_note" />
<result property="payee" column="payee" />
<result property="salesmen" column="salesmen" />
<result property="blSpecialQuote" column="bl_special_quote" />
<result property="blSensitive" column="bl_sensitive" />
<result property="blConfirmCenter" column="bl_confirm_center" />
<result property="confirmCenterDate" column="confirm_center_date" />
<result property="confirmCenterNote" column="confirm_center_note" />
<result property="confirmCenterManCode" column="confirm_center_man_code" />
<result property="confirmCenterCode" column="confirm_center_code" />
<result property="blConfirmSite" column="bl_confirm_site" />
<result property="confirmSiteDate" column="confirm_site_date" />
<result property="confirmSiteManCode" column="confirm_site_man_code" />
<result property="confirmSiteNote" column="confirm_site_note" />
<result property="confirmSiteCode" column="confirm_site_code" />
</resultMap>
@ -45,26 +51,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
fetchType="lazy"
/>
<association property="confirmManName" column="confirm_man_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectEmpNameByCode"/>
<association property="siteConfirmManName" column="site_confirm_man_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectEmpNameByCode"/>
<association property="confirmSiteName" column="confirm_site" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode"/>
<association property="confirmCenterManName" column="confirm_center_man_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectEmpNameByCode"/>
<association property="confirmSiteManName" column="confirm_site_man_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectEmpNameByCode"/>
<association property="confirmSiteName" column="confirm_site_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode"/>
</resultMap>
<sql id="selectEmisSettleSubBillVo">
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
</sql>
<select id="selectEmisSettleSubBillList" parameterType="EmisSettleSubBill" resultMap="EmisSettleSubBillResult">
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.bill_month, b.cust_no, b.customer_code, b.customer_name,
b.bl_confirm, b.confirm_date, b.confirm_site, b.confirm_man_code,
b.bl_site_confirm, b.confirm_note, b.site_confirm_date, b.site_confirm_man_code,
b.site_confirm_note, b.del_flag, b.create_by, b.create_time, b.update_by,
b.update_time, b.create_site, b.update_site
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.customer_code, b.customer_name, 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,
b.update_time, b.create_site, b.update_site
from emis_settle_sub_bill b ,emis_waybill a
<where>
@ -84,15 +91,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="custNo != null and custNo != ''"> and b.cust_no=#{custNo}</if>
<if test="customerCode != null and customerCode != ''"> and b.customer_code=#{customerCode}</if>
<if test="customerName != null and customerName != ''"> and b.customer_name like concat('%', #{customerName}, '%')</if>
<if test="blConfirm != null and blConfirm != ''"> and bl_confirm=#{blConfirm}</if>
<if test="confirmDate != null and confirmDate != ''"> and confirm_date like concat('%', #{confirmDate}, '%')</if>
<if test="confirmSite != null and confirmSite != ''"> and confirm_site=#{confirmSite}</if>
<if test="confirmManCode != null and confirmManCode != ''"> and confirm_man_code= #{confirmManCode}</if>
<if test="blSiteConfirm != null and blSiteConfirm != ''"> and bl_site_confirm=#{blSiteConfirm}</if>
<if test="confirmNote != null and confirmNote != ''"> and confirm_note like concat('%', #{confirmNote}, '%')</if>
<if test="siteConfirmDate != null and siteConfirmDate != ''"> and site_confirm_date like concat('%', #{siteConfirmDate}, '%')</if>
<if test="siteConfirmManCode != null and siteConfirmManCode != ''"> and site_confirm_man_code=#{siteConfirmManCode}</if>
<if test="siteConfirmNote != null and siteConfirmNote != ''"> and site_confirm_note like concat('%', #{siteConfirmNote}, '%')</if>
<if test="blConfirmCenter != null and blConfirmCenter != ''"> and b.bl_confirm_center = #{blConfirmCenter}</if>
<if test="confirmCenterDate != null "> and b.confirm_center_date = #{confirmCenterDate}</if>
<if test="confirmCenterNote != null and confirmCenterNote != ''"> and b.confirm_center_note = #{confirmCenterNote}</if>
<if test="confirmCenterManCode != null and confirmCenterManCode != ''"> and b.confirm_center_man_code = #{confirmCenterManCode}</if>
<if test="confirmCenterCode != null and confirmCenterCode != ''"> and b.confirm_center_code = #{confirmCenterCode}</if>
<if test="blConfirmSite != null and blConfirmSite != ''"> and b.bl_confirm_site = #{blConfirmSite}</if>
<if test="confirmSiteDate != null "> and b.confirm_site_date = #{confirmSiteDate}</if>
<if test="confirmSiteManCode != null and confirmSiteManCode != ''"> and b.confirm_site_man_code = #{confirmSiteManCode}</if>
<if test="confirmSiteNote != null and confirmSiteNote != ''"> and b.confirm_site_note = #{confirmSiteNote}</if>
<if test="confirmSiteCode != null and confirmSiteCode != ''"> and b.confirm_site_code = #{confirmSiteCode}</if>
<if test="params.sendSiteCode != null and params.sendSiteCode != ''">
and a.send_site_code = #{params.sendSiteCode}
@ -195,15 +205,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="custNo != null and custNo != ''"> and b.cust_no=#{custNo}</if>
<if test="customerCode != null and customerCode != ''"> and b.customer_code=#{customerCode}</if>
<if test="customerName != null and customerName != ''"> and b.customer_name like concat('%', #{customerName}, '%')</if>
<if test="blConfirm != null and blConfirm != ''"> and bl_confirm=#{blConfirm}</if>
<if test="confirmDate != null and confirmDate != ''"> and confirm_date like concat('%', #{confirmDate}, '%')</if>
<if test="confirmSite != null and confirmSite != ''"> and confirm_site=#{confirmSite}</if>
<if test="confirmManCode != null and confirmManCode != ''"> and confirm_man_code= #{confirmManCode}</if>
<if test="blSiteConfirm != null and blSiteConfirm != ''"> and bl_site_confirm=#{blSiteConfirm}</if>
<if test="confirmNote != null and confirmNote != ''"> and confirm_note like concat('%', #{confirmNote}, '%')</if>
<if test="siteConfirmDate != null and siteConfirmDate != ''"> and site_confirm_date like concat('%', #{siteConfirmDate}, '%')</if>
<if test="siteConfirmManCode != null and siteConfirmManCode != ''"> and site_confirm_man_code=#{siteConfirmManCode}</if>
<if test="siteConfirmNote != null and siteConfirmNote != ''"> and site_confirm_note like concat('%', #{siteConfirmNote}, '%')</if>
<if test="blConfirmCenter != null and blConfirmCenter != ''"> and b.bl_confirm_center = #{blConfirmCenter}</if>
<if test="confirmCenterDate != null "> and b.confirm_center_date = #{confirmCenterDate}</if>
<if test="confirmCenterNote != null and confirmCenterNote != ''"> and b.confirm_center_note = #{confirmCenterNote}</if>
<if test="confirmCenterManCode != null and confirmCenterManCode != ''"> and b.confirm_center_man_code = #{confirmCenterManCode}</if>
<if test="confirmCenterCode != null and confirmCenterCode != ''"> and b.confirm_center_code = #{confirmCenterCode}</if>
<if test="blConfirmSite != null and blConfirmSite != ''"> and b.bl_confirm_site = #{blConfirmSite}</if>
<if test="confirmSiteDate != null "> and b.confirm_site_date = #{confirmSiteDate}</if>
<if test="confirmSiteManCode != null and confirmSiteManCode != ''"> and b.confirm_site_man_code = #{confirmSiteManCode}</if>
<if test="confirmSiteNote != null and confirmSiteNote != ''"> and b.confirm_site_note = #{confirmSiteNote}</if>
<if test="confirmSiteCode != null and confirmSiteCode != ''"> and b.confirm_site_code = #{confirmSiteCode}</if>
<if test="params.sendSiteCode != null and params.sendSiteCode != ''">
and a.send_site_code = #{params.sendSiteCode}
@ -215,14 +227,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="params.mergeStatus != null and params.mergeStatus == 1">
and b.settle_bill_no is null
and b.bl_confirm='1'
and b.bl_site_confirm='1'
and b.bl_confirm_center='1'
and b.bl_confirm_site='1'
</if>
<if test="params.mergeStatus != null and params.mergeStatus == 2">
and b.settle_bill_no is not null
and b.bl_confirm='1'
and b.bl_site_confirm='1'
and b.bl_confirm_center='1'
and b.bl_confirm_site='1'
</if>
<if test="params.payee != null and params.payee != ''">
@ -286,9 +298,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</where>
</select>
<select id="checkUnique" parameterType="EmisSettleSubBill" resultType="int">
select count(1) from emis_settle_sub_bill
where del_flag='0'
@ -302,19 +311,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and currency = #{currency}
and settle_type = #{settleType}
and bl_split = #{blSplit}
and bl_merge = #{blMerge}
and bill_month = #{billMonth}
and cust_no = #{custNo}
and customer_code = #{customerCode}
and customer_name = #{customerName}
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_special_quote = #{blSpecialQuote}
and bl_sensitive = #{blSensitive}
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 del_flag = #{delFlag}
and create_by = #{createBy}
and create_time = #{createTime}
@ -324,26 +339,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and update_site = #{updateSite}
limit 1
</select>
<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, 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
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 a
where a.id = #{id}
</select>
<select id="selectSettleSubBillByBillCode" 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, 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
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 a
where a.del_flag='0' and a.bill_code = #{billCode} and a.parent_bill_no='0' limit 1
</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, 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
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 a
where a.del_flag='0' and a.bill_no = #{subBillNo} limit 1
</select>
<insert id="insertEmisSettleSubBill" parameterType="EmisSettleSubBill" useGeneratedKeys="true" keyProperty="id">
insert into emis_settle_sub_bill
<trim prefix="(" suffix=")" suffixOverrides=",">
@ -357,19 +374,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="currency != null and currency != ''">currency,</if>
<if test="settleType != null and settleType != ''">settle_type,</if>
<if test="blSplit != null and blSplit != ''">bl_split,</if>
<if test="blMerge != null and blMerge != ''">bl_merge,</if>
<if test="billMonth != null and billMonth != ''">bill_month,</if>
<if test="custNo != null and custNo != ''">cust_no,</if>
<if test="customerCode != null and customerCode != ''">customer_code,</if>
<if test="customerName != null and customerName != ''">customer_name,</if>
<if test="blConfirm != null and blConfirm != ''">bl_confirm,</if>
<if test="confirmDate != null and confirmDate != ''">confirm_date,</if>
<if test="confirmSite != null and confirmSite != ''">confirm_site,</if>
<if test="confirmManCode != null and confirmManCode != ''">confirm_man_code,</if>
<if test="blSiteConfirm != null and blSiteConfirm != ''">bl_site_confirm,</if>
<if test="confirmNote != null and confirmNote != ''">confirm_note,</if>
<if test="siteConfirmDate != null and siteConfirmDate != ''">site_confirm_date,</if>
<if test="siteConfirmManCode != null and siteConfirmManCode != ''">site_confirm_man_code,</if>
<if test="siteConfirmNote != null and siteConfirmNote != ''">site_confirm_note,</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>
<if test="blSensitive != null and blSensitive != ''">bl_sensitive,</if>
<if test="blConfirmCenter != null and blConfirmCenter != ''">bl_confirm_center,</if>
<if test="confirmCenterDate != null">confirm_center_date,</if>
<if test="confirmCenterNote != null and confirmCenterNote != ''">confirm_center_note,</if>
<if test="confirmCenterManCode != null and confirmCenterManCode != ''">confirm_center_man_code,</if>
<if test="confirmCenterCode != null and confirmCenterCode != ''">confirm_center_code,</if>
<if test="blConfirmSite != null and blConfirmSite != ''">bl_confirm_site,</if>
<if test="confirmSiteDate != null">confirm_site_date,</if>
<if test="confirmSiteManCode != null and confirmSiteManCode != ''">confirm_site_man_code,</if>
<if test="confirmSiteNote != null and confirmSiteNote != ''">confirm_site_note,</if>
<if test="confirmSiteCode != null and confirmSiteCode != ''">confirm_site_code,</if>
<if test="delFlag != null and delFlag != ''">del_flag,</if>
<if test="createBy != null and createBy != ''">create_by,</if>
<if test="createTime != null">create_time,</if>
@ -377,7 +400,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateTime != null">update_time,</if>
<if test="createSite != null and createSite != ''">create_site,</if>
<if test="updateSite != null and updateSite != ''">update_site,</if>
</trim>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
<if test="billNo != null and billNo != ''">#{billNo},</if>
@ -389,19 +412,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="currency != null and currency != ''">#{currency},</if>
<if test="settleType != null and settleType != ''">#{settleType},</if>
<if test="blSplit != null and blSplit != ''">#{blSplit},</if>
<if test="blMerge != null and blMerge != ''">#{blMerge},</if>
<if test="billMonth != null and billMonth != ''">#{billMonth},</if>
<if test="custNo != null and custNo != ''">#{custNo},</if>
<if test="customerCode != null and customerCode != ''">#{customerCode},</if>
<if test="customerName != null and customerName != ''">#{customerName},</if>
<if test="blConfirm != null and blConfirm != ''">#{blConfirm},</if>
<if test="confirmDate != null and confirmDate != ''">#{confirmDate},</if>
<if test="confirmSite != null and confirmSite != ''">#{confirmSite},</if>
<if test="confirmManCode != null and confirmManCode != ''">#{confirmManCode},</if>
<if test="blSiteConfirm != null and blSiteConfirm != ''">#{blSiteConfirm},</if>
<if test="confirmNote != null and confirmNote != ''">#{confirmNote},</if>
<if test="siteConfirmDate != null and siteConfirmDate != ''">#{siteConfirmDate},</if>
<if test="siteConfirmManCode != null and siteConfirmManCode != ''">#{siteConfirmManCode},</if>
<if test="siteConfirmNote != null and siteConfirmNote != ''">#{siteConfirmNote},</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>
<if test="blSensitive != null and blSensitive != ''">#{blSensitive},</if>
<if test="blConfirmCenter != null and blConfirmCenter != ''">#{blConfirmCenter},</if>
<if test="confirmCenterDate != null">#{confirmCenterDate},</if>
<if test="confirmCenterNote != null and confirmCenterNote != ''">#{confirmCenterNote},</if>
<if test="confirmCenterManCode != null and confirmCenterManCode != ''">#{confirmCenterManCode},</if>
<if test="confirmCenterCode != null and confirmCenterCode != ''">#{confirmCenterCode},</if>
<if test="blConfirmSite != null and blConfirmSite != ''">#{blConfirmSite},</if>
<if test="confirmSiteDate != null">#{confirmSiteDate},</if>
<if test="confirmSiteManCode != null and confirmSiteManCode != ''">#{confirmSiteManCode},</if>
<if test="confirmSiteNote != null and confirmSiteNote != ''">#{confirmSiteNote},</if>
<if test="confirmSiteCode != null and confirmSiteCode != ''">#{confirmSiteCode},</if>
<if test="delFlag != null and delFlag != ''">#{delFlag},</if>
<if test="createBy != null and createBy != ''">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
@ -409,7 +438,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateTime != null">#{updateTime},</if>
<if test="createSite != null and createSite != ''">#{createSite},</if>
<if test="updateSite != null and updateSite != ''">#{updateSite},</if>
</trim>
</trim>
</insert>
<update id="updateEmisSettleSubBill" parameterType="EmisSettleSubBill">
@ -424,19 +453,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="currency != null and currency != ''">currency = #{currency},</if>
<if test="settleType != null and settleType != ''">settle_type = #{settleType},</if>
<if test="blSplit != null and blSplit != ''">bl_split = #{blSplit},</if>
<if test="blMerge != null and blMerge != ''">bl_merge = #{blMerge},</if>
<if test="billMonth != null and billMonth != ''">bill_month = #{billMonth},</if>
<if test="custNo != null and custNo != ''">cust_no = #{custNo},</if>
<if test="customerCode != null and customerCode != ''">customer_code = #{customerCode},</if>
<if test="customerName != null and customerName != ''">customer_name = #{customerName},</if>
<if test="blConfirm != null and blConfirm != ''">bl_confirm = #{blConfirm},</if>
<if test="confirmDate != null and confirmDate != ''">confirm_date = #{confirmDate},</if>
<if test="confirmSite != null and confirmSite != ''">confirm_site = #{confirmSite},</if>
<if test="confirmManCode != null and confirmManCode != ''">confirm_man_code = #{confirmManCode},</if>
<if test="blSiteConfirm != null and blSiteConfirm != ''">bl_site_confirm = #{blSiteConfirm},</if>
<if test="confirmNote != null and confirmNote != ''">confirm_note = #{confirmNote},</if>
<if test="siteConfirmDate != null and siteConfirmDate != ''">site_confirm_date = #{siteConfirmDate},</if>
<if test="siteConfirmManCode != null and siteConfirmManCode != ''">site_confirm_man_code = #{siteConfirmManCode},</if>
<if test="siteConfirmNote != null and siteConfirmNote != ''">site_confirm_note = #{siteConfirmNote},</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>
<if test="blSensitive != null and blSensitive != ''">bl_sensitive = #{blSensitive},</if>
<if test="blConfirmCenter != null and blConfirmCenter != ''">bl_confirm_center = #{blConfirmCenter},</if>
<if test="confirmCenterDate != null">confirm_center_date = #{confirmCenterDate},</if>
<if test="confirmCenterNote != null and confirmCenterNote != ''">confirm_center_note = #{confirmCenterNote},</if>
<if test="confirmCenterManCode != null and confirmCenterManCode != ''">confirm_center_man_code = #{confirmCenterManCode},</if>
<if test="confirmCenterCode != null and confirmCenterCode != ''">confirm_center_code = #{confirmCenterCode},</if>
<if test="blConfirmSite != null and blConfirmSite != ''">bl_confirm_site = #{blConfirmSite},</if>
<if test="confirmSiteDate != null">confirm_site_date = #{confirmSiteDate},</if>
<if test="confirmSiteManCode != null and confirmSiteManCode != ''">confirm_site_man_code = #{confirmSiteManCode},</if>
<if test="confirmSiteNote != null and confirmSiteNote != ''">confirm_site_note = #{confirmSiteNote},</if>
<if test="confirmSiteCode != null and confirmSiteCode != ''">confirm_site_code = #{confirmSiteCode},</if>
<if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
<if test="createBy != null and createBy != ''">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
@ -460,7 +495,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where id = #{id}
</update>
<!-- 中心确认 -->
<update id="confirmBillByCenter" parameterType="EmisSettleSubBill">
update emis_settle_sub_bill