diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java index 97fc0a9d..0047e89f 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java @@ -1365,7 +1365,7 @@ public class PushInvoiceServiceImpl implements PushInvoiceService { detail.setZBHSJEY(f.getJE()); detail.setZZSEY(f.getSE()); detail.setZHSJEY(new BigDecimal(f.getJE()).add(new BigDecimal(f.getSE())).toString()); - detail.setZZDJFP((new BigDecimal(f.getJE()).add(new BigDecimal(f.getSE())).divide(new BigDecimal(f.getSPSL()),8, BigDecimal.ROUND_HALF_EVEN).toString())); + detail.setZZDJFP(new BigDecimal(f.getDJ()).multiply(new BigDecimal(f.getSL()).add(BigDecimal.ONE)).setScale(ConfigureConstant.INT_8,BigDecimal.ROUND_HALF_EVEN).toString()); detail.setINVOICEDATE(ddfpxx.getKPRQ()); detail.setINVOICETYPE(ddfpxx.getFPLXDM()); detail.setZHWMC(f.getXMMC()); @@ -1400,8 +1400,11 @@ public class PushInvoiceServiceImpl implements PushInvoiceService { fpzftsReqSap.setZFPHM(zffptsV5.getFPHM()); //0 是正常 1是作废 fpzftsReqSap.setZFPZT(ConfigureConstant.STRING_1); - //fpzftsReqSap.setZJSDH(orderInvoiceInfo.getDdh()); - fpzftsReqSap.setZBZDH(orderProcessInfo.getBzdh()); + if(OrderInfoEnum.SYS_SOURCE_SAP.getKey().equals(orderProcessInfo.getXtly())){ + fpzftsReqSap.setZJSDH(orderProcessInfo.getOriginDdh()); + }else { + fpzftsReqSap.setZBZDH(orderProcessInfo.getBzdh()); + } IsInput isInput = new IsInput(); isInput.setSYSID(OrderInfoEnum.SYS_SIGN_FP.getKey()); isInput.setIFYWID(OrderInfoEnum.INTERFACE_BUSINESS_ID_FPZFTS.getKey());