From c9b2e06c5b648c85eff8d3d210c245151f5b25bc Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Mon, 7 Jul 2025 11:27:24 +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

---
 .../impl/BomManagementServiceImpl.java        | 14 ++++++------
 .../impl/RoutingManagementServiceImpl.java    | 22 +++++++++----------
 2 files changed, 18 insertions(+), 18 deletions(-)

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 db41611a..5f204b6d 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
@@ -1379,14 +1379,14 @@ public class BomManagementServiceImpl extends ServiceImpl<BomManagementMapper, B
             plmItem.setComponentPart(ifsItem.getComponentPart());
             plmItem.setLineItemNo(Integer.valueOf(ifsItem.getLineItemNo()));
             plmItem.setPrintUnit(ifsItem.getPrintUnit());
-            plmItem.setQtyPerAssembly(UtilsClass.stringToBigDecimal(ifsItem.getQtyPerAssembly()));
-            plmItem.setComponentScrap(UtilsClass.stringToBigDecimal(ifsItem.getComponentScrap()));
-            plmItem.setShrinkageFactor(UtilsClass.stringToBigDecimal(ifsItem.getShrinkageFactor()));
+            plmItem.setQtyPerAssembly(ifsItem.getQtyPerAssembly().isEmpty() ? null : UtilsClass.stringToBigDecimal(ifsItem.getQtyPerAssembly()));
+            plmItem.setComponentScrap(ifsItem.getComponentScrap().isEmpty() ? null : UtilsClass.stringToBigDecimal(ifsItem.getComponentScrap()));
+            plmItem.setShrinkageFactor(ifsItem.getShrinkageFactor().isEmpty() ? null : UtilsClass.stringToBigDecimal(ifsItem.getShrinkageFactor()));
             plmItem.setIssueType(ifsItem.getIssueType());
             plmItem.setIssueToLoc("");
             plmItem.setOperationNo(ifsItem.getOperationNo().isEmpty() ? null : Integer.valueOf(ifsItem.getOperationNo()));
             plmItem.setNoteText(ifsItem.getNoteText());
-            plmItem.setLineSequence(Integer.valueOf(ifsItem.getLineSequence()));
+            plmItem.setLineSequence(ifsItem.getLineSequence().isEmpty() ? null : Integer.valueOf(ifsItem.getLineSequence()));
             plmItem.setConsumptionItem(ifsItem.getConsumptionItem());
             plmItem.setCreateBy(data.getUpdateBy());
             plmItems.add(plmItem);
@@ -1402,9 +1402,9 @@ public class BomManagementServiceImpl extends ServiceImpl<BomManagementMapper, B
             plmDistribution.setEngChgLevel(Integer.valueOf(ifsDistribution.getEngChgLevel()));
             plmDistribution.setBomType(ifsDistribution.getBomType());
             plmDistribution.setAlternativeNo(ifsDistribution.getAlternativeNo());
-            plmDistribution.setByProdLineItemNo(Integer.valueOf(ifsDistribution.getByProdLineItemNo()));
-            plmDistribution.setComponentLineItemNo(Integer.valueOf(ifsDistribution.getComponentLineItemNo()));
-            plmDistribution.setItemCostDistribution(Double.valueOf(ifsDistribution.getItemCostDistribution()));
+            plmDistribution.setByProdLineItemNo(ifsDistribution.getByProdLineItemNo().isEmpty() ? null : Integer.valueOf(ifsDistribution.getByProdLineItemNo()));
+            plmDistribution.setComponentLineItemNo(ifsDistribution.getComponentLineItemNo().isEmpty() ? null : Integer.valueOf(ifsDistribution.getComponentLineItemNo()));
+            plmDistribution.setItemCostDistribution(ifsDistribution.getItemCostDistribution().isEmpty() ? null : Double.valueOf(ifsDistribution.getItemCostDistribution()));
             plmDistribution.setComponentPartNo(ifsDistribution.getComponentPartNo());
             plmDistribution.setByProdPartNo(ifsDistribution.getByProductPartNo());
             plmDistribution.setCreateBy(data.getUpdateBy());
diff --git a/src/main/java/com/spring/modules/part/service/impl/RoutingManagementServiceImpl.java b/src/main/java/com/spring/modules/part/service/impl/RoutingManagementServiceImpl.java
index 925491f5..1d26a818 100644
--- a/src/main/java/com/spring/modules/part/service/impl/RoutingManagementServiceImpl.java
+++ b/src/main/java/com/spring/modules/part/service/impl/RoutingManagementServiceImpl.java
@@ -1766,22 +1766,22 @@ public class RoutingManagementServiceImpl extends ServiceImpl<RoutingManagementM
             plmItem.setRoutingRevision(Integer.valueOf(ifsItem.getRoutingRevision()));
             plmItem.setRoutingType(ifsItem.getRoutingType());
             plmItem.setAlternativeNo(ifsItem.getAlternativeNo());
-            plmItem.setOperationNo(Integer.valueOf(ifsItem.getOperationNo()));
+            plmItem.setOperationNo(ifsItem.getOperationNo().isEmpty() ? null : Integer.valueOf(ifsItem.getOperationNo()));
             plmItem.setOperationName(ifsItem.getOperationDesc());
-            plmItem.setEfficiencyFactor(UtilsClass.stringToBigDecimal(ifsItem.getEfficiencyFactor()));
-            plmItem.setMachRunFactor(UtilsClass.stringToBigDecimal(ifsItem.getMachRunFactor()));
-            plmItem.setMachSetupTime(UtilsClass.stringToBigDecimal(ifsItem.getMachSetupTime()));
+            plmItem.setEfficiencyFactor(ifsItem.getEfficiencyFactor().isEmpty() ? null : UtilsClass.stringToBigDecimal(ifsItem.getEfficiencyFactor()));
+            plmItem.setMachRunFactor(ifsItem.getMachRunFactor().isEmpty() ? null : UtilsClass.stringToBigDecimal(ifsItem.getMachRunFactor()));
+            plmItem.setMachSetupTime(ifsItem.getMachSetupTime().isEmpty() ? null : UtilsClass.stringToBigDecimal(ifsItem.getMachSetupTime()));
             plmItem.setRunTimeCode(ifsItem.getRunTimeCode());
-            plmItem.setLaborRunFactor(UtilsClass.stringToBigDecimal(ifsItem.getLaborRunFactor()));
-            plmItem.setLaborSetupTime(UtilsClass.stringToBigDecimal(ifsItem.getLaborSetupTime()));
-            plmItem.setCrewSize(Integer.valueOf(ifsItem.getCrewSize()));
-            plmItem.setSetupCrewSize(Integer.valueOf(ifsItem.getSetupCrewSize()));
+            plmItem.setLaborRunFactor(ifsItem.getLaborRunFactor().isEmpty() ? null : UtilsClass.stringToBigDecimal(ifsItem.getLaborRunFactor()));
+            plmItem.setLaborSetupTime(ifsItem.getLaborSetupTime().isEmpty() ? null : UtilsClass.stringToBigDecimal(ifsItem.getLaborSetupTime()));
+            plmItem.setCrewSize(ifsItem.getCrewSize().isEmpty() ? null : Integer.valueOf(ifsItem.getCrewSize()));
+            plmItem.setSetupCrewSize(ifsItem.getSetupCrewSize().isEmpty() ? null : Integer.valueOf(ifsItem.getSetupCrewSize()));
             plmItem.setOutsideOpItem(ifsItem.getOutsideOpItem());
             plmItem.setMachineNo(ifsItem.getMachineNo());
             plmItem.setWorkCenterNo(ifsItem.getWorkCenterNo());
             plmItem.setLaborClassNo(ifsItem.getLaborClassNo());
             plmItem.setSetupLaborClassNo(ifsItem.getSetupLaborClassNo());
-            plmItem.setOverlap(Integer.valueOf(ifsItem.getOverlap()));
+            plmItem.setOverlap(ifsItem.getOverlap().isEmpty() ? null : Integer.valueOf(ifsItem.getOverlap()));
             plmItem.setNoteText(ifsItem.getNoteText());
             plmItem.setCreateBy(data.getUpdateBy());
             plmItem.setIfsRowId(ifsItem.getIfsRowId());
@@ -1806,7 +1806,7 @@ public class RoutingManagementServiceImpl extends ServiceImpl<RoutingManagementM
                     plmTool.setAlternativeNo(ifsTool.getAlternativeNo());
                     plmTool.setOperationId(plmItem.getOperationId());
                     plmTool.setToolId(ifsTool.getToolId());
-                    plmTool.setToolQty(Integer.valueOf(ifsTool.getToolQuantity()));
+                    plmTool.setToolQty(ifsTool.getToolQuantity().isEmpty() ? null : Integer.valueOf(ifsTool.getToolQuantity()));
                     plmTool.setRemark(ifsTool.getNoteText());
                     plmTool.setCreateBy(data.getUpdateBy());
                     plmTool.setIfsRowId(ifsTool.getIfsRowId());
@@ -1833,7 +1833,7 @@ public class RoutingManagementServiceImpl extends ServiceImpl<RoutingManagementM
                     plmGuideLine.setRoutingType(ifsGuideLine.getRoutingType());
                     plmGuideLine.setAlternativeNo(ifsGuideLine.getAlternativeNo());
                     plmGuideLine.setOperationId(plmItem.getOperationId());
-                    plmGuideLine.setGuidelineSeq(Integer.valueOf(ifsGuideLine.getGuidelineSeq()));
+                    plmGuideLine.setGuidelineSeq(ifsGuideLine.getGuidelineSeq().isEmpty() ? null : Integer.valueOf(ifsGuideLine.getGuidelineSeq()));
                     plmGuideLine.setGuidelineDesc(ifsGuideLine.getGuidelineDesc());
                     plmGuideLine.setGuidelineText(ifsGuideLine.getGuidelineText());
                     plmGuideLine.setGuidelineType(ifsGuideLine.getOperWorkGuideType());