From 5f83b55730fb64b719cb4010bc0b0a6e0756b54d Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Thu, 15 Jan 2026 10:29:47 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=9C=BA=E8=BF=87=E7=A8=8B=E4=B8=AD?=
 =?UTF-8?q?=E4=BA=BA=E6=95=B0=E3=80=81=E7=94=9F=E4=BA=A7=E8=BF=87=E7=A8=8B?=
 =?UTF-8?q?=E4=B8=AD=E4=BA=BA=E6=95=B0=E5=85=81=E8=AE=B8=E6=8E=A5=E6=94=B6?=
 =?UTF-8?q?=E5=B0=8F=E6=95=B0=E7=B1=BB=E5=9E=8B=E7=9A=84=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../spring/modules/part/entity/APIEntity/RoutingIfsItem.java  | 4 ++--
 .../com/spring/modules/part/entity/RoutingAllFieldEntity.java | 4 ++--
 .../spring/modules/part/entity/RoutingComponentEntity.java    | 4 ++--
 .../modules/part/service/impl/PartInformationServiceImpl.java | 4 ++--
 .../part/service/impl/RoutingManagementServiceImpl.java       | 4 ++--
 .../spring/modules/quotation/entity/QuoteRoutingDetail.java   | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/spring/modules/part/entity/APIEntity/RoutingIfsItem.java b/src/main/java/com/spring/modules/part/entity/APIEntity/RoutingIfsItem.java
index 06c5a900..61dab7f8 100644
--- a/src/main/java/com/spring/modules/part/entity/APIEntity/RoutingIfsItem.java
+++ b/src/main/java/com/spring/modules/part/entity/APIEntity/RoutingIfsItem.java
@@ -133,8 +133,8 @@ public class RoutingIfsItem {
         this.runTimeCode = data.getRunTimeCode();
         this.laborRunFactor = data.getLaborRunFactor().toString();
         this.laborSetupTime = data.getLaborSetupTime().toString();
-        this.crewSize = data.getCrewSize().toString();
-        this.setupCrewSize = data.getSetupCrewSize().toString();
+        this.crewSize = data.getCrewSize() != null ? data.getCrewSize().toString() : "";
+        this.setupCrewSize = data.getSetupCrewSize() != null ? data.getSetupCrewSize().toString() : "";
         this.machineNo = data.getMachineNo();
         this.noteText = data.getNoteText();
         this.outsideOpItem = data.getOutsideOpItem();
diff --git a/src/main/java/com/spring/modules/part/entity/RoutingAllFieldEntity.java b/src/main/java/com/spring/modules/part/entity/RoutingAllFieldEntity.java
index 14445c92..b82ddd7d 100644
--- a/src/main/java/com/spring/modules/part/entity/RoutingAllFieldEntity.java
+++ b/src/main/java/com/spring/modules/part/entity/RoutingAllFieldEntity.java
@@ -149,11 +149,11 @@ public class RoutingAllFieldEntity extends QueryPage {
     /**
      * 生产过程中人数
      **/
-    private Integer crewSize;
+    private BigDecimal crewSize;
     /**
      * 调机过程中人数
      **/
-    private Integer setupCrewSize;
+    private BigDecimal setupCrewSize;
     /**
      * 外协时的采购料号
      **/
diff --git a/src/main/java/com/spring/modules/part/entity/RoutingComponentEntity.java b/src/main/java/com/spring/modules/part/entity/RoutingComponentEntity.java
index 65ad8e59..8b421424 100644
--- a/src/main/java/com/spring/modules/part/entity/RoutingComponentEntity.java
+++ b/src/main/java/com/spring/modules/part/entity/RoutingComponentEntity.java
@@ -78,11 +78,11 @@ public class RoutingComponentEntity extends QueryPage implements Serializable {
     /**
      * 生产过程中人数
      **/
-    private Integer crewSize;
+    private BigDecimal crewSize;
     /**
      * 调机过程中人数
      **/
-    private Integer setupCrewSize;
+    private BigDecimal setupCrewSize;
     /**
      * 外协时的采购料号
      **/
diff --git a/src/main/java/com/spring/modules/part/service/impl/PartInformationServiceImpl.java b/src/main/java/com/spring/modules/part/service/impl/PartInformationServiceImpl.java
index 3c238097..7bbd8896 100644
--- a/src/main/java/com/spring/modules/part/service/impl/PartInformationServiceImpl.java
+++ b/src/main/java/com/spring/modules/part/service/impl/PartInformationServiceImpl.java
@@ -4442,8 +4442,8 @@ public class PartInformationServiceImpl extends ServiceImpl<PartInformationMappe
             componentEntity.setRunTimeCode(component.getRunTimeCode());
             componentEntity.setLaborRunFactor(UtilsClass.stringToBigDecimal(component.getLaborRunFactor()));
             componentEntity.setLaborSetupTime(UtilsClass.stringToBigDecimal(component.getLaborSetupTime()));
-            componentEntity.setCrewSize(UtilsClass.stringToInteger(component.getCrewSize()));
-            componentEntity.setSetupCrewSize(UtilsClass.stringToInteger(component.getSetupCrewSize()));
+            componentEntity.setCrewSize(UtilsClass.stringToBigDecimal(component.getCrewSize()));
+            componentEntity.setSetupCrewSize(UtilsClass.stringToBigDecimal(component.getSetupCrewSize()));
             componentEntity.setOutsideOpItem(component.getOutsideOpItem());
             componentEntity.setMachineNo(component.getMachineNo());
             componentEntity.setWorkCenterNo(component.getWorkCenterNo());
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 a8aa91f6..fcf03f0b 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
@@ -1795,8 +1795,8 @@ public class RoutingManagementServiceImpl extends ServiceImpl<RoutingManagementM
             plmItem.setRunTimeCode(ifsItem.getRunTimeCode());
             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.setCrewSize(ifsItem.getCrewSize().isEmpty() ? null : UtilsClass.stringToBigDecimal(ifsItem.getCrewSize()));
+            plmItem.setSetupCrewSize(ifsItem.getSetupCrewSize().isEmpty() ? null : UtilsClass.stringToBigDecimal(ifsItem.getSetupCrewSize()));
             plmItem.setOutsideOpItem(ifsItem.getOutsideOpItem());
             plmItem.setMachineNo(ifsItem.getMachineNo());
             plmItem.setWorkCenterNo(ifsItem.getWorkCenterNo());
diff --git a/src/main/java/com/spring/modules/quotation/entity/QuoteRoutingDetail.java b/src/main/java/com/spring/modules/quotation/entity/QuoteRoutingDetail.java
index 99bb894a..e79e7ee6 100644
--- a/src/main/java/com/spring/modules/quotation/entity/QuoteRoutingDetail.java
+++ b/src/main/java/com/spring/modules/quotation/entity/QuoteRoutingDetail.java
@@ -83,12 +83,12 @@ public class QuoteRoutingDetail {
     /**
      * 生产过程中人数
      */
-    private Integer crewSize;
+    private BigDecimal crewSize;
 
     /**
      * 调机过程中人数
      */
-    private Integer setupCrewSize;
+    private BigDecimal setupCrewSize;
 
     /**
      * 外协时的采购料号