From 936b31e6f7d5cd993be30a3d3b04bd50a4a597ed Mon Sep 17 00:00:00 2001 From: wangzhikun Date: Wed, 26 Apr 2023 16:47:33 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=83=A8=E5=88=86=E8=BD=AC=E5=87=BAbug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erp/controller/InterfaceController.java | 26 +++++++++++++++++++ .../service/impl/ReceiptOutServiceImpl.java | 2 ++ .../service/fpqs/impl/FpqsServiceImpl.java | 10 ++++--- 3 files changed, 35 insertions(+), 3 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 c49e1762..d7634bc2 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 @@ -35,6 +35,7 @@ import io.swagger.annotations.ApiParam; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Value; +import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -1218,6 +1219,31 @@ public class InterfaceController extends AbstractController { public String transferOut(ErpInvoiceData erpInvoiceData){ String zdata = erpInvoiceData.getIS_INPUT().getZDATA(); List list = JSON.parseArray(zdata, Map.class); + for(Map map:list){ + String invoiceCode =(String) map.get("ZFPDM"); + String invoiceNo = (String)map.get("ZFPHM"); + String uuid = invoiceCode+invoiceNo; + String[] ids = uuid.split(","); + DynamicContextHolder.push("business"+DbConstant.BUSINESS_READ); + List invoices = baseIReceiptInvoiceService.selectByUuids(ids); + OutPut outPut = new OutPut(); + EsOutPutResp es = new EsOutPutResp(); + es.setSAPKEY(erpInvoiceData.getIS_INPUT().getSAPKEY()); + es.setBSKEY(erpInvoiceData.getIS_INPUT().getBSKEY()); + es.setZTYPE("S"); + es.setZMESSAGE("处理成功"); + if(CollectionUtils.isEmpty(invoices)){ + es.setZTYPE("E"); + 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); + } + } try{ diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/ReceiptOutServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/ReceiptOutServiceImpl.java index d741974a..0752751a 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/ReceiptOutServiceImpl.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/ReceiptOutServiceImpl.java @@ -135,6 +135,7 @@ public class ReceiptOutServiceImpl extends MpBaseServiceImpl Date: Wed, 26 Apr 2023 18:47:10 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=BD=AC=E5=87=BA?= =?UTF-8?q?=E6=9D=A5=E6=BA=90=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dxhy/base/model/BaseReceiptOutCancelRespVO.java | 1 + .../com/dxhy/base/service/receipt/BaseReceiptOutServiceImpl.java | 1 + 2 files changed, 2 insertions(+) diff --git a/dxhy-base/src/main/java/com/dxhy/base/model/BaseReceiptOutCancelRespVO.java b/dxhy-base/src/main/java/com/dxhy/base/model/BaseReceiptOutCancelRespVO.java index d823f655..8e87a702 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/model/BaseReceiptOutCancelRespVO.java +++ b/dxhy-base/src/main/java/com/dxhy/base/model/BaseReceiptOutCancelRespVO.java @@ -76,5 +76,6 @@ public class BaseReceiptOutCancelRespVO extends BaseBaseRespVO { private String remark; private String outBelongDate; + private String outResource; } diff --git a/dxhy-base/src/main/java/com/dxhy/base/service/receipt/BaseReceiptOutServiceImpl.java b/dxhy-base/src/main/java/com/dxhy/base/service/receipt/BaseReceiptOutServiceImpl.java index 206ee679..d41a5b48 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/service/receipt/BaseReceiptOutServiceImpl.java +++ b/dxhy-base/src/main/java/com/dxhy/base/service/receipt/BaseReceiptOutServiceImpl.java @@ -650,6 +650,7 @@ public class BaseReceiptOutServiceImpl extends MpBaseServiceImpl query = new QueryWrapper<>();