From f3d5fddaba955bdc6ecb8d41e020e7264745c705 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com>
Date: Mon, 4 Sep 2023 17:33:20 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=9B=E9=A1=B9=E7=A8=8E=E8=BD=AC=E5=87=BA?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=BE=E7=BD=AE=E6=95=B4=E4=BD=93=E6=88=90?=
 =?UTF-8?q?=E5=8A=9F=E5=92=8C=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/dxhy/erp/controller/InterfaceController.java    | 2 +-
 .../com/dxhy/erp/service/BaseIReceiptInvoiceService.java     | 2 +-
 .../main/java/com/dxhy/erp/service/IReceiptOutService.java   | 4 ++--
 .../erp/service/impl/BaseIReceiptInvoiceServiceImpl.java     | 5 ++++-
 .../com/dxhy/erp/service/impl/ReceiptOutServiceImpl.java     | 4 ++--
 5 files changed, 10 insertions(+), 7 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 642dad74..064eeb3d 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
@@ -1436,7 +1436,7 @@ public class InterfaceController extends AbstractController {
                 return JsonUtils.getInstance().toJsonString(outPut);
             }
             StringBuilder uuids = new StringBuilder();
-            zdatans.forEach(e -> uuids.append(e.getZFPDM() == null ? "" : e.getZFPDM()).append(e.getZFPHM()));
+            zdatans.forEach(e -> uuids.append(e.getZFPDM() == null ? "" : e.getZFPDM()).append(e.getZFPHM()).append(","));
 
             //根据uuid查询发票
             String[] ids = uuids.toString().split(",");
diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/BaseIReceiptInvoiceService.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/BaseIReceiptInvoiceService.java
index f8c959a9..d4ee01f7 100644
--- a/dxhy-erp/src/main/java/com/dxhy/erp/service/BaseIReceiptInvoiceService.java
+++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/BaseIReceiptInvoiceService.java
@@ -31,6 +31,6 @@ public interface BaseIReceiptInvoiceService {
      *            请求参数
      * @return 返回结果
      */
-    String cancelOut(BaseReceiptOutCancelEditReqVO reqVO) throws Exception;
+    String cancelOut(BaseReceiptOutCancelEditReqVO reqVO);
 
 }
diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/IReceiptOutService.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/IReceiptOutService.java
index ae08af61..7418da4e 100644
--- a/dxhy-erp/src/main/java/com/dxhy/erp/service/IReceiptOutService.java
+++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/IReceiptOutService.java
@@ -16,7 +16,7 @@ import java.util.concurrent.ExecutionException;
  */
 public interface IReceiptOutService {
 
-    String transfer(BaseInvoiceEditVO baseInvoiceEditVO, UserInfo userInfo) throws Exception;
+    String transfer(BaseInvoiceEditVO baseInvoiceEditVO, UserInfo userInfo);
 
-    String transferOrcancelOut(List<ZDATAN> zdatans,UserInfo userInfo) throws Exception;
+    String transferOrcancelOut(List<ZDATAN> zdatans,UserInfo userInfo);
 }
diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/BaseIReceiptInvoiceServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/BaseIReceiptInvoiceServiceImpl.java
index b36e1e16..d93f72c7 100644
--- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/BaseIReceiptInvoiceServiceImpl.java
+++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/BaseIReceiptInvoiceServiceImpl.java
@@ -63,7 +63,7 @@ public class BaseIReceiptInvoiceServiceImpl extends MpBaseServiceImpl<BaseTDxRec
      * @return 返回结果
      */
     @Override
-    public String cancelOut(BaseReceiptOutCancelEditReqVO reqVO) throws Exception{
+    public String cancelOut(BaseReceiptOutCancelEditReqVO reqVO){
         DynamicContextHolder.push("business"+ DbConstant.BUSINESS_WRITE);
 
         String[] uuids = reqVO.getPrimaryKey().split(",");
@@ -123,6 +123,8 @@ public class BaseIReceiptInvoiceServiceImpl extends MpBaseServiceImpl<BaseTDxRec
             condRecord.setOutInvoiceAmout(null);
             // 转出税额
             condRecord.setOutTaxAmount(null);
+            //转出所属期
+            condRecord.setOutBelongDate(null);
             UpdateWrapper<BaseTDxRecordInvoice> updateWrapper = new UpdateWrapper<>();
             updateWrapper.set("out_status",condRecord.getOutStatus());
             updateWrapper.set("out_reason",condRecord.getOutReason());
@@ -130,6 +132,7 @@ public class BaseIReceiptInvoiceServiceImpl extends MpBaseServiceImpl<BaseTDxRec
             updateWrapper.set("out_by",condRecord.getOutBy());
             updateWrapper.set("out_invoice_amout",condRecord.getOutInvoiceAmout());
             updateWrapper.set("out_tax_amount",condRecord.getOutTaxAmount());
+            updateWrapper.set("out_belong_date",condRecord.getOutTaxAmount());
             updateWrapper.eq("uuid",condRecord.getUuid());
             super.baseMapper.update(null,updateWrapper);
 
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 86ab510b..685657cc 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
@@ -41,7 +41,7 @@ public class ReceiptOutServiceImpl extends MpBaseServiceImpl<BaseReceiptOutDao,
     @Resource
     BaseIReceiptInvoiceService baseIReceiptInvoiceService;
     @Override
-    public String transfer( BaseInvoiceEditVO condVO, UserInfo userInfo) throws Exception{
+    public String transfer( BaseInvoiceEditVO condVO, UserInfo userInfo){
         DynamicContextHolder.push("business"+DbConstant.BUSINESS_READ);
 
         String idStr = condVO.getPrimaryKey();
@@ -79,7 +79,7 @@ public class ReceiptOutServiceImpl extends MpBaseServiceImpl<BaseReceiptOutDao,
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public String transferOrcancelOut(List<ZDATAN> zdatans,UserInfo userInfo) throws Exception{
+    public String transferOrcancelOut(List<ZDATAN> zdatans,UserInfo userInfo){
         String result = "";
         for (ZDATAN zdata : zdatans) {
             //转出税额大于1则是转出