Browse Source

调机过程中人数、生产过程中人数允许接收小数类型的值

master
han\hanst 5 months ago
parent
commit
5f83b55730
  1. 4
      src/main/java/com/spring/modules/part/entity/APIEntity/RoutingIfsItem.java
  2. 4
      src/main/java/com/spring/modules/part/entity/RoutingAllFieldEntity.java
  3. 4
      src/main/java/com/spring/modules/part/entity/RoutingComponentEntity.java
  4. 4
      src/main/java/com/spring/modules/part/service/impl/PartInformationServiceImpl.java
  5. 4
      src/main/java/com/spring/modules/part/service/impl/RoutingManagementServiceImpl.java
  6. 4
      src/main/java/com/spring/modules/quotation/entity/QuoteRoutingDetail.java

4
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();

4
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;
/**
* 外协时的采购料号
**/

4
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;
/**
* 外协时的采购料号
**/

4
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());

4
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());

4
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;
/**
* 外协时的采购料号

Loading…
Cancel
Save