From 82ea1ccb9caf0e2a9c470c59877c269a396da779 Mon Sep 17 00:00:00 2001
From: lihao <Lglh@10086>
Date: Wed, 16 Apr 2025 14:59:15 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7=E4=B8=8E=E6=94=B6=E6=AC=BE=E5=8D=95=E5=AE=A2=E6=88=B7?=
 =?UTF-8?q?=E4=B8=8D=E4=B8=80=E8=87=B4=E5=8F=96=E6=B6=88=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../public/nc/bs/arap/busireg/ArapBillUpdateChecker.java    | 6 +++---
 .../arap/listener/GatheringAddAfterListenerAction.java      | 6 +++++-
 .../arap/listener/GatheringUpdateBeforeListener.java        | 6 +++++-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/arap/src/public/nc/bs/arap/busireg/ArapBillUpdateChecker.java b/arap/src/public/nc/bs/arap/busireg/ArapBillUpdateChecker.java
index 3630976..0b3139c 100644
--- a/arap/src/public/nc/bs/arap/busireg/ArapBillUpdateChecker.java
+++ b/arap/src/public/nc/bs/arap/busireg/ArapBillUpdateChecker.java
@@ -129,9 +129,9 @@ public class ArapBillUpdateChecker implements BillUpdateChecker {
                         ++m;
                         if (vo.getObjtype() == s) {
                             Object[] values = valuechangeMap.get(s3[m]);
-//                            if(vo.getMetaData().getEntityName().equals("arap.gatheritem") && vo.getSrc_billtype().equals("30") && s3[m].equals("customer")){
-//                                break;
-//                            }
+                            if(vo.getMetaData().getEntityName().equals("arap.gatheritem") && vo.getSrc_billtype().equals("30") && s3[m].equals("customer")){
+                                break;
+                            }
                             if (values != null) {
                                 Object oldvalue = values[1];
                                 if (oldvalue != null && oldvalue.toString().length() == 20) {
diff --git a/so/src/private/nc/pubimpl/so/sobalance/arap/listener/GatheringAddAfterListenerAction.java b/so/src/private/nc/pubimpl/so/sobalance/arap/listener/GatheringAddAfterListenerAction.java
index 955365b..626fbf4 100644
--- a/so/src/private/nc/pubimpl/so/sobalance/arap/listener/GatheringAddAfterListenerAction.java
+++ b/so/src/private/nc/pubimpl/so/sobalance/arap/listener/GatheringAddAfterListenerAction.java
@@ -128,11 +128,15 @@ public class GatheringAddAfterListenerAction {
 
         for(IDataFromF2ForM30 data : datas) {
             if (!ccustomerid.equals(data.getPayBillOrderCust())) {
-                throw new BusinessException(NCLangRes4VoTransl.getNCLangRes().getStrByID("4006011_0", "04006011-0193", (String)null, new String[]{head.getVbillcode()}));
+                if(!data.getFirstBillType().equals("30") ){
+                    throw new BusinessException(NCLangRes4VoTransl.getNCLangRes().getStrByID("4006011_0", "04006011-0193", (String)null, new String[]{head.getVbillcode()}));
+                }
             }
 
             if (!cinvoicecustid.equals(data.getPayBillCustomer())) {
+                if(!data.getFirstBillType().equals("30") ){
                 throw new BusinessException(NCLangRes4VoTransl.getNCLangRes().getStrByID("4006011_0", "04006011-0194", (String)null, new String[]{head.getVbillcode()}));
+                }
             }
 
             if (!corigcurrencyid.equals(data.getPayBillCurID())) {
diff --git a/so/src/private/nc/pubimpl/so/sobalance/arap/listener/GatheringUpdateBeforeListener.java b/so/src/private/nc/pubimpl/so/sobalance/arap/listener/GatheringUpdateBeforeListener.java
index ab99e67..24651b9 100644
--- a/so/src/private/nc/pubimpl/so/sobalance/arap/listener/GatheringUpdateBeforeListener.java
+++ b/so/src/private/nc/pubimpl/so/sobalance/arap/listener/GatheringUpdateBeforeListener.java
@@ -155,11 +155,15 @@ public class GatheringUpdateBeforeListener implements IBusinessListener {
 
         if (SoBalanceType.SOBALANCE_ORDERBAL.getIntValue() == fibaltype) {
             if (!ccustomerid.equals(data.getPayBillOrderCust())) {
-                throw new BusinessException(NCLangRes4VoTransl.getNCLangRes().getStrByID("4006011_0", "04006011-0193", (String)null, new String[]{(String)map.get(head.getCsobalanceid())}));
+                if(!(data.getFirstBillType().equals("30")&&head.getMetaData().getEntityName().equals("so.so_balance")) ) {
+                    throw new BusinessException(NCLangRes4VoTransl.getNCLangRes().getStrByID("4006011_0", "04006011-0193", (String) null, new String[]{(String) map.get(head.getCsobalanceid())}));
+                }
             }
 
             if (!cinvoicecustid.equals(data.getPayBillCustomer())) {
+                if(!(data.getFirstBillType().equals("30")&&head.getMetaData().getEntityName().equals("so.so_balance"))) {
                 throw new BusinessException(NCLangRes4VoTransl.getNCLangRes().getStrByID("4006011_0", "04006011-0194", (String)null, new String[]{(String)map.get(head.getCsobalanceid())}));
+                }
             }
 
             if (!corigcurrencyid.equals(data.getPayBillCurID())) {