From 12ff9ca7cbfaab09415c3ae064639d37df0b998f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=98=8E?=
 <125556714+Topfunplus@users.noreply.github.com>
Date: Sat, 14 Jun 2025 13:22:17 +0800
Subject: [PATCH] =?UTF-8?q?refactor(taikai2312):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=B9=B6=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 AfterApprovingSynchronizeRuleMES 中添加 DefdocVO 导入，用于产品编号转换
- 在 BatchTransferToPurchaseOrder 中：
  - 优化变量命名，提高代码可读性
  - 添加日志记录功能，记录请购单和采购订单信息
  - 修复 SQL 日志输出，提高调试效率
---
 .../plugin/BatchTransferToPurchaseOrder.java  | 22 ++++++++++++++++---
 .../AfterApprovingSynchronizeRuleMES.java     |  3 ++-
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/pu/src/private/nc/bs/pu/m21/plugin/BatchTransferToPurchaseOrder.java b/pu/src/private/nc/bs/pu/m21/plugin/BatchTransferToPurchaseOrder.java
index c36d6b4..06f0761 100644
--- a/pu/src/private/nc/bs/pu/m21/plugin/BatchTransferToPurchaseOrder.java
+++ b/pu/src/private/nc/bs/pu/m21/plugin/BatchTransferToPurchaseOrder.java
@@ -2,6 +2,8 @@ package nc.bs.pu.m21.plugin;
 
 import java.util.*;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import nc.bs.framework.common.NCLocator;
 import nc.bs.logging.Log;
 import nc.bs.pub.common.PfServiceScmUtil;
@@ -41,7 +43,8 @@ public class BatchTransferToPurchaseOrder implements IBackgroundWorkPlugin {
         // �������� ÿ�β�ѯ������
         String limitNum = (String) bgWorkingContext.getKeyMap().get("limitNum");
         // �Ƿ����ʧ�� ����true��ʱ�� ���� ��������Ϊ vdef31 != N ���� falseʱ ������ ��ѯȫ������
-        String filterFailed = (String) bgWorkingContext.getKeyMap().get("filterFail6ed");
+        String filterFailed = (String) bgWorkingContext.getKeyMap().get("filterFailed");
+        // ������õ��ǹ��� ��ô����Y ���� ��������Ϊ vdef31 != N
         String failed = filterFailed.equals("Y") ? "N" : "";
         PreAlertObject retObj = new PreAlertObject();
         retObj.setReturnType(PreAlertReturnType.RETURNNOTHING);
@@ -53,6 +56,11 @@ public class BatchTransferToPurchaseOrder implements IBackgroundWorkPlugin {
                 logger.info("δ�ҵ������������빺�����������", this.getClass(), "executeTask");
                 return null;
             }
+            // ѭ����ӡ�빺��VO����Ϣ
+            for (PraybillVO vo : purchaseRequestVOs) {
+                logger.info("�빺����Ϣ:\n");
+                logger.info("���ݺ�:" + vo.getHVO().getVbillcode(), this.getClass(), "executeTask");
+            }
             // 2. ����ת������
             processBatchTransfer(purchaseRequestVOs);
             logger.info("����ת���빺�����ɹ��������", this.getClass(), "executeTask");
@@ -110,7 +118,7 @@ public class BatchTransferToPurchaseOrder implements IBackgroundWorkPlugin {
             sb.append(" AND ROWNUM ", "<", limitNum);
         }
         String finalSql = sb.toString();
-        logger.debug("SQL�������", this.getClass(), "getSql");
+        logger.debug("SQL�������->" + finalSql, this.getClass(), "getSql");
         return finalSql;
     }
 
@@ -219,6 +227,14 @@ public class BatchTransferToPurchaseOrder implements IBackgroundWorkPlugin {
         }
         SCMScriptResultDTO scriptResult = ((IBatchRunScriptService) NCLocator.getInstance().lookup(IBatchRunScriptService.class)).runBacth(cloudContext, OrderVO.class);
         AbstractBill[] sucessVOs = scriptResult.getSucessVOs();
+        // �����ɵIJɹ�����������־��Ϣ��¼
+        sucessVOs = scriptResult.getSucessVOs();
+        logger.info("���������ɹ�,�ɹ�������Ϣ����:\n");
+        for (AbstractBill sucessVO : sucessVOs) {
+            OrderVO orderVO = (OrderVO) sucessVO;
+            logger.info("�ɹ���������" + orderVO.getHVO().getPk_order(), this.getClass(), "processBatch");
+            logger.info("�ɹ�������Ϣ:" + JSONObject.toJSONString(orderVO.getHVO()), this.getClass(), "processBatch");
+        }
         // Ҫ�����������µ�����
         List<PraybillVO> failedHVOList = new ArrayList<>(vos.length - sucessVOs.length);
         Map<Integer, String> errorMessageMap = scriptResult.getErrorMessageMap();
@@ -246,7 +262,7 @@ public class BatchTransferToPurchaseOrder implements IBackgroundWorkPlugin {
         }
         for (PraybillVO hvo : hvoList) {
             hvoBatchUpdatedList = ArrayUtils.add(hvoBatchUpdatedList, hvo.getHVO());
-            logger.info("ѭ�������빺����ͷ: " + hvo.getHVO().getPk_praybill(), this.getClass(), "processBatchTransfer");
+            logger.info("�����빺����ͷ: " + hvo.getHVO().getPk_praybill(), this.getClass(), "processBatchTransfer");
         }
         if (hvoBatchUpdatedList.length == 0) {
             logger.warn("���������빺����ͷʧ��,��Ҫ���µ�����Ϊ0", this.getClass(), "processBatchTransfer");
diff --git a/so/src/private/nc/bs/so/m30/rule/approve/AfterApprovingSynchronizeRuleMES.java b/so/src/private/nc/bs/so/m30/rule/approve/AfterApprovingSynchronizeRuleMES.java
index d2dd0b4..a025b26 100644
--- a/so/src/private/nc/bs/so/m30/rule/approve/AfterApprovingSynchronizeRuleMES.java
+++ b/so/src/private/nc/bs/so/m30/rule/approve/AfterApprovingSynchronizeRuleMES.java
@@ -10,6 +10,7 @@ import nc.jdbc.framework.processor.ColumnProcessor;
 import nc.vo.bd.balatype.BalaTypeVO;
 import nc.vo.bd.currtype.CurrtypeVO;
 import nc.vo.bd.cust.CustomerVO;
+import nc.vo.bd.defdoc.DefdocVO;
 import nc.vo.bd.material.MaterialVO;
 import nc.vo.bd.material.measdoc.MeasdocVO;
 import nc.vo.bd.psn.PsndocVO;
@@ -139,7 +140,7 @@ public class AfterApprovingSynchronizeRuleMES implements IRule<SaleOrderVO> {
         if (bodys != null) {
             for (SaleOrderBVO body : bodys) {
                 JSONObject detailItem = new JSONObject();
-                detailItem.put("productNum", body.getVbdef1());
+                detailItem.put("productNum", transferCodeByPk("bd_defdoc", DefdocVO.CODE, DefdocVO.PK_DEFDOC, body.getVbdef1()));
                 // �����ֶ���Ҫ������ֶ�
                 // �������� ����dreceivedate
                 UFDate dreceivedate = body.getDreceivedate();