From 4cac17c8bd294974eeea43cf8371c9002f6e7fc8 Mon Sep 17 00:00:00 2001
From: maolei <maolei01@yonyou.com>
Date: Thu, 29 May 2025 10:04:16 +0800
Subject: [PATCH] =?UTF-8?q?refactor(mmpac):=20=E9=87=8D=E6=9E=84=20MES=20?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=8E=A5=E5=8F=A3=E6=9E=84=E5=BB=BA=20proper?=
 =?UTF-8?q?ties=20=E6=95=B0=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 提取 buildProperties 方法，用于构建 MES 同步所需的 properties 数组
- 添加 addProperty 方法，简化单个 property 的添加过程
- 新增 SXZF22、SXZF23、SXZF24 字段的同步- 优化代码结构，提高可读性和可维护性
---
 .../bp/rule/AfterApproveRuleSyncMes.java      | 62 ++++++++++++++-----
 1 file changed, 46 insertions(+), 16 deletions(-)

diff --git a/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterApproveRuleSyncMes.java b/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterApproveRuleSyncMes.java
index d92f337..2a015f8 100644
--- a/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterApproveRuleSyncMes.java
+++ b/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterApproveRuleSyncMes.java
@@ -302,22 +302,7 @@ public class AfterApproveRuleSyncMes implements IRule<PMOAggVO> {
         }
 
         // ͨ���Զ������Դ�
-        JSONArray properties = new JSONArray();
-        JSONObject SXZF16 = new JSONObject();
-        JSONObject SXZF17 = new JSONObject();
-        JSONObject SXZF18 = new JSONObject();
-
-        SXZF16.put("propertyFiled", "SXZF16");
-        SXZF17.put("propertyFiled", "SXZF17");
-        SXZF18.put("propertyFiled", "SXZF18");
-
-        SXZF16.put("propertyValue", item.getVparentbillcode());
-        SXZF17.put("propertyValue", item.getVparentmorowno());
-        SXZF18.put("propertyValue", head.getVtrantypecode());
-
-        properties.add(SXZF16);
-        properties.add(SXZF17);
-        properties.add(SXZF18);
+        JSONArray properties = buildProperties(head, item);
 
         data.put("properties", properties);
         JSONObject requestPayload = new JSONObject();
@@ -334,6 +319,51 @@ public class AfterApproveRuleSyncMes implements IRule<PMOAggVO> {
         obmlog.info("�������� " + vbillcode + " �� " + itemRow + " �ѳɹ����͵�MESϵͳ���ض������ѱ���¼��");
     }
 
+    /**
+     * ����MESͬ�������properties����
+     * 
+     * @param head ����������ͷ
+     * @param item ����������ϸ
+     * @return JSONArray properties����
+     */
+    private JSONArray buildProperties(PMOHeadVO head, PMOItemVO item) {
+        JSONArray properties = new JSONArray();
+        
+        // SXZF16 - �ϼ�����������
+        addProperty(properties, "SXZF16", item.getVparentbillcode());
+        
+        // SXZF17 - �ϼ����������к�
+        addProperty(properties, "SXZF17", item.getVparentmorowno());
+        
+        // SXZF18 - ���������������ͱ���
+        addProperty(properties, "SXZF18", head.getVtrantypecode());
+        
+        // SXZF22 - ���������������ͱ���
+        addProperty(properties, "SXZF22", head.getVtrantypecode());
+        
+        // SXZF23 - ������������
+        addProperty(properties, "SXZF23", head.getCpmohid());
+        
+        // SXZF24 - ����������ϸ����
+        addProperty(properties, "SXZF24", item.getCmoid());
+        
+        return properties;
+    }
+    
+    /**
+     * ���ӵ���property��properties����
+     * 
+     * @param properties JSONArray����
+     * @param propertyField �����ֶ���
+     * @param propertyValue ����ֵ
+     */
+    private void addProperty(JSONArray properties, String propertyField, String propertyValue) {
+        JSONObject property = new JSONObject();
+        property.put("propertyFiled", propertyField);
+        property.put("propertyValue", propertyValue);
+        properties.add(property);
+    }
+
 
     /**
      * ����������ѯ����