md
This commit is contained in:
parent
c10fab0864
commit
1a2c5e75f7
@ -11,10 +11,12 @@
|
|||||||
package com.xdadan.erp.emis.service.impl;
|
package com.xdadan.erp.emis.service.impl;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
import java.util.Date;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import com.alibaba.fastjson.JSONArray;
|
import com.alibaba.fastjson.JSONArray;
|
||||||
import com.alibaba.fastjson.JSONObject;
|
import com.alibaba.fastjson.JSONObject;
|
||||||
|
import com.xdadan.erp.common.utils.SecurityUtils;
|
||||||
import com.xdadan.erp.emis.domain.EmisBaseInvoiceChInfo;
|
import com.xdadan.erp.emis.domain.EmisBaseInvoiceChInfo;
|
||||||
import com.xdadan.erp.emis.domain.EmisSettleBill;
|
import com.xdadan.erp.emis.domain.EmisSettleBill;
|
||||||
import com.xdadan.erp.emis.domain.EmisSettleInvoiceRecord;
|
import com.xdadan.erp.emis.domain.EmisSettleInvoiceRecord;
|
||||||
@ -110,7 +112,18 @@ public class EmisSettleInvoiceChRecordServiceImpl implements IEmisSettleInvoiceC
|
|||||||
newApply.setInvoiceStatus("1");
|
newApply.setInvoiceStatus("1");
|
||||||
newApply.setInvoiceStatusDesc("开票中");
|
newApply.setInvoiceStatusDesc("开票中");
|
||||||
|
|
||||||
// 渠道待开票
|
// 操作人
|
||||||
|
newApply.setOpManCode(SecurityUtils.getLoginUser().getUser().getEmpCode());
|
||||||
|
newApply.setOpSiteCode(SecurityUtils.getLoginUser().getUser().getOwnerSiteCode());
|
||||||
|
newApply.setOpDate(new Date());
|
||||||
|
|
||||||
|
// 审核人
|
||||||
|
newApply.setBlAudit("1");
|
||||||
|
newApply.setAuditManCode(SecurityUtils.getLoginUser().getUser().getEmpCode());
|
||||||
|
newApply.setAuditDate(new Date());
|
||||||
|
newApply.setAuditSiteCode(SecurityUtils.getLoginUser().getUser().getOwnerSiteCode());
|
||||||
|
|
||||||
|
// 渠道待发送
|
||||||
newApply.setOpenChStatus("0");
|
newApply.setOpenChStatus("0");
|
||||||
|
|
||||||
emisSettleInvoiceRecordMapper.updateEmisSettleInvoiceRecord(newApply);
|
emisSettleInvoiceRecordMapper.updateEmisSettleInvoiceRecord(newApply);
|
||||||
@ -228,11 +241,11 @@ public class EmisSettleInvoiceChRecordServiceImpl implements IEmisSettleInvoiceC
|
|||||||
updateEmisSettleInvoiceChRecord(newRecord);
|
updateEmisSettleInvoiceChRecord(newRecord);
|
||||||
}
|
}
|
||||||
else{
|
else{
|
||||||
EmisSettleInvoiceChRecord newRecord=new EmisSettleInvoiceChRecord();
|
// EmisSettleInvoiceChRecord newRecord=new EmisSettleInvoiceChRecord();
|
||||||
newRecord.setId(old.getId());
|
// newRecord.setId(old.getId());
|
||||||
newRecord.setOpenChStatus("3");
|
// newRecord.setOpenChStatus("3");
|
||||||
newRecord.setOpenChStatusDesc(jRst.getString("message"));
|
// newRecord.setOpenChStatusDesc(jRst.getString("message"));
|
||||||
emisSettleInvoiceChRecordMapper.updateEmisSettleInvoiceChRecord(newRecord);
|
// emisSettleInvoiceChRecordMapper.updateEmisSettleInvoiceChRecord(newRecord);
|
||||||
}
|
}
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -178,7 +178,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
<select id="selectWaitQueryStatusList" parameterType="String" resultMap="EmisSettleInvoiceChRecordResult">
|
<select id="selectWaitQueryStatusList" parameterType="String" resultMap="EmisSettleInvoiceChRecordResult">
|
||||||
select id, req_no, apply_seq_no, bl_ecinv, invoice_type, real_invoice_type, company_name, company_tax_no, company_tel, company_address, bank_name, bank_acc_no, contact, phone, tax_rate, open_money, email, saler_company_name, saler_company_tax_no, saler_company_tel, saler_company_address, saler_bank_name, saler_bank_acc_no, saler_contact, saler_phone, invoice_no, file_path, qr_path, op_man_code, op_date, op_site_code, open_ch_id, open_ch_status, open_ch_status_desc, open_com_code, ext_data, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
|
select id, req_no, apply_seq_no, bl_ecinv, invoice_type, real_invoice_type, company_name, company_tax_no, company_tel, company_address, bank_name, bank_acc_no, contact, phone, tax_rate, open_money, email, saler_company_name, saler_company_tax_no, saler_company_tel, saler_company_address, saler_bank_name, saler_bank_acc_no, saler_contact, saler_phone, invoice_no, file_path, qr_path, op_man_code, op_date, op_site_code, open_ch_id, open_ch_status, open_ch_status_desc, open_com_code, ext_data, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
|
||||||
from emis_settle_invoice_ch_record a
|
from emis_settle_invoice_ch_record a
|
||||||
where a.del_flag='0' and a.open_ch_status = '1'
|
where a.del_flag='0' and a.open_ch_status != '2'
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<insert id="insertEmisSettleInvoiceChRecord" parameterType="EmisSettleInvoiceChRecord" useGeneratedKeys="true" keyProperty="id">
|
<insert id="insertEmisSettleInvoiceChRecord" parameterType="EmisSettleInvoiceChRecord" useGeneratedKeys="true" keyProperty="id">
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user