|
|
@@ -61,7 +61,9 @@ public class ERPServiceImpl implements ERPService {
|
|
|
}
|
|
|
logger.info("pushInvoiceOrder begin: master {} ,id {} ",master,id);
|
|
|
SpObserver.putSp(master);
|
|
|
- SqlRowList rs_main = baseDao.queryForRowSet("select * from invoiceOrder left join customer on io_cucode=cu_code where io_id="+id);
|
|
|
+ SqlRowList rs_main = baseDao.queryForRowSet("select * from invoiceOrder left join customer on io_cucode=cu_code " +
|
|
|
+ " left join YITOA_DATACENTER.custinvoicemsg on ci_cucode = cu_code " +
|
|
|
+ " where io_id="+id);
|
|
|
if(rs_main.next()){
|
|
|
String autoInvoiceFlag= baseDao.isDBSetting("InvoiceOrder", "autoInvoice")?"true":"false";
|
|
|
//数据组装
|
|
|
@@ -77,10 +79,10 @@ public class ERPServiceImpl implements ERPService {
|
|
|
orderDTO.setSpecificFactor("0");
|
|
|
orderDTO.setSaleTaxNum(donlimConfig.getTaxnum());//
|
|
|
orderDTO.setBuyerName(rs_main.getGeneralString("cu_name"));//客户名称
|
|
|
- orderDTO.setTaxNum(rs_main.getGeneralString("cu_registerno").trim());//购方税号
|
|
|
- orderDTO.setAccount(rs_main.getGeneralString("cu_bank")+":"+rs_main.getGeneralString("cu_bankaccount"));
|
|
|
- orderDTO.setAddress(rs_main.getGeneralString("cu_add1"));
|
|
|
- orderDTO.setTelephone(rs_main.getGeneralString("cu_tel"));
|
|
|
+ orderDTO.setTaxNum(rs_main.getGeneralString("ci_taxnum").trim());//购方税号
|
|
|
+ orderDTO.setAccount(rs_main.getGeneralString("ci_account"));
|
|
|
+ orderDTO.setAddress(rs_main.getGeneralString("ci_address"));
|
|
|
+ orderDTO.setTelephone(rs_main.getGeneralString("ci_telephone"));
|
|
|
orderDTO.setRemark(rs_main.getGeneralString("io_remark"));
|
|
|
invoiceOrderDTO.setOrderInfo(orderDTO);
|
|
|
|