From 9b39e571508fff8f09d6ea2f3e514817fa2446b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E6=AD=A3=40=E7=94=A8=E5=8F=8B?=
 <sdlizheng@yonyou.com>
Date: Fri, 11 Apr 2025 11:08:31 +0800
Subject: [PATCH] =?UTF-8?q?uapbd=5Fbom=E6=96=B0=E5=A2=9E=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E5=8D=95=E6=8D=AE=E7=8A=B6=E6=80=81=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E8=87=AA=E5=8A=A8=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/mmbd/bom/APIBomBusinessServiceImpl.java   | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/uapbd/src/private/nccloud/api/impl/mmbd/bom/APIBomBusinessServiceImpl.java b/uapbd/src/private/nccloud/api/impl/mmbd/bom/APIBomBusinessServiceImpl.java
index 68c727b..116da95 100644
--- a/uapbd/src/private/nccloud/api/impl/mmbd/bom/APIBomBusinessServiceImpl.java
+++ b/uapbd/src/private/nccloud/api/impl/mmbd/bom/APIBomBusinessServiceImpl.java
@@ -113,13 +113,17 @@ public class APIBomBusinessServiceImpl implements IAPIBomBusinessService {
 			List<AggBomVO> commitAggvoList=new ArrayList<>();
 			List<AggBomVO> addAggvoList=new ArrayList<>();
 			for (AggBomVO agg : aggVOs) {
+				Object fBillStatusFlag =  agg.getParent().getAttributeValue("fbillstatus");
+				if(fBillStatusFlag==null||"-1".equals(fBillStatusFlag.toString())){
+					addAggvoList.add(agg);
+				}else if("1".equals(fBillStatusFlag.toString())){
+					commitAggvoList.add(agg);
+				}
 				// zhangxinah 对物料主键进行翻译
 				dealWithMaterial(agg);
 				dataSupplement(agg);
 
 				UFBoolean flag = (UFBoolean) agg.getParent().getAttributeValue("hbdefault");
-				Object fBillStatusFlag =  agg.getParent().getAttributeValue("fbillstatus");
-
 				if (UFBoolean.TRUE.equals(flag)) {
 					UFBoolean bHasOtherDefaultVersion = getIsExistDefaultVersion(agg);
 					if (bHasOtherDefaultVersion.equals(UFBoolean.TRUE)) {
@@ -127,12 +131,6 @@ public class APIBomBusinessServiceImpl implements IAPIBomBusinessService {
 					}
 				}
 				(new BomSavingValidation()).validate(agg);
-				if(fBillStatusFlag==null||"-1".equals(fBillStatusFlag.toString())){
-					addAggvoList.add(agg);
-				}
-				if(fBillStatusFlag !=null && "1".equals(fBillStatusFlag.toString())){
-					commitAggvoList.add(agg);
-				}
 			}
 
 			mapClear();