From 363133652497906ddf041c042fd6bd45cfe49b4c Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Mon, 7 Jul 2025 11:18:08 +0800
Subject: [PATCH] =?UTF-8?q?2025-07-07=20Bom=20Routing=20=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5-=E5=8F=8D=E5=90=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/spring/ifs/api/BomApi.java                    | 2 +-
 .../modules/part/service/impl/BomManagementServiceImpl.java     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/spring/ifs/api/BomApi.java b/src/main/java/com/spring/ifs/api/BomApi.java
index 471fd9e7..38873e42 100644
--- a/src/main/java/com/spring/ifs/api/BomApi.java
+++ b/src/main/java/com/spring/ifs/api/BomApi.java
@@ -778,7 +778,7 @@ public class BomApi {
     */
     public static List<BomIfsManufStructCostDistrib> getBomDistributionsForSync(Server srv, String contract, String partNo, String engChgLevel, String bomType, String alternativeNo) throws APException {
         StringBuilder searchSql = new StringBuilder();
-        searchSql.append("SELECT OBJID ifsRowId, OBJVERSION ifsRowVersion, CONTRACT contract, PART_NO partNo, ENG_CHG_LEVEL engChgLevel,");
+        searchSql.append("SELECT OBJID ifsRowId, OBJVERSION ifsRowVersion, CONTRACT contract, PART_NO partNo, ENG_CHG_LEVEL,");
         searchSql.append(" BOM_TYPE bomType, ALTERNATIVE_NO alternativeNo, BYPROD_LINE_ITEM_NO byProdLineItemNo,");
         searchSql.append(" IFSAPP.MANUF_STRUCTURE_API.Get_Component_Part(contract,part_no,eng_chg_level,bom_type,alternative_no,BYPROD_LINE_ITEM_NO) byProductPartNo,");
         searchSql.append(" COMPONENT_LINE_ITEM_NO componentLineItemNo,");
diff --git a/src/main/java/com/spring/modules/part/service/impl/BomManagementServiceImpl.java b/src/main/java/com/spring/modules/part/service/impl/BomManagementServiceImpl.java
index 5eb4cbbb..db41611a 100644
--- a/src/main/java/com/spring/modules/part/service/impl/BomManagementServiceImpl.java
+++ b/src/main/java/com/spring/modules/part/service/impl/BomManagementServiceImpl.java
@@ -1384,7 +1384,7 @@ public class BomManagementServiceImpl extends ServiceImpl<BomManagementMapper, B
             plmItem.setShrinkageFactor(UtilsClass.stringToBigDecimal(ifsItem.getShrinkageFactor()));
             plmItem.setIssueType(ifsItem.getIssueType());
             plmItem.setIssueToLoc("");
-            plmItem.setOperationNo(Integer.valueOf(ifsItem.getOperationNo()));
+            plmItem.setOperationNo(ifsItem.getOperationNo().isEmpty() ? null : Integer.valueOf(ifsItem.getOperationNo()));
             plmItem.setNoteText(ifsItem.getNoteText());
             plmItem.setLineSequence(Integer.valueOf(ifsItem.getLineSequence()));
             plmItem.setConsumptionItem(ifsItem.getConsumptionItem());