From fb986f0a2950272cb0d7abd8461b8b94b28f9c47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com>
Date: Fri, 15 Sep 2023 14:43:14 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../erp/controller/InterfaceController.java   | 13 ++++++++++++-
 .../service/impl/ReceiptOutServiceImpl.java   | 19 +++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)

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 064eeb3d..7b2ccb4f 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
@@ -1464,7 +1464,18 @@ public class InterfaceController extends AbstractController {
             es.setZMESSAGE("操作成功");
             log.info("进项税转出成功");
             return JsonUtils.getInstance().toJsonString(es);
-        }catch (Exception e){
+        }catch(RuntimeException e){
+            e.printStackTrace();
+            log.error("error", e.getMessage());
+            OutPut outPut = new OutPut();
+            EsOutPutResp es = new EsOutPutResp();
+            es.setBSKEY(erpInvoiceData.getIS_INPUT().getBSKEY());
+            es.setSAPKEY(erpInvoiceData.getIS_INPUT().getSAPKEY());
+            es.setZTYPE("E");
+            es.setZMESSAGE(e.getMessage());
+            outPut.setES_OUTPUT(es);
+            return JsonUtils.getInstance().toJsonString(outPut);
+        } catch (Exception e){
             e.printStackTrace();
             log.error("error", e.getMessage());
             OutPut outPut = new OutPut();
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 685657cc..1552fcd1 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
@@ -19,6 +19,7 @@ import com.dxhy.erp.service.BaseIReceiptInvoiceService;
 import com.dxhy.erp.service.IReceiptOutService;
 import com.dxhy.erp.utils.JsonUtils;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
@@ -152,10 +153,19 @@ public class ReceiptOutServiceImpl extends MpBaseServiceImpl<BaseReceiptOutDao,
             }
             /*全部转出 */
             if (JxszcZtEnum.QBZC.getZcztDm().equals(condVO.getOutStatus())) {
+                if (record.getOutTaxAmount() != null && record.getOutTaxAmount().compareTo(BigDecimal.ZERO)>0){
+                    throw new RuntimeException("累计转出税额不能大于发票税额");
+                }
                 // 转出金额
                 condRecord.setOutInvoiceAmout(record.getInvoiceAmount());
                 // 转出税额
                 condRecord.setOutTaxAmount(record.getDkTaxAmount());
+                if (condRecord.getOutTaxAmount() == null){
+                    condRecord.setOutTaxAmount(new BigDecimal(condVO.getOutTax()));
+                }
+                if (condRecord.getOutTaxAmount().compareTo(record.getTaxAmount()) > 0){
+                    throw new RuntimeException("转出税额不能大于发票税额");
+                }
             }
             /*部分转出 */
             if (JxszcZtEnum.BFZC.getZcztDm().equals(condVO.getOutStatus())) {
@@ -221,10 +231,19 @@ public class ReceiptOutServiceImpl extends MpBaseServiceImpl<BaseReceiptOutDao,
 
         /* 全部转出 */
         if (JxszcZtEnum.QBZC.getZcztDm().equals(condVO.getOutStatus())) {
+            if (invoice.getOutTaxAmount() != null && invoice.getOutTaxAmount().compareTo(BigDecimal.ZERO)>0){
+                throw new RuntimeException("累计转出税额不能大于发票税额");
+            }
             // 转出金额
             record.setOutInvoiceAmout(invoice.getInvoiceAmount());
             // 转出税额
             record.setOutTaxAmount(invoice.getDkTaxAmount());
+            if (record.getOutTaxAmount() == null){
+                record.setOutTaxAmount(new BigDecimal(condVO.getOutTax()));
+            }
+            if (record.getOutTaxAmount().compareTo(invoice.getTaxAmount()) > 0){
+                throw new RuntimeException("转出税额不能大于发票税额");
+            }
         }
         /* 部分转出 */
         if (JxszcZtEnum.BFZC.getZcztDm().equals(condVO.getOutStatus())) {