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

dxhy-erp/src/main/java/com/dxhy/erp/controller/InterfaceController.java

@@ -1237,11 +1237,6 @@ public class InterfaceController extends AbstractController {
                 es.setZMESSAGE("底账数据不存在");
                 outPut.setES_OUTPUT(es);
                 return JsonUtils.getInstance().toJsonString(outPut);
-            }else if(!invoices.get(0).getAuthStatus().equals("4")){
-                es.setZTYPE("E");
-                es.setZMESSAGE("发票状态不是认证成功不允许转出");
-                outPut.setES_OUTPUT(es);
-                return JsonUtils.getInstance().toJsonString(outPut);
             }
         }
 

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

@@ -271,6 +271,7 @@ public class ExtInvoicePoolController extends AbstractController {
                 List<TaxOrgCode> orgCodes = getUserInfo().getOrgCodes();
                 List<String> collect = orgCodes.stream().map(TaxOrgCode::getOrgCode).collect(Collectors.toList());
                 pullRecordReq.setOrgCode(collect);
+                pullRecordReq.setCompanyCode("");
             }
             return ResponseEntity.ok(R.ok().put("data",extInvoicePoolService.selectPullRecord(pullRecordReq)));
         }catch (Exception e){

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

@@ -35,8 +35,8 @@ public class VouncherSyncController {
         //全量推送逻辑为 查询出的符合条件的凭证全部推送，全量推送不再检查是否在自定义表中已传输。
         //增量推送，已传输的凭证数据不再推送（检查传输记录表是否已传输成功）
         try{
-        String companyCode = map.get("companyCode");
-        String[] split = companyCode.split(",");
+        String companyCodes = map.get("companyCode");
+        String[] split = companyCodes.split(",");
         StringBuilder sb = new StringBuilder();
         for (String str:split){
             /**
@@ -73,7 +73,7 @@ public class VouncherSyncController {
             object.setZFILED5("200");
             Map<String,String> requestMap = new HashMap<>();
             List<Object> list = new ArrayList<>();
-            requestMap.put("ZGSDM",companyCode);
+            requestMap.put("ZGSDM",str);
             requestMap.put("GJAHR",gjahr);
             requestMap.put("MONAT",month);
             requestMap.put("ZDATEF",startTime);