Merge remote-tracking branch 'origin/release' into release

dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/drawback/impl/DomesticInvoiceDrawbackServiceImpl.java

@@ -253,7 +253,12 @@ public class DomesticInvoiceDrawbackServiceImpl implements DomesticInvoiceDrawba
                 vo.setSelected("0");
                 return vo;
             }
-            String uuid = dto.getInvoiceCode() + dto.getInvoiceNo();
+            String uuid ="";
+            if(dto.getInvoiceCode()!=null){
+                 uuid= dto.getInvoiceCode() + dto.getInvoiceNo();
+            }else {
+                uuid = dto.getInvoiceNo();
+            }
             List<TdxRecordInvoice> tdxRecordInvoices =
                 domesticRecordInvoiceDao.selectByUuidList(Collections.singletonList(uuid));
             // 底账信息查询
@@ -535,4 +540,5 @@ public class DomesticInvoiceDrawbackServiceImpl implements DomesticInvoiceDrawba
         return business.stream().filter(b -> deptId.equals(b.getBusinessCode())).findFirst()
             .map(Business::getBusinessName).orElse(null);
     }
+
 }

dxhy-extend/src/main/java/com/dxhy/extend/controller/VouncherSyncController.java

@@ -81,7 +81,7 @@ public class VouncherSyncController {
             if(ztype.equals("S")){
                 return ResponseEntity.ok(R.ok().put("data","数据拉取成功"));
             }else {
-                return ResponseEntity.ok(R.error(CommonConstants.MSG_ERR_DEFAULT));
+                return ResponseEntity.ok(R.error((String)output.get("ZDATA")));
             }
 
         }catch (Exception e ){