From c8dfca7a0855f31fe88ed3ba3c7fc4d787e62043 Mon Sep 17 00:00:00 2001
From: mzr <mengzhaorui@qq.com>
Date: Tue, 2 Sep 2025 10:58:54 +0800
Subject: [PATCH] =?UTF-8?q?feat(bom):=20BOM=E6=8E=A8EpicMes=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=20-=20=E6=B7=BB=E5=8A=A0=E5=AF=B9=20BOM=20=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E7=9A=84=E5=88=A4=E6=96=AD=EF=BC=8C=E5=8F=AA=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=E7=94=9F=E4=BA=A7=20BOM=EF=BC=88fbomtype=20=3D=201?=
 =?UTF-8?q?=EF=BC=89=20-=20=E4=BF=AE=E6=94=B9=E7=88=B6=E9=A1=B9=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E7=BC=96=E7=A0=81=E5=92=8C=20BOM=20=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=8F=B7=E7=9A=84=E8=8E=B7=E5=8F=96=E9=80=BB=E8=BE=91=20-?=
 =?UTF-8?q?=E5=B0=86=E5=90=88=E5=90=8C=E5=8F=B7=E5=AD=97=E6=AE=B5=E4=BB=8E?=
 =?UTF-8?q?=20ERP=20=E9=A1=B9=E7=9B=AE=E6=94=B9=E4=B8=BA=20BOM=20=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bom/bom0202/rule/BomSaveAfterEpicMesRule.java  | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/uapbd/src/private/nc/bs/bd/bom/bom0202/rule/BomSaveAfterEpicMesRule.java b/uapbd/src/private/nc/bs/bd/bom/bom0202/rule/BomSaveAfterEpicMesRule.java
index 4b43379..6a17c37 100644
--- a/uapbd/src/private/nc/bs/bd/bom/bom0202/rule/BomSaveAfterEpicMesRule.java
+++ b/uapbd/src/private/nc/bs/bd/bom/bom0202/rule/BomSaveAfterEpicMesRule.java
@@ -64,25 +64,25 @@ public class BomSaveAfterEpicMesRule implements IRule<AggBomVO> {
             if (MMValueCheck.isEmpty(childrenVOs)) {
                 continue;
             }
-            String hcmaterialid = hvo.getHcmaterialid();// 物料编码
-            String hfmaterialid = hvo.getHfmaterialid();// 父项物料编码
-            String hcprojectid = hvo.getHcprojectid();// 项目
+            // 只推送生产BOM 1=生产BOM;2=包装BOM;3=配置BOM;
+            Integer fbomtype = hvo.getFbomtype();
+            if (fbomtype != 1) {
+                continue;
+            }
+            String hcmaterialid = hvo.getHcmaterialid();// 父项物料编码
             String hversion = hvo.getHversion();// BOM版本号
 
             String mitm = MyHelper.getStrValByCondition(MaterialVO.getDefaultTableName(), MaterialVO.CODE,
                     MaterialVO.PK_MATERIAL + " = '" + hcmaterialid + "'");
             for (BomItemVO childrenVO : childrenVOs) {
                 String cmaterialid = childrenVO.getCmaterialid();
-                String cprojectid = childrenVO.getCprojectid();
                 String sitm = MyHelper.getStrValByCondition(MaterialVO.getDefaultTableName(), MaterialVO.CODE,
                         MaterialVO.PK_MATERIAL + " = '" + cmaterialid + "'");
-                String projectCode = MyHelper.getStrValByCondition(ProjectHeadVO.getDefaultTableName(), ProjectHeadVO.PROJECT_CODE,
-                        ProjectHeadVO.PK_PROJECT + " = '" + cprojectid + "'");
                 // 组装数据
                 JSONObject singleObj = new JSONObject();
                 singleObj.put("mitm", mitm); // 制造物料编码(ERP父项物料编码)
                 singleObj.put("sitm", sitm); // 子物料编码
-                singleObj.put("orderNum", projectCode); // 合同号(ERP项目)
+                singleObj.put("orderNum", hversion); // 合同号(ERP中电力电子项目号=BOM版本号)
                 singleObj.put("qana", childrenVO.getNassitemnum().toString()); // 数量(ERP子项数量)
                 singleObj.put("ver", hversion); // BOM版本号
                 singleObj.put("remark", childrenVO.getVnote()); // 备注