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