From b4cfe0d6f10636d15af23785da1fae1a5ebf8a70 Mon Sep 17 00:00:00 2001 From: wangzhikun Date: Wed, 26 Apr 2023 22:12:10 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=8B=89=E5=8F=96=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E8=8E=B7=E5=8F=96-=E6=A0=B9=E6=8D=AE?= =?UTF-8?q?=E5=85=AC=E5=8F=B8=E7=BC=96=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dxhy/extend/controller/ExtInvoicePoolController.java | 1 + .../com/dxhy/extend/controller/VouncherSyncController.java | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtInvoicePoolController.java b/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtInvoicePoolController.java index 5a731004..84b58eb1 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtInvoicePoolController.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtInvoicePoolController.java @@ -271,6 +271,7 @@ public class ExtInvoicePoolController extends AbstractController { List orgCodes = getUserInfo().getOrgCodes(); List 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){ diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/controller/VouncherSyncController.java b/dxhy-extend/src/main/java/com/dxhy/extend/controller/VouncherSyncController.java index 893688b4..f27ed37e 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/controller/VouncherSyncController.java +++ b/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 requestMap = new HashMap<>(); List list = new ArrayList<>(); - requestMap.put("ZGSDM",companyCode); + requestMap.put("ZGSDM",str); requestMap.put("GJAHR",gjahr); requestMap.put("MONAT",month); requestMap.put("ZDATEF",startTime); From 7605e74146e38c4d85fa74423870efc6ca818c5a Mon Sep 17 00:00:00 2001 From: wangzhikun Date: Wed, 26 Apr 2023 22:37:35 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=BD=AC=E5=87=BA=E5=8E=BB=E9=99=A4?= =?UTF-8?q?=E5=B7=B2=E8=AE=A4=E8=AF=81=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dxhy/erp/controller/InterfaceController.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/controller/InterfaceController.java b/dxhy-erp/src/main/java/com/dxhy/erp/controller/InterfaceController.java index d7634bc2..1b782619 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/controller/InterfaceController.java +++ b/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); } }