Merge branch 'salePush' into 'release'

Sale push

See merge request invoice/pt!89

dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoicePoolServiceImpl.java

@@ -1945,11 +1945,12 @@ public class InvoicePoolServiceImpl implements InvoicePoolService {
     public ReturnStateInfo getCheckData(SalesInvoicePushInfos info) {
         ReturnStateInfo run = new ReturnStateInfo();
 
-        if (StringUtils.isBlank(info.getInvoiceCode())) {
+        //兼容全电类型，不校验发票代码
-            run.setReturnCode(ReturnCodeEnum.FPDMBNWK.getFhzDm());
+//        if (StringUtils.isBlank(info.getInvoiceCode())) {
-            run.setReturnMessage(ReturnCodeEnum.FPDMBNWK.getFhzMc(ReturnCodeEnum.FPDMBNWK.getIndex()));
+//            run.setReturnCode(ReturnCodeEnum.FPDMBNWK.getFhzDm());
-            return run;
+//            run.setReturnMessage(ReturnCodeEnum.FPDMBNWK.getFhzMc(ReturnCodeEnum.FPDMBNWK.getIndex()));
-        }
+//            return run;
+//        }
         if (StringUtils.isBlank(info.getInvoiceNo())) {
             run.setReturnCode(ReturnCodeEnum.FPHMBNWK.getFhzDm());
             run.setReturnMessage(ReturnCodeEnum.FPHMBNWK.getFhzMc(ReturnCodeEnum.FPHMBNWK.getIndex()));