From cfc7feaaaec9ca71f07759c0a8f41145d69060d2 Mon Sep 17 00:00:00 2001
From: maolei <maolei01@yonyou.com>
Date: Fri, 13 Jun 2025 09:42:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=94=9F=E4=BA=A7=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95:=20=E4=BC=98=E5=8C=96=E7=94=9F=E4=BA=A7=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E5=88=B6=E4=BB=A4=E5=8F=B7=E5=90=8C=E6=AD=A5=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 使用 Objects.equals 优化字符串比较- 增加对 cprojectid 的处理，优先使用项目编号作为制令号
- 通过 transferCodeByPk 方法获取项目编号对应的编码
---
 .../pmo/pac0002/bp/rule/AfterApproveRuleSyncMes.java | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 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 a22d28a..84aa02e 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
@@ -8,6 +8,7 @@ import nc.bs.framework.common.NCLocator;
 import nc.bs.logging.Log;
 import nc.impl.pubapp.pattern.rule.IRule;
 import nc.jdbc.framework.processor.ColumnProcessor;
+import nc.vo.bc.pmpub.project.ProjectHeadVO;
 import nc.vo.bd.bom.bom0202.entity.BomVO;
 import nc.vo.bd.material.MaterialVO;
 import nc.vo.bd.material.MaterialVersionVO;
@@ -28,6 +29,7 @@ import java.math.RoundingMode;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * ����������������������MES
@@ -72,7 +74,7 @@ public class AfterApproveRuleSyncMes implements IRule<PMOAggVO> {
                 for (PMOItemVO item : bodys) {
                     obmlog.debug("�������������� " + item.getVrowno());
                     obmlog.debug(item);
-                    if (!item.getVsrctype().equals("55A2")) {
+                    if (!Objects.equals(item.getVsrctype(),"55A2")) {
                         syncOrderItemToMes(head, item);
                     }else {
                         obmlog.warn("�������� " + head.getVbillcode() + " �� " + item.getVrowno() + " ����ͬ��:���dz�Ʒ");
@@ -268,8 +270,12 @@ public class AfterApproveRuleSyncMes implements IRule<PMOAggVO> {
             throw new BusinessException("�������� " + vbillcode + " �� : MESϵͳҪ��" + itemRow + " ������Ϣ����Ϊ�ա�");
         }
 
-        // productNum String ����� vsalebillcode
-        data.put("productNum", item.getVsalebillcode());
+        // productNum String ����� vsalebillcode 2025��6��13������&����:�����������������ȡ��ϸ�е�cprojectid�ı���
+
+        if(!StringUtils.isEmpty(item.getCprojectid())){
+            data.put("productNum", transferCodeByPk(ProjectHeadVO.getDefaultTableName(),  ProjectHeadVO.PROJECT_CODE, ProjectHeadVO.PK_PROJECT, item.getCprojectid()));
+        }
+
         // saleOrderNo String ���۶����� vsalebillcode
         data.put("saleOrderNo", item.getVsalebillcode());