Merge branch 'release' into test

order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java

@@ -1445,16 +1445,23 @@ public class PushInvoiceServiceImpl implements PushInvoiceService {
                 fpkjtsReqSap.setZBHSJEY(ddfpxx.getHJJE());
                 fpkjtsReqSap.setZZSEY(ddfpxx.getHJSE());
                 fpkjtsReqSap.setZHSJEY(ddfpxx.getJSHJ());
+                fpkjtsReqSap.setZHSJE(ddfpxx.getJSHJ());
                 fpkjtsReqSap.setZZBZ(ddfpxx.getBZ());
                 fpkjtsReqSap.setZFPZT(ConfigureConstant.STRING_0);//0-正常、1-作废
                 String formatKprq = "";
                 try {
                     Date date = (Date) new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(ddfpxx.getKPRQ());
-                    SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+                    SimpleDateFormat sdf = null;
+                    if(OrderInfoEnum.SYS_SOURCE_SNYXX.getKey().equals(ddfpxx.getXtly())) {
+                        sdf = new SimpleDateFormat("yyyy-MM-dd");
+                    }else{
+                        sdf = new SimpleDateFormat("yyyyMMdd");
+                    }
                     formatKprq = sdf.format(date);
                 }catch (Exception e){
                     log.error("{}发票推送SAP格式化开票日期错误:{}",LOGGER_MSG,e);
                 }
+
                 fpkjtsReqSap.setZKPRQ(formatKprq);
                 fpkjtsReqSap.setZGFMC(ddfpxx.getGMFMC());
                 fpkjtsReqSap.setZGFSH(ddfpxx.getGMFSBH());
@@ -1468,6 +1475,7 @@ public class PushInvoiceServiceImpl implements PushInvoiceService {
                 fpkjtsReqSap.setZGSDM(ddfpxx.getCompanyCode());
                 fpkjtsReqSap.setZYWDJ(ddfpxx.getBillNum());
                 fpkjtsReqSap.setIMGID(ddfpxx.getDocuId());
+                fpkjtsReqSap.setZBZDH(ddfpxx.getBillNum());
                 if(OrderInfoEnum.SYS_SOURCE_DSXT01.getKey().equals(ddfpxx.getXtly()) ||
                         OrderInfoEnum.SYS_SOURCE_DSXT02.getKey().equals(ddfpxx.getXtly())){
                     fpkjtsReqSap.setPDFZJL(ddfpxx.getPDFZJL());