From f7085e8a94c39ab6b4d9d703b247749118bce01e Mon Sep 17 00:00:00 2001 From: wangzhikun Date: Wed, 26 Apr 2023 21:44:11 +0800 Subject: [PATCH 1/5] =?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 --- .../controller/ExtInvoicePoolController.java | 7 ++ .../controller/VouncherSyncController.java | 92 ++++++++++--------- .../com/dxhy/extend/entity/PullRecordReq.java | 6 ++ .../resources/mapper/ExtInvoicePoolMapper.xml | 9 ++ 4 files changed, 72 insertions(+), 42 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 7481e3bf..80c6ffdb 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 @@ -4,11 +4,13 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Objects; +import java.util.stream.Collectors; import javax.annotation.Resource; import com.dxhy.auth.client.annotation.IgnoreClientToken; import com.dxhy.auth.client.annotation.IgnoreUserToken; +import com.dxhy.common.vo.TaxOrgCode; import com.dxhy.extend.entity.PullRecordReq; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.RequestBody; @@ -260,6 +262,11 @@ public class ExtInvoicePoolController extends AbstractController { if(pullRecordReq.getSm().equals("99")){ pullRecordReq.setSm(""); } + if(pullRecordReq.getCompanyCode().equals("99")){ + List orgCodes = getUserInfo().getOrgCodes(); + List collect = orgCodes.stream().map(TaxOrgCode::getOrgCode).collect(Collectors.toList()); + pullRecordReq.setOrgCode(collect); + } return ResponseEntity.ok(R.ok().put("data",extInvoicePoolService.selectPullRecord(pullRecordReq))); }catch (Exception e){ e.printStackTrace(); 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 eb73760e..893688b4 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 @@ -34,62 +34,70 @@ public class VouncherSyncController { //是否全量 X为全量推送，空为增量推送。 //全量推送逻辑为 查询出的符合条件的凭证全部推送，全量推送不再检查是否在自定义表中已传输。 //增量推送，已传输的凭证数据不再推送（检查传输记录表是否已传输成功） - - - /** - * 传参逻辑 年 月 必传 期间只能传一个月的 - * - */ - String ifAll=map.get("ifAll"); - //公司代码 + try{ String companyCode = map.get("companyCode"); - //开始日期 - String startTime= map.get("startTime"); - String endTime = map.get("endTime"); - if(startTime!=null && startTime!=""){ - startTime=startTime.replace("-",""); - } - if(endTime!=null && endTime!=""){ - endTime=endTime.replace("-",""); - } - //结束日期 - String month=map.get("monat"); - //GJAHR nian - String gjahr=map.get("gjahr"); + String[] split = companyCode.split(","); + StringBuilder sb = new StringBuilder(); + for (String str:split){ + /** + * 传参逻辑 年 月 必传 期间只能传一个月的 + * + */ + String ifAll=map.get("ifAll"); + //公司代码 + + //开始日期 + String startTime= map.get("startTime"); + String endTime = map.get("endTime"); + if(startTime!=null && startTime!=""){ + startTime=startTime.replace("-",""); + } + if(endTime!=null && endTime!=""){ + endTime=endTime.replace("-",""); + } + //结束日期 + String month=map.get("monat"); + //GJAHR nian + String gjahr=map.get("gjahr"); - SNSAPObject object = new SNSAPObject(); - object.setSYSID("FPXT"); - object.setIFYWID("FI842"); - object.setBSKEY(UUID.randomUUID().toString().replace("-", "")); - //object.setSAPKEY(""); + SNSAPObject object = new SNSAPObject(); + object.setSYSID("FPXT"); + object.setIFYWID("FI842"); + object.setBSKEY(UUID.randomUUID().toString().replace("-", "")); + //object.setSAPKEY(""); // object.setZFILED1(""); // object.setZFILED2(""); // object.setZFILED3(""); // object.setZFILED4(""); - object.setZFILED5("200"); - Map requestMap = new HashMap<>(); - List list = new ArrayList<>(); - requestMap.put("ZGSDM",companyCode); - requestMap.put("GJAHR",gjahr); - requestMap.put("MONAT",month); - requestMap.put("ZDATEF",startTime); - requestMap.put("ZDATET",endTime); - requestMap.put("ZFLAG",ifAll); - object.setZDATA(JSONObject.toJSONString(requestMap)); - JSONObject request = new JSONObject(); - request.put("IS_INPUT",object); - try{ + object.setZFILED5("200"); + Map requestMap = new HashMap<>(); + List list = new ArrayList<>(); + requestMap.put("ZGSDM",companyCode); + requestMap.put("GJAHR",gjahr); + requestMap.put("MONAT",month); + requestMap.put("ZDATEF",startTime); + requestMap.put("ZDATET",endTime); + requestMap.put("ZFLAG",ifAll); + object.setZDATA(JSONObject.toJSONString(requestMap)); + JSONObject request = new JSONObject(); + request.put("IS_INPUT",object); + String s = vouncherSyncService.sendPo(JSONObject.toJSONString(request)); Map map1 = JSONObject.parseObject(s, Map.class); Map output = (Map)map1.get("ES_OUTPUT"); String ztype =(String) output.get("ZTYPE"); if(ztype.equals("S")){ - return ResponseEntity.ok(R.ok().put("data","数据拉取成功")); + }else { - return ResponseEntity.ok(R.error((String)output.get("ZDATA"))); + sb.append(str+output.get("ZDATA")); } - + } + if(sb.length()>0){ + return ResponseEntity.ok(R.ok().put("data",sb)); + }else{ + return ResponseEntity.ok(R.ok().put("data","拉取成功")); + } }catch (Exception e ){ e.printStackTrace(); return ResponseEntity.ok(R.error(CommonConstants.MSG_ERR_DEFAULT)); diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/entity/PullRecordReq.java b/dxhy-extend/src/main/java/com/dxhy/extend/entity/PullRecordReq.java index 75ffa921..a0f4d596 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/entity/PullRecordReq.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/entity/PullRecordReq.java @@ -2,12 +2,16 @@ package com.dxhy.extend.entity; import lombok.Data; +import java.util.List; + /** * @Author wangzhikun * @Date 2023/4/14 2023/4/14 */ @Data public class PullRecordReq { + private String companyCode; + //公司名称 private String companyName; //账期 @@ -27,6 +31,8 @@ public class PullRecordReq { //过账终止日期 private String accountEndDate; + private List orgCode; + private int curr; private int size; } diff --git a/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml b/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml index 4b9da6a7..3cbcea0c 100644 --- a/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml +++ b/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml @@ -561,6 +561,15 @@ and vr.butxt = #{companyName} + + and vr.bukrs in + + #{item} + + + + and vr.bukrs = #{companyCode} + and CONCAT_WS("-",vr.gjahr,vr.monat) = #{accountPeriod} From 02cd1b2022f3da778c6cf4fdb767504e40b8338d Mon Sep 17 00:00:00 2001 From: yefei Date: Wed, 26 Apr 2023 22:09:52 +0800 Subject: [PATCH 2/5] =?UTF-8?q?ariesy=20=E4=BF=AE=E6=94=B9=E9=94=80?= =?UTF-8?q?=E9=A1=B9=E7=A5=A8=E6=B1=A0=E5=8F=91=E7=A5=A8=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E4=B8=8D=E5=88=B0=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dxhy/erp/controller/SDNYMainProcessController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java index bc51b06c..95fd8e6d 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java @@ -99,7 +99,7 @@ public class SDNYMainProcessController extends AbstractController { JSONObject checkInvoiceResult = null; InvoiceUtil iu = new InvoiceUtil(pramsMap.get("invoiceCode")); String fplxdm = iu.getFplxdm(); - if (fplxdm != null || "10107".equals(pramsMap.get("invoiceType")) || "10108".equals(pramsMap.get("invoiceType"))) { + if (fplxdm != null || "10107".equals(pramsMap.get("invoiceType")) || "10108".equals(pramsMap.get("invoiceType")) || pramsMap.get("invoiceCode").startsWith("50000")) { //查验类发票,执行查验操作后入库 log.info("查验类发票,执行查验操作后入库"); //权限校验 From b4cfe0d6f10636d15af23785da1fae1a5ebf8a70 Mon Sep 17 00:00:00 2001 From: wangzhikun Date: Wed, 26 Apr 2023 22:12:10 +0800 Subject: [PATCH 3/5] =?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 4/5] =?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); } } From 3a26e87da1342d4d58121ad78393771c2914b977 Mon Sep 17 00:00:00 2001 From: yefei Date: Wed, 26 Apr 2023 22:53:02 +0800 Subject: [PATCH 5/5] =?UTF-8?q?ariesy=20=E4=BF=AE=E6=94=B9=E9=94=80?= =?UTF-8?q?=E9=A1=B9=E7=A5=A8=E6=B1=A0=E5=8F=91=E7=A5=A8=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E4=B8=8D=E5=88=B0=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dxhy-sign/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dxhy-sign/pom.xml b/dxhy-sign/pom.xml index a3c3eef6..57de7ab7 100644 --- a/dxhy-sign/pom.xml +++ b/dxhy-sign/pom.xml @@ -16,7 +16,7 @@ com.dxhy.base sims-base-sms - 6.1.4.0-BASE + 1.0.0.1-sdenergy compile