开票申请修改
This commit is contained in:
parent
b5c79604bc
commit
a4833d5cfc
|
@ -36,7 +36,7 @@
|
||||||
from
|
from
|
||||||
formmain_0331
|
formmain_0331
|
||||||
LEFT JOIN COL_SUMMARY on COL_SUMMARY.FORM_RECORDID = formmain_0331.id
|
LEFT JOIN COL_SUMMARY on COL_SUMMARY.FORM_RECORDID = formmain_0331.id
|
||||||
LEFT JOIN CTP_AFFAIR on CTP_AFFAIR.OBJECT_ID = COL_SUMMARY.id and CTP_AFFAIR.MEMBER_ID = '' and CTP_AFFAIR.STATE = '3'
|
LEFT JOIN CTP_AFFAIR on CTP_AFFAIR.OBJECT_ID = COL_SUMMARY.id and CTP_AFFAIR.MEMBER_ID = '8802902519613178734' and CTP_AFFAIR.STATE = '3'
|
||||||
where
|
where
|
||||||
formmain_0331.id = #{id}
|
formmain_0331.id = #{id}
|
||||||
and CTP_AFFAIR.SUB_OBJECT_ID is not null
|
and CTP_AFFAIR.SUB_OBJECT_ID is not null
|
||||||
|
|
|
@ -72,6 +72,7 @@ public class InvoiceEntity extends BaseEntity {
|
||||||
private String url;// 发票文件
|
private String url;// 发票文件
|
||||||
private String result_status;// 开票结果
|
private String result_status;// 开票结果
|
||||||
|
|
||||||
|
private String failure_reason; //失败原因
|
||||||
private String summaryId;//
|
private String summaryId;//
|
||||||
private String input_result_status_filed;//进项发票结果字段
|
private String input_result_status_filed;//进项发票结果字段
|
||||||
private String input_result_status;//进项发票结果
|
private String input_result_status;//进项发票结果
|
||||||
|
@ -697,4 +698,12 @@ public class InvoiceEntity extends BaseEntity {
|
||||||
public void setOriginal_invoice_check_ode(String original_invoice_check_ode) {
|
public void setOriginal_invoice_check_ode(String original_invoice_check_ode) {
|
||||||
this.original_invoice_check_ode = original_invoice_check_ode;
|
this.original_invoice_check_ode = original_invoice_check_ode;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public String getFailure_reason() {
|
||||||
|
return failure_reason;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setFailure_reason(String failure_reason) {
|
||||||
|
this.failure_reason = failure_reason;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -120,6 +120,7 @@
|
||||||
<if test="invoice_code != null and invoice_code != ''"> ${invoice_code_field} = #{invoice_code},</if>
|
<if test="invoice_code != null and invoice_code != ''"> ${invoice_code_field} = #{invoice_code},</if>
|
||||||
<if test="invoice_number != null and invoice_number != ''"> ${invoice_number_field} = #{invoice_number},</if>
|
<if test="invoice_number != null and invoice_number != ''"> ${invoice_number_field} = #{invoice_number},</if>
|
||||||
<if test="result_status != null and result_status != ''"> ${result_status_field} = #{result_status},</if>
|
<if test="result_status != null and result_status != ''"> ${result_status_field} = #{result_status},</if>
|
||||||
|
<if test="failure_reason != null and failure_reason != ''"> field0225 = #{failure_reason},</if>
|
||||||
</trim>
|
</trim>
|
||||||
where id=#{id}
|
where id=#{id}
|
||||||
</update>
|
</update>
|
||||||
|
|
|
@ -10,6 +10,8 @@ import com.alibaba.fastjson.JSONObject;
|
||||||
import com.hzya.frame.basedao.service.impl.BaseService;
|
import com.hzya.frame.basedao.service.impl.BaseService;
|
||||||
import com.hzya.frame.mdm.mdmModuleSource.dao.impl.MdmModuleSourceDaoImpl;
|
import com.hzya.frame.mdm.mdmModuleSource.dao.impl.MdmModuleSourceDaoImpl;
|
||||||
import com.hzya.frame.mdm.mdmModuleSource.entity.MdmModuleSourceEntity;
|
import com.hzya.frame.mdm.mdmModuleSource.entity.MdmModuleSourceEntity;
|
||||||
|
import com.hzya.frame.plugin.ht.entity.ApplyInvoiceEntity;
|
||||||
|
import com.hzya.frame.plugin.ht.service.IApplyInvoiceService;
|
||||||
import com.hzya.frame.seeyon.dao.ICtpAttachmentDao;
|
import com.hzya.frame.seeyon.dao.ICtpAttachmentDao;
|
||||||
import com.hzya.frame.seeyon.dao.ICtpFileDao;
|
import com.hzya.frame.seeyon.dao.ICtpFileDao;
|
||||||
import com.hzya.frame.seeyon.entity.CtpAttachmentEntity;
|
import com.hzya.frame.seeyon.entity.CtpAttachmentEntity;
|
||||||
|
@ -68,7 +70,7 @@ public class InvoiceServiceImpl extends BaseService<InvoiceEntity, String> imple
|
||||||
@Autowired
|
@Autowired
|
||||||
private ICtpFileDao ctpFileDao;
|
private ICtpFileDao ctpFileDao;
|
||||||
|
|
||||||
|
private IApplyInvoiceService applyInvoiceService;
|
||||||
@Value("${zt.url}")
|
@Value("${zt.url}")
|
||||||
private String url;
|
private String url;
|
||||||
|
|
||||||
|
@ -273,14 +275,18 @@ public class InvoiceServiceImpl extends BaseService<InvoiceEntity, String> imple
|
||||||
}else {
|
}else {
|
||||||
//开票失败,流程回退
|
//开票失败,流程回退
|
||||||
//查询待办,退回流程用,这里只处理退回的情况,如果要处理提交,要等开票成功后才能提交,去定时查开票结果的定时任务里做
|
//查询待办,退回流程用,这里只处理退回的情况,如果要处理提交,要等开票成功后才能提交,去定时查开票结果的定时任务里做
|
||||||
// ApplyInvoiceEntity applyInvoice = new ApplyInvoiceEntity();
|
ApplyInvoiceEntity applyInvoice = new ApplyInvoiceEntity();
|
||||||
// applyInvoice.setId(entity.getSerial_number());
|
applyInvoice.setId(entity.getSerial_number());
|
||||||
// applyInvoice.setDataSourceCode("HT-OA");
|
applyInvoice.setDataSourceCode("HT-OA");
|
||||||
// ApplyInvoiceEntity applyInvoiceEntity = applyInvoiceService.queryAffair(applyInvoice);
|
ApplyInvoiceEntity applyInvoiceEntity = applyInvoiceService.queryAffair(applyInvoice);
|
||||||
// if (null != applyInvoiceEntity){
|
if (null != applyInvoiceEntity){
|
||||||
// String stepBack = applyInvoiceService.stepBackValueOf(applyInvoiceEntity.getWorkitem_id(), attribute.getString("resultMsg"));
|
String resultMsg = attribute.getString("resultMsg");
|
||||||
// applyInvoiceService.process(stepBack,"8000590006");
|
if (StrUtil.isEmpty(resultMsg)){
|
||||||
// }
|
resultMsg = "开票失败";
|
||||||
|
}
|
||||||
|
String stepBack = applyInvoiceService.stepBackValueOf(applyInvoiceEntity.getWorkitem_id(), resultMsg);
|
||||||
|
applyInvoiceService.process(stepBack,"8000590006","ZZZH");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue