From 137c78408ac2f5f97e5c5ec40be3fab49c6d6e99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=98=8E?= <ming10655@gmail.com>
Date: Thu, 15 May 2025 18:19:53 +0800
Subject: [PATCH] =?UTF-8?q?feat(ic):=20=E4=BB=85=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E7=94=B5=E7=BC=86=E7=B1=BB=E9=94=80=E5=94=AE=E5=87=BA=E5=BA=93?=
 =?UTF-8?q?=E5=8D=95=E5=92=8C=E7=9B=98=E7=82=B9=E5=8D=95=E8=87=B3=E9=87=91?=
 =?UTF-8?q?=E6=80=9D=E7=BB=B4=E7=B3=BB=E7=BB=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 AfterApprovingSynchronizeRule 和 AfterSigningSynchronizeRule 中添加组织代码判断逻辑
- 仅当组织代码为 "0001A1100000000026O5" 或 "1001A11000000KFE18FO" 时才执行同步操作
- 优化了同步流程，减少了不必要的网络请求
---
 .../sign/rule/AfterSigningSynchronizeRule.java  | 17 ++++++++++++-----
 .../rule/AfterApprovingSynchronizeRule.java     | 17 ++++++++++++-----
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/ic/src/private/nc/bs/ic/m4c/sign/rule/AfterSigningSynchronizeRule.java b/ic/src/private/nc/bs/ic/m4c/sign/rule/AfterSigningSynchronizeRule.java
index bdfd9ba..9909ce7 100644
--- a/ic/src/private/nc/bs/ic/m4c/sign/rule/AfterSigningSynchronizeRule.java
+++ b/ic/src/private/nc/bs/ic/m4c/sign/rule/AfterSigningSynchronizeRule.java
@@ -40,11 +40,13 @@ public class AfterSigningSynchronizeRule implements IRule<SaleOutVO> {
                 SaleOutBodyVO[] bvos = (SaleOutBodyVO[]) saleOutVO.getChildrenVO();
                 // ����Ҫ���͵�����
                 JSONObject syncData = buildSyncData(hvo, bvos);
-                // �������ݵ���˼άϵͳ��ʹ��HttpPostOtherSysImpl������������
-                String mesResponse = httpPostOtherSys.callMes(SALE_OUT_URL, syncData);
-                obmlog.debug("AfterSigningSynchronizeRule-��˼άϵͳ��Ӧ: " + mesResponse);
-                // ������Ӧ���������
-                processResponse(hvo.getVbillcode(), mesResponse);
+                if (syncData != null) {
+                    // �������ݵ���˼άϵͳ��ʹ��HttpPostOtherSysImpl������������
+                    String mesResponse = httpPostOtherSys.callMes(SALE_OUT_URL, syncData);
+                    obmlog.debug("AfterSigningSynchronizeRule-��˼άϵͳ��Ӧ: " + mesResponse);
+                    // ������Ӧ���������
+                    processResponse(hvo.getVbillcode(), mesResponse);
+                }
             }
         } catch (Exception e) {
             obmlog.error("AfterSigningSynchronizeRule-�����쳣:" + e.getMessage(), e);
@@ -56,6 +58,11 @@ public class AfterSigningSynchronizeRule implements IRule<SaleOutVO> {
      * ����NCC/YonBIP�ֶ�ӳ�䵽��˼άϵͳ�ֶ�
      */
     private JSONObject buildSyncData(SaleOutHeadVO hvo, SaleOutBodyVO[] bvos) {
+        obmlog.debug("AfterSigningSynchronizeRule-��ʼ�������۳��ⵥ: " + hvo.getVbillcode());
+        if (!hvo.getPk_org().equals("0001A1100000000026O5") || !hvo.getPk_org().equals("1001A11000000KFE18FO")) {
+            obmlog.debug("AfterSigningSynchronizeRule-�����������۳��ⵥ,��Ϊ�˵�����֯�ǵ���: " + hvo.getVbillcode());
+            return null;
+        }
         JSONObject requestData = new JSONObject();
         requestData.put("operation_type", "I");
 
diff --git a/ic/src/private/nc/bs/ic/m4r/approve/rule/AfterApprovingSynchronizeRule.java b/ic/src/private/nc/bs/ic/m4r/approve/rule/AfterApprovingSynchronizeRule.java
index 44a1525..e4f7a5e 100644
--- a/ic/src/private/nc/bs/ic/m4r/approve/rule/AfterApprovingSynchronizeRule.java
+++ b/ic/src/private/nc/bs/ic/m4r/approve/rule/AfterApprovingSynchronizeRule.java
@@ -45,12 +45,14 @@ public class AfterApprovingSynchronizeRule implements IRule<InvCountBillVO> {
                 // ����Ҫ���͵�����
                 JSONObject syncData = buildSyncData(hvo, bvos);
 
-                // �������ݵ���˼άϵͳ��ʹ��HttpPostOtherSysImpl������������
-                String mesResponse = httpPostOtherSys.callMes(INV_COUNT_URL, syncData);
-                obmlog.debug("AfterApprovingSynchronizeRule-��˼άϵͳ��Ӧ: " + mesResponse);
+                if (syncData != null) {
+                    // �������ݵ���˼άϵͳ��ʹ��HttpPostOtherSysImpl������������
+                    String mesResponse = httpPostOtherSys.callMes(INV_COUNT_URL, syncData);
+                    obmlog.debug("AfterApprovingSynchronizeRule-��˼άϵͳ��Ӧ: " + mesResponse);
 
-                // ������Ӧ���������
-                processResponse(hvo.getVbillcode(), mesResponse);
+                    // ������Ӧ���������
+                    processResponse(hvo.getVbillcode(), mesResponse);
+                }
             }
         } catch (Exception e) {
             obmlog.error("AfterApprovingSynchronizeRule-�����쳣:" + e.getMessage(), e);
@@ -62,6 +64,11 @@ public class AfterApprovingSynchronizeRule implements IRule<InvCountBillVO> {
      * ���սӿ��ĵ�Ҫ�󹹽�JSON�ṹ
      */
     private JSONObject buildSyncData(InvCountHeaderVO hvo, InvCountBodyVO[] bvos) throws BusinessException {
+        obmlog.debug("AfterApprovingSynchronizeRule-��ʼ�����̵㵥: " + hvo.getVbillcode());
+        if (!hvo.getPk_org().equals("0001A1100000000026O5") || !hvo.getPk_org().equals("1001A11000000KFE18FO")) {
+            obmlog.debug("AfterApprovingSynchronizeRule-�����������۳��ⵥ,��Ϊ�˵�����֯�ǵ���: " + hvo.getVbillcode());
+            return null;
+        }
         JSONObject requestData = new JSONObject();
         // ������������
         requestData.put("operation_type", "I");