|
|
@@ -107,12 +107,13 @@ public class ERPServiceImpl implements ERPService {
|
|
|
orderDetDTO.setNum(rs_det.getGeneralString("id_qty"));
|
|
|
//orderDetDTO.setPrice(rs_det.getGeneralString("id_price"));//平台算法问题 传单价会有差异,校验可能不通过,所有传金额和数量,不传单价
|
|
|
orderDetDTO.setTaxRate(rs_det.getGeneralString("taxrate"));//0.13
|
|
|
- orderDetDTO.setTaxAmount(rs_det.getGeneralString("id_amount"));
|
|
|
- /*传含税
|
|
|
orderDetDTO.setTax(rs_det.getGeneralString("TAXTOTAL"));
|
|
|
+
|
|
|
+ /*传含税
|
|
|
+ orderDetDTO.setTaxAmount(rs_det.getGeneralString("id_amount"));
|
|
|
orderDetDTO.setHsbz(rs_det.getGeneralString("hsbz"));*/
|
|
|
/*传不含税*/
|
|
|
- orderDetDTO.setTax(rs_det.getGeneralString("NETTOTAL"));
|
|
|
+ orderDetDTO.setTaxAmount(rs_det.getGeneralString("NETTOTAL"));
|
|
|
orderDetDTO.setHsbz("0");
|
|
|
|
|
|
orderDetDTO.setSpbm(rs_det.getGeneralString("spbm"));
|
|
|
@@ -122,6 +123,7 @@ public class ERPServiceImpl implements ERPService {
|
|
|
invoiceOrderDTO.setOrderOriginalDetails(dets);
|
|
|
invoiceOrderDTO.setInvoiceGoodsTransports(new ArrayList<>());
|
|
|
System.out.println(JSONArray.toJSONString(invoiceOrderDTO));
|
|
|
+ logger.info("pushInvoiceOrder master {} , id {} , content {}", master, id,JSONArray.toJSONString(invoiceOrderDTO));
|
|
|
//调用对接
|
|
|
NNOpenSDK sdk = NNOpenSDK.getIntance();
|
|
|
String method = "nuonuo.OpeMplatform.saveOrder"; // API方法名
|