diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/entity/CertificateMaintenanceEntity.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/entity/CertificateMaintenanceEntity.java similarity index 96% rename from blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/entity/CertificateMaintenanceEntity.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/entity/CertificateMaintenanceEntity.java index 0b8b4a4a..033f72f0 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/entity/CertificateMaintenanceEntity.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/entity/CertificateMaintenanceEntity.java @@ -1,4 +1,4 @@ -package org.springblade.desk.jobTransfer.pojo.entity; +package org.springblade.desk.jobtransfer.pojo.entity; import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/entity/CertificateTypeEntity.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/entity/CertificateTypeEntity.java similarity index 95% rename from blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/entity/CertificateTypeEntity.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/entity/CertificateTypeEntity.java index 09ca27d6..24f35af3 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/entity/CertificateTypeEntity.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/entity/CertificateTypeEntity.java @@ -1,4 +1,4 @@ -package org.springblade.desk.jobTransfer.pojo.entity; +package org.springblade.desk.jobtransfer.pojo.entity; import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/entity/CultivateDetailEntity.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/entity/CultivateDetailEntity.java similarity index 97% rename from blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/entity/CultivateDetailEntity.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/entity/CultivateDetailEntity.java index 705554c4..b32a968b 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/entity/CultivateDetailEntity.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/entity/CultivateDetailEntity.java @@ -1,4 +1,4 @@ -package org.springblade.desk.jobTransfer.pojo.entity; +package org.springblade.desk.jobtransfer.pojo.entity; import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/entity/EquipmentMaintenanceEntity.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/entity/EquipmentMaintenanceEntity.java similarity index 95% rename from blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/entity/EquipmentMaintenanceEntity.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/entity/EquipmentMaintenanceEntity.java index 82932104..4382cb19 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/entity/EquipmentMaintenanceEntity.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/entity/EquipmentMaintenanceEntity.java @@ -1,4 +1,4 @@ -package org.springblade.desk.jobTransfer.pojo.entity; +package org.springblade.desk.jobtransfer.pojo.entity; import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/entity/PostHandleEntity.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/entity/PostHandleEntity.java similarity index 98% rename from blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/entity/PostHandleEntity.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/entity/PostHandleEntity.java index ca2b9d43..7c07cce7 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/entity/PostHandleEntity.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/entity/PostHandleEntity.java @@ -1,4 +1,4 @@ -package org.springblade.desk.jobTransfer.pojo.entity; +package org.springblade.desk.jobtransfer.pojo.entity; import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/entity/TrainingPlanEntity.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/entity/TrainingPlanEntity.java similarity index 96% rename from blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/entity/TrainingPlanEntity.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/entity/TrainingPlanEntity.java index 1dec4736..96f8cd03 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/entity/TrainingPlanEntity.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/entity/TrainingPlanEntity.java @@ -1,4 +1,4 @@ -package org.springblade.desk.jobTransfer.pojo.entity; +package org.springblade.desk.jobtransfer.pojo.entity; import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/enums/CultivateStatusEnum.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/enums/CultivateStatusEnum.java similarity index 96% rename from blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/enums/CultivateStatusEnum.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/enums/CultivateStatusEnum.java index a1abb2e4..5c119257 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/enums/CultivateStatusEnum.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/enums/CultivateStatusEnum.java @@ -1,4 +1,4 @@ -package org.springblade.desk.jobTransfer.pojo.enums; +package org.springblade.desk.jobtransfer.pojo.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/enums/GenderEnum.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/enums/GenderEnum.java similarity index 96% rename from blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/enums/GenderEnum.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/enums/GenderEnum.java index 8102a07c..d63e4dd1 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/enums/GenderEnum.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/enums/GenderEnum.java @@ -1,4 +1,4 @@ -package org.springblade.desk.jobTransfer.pojo.enums; +package org.springblade.desk.jobtransfer.pojo.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/enums/MaintenanceStatusEnum.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/enums/MaintenanceStatusEnum.java similarity index 96% rename from blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/enums/MaintenanceStatusEnum.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/enums/MaintenanceStatusEnum.java index 259c07cc..41699627 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/enums/MaintenanceStatusEnum.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/enums/MaintenanceStatusEnum.java @@ -1,4 +1,4 @@ -package org.springblade.desk.jobTransfer.pojo.enums; +package org.springblade.desk.jobtransfer.pojo.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/enums/MarriageEnum.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/enums/MarriageEnum.java similarity index 96% rename from blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/enums/MarriageEnum.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/enums/MarriageEnum.java index 0a5eba2b..de84c0c2 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/enums/MarriageEnum.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/enums/MarriageEnum.java @@ -1,4 +1,4 @@ -package org.springblade.desk.jobTransfer.pojo.enums; +package org.springblade.desk.jobtransfer.pojo.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/enums/PostHandleStatusEnum.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/enums/PostHandleStatusEnum.java similarity index 97% rename from blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/enums/PostHandleStatusEnum.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/enums/PostHandleStatusEnum.java index 4ba3b663..2e3dccf8 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/enums/PostHandleStatusEnum.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/enums/PostHandleStatusEnum.java @@ -1,4 +1,4 @@ -package org.springblade.desk.jobTransfer.pojo.enums; +package org.springblade.desk.jobtransfer.pojo.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/enums/SkillEnum.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/enums/SkillEnum.java similarity index 96% rename from blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/enums/SkillEnum.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/enums/SkillEnum.java index 5f9dcb02..955c9cef 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/enums/SkillEnum.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/enums/SkillEnum.java @@ -1,4 +1,4 @@ -package org.springblade.desk.jobTransfer.pojo.enums; +package org.springblade.desk.jobtransfer.pojo.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/enums/StaffTypeEnum.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/enums/StaffTypeEnum.java similarity index 96% rename from blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/enums/StaffTypeEnum.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/enums/StaffTypeEnum.java index 9f64feef..8da166ec 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/enums/StaffTypeEnum.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/enums/StaffTypeEnum.java @@ -1,4 +1,4 @@ -package org.springblade.desk.jobTransfer.pojo.enums; +package org.springblade.desk.jobtransfer.pojo.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/enums/TrainingStatusEnum.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/enums/TrainingStatusEnum.java similarity index 96% rename from blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/enums/TrainingStatusEnum.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/enums/TrainingStatusEnum.java index ae79787f..f9047f36 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/enums/TrainingStatusEnum.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/enums/TrainingStatusEnum.java @@ -1,4 +1,4 @@ -package org.springblade.desk.jobTransfer.pojo.enums; +package org.springblade.desk.jobtransfer.pojo.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/excel/CertificateMaintenanceExcel.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/excel/CertificateMaintenanceExcel.java similarity index 95% rename from blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/excel/CertificateMaintenanceExcel.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/excel/CertificateMaintenanceExcel.java index 51078350..1da39338 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/excel/CertificateMaintenanceExcel.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/excel/CertificateMaintenanceExcel.java @@ -1,10 +1,8 @@ -package org.springblade.desk.jobTransfer.pojo.excel; +package org.springblade.desk.jobtransfer.pojo.excel; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import java.math.BigDecimal; import java.util.Date; import com.alibaba.excel.annotation.ExcelProperty; diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/excel/CertificateMaintenanceImport.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/excel/CertificateMaintenanceImport.java similarity index 95% rename from blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/excel/CertificateMaintenanceImport.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/excel/CertificateMaintenanceImport.java index fc8ce960..fd128c23 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/excel/CertificateMaintenanceImport.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/excel/CertificateMaintenanceImport.java @@ -1,4 +1,4 @@ -package org.springblade.desk.jobTransfer.pojo.excel; +package org.springblade.desk.jobtransfer.pojo.excel; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.format.DateTimeFormat; diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/excel/CertificateTypeExcel.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/excel/CertificateTypeExcel.java similarity index 91% rename from blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/excel/CertificateTypeExcel.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/excel/CertificateTypeExcel.java index bd5a9703..4d7c57d7 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/excel/CertificateTypeExcel.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/excel/CertificateTypeExcel.java @@ -1,11 +1,8 @@ -package org.springblade.desk.jobTransfer.pojo.excel; +package org.springblade.desk.jobtransfer.pojo.excel; import lombok.Data; -import java.math.BigDecimal; -import java.util.Date; - import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.alibaba.excel.annotation.write.style.ContentRowHeight; diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/excel/CultivateDetailExcel.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/excel/CultivateDetailExcel.java similarity index 95% rename from blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/excel/CultivateDetailExcel.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/excel/CultivateDetailExcel.java index 70f4a3f1..abb1c587 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/excel/CultivateDetailExcel.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/excel/CultivateDetailExcel.java @@ -1,9 +1,8 @@ -package org.springblade.desk.jobTransfer.pojo.excel; +package org.springblade.desk.jobtransfer.pojo.excel; import lombok.Data; -import java.math.BigDecimal; import java.util.Date; import com.alibaba.excel.annotation.ExcelProperty; diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/excel/EquipmentMaintenanceExcel.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/excel/EquipmentMaintenanceExcel.java similarity index 96% rename from blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/excel/EquipmentMaintenanceExcel.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/excel/EquipmentMaintenanceExcel.java index 6742f716..0958c2fb 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/excel/EquipmentMaintenanceExcel.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/excel/EquipmentMaintenanceExcel.java @@ -1,9 +1,8 @@ -package org.springblade.desk.jobTransfer.pojo.excel; +package org.springblade.desk.jobtransfer.pojo.excel; import lombok.Data; -import java.math.BigDecimal; import java.util.Date; import com.alibaba.excel.annotation.ExcelProperty; diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/excel/PostHandleExcel.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/excel/PostHandleExcel.java similarity index 97% rename from blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/excel/PostHandleExcel.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/excel/PostHandleExcel.java index 743df5a3..6fbab914 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/excel/PostHandleExcel.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/excel/PostHandleExcel.java @@ -1,9 +1,8 @@ -package org.springblade.desk.jobTransfer.pojo.excel; +package org.springblade.desk.jobtransfer.pojo.excel; import lombok.Data; -import java.math.BigDecimal; import java.util.Date; import com.alibaba.excel.annotation.ExcelProperty; diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/excel/PostHandleImport.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/excel/PostHandleImport.java similarity index 93% rename from blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/excel/PostHandleImport.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/excel/PostHandleImport.java index 77f668a1..9bd1df00 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/excel/PostHandleImport.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/excel/PostHandleImport.java @@ -1,14 +1,11 @@ -package org.springblade.desk.jobTransfer.pojo.excel; +package org.springblade.desk.jobtransfer.pojo.excel; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.format.DateTimeFormat; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; import org.springblade.core.mp.base.BaseEntity; -import java.io.Serial; import java.util.Date; /** diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/excel/TrainingPlanExcel.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/excel/TrainingPlanExcel.java similarity index 93% rename from blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/excel/TrainingPlanExcel.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/excel/TrainingPlanExcel.java index 97732d25..deb2ac88 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/excel/TrainingPlanExcel.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/excel/TrainingPlanExcel.java @@ -1,11 +1,8 @@ -package org.springblade.desk.jobTransfer.pojo.excel; +package org.springblade.desk.jobtransfer.pojo.excel; import lombok.Data; -import java.math.BigDecimal; -import java.util.Date; - import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.alibaba.excel.annotation.write.style.ContentRowHeight; diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/request/CertificateLedgerQuery.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/request/CertificateLedgerQuery.java similarity index 94% rename from blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/request/CertificateLedgerQuery.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/request/CertificateLedgerQuery.java index 8f81505a..b23a339d 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/request/CertificateLedgerQuery.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/request/CertificateLedgerQuery.java @@ -1,4 +1,4 @@ -package org.springblade.desk.jobTransfer.pojo.request; +package org.springblade.desk.jobtransfer.pojo.request; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/request/CultivateDetailQuery.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/request/CultivateDetailQuery.java similarity index 93% rename from blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/request/CultivateDetailQuery.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/request/CultivateDetailQuery.java index 19fb4664..e7a18980 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/request/CultivateDetailQuery.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/request/CultivateDetailQuery.java @@ -1,4 +1,4 @@ -package org.springblade.desk.jobTransfer.pojo.request; +package org.springblade.desk.jobtransfer.pojo.request; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; @@ -71,11 +71,13 @@ public class CultivateDetailQuery extends BaseEntity { /** * 开始时间 */ + @Schema(description = "开始时间") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date startTime; /** * 结束时间 */ + @Schema(description = "结束时间") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date endTime; } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/request/EquipmentMaintenanceQuery.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/request/EquipmentMaintenanceQuery.java similarity index 83% rename from blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/request/EquipmentMaintenanceQuery.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/request/EquipmentMaintenanceQuery.java index 1a6e9b01..09ea9a95 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/request/EquipmentMaintenanceQuery.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/request/EquipmentMaintenanceQuery.java @@ -1,4 +1,4 @@ -package org.springblade.desk.jobTransfer.pojo.request; +package org.springblade.desk.jobtransfer.pojo.request; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -39,4 +39,9 @@ public class EquipmentMaintenanceQuery { */ @Schema(description = "维护状态(1正常,2到期,3离职)") private Short maintenanceStatus; + /** + * 多能工 + */ + @Schema(description = "多能工") + private Boolean pleuripotent; } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/request/JobTransferSave.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/request/JobTransferSave.java new file mode 100644 index 00000000..9df9f047 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/request/JobTransferSave.java @@ -0,0 +1,22 @@ +package org.springblade.desk.jobtransfer.pojo.request; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +/** + * 转岗功能保存实体类 + */ +@Data +public class JobTransferSave { + @Schema(description = "人员岗位管理ID", required = true) + private Long phId; + + @Schema(description = "人员岗位管理状态1实习-培训中,2转岗中,3正常,4下岗中,5离职,6转岗培训合格,7下岗培训合格，8实习培训合格，9培训不合格", required = true) + private Short phStatus; + + @Schema(description = "新班组ID", required = true) + private Long deptId; + + @Schema(description = "新岗位", required = true) + private String station; +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/request/PostHandleQuery.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/request/PostHandleQuery.java similarity index 76% rename from blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/request/PostHandleQuery.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/request/PostHandleQuery.java index 2354f055..3ec123ff 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/request/PostHandleQuery.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/request/PostHandleQuery.java @@ -1,11 +1,7 @@ -package org.springblade.desk.jobTransfer.pojo.request; +package org.springblade.desk.jobtransfer.pojo.request; import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Parameters; -import io.swagger.v3.oas.annotations.enums.ParameterIn; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotNull; import lombok.Data; import java.util.Date; @@ -44,8 +40,8 @@ public class PostHandleQuery { /** * 状态 */ - @Schema(description = "状态") - private Integer phStatus; + @Schema(description = "多个状态（1,2,3,4）") + private String phStatus; /** * 入职时间 */ diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/vo/CertificateLedgerVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/vo/CertificateLedgerVO.java similarity index 89% rename from blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/vo/CertificateLedgerVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/vo/CertificateLedgerVO.java index e236d254..f9a4063a 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/vo/CertificateLedgerVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/vo/CertificateLedgerVO.java @@ -1,4 +1,4 @@ -package org.springblade.desk.jobTransfer.pojo.vo; +package org.springblade.desk.jobtransfer.pojo.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/vo/CertificateMaintenanceVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/vo/CertificateMaintenanceVO.java similarity index 96% rename from blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/vo/CertificateMaintenanceVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/vo/CertificateMaintenanceVO.java index 17bddf95..61258eca 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/vo/CertificateMaintenanceVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/vo/CertificateMaintenanceVO.java @@ -1,10 +1,10 @@ -package org.springblade.desk.jobTransfer.pojo.vo; +package org.springblade.desk.jobtransfer.pojo.vo; import io.swagger.v3.oas.annotations.media.Schema; -import org.springblade.desk.jobTransfer.pojo.entity.CertificateMaintenanceEntity; +import org.springblade.desk.jobtransfer.pojo.entity.CertificateMaintenanceEntity; import lombok.Data; import lombok.EqualsAndHashCode; -import org.springblade.desk.jobTransfer.pojo.enums.MaintenanceStatusEnum; +import org.springblade.desk.jobtransfer.pojo.enums.MaintenanceStatusEnum; import java.io.Serial; import java.time.LocalDate; diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/vo/CertificateTypeVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/vo/CertificateTypeVO.java similarity index 75% rename from blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/vo/CertificateTypeVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/vo/CertificateTypeVO.java index ba85252d..878b4462 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/vo/CertificateTypeVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/vo/CertificateTypeVO.java @@ -1,6 +1,6 @@ -package org.springblade.desk.jobTransfer.pojo.vo; +package org.springblade.desk.jobtransfer.pojo.vo; -import org.springblade.desk.jobTransfer.pojo.entity.CertificateTypeEntity; +import org.springblade.desk.jobtransfer.pojo.entity.CertificateTypeEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/vo/CultivateDetailVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/vo/CultivateDetailVO.java similarity index 80% rename from blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/vo/CultivateDetailVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/vo/CultivateDetailVO.java index 0c8e0dc8..2999b7d6 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/vo/CultivateDetailVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/vo/CultivateDetailVO.java @@ -1,11 +1,11 @@ -package org.springblade.desk.jobTransfer.pojo.vo; +package org.springblade.desk.jobtransfer.pojo.vo; -import org.springblade.desk.jobTransfer.pojo.entity.CultivateDetailEntity; +import org.springblade.desk.jobtransfer.pojo.entity.CultivateDetailEntity; import lombok.Data; import lombok.EqualsAndHashCode; -import org.springblade.desk.jobTransfer.pojo.enums.CultivateStatusEnum; -import org.springblade.desk.jobTransfer.pojo.enums.StaffTypeEnum; -import org.springblade.desk.jobTransfer.pojo.enums.TrainingStatusEnum; +import org.springblade.desk.jobtransfer.pojo.enums.CultivateStatusEnum; +import org.springblade.desk.jobtransfer.pojo.enums.StaffTypeEnum; +import org.springblade.desk.jobtransfer.pojo.enums.TrainingStatusEnum; import java.io.Serial; diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/vo/EquipmentMaintenanceListVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/vo/EquipmentMaintenanceListVO.java similarity index 89% rename from blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/vo/EquipmentMaintenanceListVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/vo/EquipmentMaintenanceListVO.java index 2eda7eea..77f61fb1 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/vo/EquipmentMaintenanceListVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/vo/EquipmentMaintenanceListVO.java @@ -1,4 +1,4 @@ -package org.springblade.desk.jobTransfer.pojo.vo; +package org.springblade.desk.jobtransfer.pojo.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/vo/EquipmentMaintenanceVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/vo/EquipmentMaintenanceVO.java similarity index 91% rename from blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/vo/EquipmentMaintenanceVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/vo/EquipmentMaintenanceVO.java index b8721eb2..80b80127 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/vo/EquipmentMaintenanceVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/vo/EquipmentMaintenanceVO.java @@ -1,10 +1,10 @@ -package org.springblade.desk.jobTransfer.pojo.vo; +package org.springblade.desk.jobtransfer.pojo.vo; import io.swagger.v3.oas.annotations.media.Schema; -import org.springblade.desk.jobTransfer.pojo.entity.EquipmentMaintenanceEntity; +import org.springblade.desk.jobtransfer.pojo.entity.EquipmentMaintenanceEntity; import lombok.Data; import lombok.EqualsAndHashCode; -import org.springblade.desk.jobTransfer.pojo.enums.MaintenanceStatusEnum; +import org.springblade.desk.jobtransfer.pojo.enums.MaintenanceStatusEnum; import java.io.Serial; import java.util.Calendar; diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/vo/PostHandleVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/vo/PostHandleVO.java similarity index 95% rename from blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/vo/PostHandleVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/vo/PostHandleVO.java index 7aa66e25..c5d4c6e5 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/vo/PostHandleVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/vo/PostHandleVO.java @@ -1,10 +1,10 @@ -package org.springblade.desk.jobTransfer.pojo.vo; +package org.springblade.desk.jobtransfer.pojo.vo; import io.swagger.v3.oas.annotations.media.Schema; -import org.springblade.desk.jobTransfer.pojo.entity.PostHandleEntity; +import org.springblade.desk.jobtransfer.pojo.entity.PostHandleEntity; import lombok.Data; import lombok.EqualsAndHashCode; -import org.springblade.desk.jobTransfer.pojo.enums.*; +import org.springblade.desk.jobtransfer.pojo.enums.*; import java.io.Serial; import java.time.LocalDate; diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/vo/TrainingPlanVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/vo/TrainingPlanVO.java similarity index 74% rename from blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/vo/TrainingPlanVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/vo/TrainingPlanVO.java index 03aaf9ca..146cb79c 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/vo/TrainingPlanVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/vo/TrainingPlanVO.java @@ -1,6 +1,6 @@ -package org.springblade.desk.jobTransfer.pojo.vo; +package org.springblade.desk.jobtransfer.pojo.vo; -import org.springblade.desk.jobTransfer.pojo.entity.TrainingPlanEntity; +import org.springblade.desk.jobtransfer.pojo.entity.TrainingPlanEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/YieldPlan.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/YieldPlan.java index 269f3771..76b0871c 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/YieldPlan.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/YieldPlan.java @@ -66,7 +66,7 @@ public class YieldPlan extends BaseEntity { * 使用部门 */ @TableField(value = "USE_DEPT") - private String useDept; + private Long useDept; /** * 数量 @@ -90,7 +90,7 @@ public class YieldPlan extends BaseEntity { * 计划员 */ @TableField(value = "PLAN_USER") - private String planUser; + private Long planUser; /** * 计划下达时间 diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/request/PlateGoodsApplySave.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/request/PlateGoodsApplySave.java index 6b11c0a1..d813b6a1 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/request/PlateGoodsApplySave.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/request/PlateGoodsApplySave.java @@ -22,4 +22,10 @@ public class PlateGoodsApplySave { * 化验含量明细 */ private List detailList; + + + /** + * 本次添加相关的需求单ID列表 + */ + private List recordIdList; } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/YieldPlanVo.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/YieldPlanVo.java index 47ac5aae..9d6d297d 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/YieldPlanVo.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/YieldPlanVo.java @@ -27,4 +27,9 @@ public class YieldPlanVo extends YieldPlan { * 状态名称 */ String statusName; + + /** + * 计划员名称 + */ + String planUserName; } diff --git a/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/feign/IWorkOrderClient.java b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/feign/IWorkOrderClient.java new file mode 100644 index 00000000..0f0af614 --- /dev/null +++ b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/feign/IWorkOrderClient.java @@ -0,0 +1,31 @@ +package org.springblade.scheduling.feign; + +import org.springblade.core.tool.api.R; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; + +/** + * TODO：功能描述 + * + * @author sjx + * @version 1.0 + * @BelongsProject jonhon-mes-svr + * @BelongsPackage org.springblade.scheduling.feign + * @since 2026-01-16 10:06 + */ +@FeignClient( + value = "blade-scheduling" +) +public interface IWorkOrderClient { + String API_PREFIX = "/feign/client/workOrder"; + + String SCHEDULING = API_PREFIX + "/scheduling"; + + /** + * 排产 + * + */ + @GetMapping(SCHEDULING) + R scheduling(); +} diff --git a/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/feign/IWorkOrderClientFallback.java b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/feign/IWorkOrderClientFallback.java new file mode 100644 index 00000000..076be6dc --- /dev/null +++ b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/feign/IWorkOrderClientFallback.java @@ -0,0 +1,43 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.scheduling.feign; + +import org.springblade.core.tool.api.R; +import org.springframework.stereotype.Component; + +/** + * Feign失败配置 + * + * @author Chill + */ +@Component +public class IWorkOrderClientFallback implements IWorkOrderClient { + + @Override + public R scheduling() { + return R.fail("获取数据失败"); + } +} diff --git a/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/EquipAbilityEntity.java b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/EquipAbilityEntity.java index a5cefaaf..a293b7d8 100644 --- a/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/EquipAbilityEntity.java +++ b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/EquipAbilityEntity.java @@ -120,7 +120,7 @@ public class EquipAbilityEntity extends BaseEntity { * 轮次间隔（分钟） */ @Schema(description = "轮次间隔（分钟）") - @JsonSerialize(using = ToStringSerializer.class) + @JsonSerialize(nullsUsing = NullSerializer.class) private BigDecimal interval; /** diff --git a/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/PersonAbilityEntity.java b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/PersonAbilityEntity.java index f04edcdb..d532c5bd 100644 --- a/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/PersonAbilityEntity.java +++ b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/PersonAbilityEntity.java @@ -26,6 +26,8 @@ package org.springblade.scheduling.pojo.entity; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.NullSerializer; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -53,6 +55,7 @@ public class PersonAbilityEntity extends BaseEntity { * 作业中心Id */ @Schema(description = "作业中心Id") + @JsonSerialize(nullsUsing = NullSerializer.class) private Long workCenterId; /** @@ -65,6 +68,7 @@ public class PersonAbilityEntity extends BaseEntity { * 工序编码 */ @Schema(description = "工序编码") + @JsonSerialize(nullsUsing = NullSerializer.class) private Long processId; /** @@ -77,6 +81,7 @@ public class PersonAbilityEntity extends BaseEntity { * 工艺能力Id */ @Schema(description = "工艺能力Id") + @JsonSerialize(nullsUsing = NullSerializer.class) private Long craftId; /** @@ -103,4 +108,19 @@ public class PersonAbilityEntity extends BaseEntity { @Schema(description = "0-按单个零件统计 1-按订单统计") private String type; + /** + * 证书ID + */ + private Long certificateId; + + /** + * 证书名称 + */ + private String certificateName; + + /** + * 生产标识 + */ + private String productIdent; + } diff --git a/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/WorkPlanEntity.java b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/WorkPlanEntity.java index b64b7447..fd403ece 100644 --- a/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/WorkPlanEntity.java +++ b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/WorkPlanEntity.java @@ -264,4 +264,9 @@ public class WorkPlanEntity extends BaseEntity { @Schema(description = "占用设备资源ID") private String personResourceIds; + /** + * 班组人员 + */ + private String teamMembers; + } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsDischargeRecController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsDischargeRecController.java index f702d3d0..d8d08dde 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsDischargeRecController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsDischargeRecController.java @@ -25,40 +25,38 @@ */ package org.springblade.desk.energy.controller; -import io.swagger.v3.oas.annotations.tags.Tag; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; -import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; -import lombok.AllArgsConstructor; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.Valid; - -import org.springblade.core.secure.BladeUser; -import org.springblade.core.secure.annotation.IsAdmin; +import lombok.AllArgsConstructor; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.excel.util.ExcelUtil; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; +import org.springblade.core.secure.BladeUser; +import org.springblade.core.secure.annotation.IsAdmin; import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.util.ExcelExtUtil; import org.springblade.desk.energy.excel.BsDischargeRecExcel; import org.springblade.desk.energy.pojo.entity.BsDischargeRecEntity; -import org.springblade.desk.energy.pojo.entity.BsDosingRecEntity; import org.springblade.desk.energy.pojo.vo.BsDischargeRecVO; import org.springblade.desk.energy.service.IBsDischargeRecService; import org.springblade.desk.energy.wrapper.BsDischargeRecWrapper; import org.springframework.core.io.Resource; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import org.springblade.core.boot.ctrl.BladeController; -import org.springblade.core.tool.utils.DateUtil; -import org.springblade.core.excel.util.ExcelUtil; -import org.springblade.core.tool.constant.BladeConstant; -import java.util.Map; -import java.util.List; -import jakarta.servlet.http.HttpServletResponse; import org.springframework.web.multipart.MultipartFile; +import java.util.List; +import java.util.Map; + /** * 槽液排放记录表 控制器 * diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsInsTestController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsInsTestController.java index 71a1c7db..19184ee1 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsInsTestController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsInsTestController.java @@ -45,7 +45,6 @@ import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.util.ExcelExtUtil; import org.springblade.desk.energy.excel.BsInsTestExcel; -import org.springblade.desk.energy.pojo.entity.BsDosingRecEntity; import org.springblade.desk.energy.pojo.entity.BsInsTestEntity; import org.springblade.desk.energy.pojo.vo.BsInsTestVO; import org.springblade.desk.energy.service.IBsInsTestService; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/util/JasperReportUtil.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/util/JasperReportUtil.java index 6816a3aa..e6740e70 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/util/JasperReportUtil.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/util/JasperReportUtil.java @@ -84,7 +84,6 @@ public class JasperReportUtil { ((Map)params).put("subData_" + subReport.getDataParamName(), subData != null ? new JRBeanCollectionDataSource(subData) : null); } } - JasperPrint jp = JasperFillManager.fillReport(jr, (Map)params, new JRBeanCollectionDataSource((Collection)mainData)); mainData = null; subData = null; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/CertificateMaintenanceController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/controller/CertificateMaintenanceController.java similarity index 89% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/CertificateMaintenanceController.java rename to blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/controller/CertificateMaintenanceController.java index 84321bfe..4e244c9e 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/CertificateMaintenanceController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/controller/CertificateMaintenanceController.java @@ -1,4 +1,4 @@ -package org.springblade.desk.jobTransfer.controller; +package org.springblade.desk.jobtransfer.controller; import io.swagger.v3.oas.annotations.Parameters; import io.swagger.v3.oas.annotations.enums.ParameterIn; @@ -12,33 +12,26 @@ import lombok.AllArgsConstructor; import jakarta.validation.Valid; import org.springblade.core.secure.BladeUser; -import org.springblade.core.secure.annotation.IsAdmin; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.util.ExcelExtUtil; -import org.springblade.desk.jobTransfer.pojo.excel.CertificateMaintenanceExcel; -import org.springblade.desk.jobTransfer.pojo.excel.CertificateMaintenanceImport; -import org.springblade.desk.jobTransfer.pojo.excel.CultivateDetailExcel; -import org.springblade.desk.jobTransfer.pojo.excel.PostHandleImport; -import org.springblade.desk.jobTransfer.pojo.request.CertificateLedgerQuery; -import org.springblade.desk.jobTransfer.pojo.vo.CertificateLedgerVO; -import org.springblade.desk.jobTransfer.pojo.vo.CultivateDetailVO; -import org.springblade.desk.jobTransfer.pojo.vo.PostHandleVO; -import org.springblade.system.cache.UserCache; -import org.springblade.system.pojo.entity.UserInfo; +import org.springblade.desk.jobtransfer.pojo.excel.CertificateMaintenanceExcel; +import org.springblade.desk.jobtransfer.pojo.excel.CertificateMaintenanceImport; +import org.springblade.desk.jobtransfer.pojo.request.CertificateLedgerQuery; +import org.springblade.desk.jobtransfer.pojo.vo.CertificateLedgerVO; +import org.springblade.desk.jobtransfer.pojo.vo.PostHandleVO; import org.springframework.beans.BeanUtils; import org.springframework.core.io.Resource; import org.springframework.http.ResponseEntity; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.web.bind.annotation.*; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import org.springblade.desk.jobTransfer.pojo.entity.CertificateMaintenanceEntity; -import org.springblade.desk.jobTransfer.pojo.vo.CertificateMaintenanceVO; -import org.springblade.desk.jobTransfer.wrapper.CertificateMaintenanceWrapper; -import org.springblade.desk.jobTransfer.service.ICertificateMaintenanceService; +import org.springblade.desk.jobtransfer.pojo.entity.CertificateMaintenanceEntity; +import org.springblade.desk.jobtransfer.pojo.vo.CertificateMaintenanceVO; +import org.springblade.desk.jobtransfer.wrapper.CertificateMaintenanceWrapper; +import org.springblade.desk.jobtransfer.service.ICertificateMaintenanceService; import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.excel.util.ExcelUtil; @@ -187,7 +180,7 @@ public class CertificateMaintenanceController extends BladeController { @Operation(summary = "下载Excel模板", description = "") public ResponseEntity downloadExcelTemplate() { return ExcelExtUtil.downloadXlsTemplate( - "Excel/jobTransfer/证书维护导入模板.xls", + "Excel/jobtransfer/证书维护导入模板.xls", "证书维护导入模板.xls"); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/CertificateTypeController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/controller/CertificateTypeController.java similarity index 90% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/CertificateTypeController.java rename to blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/controller/CertificateTypeController.java index 97b44fbf..6ef3dbb2 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/CertificateTypeController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/controller/CertificateTypeController.java @@ -1,4 +1,4 @@ -package org.springblade.desk.jobTransfer.controller; +package org.springblade.desk.jobtransfer.controller; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Operation; @@ -8,23 +8,21 @@ import lombok.AllArgsConstructor; import jakarta.validation.Valid; import org.springblade.core.secure.BladeUser; -import org.springblade.core.secure.annotation.IsAdmin; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; -import org.springblade.desk.jobTransfer.pojo.excel.CertificateTypeExcel; +import org.springblade.desk.jobtransfer.pojo.excel.CertificateTypeExcel; import org.springframework.web.bind.annotation.*; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import org.springblade.desk.jobTransfer.pojo.entity.CertificateTypeEntity; -import org.springblade.desk.jobTransfer.pojo.vo.CertificateTypeVO; -import org.springblade.desk.jobTransfer.wrapper.CertificateTypeWrapper; -import org.springblade.desk.jobTransfer.service.ICertificateTypeService; +import org.springblade.desk.jobtransfer.pojo.entity.CertificateTypeEntity; +import org.springblade.desk.jobtransfer.pojo.vo.CertificateTypeVO; +import org.springblade.desk.jobtransfer.wrapper.CertificateTypeWrapper; +import org.springblade.desk.jobtransfer.service.ICertificateTypeService; import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.excel.util.ExcelUtil; -import org.springblade.core.tool.constant.BladeConstant; import java.util.Map; import java.util.List; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/CultivateDetailController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/controller/CultivateDetailController.java similarity index 90% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/CultivateDetailController.java rename to blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/controller/CultivateDetailController.java index 30bbbdf6..53260b07 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/CultivateDetailController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/controller/CultivateDetailController.java @@ -1,4 +1,4 @@ -package org.springblade.desk.jobTransfer.controller; +package org.springblade.desk.jobtransfer.controller; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Operation; @@ -8,34 +8,27 @@ import jakarta.annotation.PostConstruct; import lombok.AllArgsConstructor; import jakarta.validation.Valid; -import org.springblade.core.secure.BladeUser; -import org.springblade.core.secure.annotation.IsAdmin; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; -import org.springblade.desk.jobTransfer.pojo.enums.TrainingStatusEnum; -import org.springblade.desk.jobTransfer.pojo.excel.CultivateDetailExcel; -import org.springblade.desk.jobTransfer.pojo.excel.PostHandleExcel; -import org.springblade.desk.jobTransfer.pojo.request.CultivateDetailQuery; -import org.springblade.desk.jobTransfer.pojo.vo.PostHandleVO; +import org.springblade.desk.jobtransfer.pojo.enums.TrainingStatusEnum; +import org.springblade.desk.jobtransfer.pojo.excel.CultivateDetailExcel; +import org.springblade.desk.jobtransfer.pojo.request.CultivateDetailQuery; import org.springframework.beans.BeanUtils; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.web.bind.annotation.*; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import org.springblade.desk.jobTransfer.pojo.entity.CultivateDetailEntity; -import org.springblade.desk.jobTransfer.pojo.vo.CultivateDetailVO; -import org.springblade.desk.jobTransfer.wrapper.CultivateDetailWrapper; -import org.springblade.desk.jobTransfer.service.ICultivateDetailService; +import org.springblade.desk.jobtransfer.pojo.entity.CultivateDetailEntity; +import org.springblade.desk.jobtransfer.pojo.vo.CultivateDetailVO; +import org.springblade.desk.jobtransfer.wrapper.CultivateDetailWrapper; +import org.springblade.desk.jobtransfer.service.ICultivateDetailService; import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.excel.util.ExcelUtil; -import org.springblade.core.tool.constant.BladeConstant; import java.util.ArrayList; import java.util.Date; -import java.util.Map; import java.util.List; import jakarta.servlet.http.HttpServletResponse; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/EquipmentMaintenanceController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/controller/EquipmentMaintenanceController.java similarity index 91% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/EquipmentMaintenanceController.java rename to blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/controller/EquipmentMaintenanceController.java index 019f5f9e..a89aef12 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/EquipmentMaintenanceController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/controller/EquipmentMaintenanceController.java @@ -1,4 +1,4 @@ -package org.springblade.desk.jobTransfer.controller; +package org.springblade.desk.jobtransfer.controller; import io.swagger.v3.oas.annotations.Parameters; import io.swagger.v3.oas.annotations.enums.ParameterIn; @@ -12,31 +12,25 @@ import lombok.AllArgsConstructor; import jakarta.validation.Valid; import org.springblade.core.secure.BladeUser; -import org.springblade.core.secure.annotation.IsAdmin; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; -import org.springblade.desk.jobTransfer.pojo.entity.CertificateMaintenanceEntity; -import org.springblade.desk.jobTransfer.pojo.excel.EquipmentMaintenanceExcel; -import org.springblade.desk.jobTransfer.pojo.excel.EquipmentMaintenanceExcel; -import org.springblade.desk.jobTransfer.pojo.request.EquipmentMaintenanceQuery; -import org.springblade.desk.jobTransfer.pojo.vo.*; +import org.springblade.desk.jobtransfer.pojo.excel.EquipmentMaintenanceExcel; +import org.springblade.desk.jobtransfer.pojo.request.EquipmentMaintenanceQuery; +import org.springblade.desk.jobtransfer.pojo.vo.*; import org.springframework.beans.BeanUtils; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.web.bind.annotation.*; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import org.springblade.desk.jobTransfer.pojo.entity.EquipmentMaintenanceEntity; -import org.springblade.desk.jobTransfer.wrapper.EquipmentMaintenanceWrapper; -import org.springblade.desk.jobTransfer.service.IEquipmentMaintenanceService; +import org.springblade.desk.jobtransfer.pojo.entity.EquipmentMaintenanceEntity; +import org.springblade.desk.jobtransfer.wrapper.EquipmentMaintenanceWrapper; +import org.springblade.desk.jobtransfer.service.IEquipmentMaintenanceService; import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.excel.util.ExcelUtil; -import org.springblade.core.tool.constant.BladeConstant; import java.util.ArrayList; -import java.util.Map; import java.util.List; import jakarta.servlet.http.HttpServletResponse; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/PostHandleController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/controller/PostHandleController.java similarity index 90% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/PostHandleController.java rename to blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/controller/PostHandleController.java index 1663826f..139fea14 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/PostHandleController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/controller/PostHandleController.java @@ -1,6 +1,5 @@ -package org.springblade.desk.jobTransfer.controller; +package org.springblade.desk.jobtransfer.controller; -import io.micrometer.core.instrument.binder.BaseUnits; import io.swagger.v3.oas.annotations.Parameters; import io.swagger.v3.oas.annotations.enums.ParameterIn; import io.swagger.v3.oas.annotations.media.Schema; @@ -11,34 +10,30 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import lombok.AllArgsConstructor; import jakarta.validation.Valid; -import org.springblade.core.secure.BladeUser; -import org.springblade.core.secure.annotation.IsAdmin; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.util.ExcelExtUtil; -import org.springblade.desk.jobTransfer.pojo.excel.PostHandleExcel; -import org.springblade.desk.jobTransfer.pojo.excel.PostHandleImport; -import org.springblade.desk.jobTransfer.pojo.request.PostHandleQuery; +import org.springblade.desk.jobtransfer.pojo.excel.PostHandleExcel; +import org.springblade.desk.jobtransfer.pojo.excel.PostHandleImport; +import org.springblade.desk.jobtransfer.pojo.request.JobTransferSave; +import org.springblade.desk.jobtransfer.pojo.request.PostHandleQuery; import org.springframework.beans.BeanUtils; import org.springframework.core.io.Resource; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import org.springblade.desk.jobTransfer.pojo.entity.PostHandleEntity; -import org.springblade.desk.jobTransfer.pojo.vo.PostHandleVO; -import org.springblade.desk.jobTransfer.wrapper.PostHandleWrapper; -import org.springblade.desk.jobTransfer.service.IPostHandleService; +import org.springblade.desk.jobtransfer.pojo.entity.PostHandleEntity; +import org.springblade.desk.jobtransfer.pojo.vo.PostHandleVO; +import org.springblade.desk.jobtransfer.wrapper.PostHandleWrapper; +import org.springblade.desk.jobtransfer.service.IPostHandleService; import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.excel.util.ExcelUtil; import java.util.ArrayList; -import java.util.Map; import java.util.List; -import java.util.stream.Collectors; import jakarta.servlet.http.HttpServletResponse; import org.springframework.web.multipart.MultipartFile; @@ -81,7 +76,7 @@ public class PostHandleController extends BladeController { @Parameter(name = "station", description = "所属岗位", in = ParameterIn.QUERY, schema = @Schema(type = "string")), @Parameter(name = "inJobDate", description = "入职时间", in = ParameterIn.QUERY, schema = @Schema(type = "string", format = "date")), @Parameter(name = "skill", description = "技能等级", in = ParameterIn.QUERY, schema = @Schema(type = "integer")), - @Parameter(name = "phStatus", description = "状态", in = ParameterIn.QUERY, schema = @Schema(type = "integer")), + @Parameter(name = "phStatus", description = "状态", in = ParameterIn.QUERY, schema = @Schema(type = "string")), @Parameter(name = "conExpDate", description = "合同到期日期", in = ParameterIn.QUERY, schema = @Schema(type = "string", format = "date")), }) public R> page(@Parameter(hidden = true) PostHandleQuery postHandleQuery, Query query) { @@ -242,8 +237,8 @@ public class PostHandleController extends BladeController { @PostMapping("/jobTransfer") @ApiOperationSupport(order = 13) @Operation(summary = "转岗", description = "传入postHandle") - public R jobTransfer(@Valid @RequestBody PostHandleEntity postHandle) { - return postHandleService.jobTransfer(postHandle); + public R jobTransfer(@Valid @RequestBody JobTransferSave jobTransferSave) { + return postHandleService.jobTransfer(jobTransferSave); } /** diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/TrainingPlanController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/controller/TrainingPlanController.java similarity index 88% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/TrainingPlanController.java rename to blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/controller/TrainingPlanController.java index ff06551c..9965a964 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/TrainingPlanController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/controller/TrainingPlanController.java @@ -1,4 +1,4 @@ -package org.springblade.desk.jobTransfer.controller; +package org.springblade.desk.jobtransfer.controller; import io.swagger.v3.oas.annotations.Parameters; import io.swagger.v3.oas.annotations.enums.ParameterIn; @@ -11,27 +11,22 @@ import lombok.AllArgsConstructor; import jakarta.validation.Valid; import org.springblade.core.secure.BladeUser; -import org.springblade.core.secure.annotation.IsAdmin; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; -import org.springblade.desk.jobTransfer.pojo.entity.CultivateDetailEntity; -import org.springblade.desk.jobTransfer.pojo.enums.TrainingStatusEnum; -import org.springblade.desk.jobTransfer.pojo.excel.TrainingPlanExcel; +import org.springblade.desk.jobtransfer.pojo.excel.TrainingPlanExcel; import org.springframework.web.bind.annotation.*; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import org.springblade.desk.jobTransfer.pojo.entity.TrainingPlanEntity; -import org.springblade.desk.jobTransfer.pojo.vo.TrainingPlanVO; -import org.springblade.desk.jobTransfer.wrapper.TrainingPlanWrapper; -import org.springblade.desk.jobTransfer.service.ITrainingPlanService; +import org.springblade.desk.jobtransfer.pojo.entity.TrainingPlanEntity; +import org.springblade.desk.jobtransfer.pojo.vo.TrainingPlanVO; +import org.springblade.desk.jobtransfer.wrapper.TrainingPlanWrapper; +import org.springblade.desk.jobtransfer.service.ITrainingPlanService; import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.excel.util.ExcelUtil; -import org.springblade.core.tool.constant.BladeConstant; -import java.util.Date; import java.util.Map; import java.util.List; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CertificateMaintenanceMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/mapper/CertificateMaintenanceMapper.java similarity index 74% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CertificateMaintenanceMapper.java rename to blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/mapper/CertificateMaintenanceMapper.java index 85ea27e8..72fd87ef 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CertificateMaintenanceMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/mapper/CertificateMaintenanceMapper.java @@ -1,10 +1,9 @@ -package org.springblade.desk.jobTransfer.mapper; +package org.springblade.desk.jobtransfer.mapper; -import org.springblade.desk.jobTransfer.pojo.entity.CertificateMaintenanceEntity; -import org.springblade.desk.jobTransfer.pojo.excel.CertificateMaintenanceExcel; -import org.springblade.desk.jobTransfer.pojo.request.CertificateLedgerQuery; -import org.springblade.desk.jobTransfer.pojo.vo.CertificateLedgerVO; -import org.springblade.desk.jobTransfer.pojo.vo.CertificateMaintenanceVO; +import org.springblade.desk.jobtransfer.pojo.entity.CertificateMaintenanceEntity; +import org.springblade.desk.jobtransfer.pojo.excel.CertificateMaintenanceExcel; +import org.springblade.desk.jobtransfer.pojo.request.CertificateLedgerQuery; +import org.springblade.desk.jobtransfer.pojo.vo.CertificateLedgerVO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CertificateMaintenanceMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/mapper/CertificateMaintenanceMapper.xml similarity index 94% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CertificateMaintenanceMapper.xml rename to blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/mapper/CertificateMaintenanceMapper.xml index fb44eea5..46f4aac4 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CertificateMaintenanceMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/mapper/CertificateMaintenanceMapper.xml @@ -1,10 +1,10 @@ - + + type="org.springblade.desk.jobtransfer.pojo.entity.CertificateMaintenanceEntity"> @@ -23,16 +23,16 @@ - + - + - + @@ -41,14 +41,14 @@ - + @@ -92,7 +92,7 @@ - + @@ -159,7 +159,7 @@ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CertificateTypeMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/mapper/CertificateTypeMapper.java similarity index 79% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CertificateTypeMapper.java rename to blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/mapper/CertificateTypeMapper.java index 8c322867..e40c62c9 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CertificateTypeMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/mapper/CertificateTypeMapper.java @@ -1,8 +1,8 @@ -package org.springblade.desk.jobTransfer.mapper; +package org.springblade.desk.jobtransfer.mapper; -import org.springblade.desk.jobTransfer.pojo.entity.CertificateTypeEntity; -import org.springblade.desk.jobTransfer.pojo.excel.CertificateTypeExcel; -import org.springblade.desk.jobTransfer.pojo.vo.CertificateTypeVO; +import org.springblade.desk.jobtransfer.pojo.entity.CertificateTypeEntity; +import org.springblade.desk.jobtransfer.pojo.excel.CertificateTypeExcel; +import org.springblade.desk.jobtransfer.pojo.vo.CertificateTypeVO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CertificateTypeMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/mapper/CertificateTypeMapper.xml similarity index 88% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CertificateTypeMapper.xml rename to blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/mapper/CertificateTypeMapper.xml index e8d02765..0e45505a 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CertificateTypeMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/mapper/CertificateTypeMapper.xml @@ -1,10 +1,10 @@ - + + type="org.springblade.desk.jobtransfer.pojo.entity.CertificateTypeEntity"> @@ -28,7 +28,7 @@ - SELECT * FROM MES_CERTIFICATE_TYPE ${ew.customSqlSegment} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CultivateDetailMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/mapper/CultivateDetailMapper.java similarity index 76% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CultivateDetailMapper.java rename to blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/mapper/CultivateDetailMapper.java index 34b87a7d..8e80525e 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CultivateDetailMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/mapper/CultivateDetailMapper.java @@ -1,9 +1,9 @@ -package org.springblade.desk.jobTransfer.mapper; +package org.springblade.desk.jobtransfer.mapper; -import org.springblade.desk.jobTransfer.pojo.entity.CultivateDetailEntity; -import org.springblade.desk.jobTransfer.pojo.excel.CultivateDetailExcel; -import org.springblade.desk.jobTransfer.pojo.request.CultivateDetailQuery; -import org.springblade.desk.jobTransfer.pojo.vo.CultivateDetailVO; +import org.springblade.desk.jobtransfer.pojo.entity.CultivateDetailEntity; +import org.springblade.desk.jobtransfer.pojo.excel.CultivateDetailExcel; +import org.springblade.desk.jobtransfer.pojo.request.CultivateDetailQuery; +import org.springblade.desk.jobtransfer.pojo.vo.CultivateDetailVO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CultivateDetailMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/mapper/CultivateDetailMapper.xml similarity index 93% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CultivateDetailMapper.xml rename to blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/mapper/CultivateDetailMapper.xml index 1a7f9c64..25e7fb04 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CultivateDetailMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/mapper/CultivateDetailMapper.xml @@ -1,10 +1,10 @@ - + + type="org.springblade.desk.jobtransfer.pojo.entity.CultivateDetailEntity"> @@ -26,7 +26,7 @@ - + @@ -107,17 +107,17 @@ AND mp.early_warning_day = #{query.earlyWarningDay} - + AND cd.DISTRIBUTE_TIME >= #{query.startTime} - + AND cd.DISTRIBUTE_TIME <= #{query.endTime} ORDER BY cd.create_time DESC - SELECT * FROM MES_CULTIVATE_DETAIL ${ew.customSqlSegment} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/EquipmentMaintenanceMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/mapper/EquipmentMaintenanceMapper.java similarity index 74% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/EquipmentMaintenanceMapper.java rename to blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/mapper/EquipmentMaintenanceMapper.java index 79f59061..74856af4 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/EquipmentMaintenanceMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/mapper/EquipmentMaintenanceMapper.java @@ -1,10 +1,9 @@ -package org.springblade.desk.jobTransfer.mapper; +package org.springblade.desk.jobtransfer.mapper; -import org.springblade.desk.jobTransfer.pojo.entity.EquipmentMaintenanceEntity; -import org.springblade.desk.jobTransfer.pojo.excel.EquipmentMaintenanceExcel; -import org.springblade.desk.jobTransfer.pojo.request.EquipmentMaintenanceQuery; -import org.springblade.desk.jobTransfer.pojo.vo.EquipmentMaintenanceListVO; -import org.springblade.desk.jobTransfer.pojo.vo.EquipmentMaintenanceVO; +import org.springblade.desk.jobtransfer.pojo.entity.EquipmentMaintenanceEntity; +import org.springblade.desk.jobtransfer.pojo.excel.EquipmentMaintenanceExcel; +import org.springblade.desk.jobtransfer.pojo.request.EquipmentMaintenanceQuery; +import org.springblade.desk.jobtransfer.pojo.vo.EquipmentMaintenanceListVO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/EquipmentMaintenanceMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/mapper/EquipmentMaintenanceMapper.xml similarity index 90% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/EquipmentMaintenanceMapper.xml rename to blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/mapper/EquipmentMaintenanceMapper.xml index afab02e0..ff62d6d3 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/EquipmentMaintenanceMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/mapper/EquipmentMaintenanceMapper.xml @@ -1,10 +1,10 @@ - + + type="org.springblade.desk.jobtransfer.pojo.entity.EquipmentMaintenanceEntity"> @@ -20,7 +20,7 @@ - + @@ -29,14 +29,14 @@ - + @@ -80,7 +80,7 @@ - + @@ -134,12 +134,21 @@ AND em.maintenance_status = #{query.maintenanceStatus} + + AND ph.id IN ( + SELECT em_inner.ph_id + FROM MES_EQUIPMENT_MAINTENANCE em_inner + WHERE em_inner.is_deleted = 0 + GROUP BY em_inner.ph_id + HAVING COUNT(em_inner.id) >= 2 + ) + ORDER BY ph.create_time DESC, em.equipment_date DESC diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/PostHandleMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/mapper/PostHandleMapper.java similarity index 78% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/PostHandleMapper.java rename to blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/mapper/PostHandleMapper.java index ed153d93..f56ddfc1 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/PostHandleMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/mapper/PostHandleMapper.java @@ -1,10 +1,10 @@ -package org.springblade.desk.jobTransfer.mapper; +package org.springblade.desk.jobtransfer.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.springblade.desk.jobTransfer.pojo.entity.PostHandleEntity; -import org.springblade.desk.jobTransfer.pojo.excel.PostHandleExcel; -import org.springblade.desk.jobTransfer.pojo.request.PostHandleQuery; -import org.springblade.desk.jobTransfer.pojo.vo.PostHandleVO; +import org.springblade.desk.jobtransfer.pojo.entity.PostHandleEntity; +import org.springblade.desk.jobtransfer.pojo.excel.PostHandleExcel; +import org.springblade.desk.jobtransfer.pojo.request.PostHandleQuery; +import org.springblade.desk.jobtransfer.pojo.vo.PostHandleVO; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Param; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/PostHandleMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/mapper/PostHandleMapper.xml similarity index 92% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/PostHandleMapper.xml rename to blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/mapper/PostHandleMapper.xml index 2faca7a3..dc07a64c 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/PostHandleMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/mapper/PostHandleMapper.xml @@ -1,9 +1,9 @@ - + - + @@ -41,7 +41,7 @@ - + @@ -91,7 +91,7 @@ - SELECT * FROM MES_POST_HANDLE ${ew.customSqlSegment} @@ -122,8 +122,12 @@ AND mph.SKILL = #{postHandle.skill} - - AND mph.PH_STATUS = #{postHandle.phStatus} + + AND mph.PH_STATUS IN + + #{status} + AND mph.IN_JOB_DATE = #{postHandle.inJobDate} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/TrainingPlanMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/mapper/TrainingPlanMapper.java similarity index 78% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/TrainingPlanMapper.java rename to blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/mapper/TrainingPlanMapper.java index 74e8ad84..882bf849 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/TrainingPlanMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/mapper/TrainingPlanMapper.java @@ -1,8 +1,8 @@ -package org.springblade.desk.jobTransfer.mapper; +package org.springblade.desk.jobtransfer.mapper; -import org.springblade.desk.jobTransfer.pojo.entity.TrainingPlanEntity; -import org.springblade.desk.jobTransfer.pojo.excel.TrainingPlanExcel; -import org.springblade.desk.jobTransfer.pojo.vo.TrainingPlanVO; +import org.springblade.desk.jobtransfer.pojo.entity.TrainingPlanEntity; +import org.springblade.desk.jobtransfer.pojo.excel.TrainingPlanExcel; +import org.springblade.desk.jobtransfer.pojo.vo.TrainingPlanVO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/TrainingPlanMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/mapper/TrainingPlanMapper.xml similarity index 90% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/TrainingPlanMapper.xml rename to blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/mapper/TrainingPlanMapper.xml index 9996d23c..524b2c57 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/TrainingPlanMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/mapper/TrainingPlanMapper.xml @@ -1,9 +1,9 @@ - + - + @@ -30,7 +30,7 @@ - SELECT * FROM MES_TRAINING_PLAN ${ew.customSqlSegment} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/ICertificateMaintenanceService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/ICertificateMaintenanceService.java similarity index 80% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/ICertificateMaintenanceService.java rename to blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/ICertificateMaintenanceService.java index dba9d2d0..55625807 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/ICertificateMaintenanceService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/ICertificateMaintenanceService.java @@ -1,12 +1,12 @@ -package org.springblade.desk.jobTransfer.service; +package org.springblade.desk.jobtransfer.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import org.springblade.core.tool.api.R; -import org.springblade.desk.jobTransfer.pojo.entity.CertificateMaintenanceEntity; -import org.springblade.desk.jobTransfer.pojo.excel.CertificateMaintenanceExcel; -import org.springblade.desk.jobTransfer.pojo.excel.CertificateMaintenanceImport; -import org.springblade.desk.jobTransfer.pojo.request.CertificateLedgerQuery; -import org.springblade.desk.jobTransfer.pojo.vo.CertificateLedgerVO; +import org.springblade.desk.jobtransfer.pojo.entity.CertificateMaintenanceEntity; +import org.springblade.desk.jobtransfer.pojo.excel.CertificateMaintenanceExcel; +import org.springblade.desk.jobtransfer.pojo.excel.CertificateMaintenanceImport; +import org.springblade.desk.jobtransfer.pojo.request.CertificateLedgerQuery; +import org.springblade.desk.jobtransfer.pojo.vo.CertificateLedgerVO; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseService; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/ICertificateTypeService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/ICertificateTypeService.java similarity index 78% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/ICertificateTypeService.java rename to blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/ICertificateTypeService.java index e976a6dd..ced6bc5e 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/ICertificateTypeService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/ICertificateTypeService.java @@ -1,9 +1,9 @@ -package org.springblade.desk.jobTransfer.service; +package org.springblade.desk.jobtransfer.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; -import org.springblade.desk.jobTransfer.pojo.entity.CertificateTypeEntity; -import org.springblade.desk.jobTransfer.pojo.excel.CertificateTypeExcel; -import org.springblade.desk.jobTransfer.pojo.vo.CertificateTypeVO; +import org.springblade.desk.jobtransfer.pojo.entity.CertificateTypeEntity; +import org.springblade.desk.jobtransfer.pojo.excel.CertificateTypeExcel; +import org.springblade.desk.jobtransfer.pojo.vo.CertificateTypeVO; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseService; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/ICultivateDetailService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/ICultivateDetailService.java similarity index 79% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/ICultivateDetailService.java rename to blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/ICultivateDetailService.java index febffdc1..4a968a7a 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/ICultivateDetailService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/ICultivateDetailService.java @@ -1,11 +1,11 @@ -package org.springblade.desk.jobTransfer.service; +package org.springblade.desk.jobtransfer.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import org.springblade.core.tool.api.R; -import org.springblade.desk.jobTransfer.pojo.entity.CultivateDetailEntity; -import org.springblade.desk.jobTransfer.pojo.excel.CultivateDetailExcel; -import org.springblade.desk.jobTransfer.pojo.request.CultivateDetailQuery; -import org.springblade.desk.jobTransfer.pojo.vo.CultivateDetailVO; +import org.springblade.desk.jobtransfer.pojo.entity.CultivateDetailEntity; +import org.springblade.desk.jobtransfer.pojo.excel.CultivateDetailExcel; +import org.springblade.desk.jobtransfer.pojo.request.CultivateDetailQuery; +import org.springblade.desk.jobtransfer.pojo.vo.CultivateDetailVO; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseService; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/IEquipmentMaintenanceService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/IEquipmentMaintenanceService.java similarity index 80% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/IEquipmentMaintenanceService.java rename to blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/IEquipmentMaintenanceService.java index 6ef616a0..b76f9f01 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/IEquipmentMaintenanceService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/IEquipmentMaintenanceService.java @@ -1,10 +1,10 @@ -package org.springblade.desk.jobTransfer.service; +package org.springblade.desk.jobtransfer.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; -import org.springblade.desk.jobTransfer.pojo.entity.EquipmentMaintenanceEntity; -import org.springblade.desk.jobTransfer.pojo.excel.EquipmentMaintenanceExcel; -import org.springblade.desk.jobTransfer.pojo.request.EquipmentMaintenanceQuery; -import org.springblade.desk.jobTransfer.pojo.vo.EquipmentMaintenanceListVO; +import org.springblade.desk.jobtransfer.pojo.entity.EquipmentMaintenanceEntity; +import org.springblade.desk.jobtransfer.pojo.excel.EquipmentMaintenanceExcel; +import org.springblade.desk.jobtransfer.pojo.request.EquipmentMaintenanceQuery; +import org.springblade.desk.jobtransfer.pojo.vo.EquipmentMaintenanceListVO; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseService; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/IPostHandleService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/IPostHandleService.java similarity index 79% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/IPostHandleService.java rename to blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/IPostHandleService.java index 45045850..6319b862 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/IPostHandleService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/IPostHandleService.java @@ -1,12 +1,13 @@ -package org.springblade.desk.jobTransfer.service; +package org.springblade.desk.jobtransfer.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import org.springblade.core.tool.api.R; -import org.springblade.desk.jobTransfer.pojo.entity.PostHandleEntity; -import org.springblade.desk.jobTransfer.pojo.excel.PostHandleExcel; -import org.springblade.desk.jobTransfer.pojo.excel.PostHandleImport; -import org.springblade.desk.jobTransfer.pojo.request.PostHandleQuery; -import org.springblade.desk.jobTransfer.pojo.vo.PostHandleVO; +import org.springblade.desk.jobtransfer.pojo.entity.PostHandleEntity; +import org.springblade.desk.jobtransfer.pojo.excel.PostHandleExcel; +import org.springblade.desk.jobtransfer.pojo.excel.PostHandleImport; +import org.springblade.desk.jobtransfer.pojo.request.JobTransferSave; +import org.springblade.desk.jobtransfer.pojo.request.PostHandleQuery; +import org.springblade.desk.jobtransfer.pojo.vo.PostHandleVO; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseService; @@ -86,10 +87,10 @@ public interface IPostHandleService extends BaseService { /** * 转岗 * - * @param postHandleEntity + * @param jobTransferSave * @return */ - R jobTransfer(PostHandleEntity postHandleEntity); + R jobTransfer(JobTransferSave jobTransferSave); /** * 离职 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/ITrainingPlanService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/ITrainingPlanService.java similarity index 77% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/ITrainingPlanService.java rename to blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/ITrainingPlanService.java index bd0bbacb..a6c42a59 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/ITrainingPlanService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/ITrainingPlanService.java @@ -1,9 +1,8 @@ -package org.springblade.desk.jobTransfer.service; +package org.springblade.desk.jobtransfer.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; -import org.springblade.desk.jobTransfer.pojo.entity.TrainingPlanEntity; -import org.springblade.desk.jobTransfer.pojo.excel.TrainingPlanExcel; -import org.springblade.desk.jobTransfer.pojo.vo.TrainingPlanVO; +import org.springblade.desk.jobtransfer.pojo.entity.TrainingPlanEntity; +import org.springblade.desk.jobtransfer.pojo.excel.TrainingPlanExcel; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseService; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/CertificateMaintenanceServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/impl/CertificateMaintenanceServiceImpl.java similarity index 63% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/CertificateMaintenanceServiceImpl.java rename to blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/impl/CertificateMaintenanceServiceImpl.java index 89c27b2c..4b30b14e 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/CertificateMaintenanceServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/impl/CertificateMaintenanceServiceImpl.java @@ -1,20 +1,23 @@ -package org.springblade.desk.jobTransfer.service.impl; +package org.springblade.desk.jobtransfer.service.impl; +import com.alibaba.nacos.common.utils.CollectionUtils; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import jakarta.annotation.Resource; import org.springblade.core.tool.api.R; -import org.springblade.desk.jobTransfer.mapper.CertificateTypeMapper; -import org.springblade.desk.jobTransfer.mapper.PostHandleMapper; -import org.springblade.desk.jobTransfer.pojo.entity.CertificateMaintenanceEntity; -import org.springblade.desk.jobTransfer.pojo.entity.PostHandleEntity; -import org.springblade.desk.jobTransfer.pojo.enums.PostHandleStatusEnum; -import org.springblade.desk.jobTransfer.pojo.enums.StaffTypeEnum; -import org.springblade.desk.jobTransfer.pojo.excel.CertificateMaintenanceExcel; -import org.springblade.desk.jobTransfer.pojo.excel.CertificateMaintenanceImport; -import org.springblade.desk.jobTransfer.pojo.request.CertificateLedgerQuery; -import org.springblade.desk.jobTransfer.pojo.vo.CertificateLedgerVO; -import org.springblade.desk.jobTransfer.mapper.CertificateMaintenanceMapper; -import org.springblade.desk.jobTransfer.service.ICertificateMaintenanceService; +import org.springblade.desk.jobtransfer.mapper.CertificateTypeMapper; +import org.springblade.desk.jobtransfer.mapper.PostHandleMapper; +import org.springblade.desk.jobtransfer.pojo.entity.CertificateMaintenanceEntity; +import org.springblade.desk.jobtransfer.pojo.entity.CertificateTypeEntity; +import org.springblade.desk.jobtransfer.pojo.entity.PostHandleEntity; +import org.springblade.desk.jobtransfer.pojo.enums.MaintenanceStatusEnum; +import org.springblade.desk.jobtransfer.pojo.enums.PostHandleStatusEnum; +import org.springblade.desk.jobtransfer.pojo.enums.StaffTypeEnum; +import org.springblade.desk.jobtransfer.pojo.excel.CertificateMaintenanceExcel; +import org.springblade.desk.jobtransfer.pojo.excel.CertificateMaintenanceImport; +import org.springblade.desk.jobtransfer.pojo.request.CertificateLedgerQuery; +import org.springblade.desk.jobtransfer.pojo.vo.CertificateLedgerVO; +import org.springblade.desk.jobtransfer.mapper.CertificateMaintenanceMapper; +import org.springblade.desk.jobtransfer.service.ICertificateMaintenanceService; import org.springblade.system.cache.UserCache; import org.springblade.system.pojo.entity.UserInfo; import org.springframework.stereotype.Service; @@ -72,6 +75,7 @@ public class CertificateMaintenanceServiceImpl extends BaseServiceImpl certificateMaintenanceImports) { //获取全部用户codes，通过code获取用户ID, Set codes = certificateMaintenanceImports.stream().map(CertificateMaintenanceImport::getUserCode) @@ -106,8 +110,30 @@ public class CertificateMaintenanceServiceImpl extends BaseServiceImpl certificateType = certificateMaintenanceImports.stream().map(CertificateMaintenanceImport::getCertificateType) .collect(Collectors.toSet()); - - return null; + LambdaQueryWrapper certificateTypeEntityLambdaQueryWrapper = new LambdaQueryWrapper<>(); + certificateTypeEntityLambdaQueryWrapper.in(CollectionUtils.isNotEmpty(certificateType), CertificateTypeEntity::getName, certificateType); // [8](@ref) + List certificateTypeEntities = certificateTypeMapper.selectList(certificateTypeEntityLambdaQueryWrapper); + Map certificateTypeNameIds = certificateTypeEntities.stream().collect(Collectors.toMap( + entity -> entity.getName(), + entity -> entity.getId())); + certificateType.removeAll(certificateTypeNameIds.keySet()); + if (certificateType.size() > 0) { + return R.fail("证书:" + String.join(",", certificateType) + "不存在。"); + } + List saves = new ArrayList<>(); + certificateMaintenanceImports.forEach(e -> { + CertificateMaintenanceEntity entity = new CertificateMaintenanceEntity(); + entity.setPhId(codePostHandleIdMap.get(e.getUserCode())); + entity.setCertificateId(certificateTypeNameIds.get(e.getCertificateType())); + entity.setCertificateDate(e.getCertificateDate()); + entity.setAstronautDate(e.getAstronautDate()); + entity.setAirworthinessDate(e.getAirworthinessDate()); + entity.setCertificateCode(e.getCertificateCode()); + entity.setMaintenanceStatus(MaintenanceStatusEnum.NORMAL.getCode().shortValue()); + saves.add(entity); + }); + boolean saved = this.saveBatch(saves); + return R.status(saved); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/CertificateTypeServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/impl/CertificateTypeServiceImpl.java similarity index 76% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/CertificateTypeServiceImpl.java rename to blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/impl/CertificateTypeServiceImpl.java index a6bc9570..d7a6e179 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/CertificateTypeServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/impl/CertificateTypeServiceImpl.java @@ -1,10 +1,10 @@ -package org.springblade.desk.jobTransfer.service.impl; +package org.springblade.desk.jobtransfer.service.impl; -import org.springblade.desk.jobTransfer.pojo.entity.CertificateTypeEntity; -import org.springblade.desk.jobTransfer.pojo.excel.CertificateTypeExcel; -import org.springblade.desk.jobTransfer.pojo.vo.CertificateTypeVO; -import org.springblade.desk.jobTransfer.mapper.CertificateTypeMapper; -import org.springblade.desk.jobTransfer.service.ICertificateTypeService; +import org.springblade.desk.jobtransfer.pojo.entity.CertificateTypeEntity; +import org.springblade.desk.jobtransfer.pojo.excel.CertificateTypeExcel; +import org.springblade.desk.jobtransfer.pojo.vo.CertificateTypeVO; +import org.springblade.desk.jobtransfer.mapper.CertificateTypeMapper; +import org.springblade.desk.jobtransfer.service.ICertificateTypeService; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/CultivateDetailServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/impl/CultivateDetailServiceImpl.java similarity index 83% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/CultivateDetailServiceImpl.java rename to blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/impl/CultivateDetailServiceImpl.java index 4f7ad9d1..da3e9f86 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/CultivateDetailServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/impl/CultivateDetailServiceImpl.java @@ -1,17 +1,16 @@ -package org.springblade.desk.jobTransfer.service.impl; +package org.springblade.desk.jobtransfer.service.impl; import jakarta.annotation.Resource; import org.springblade.core.tool.api.R; -import org.springblade.desk.jobTransfer.pojo.entity.CultivateDetailEntity; -import org.springblade.desk.jobTransfer.pojo.entity.PostHandleEntity; -import org.springblade.desk.jobTransfer.pojo.enums.PostHandleStatusEnum; -import org.springblade.desk.jobTransfer.pojo.excel.CultivateDetailExcel; -import org.springblade.desk.jobTransfer.pojo.request.CultivateDetailQuery; -import org.springblade.desk.jobTransfer.pojo.vo.CultivateDetailVO; -import org.springblade.desk.jobTransfer.mapper.CultivateDetailMapper; -import org.springblade.desk.jobTransfer.service.ICultivateDetailService; -import org.springblade.desk.jobTransfer.service.IPostHandleService; -import org.springframework.beans.factory.annotation.Autowired; +import org.springblade.desk.jobtransfer.pojo.entity.CultivateDetailEntity; +import org.springblade.desk.jobtransfer.pojo.entity.PostHandleEntity; +import org.springblade.desk.jobtransfer.pojo.enums.PostHandleStatusEnum; +import org.springblade.desk.jobtransfer.pojo.excel.CultivateDetailExcel; +import org.springblade.desk.jobtransfer.pojo.request.CultivateDetailQuery; +import org.springblade.desk.jobtransfer.pojo.vo.CultivateDetailVO; +import org.springblade.desk.jobtransfer.mapper.CultivateDetailMapper; +import org.springblade.desk.jobtransfer.service.ICultivateDetailService; +import org.springblade.desk.jobtransfer.service.IPostHandleService; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.Wrapper; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/EquipmentMaintenanceServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/impl/EquipmentMaintenanceServiceImpl.java similarity index 77% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/EquipmentMaintenanceServiceImpl.java rename to blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/impl/EquipmentMaintenanceServiceImpl.java index 8341ba92..d8e040b6 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/EquipmentMaintenanceServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/impl/EquipmentMaintenanceServiceImpl.java @@ -1,12 +1,11 @@ -package org.springblade.desk.jobTransfer.service.impl; - -import org.springblade.desk.jobTransfer.pojo.entity.EquipmentMaintenanceEntity; -import org.springblade.desk.jobTransfer.pojo.excel.EquipmentMaintenanceExcel; -import org.springblade.desk.jobTransfer.pojo.request.EquipmentMaintenanceQuery; -import org.springblade.desk.jobTransfer.pojo.vo.EquipmentMaintenanceListVO; -import org.springblade.desk.jobTransfer.pojo.vo.EquipmentMaintenanceVO; -import org.springblade.desk.jobTransfer.mapper.EquipmentMaintenanceMapper; -import org.springblade.desk.jobTransfer.service.IEquipmentMaintenanceService; +package org.springblade.desk.jobtransfer.service.impl; + +import org.springblade.desk.jobtransfer.pojo.entity.EquipmentMaintenanceEntity; +import org.springblade.desk.jobtransfer.pojo.excel.EquipmentMaintenanceExcel; +import org.springblade.desk.jobtransfer.pojo.request.EquipmentMaintenanceQuery; +import org.springblade.desk.jobtransfer.pojo.vo.EquipmentMaintenanceListVO; +import org.springblade.desk.jobtransfer.mapper.EquipmentMaintenanceMapper; +import org.springblade.desk.jobtransfer.service.IEquipmentMaintenanceService; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/PostHandleServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/impl/PostHandleServiceImpl.java similarity index 92% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/PostHandleServiceImpl.java rename to blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/impl/PostHandleServiceImpl.java index c9df38a1..bdfdd213 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/PostHandleServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/impl/PostHandleServiceImpl.java @@ -1,30 +1,27 @@ -package org.springblade.desk.jobTransfer.service.impl; +package org.springblade.desk.jobtransfer.service.impl; -import com.baomidou.mybatisplus.core.toolkit.StringUtils; import jakarta.annotation.Resource; import org.springblade.core.tool.api.R; import org.springblade.desk.basic.pojo.entity.RelTeamSetUser; import org.springblade.desk.basic.service.IRelTeamSetUserService; -import org.springblade.desk.jobTransfer.pojo.entity.CertificateMaintenanceEntity; -import org.springblade.desk.jobTransfer.pojo.entity.CultivateDetailEntity; -import org.springblade.desk.jobTransfer.pojo.entity.EquipmentMaintenanceEntity; -import org.springblade.desk.jobTransfer.pojo.entity.PostHandleEntity; -import org.springblade.desk.jobTransfer.pojo.enums.*; -import org.springblade.desk.jobTransfer.pojo.excel.PostHandleExcel; -import org.springblade.desk.jobTransfer.pojo.excel.PostHandleImport; -import org.springblade.desk.jobTransfer.pojo.request.PostHandleQuery; -import org.springblade.desk.jobTransfer.pojo.vo.PostHandleVO; -import org.springblade.desk.jobTransfer.mapper.PostHandleMapper; -import org.springblade.desk.jobTransfer.service.ICertificateMaintenanceService; -import org.springblade.desk.jobTransfer.service.ICultivateDetailService; -import org.springblade.desk.jobTransfer.service.IEquipmentMaintenanceService; -import org.springblade.desk.jobTransfer.service.IPostHandleService; -import org.springblade.system.cache.SysCache; +import org.springblade.desk.jobtransfer.pojo.entity.CertificateMaintenanceEntity; +import org.springblade.desk.jobtransfer.pojo.entity.CultivateDetailEntity; +import org.springblade.desk.jobtransfer.pojo.entity.EquipmentMaintenanceEntity; +import org.springblade.desk.jobtransfer.pojo.entity.PostHandleEntity; +import org.springblade.desk.jobtransfer.pojo.enums.*; +import org.springblade.desk.jobtransfer.pojo.excel.PostHandleExcel; +import org.springblade.desk.jobtransfer.pojo.excel.PostHandleImport; +import org.springblade.desk.jobtransfer.pojo.request.JobTransferSave; +import org.springblade.desk.jobtransfer.pojo.request.PostHandleQuery; +import org.springblade.desk.jobtransfer.pojo.vo.PostHandleVO; +import org.springblade.desk.jobtransfer.mapper.PostHandleMapper; +import org.springblade.desk.jobtransfer.service.ICertificateMaintenanceService; +import org.springblade.desk.jobtransfer.service.ICultivateDetailService; +import org.springblade.desk.jobtransfer.service.IEquipmentMaintenanceService; +import org.springblade.desk.jobtransfer.service.IPostHandleService; import org.springblade.system.cache.UserCache; -import org.springblade.system.pojo.entity.User; import org.springblade.system.pojo.entity.UserInfo; import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -262,12 +259,16 @@ public class PostHandleServiceImpl extends BaseServiceImpl detailList = saveData.getDetailList(); - plateGoodsApplyService.save(entity, detailList); + List recordIdList = saveData.getRecordIdList(); + plateGoodsApplyService.save(entity, detailList, recordIdList); return R.status(true); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/YieldOrderController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/YieldOrderController.java index 55c79d6c..cbfcfce9 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/YieldOrderController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/YieldOrderController.java @@ -225,6 +225,7 @@ public class YieldOrderController extends BladeController { * * @return true:重复 false:不重复 */ + @Deprecated @PostMapping(value = "/receiveOrderFromOldMes") @Operation(summary = "保存旧mes传过来的生产订单", description = "") public R receiveOrderFromOldMes(@RequestBody JSONObject dataObject) { @@ -232,4 +233,17 @@ public class YieldOrderController extends BladeController { yieldOrderService.receiveOrderFromOldMes(dataList); return R.success(); } + + /** + * 保存旧mes传过来的生产订单状态 + * + * @return + */ + @Deprecated + @PostMapping(value = "/receiveOrderStatusFromOldMes") + @Operation(summary = "保存旧mes传过来的生产订单状态数据", description = "") + public R receiveOrderStatusFromOldMes(@RequestBody JSONObject entity) { + yieldOrderService.receiveOrderStatusFromOldMes(entity.getString("cardNo"), entity.getInteger("status")); + return R.success(); + } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IPlateGoodsApplyService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IPlateGoodsApplyService.java index 7da55000..4244337c 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IPlateGoodsApplyService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IPlateGoodsApplyService.java @@ -27,9 +27,10 @@ public interface IPlateGoodsApplyService extends BaseService { * * @param entity * @param detailList + * @param recordIdList * @return */ - boolean save(PlateGoodsApply entity, List detailList); + boolean save(PlateGoodsApply entity, List detailList, List recordIdList); /** * 修改 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IYieldOrderService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IYieldOrderService.java index d6c73150..dce29511 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IYieldOrderService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IYieldOrderService.java @@ -151,4 +151,12 @@ public interface IYieldOrderService extends BaseService { * @param dataList */ void receiveOrderFromOldMes(JSONArray dataList); + + /** + * 接收旧mes同步的生产订单状态数据 + * + * @param cardNo + * @param statusCode + */ + void receiveOrderStatusFromOldMes(String cardNo, Integer statusCode); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsApplyServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsApplyServiceImpl.java index 4c5e4ae2..83222e1d 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsApplyServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsApplyServiceImpl.java @@ -34,8 +34,11 @@ public class PlateGoodsApplyServiceImpl extends BaseServiceImpl detailList) { + public boolean save(PlateGoodsApply entity, List detailList, List recordIdList) { if (this.save(entity)) { + // 1. 更新化验记录相关数据 + + // 2. 更新需求单的相关数据 for (PlateGoodsApplyDetail detail : detailList) { detail.setPgadId(entity.getId()); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java index 94754cda..dbb44b74 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java @@ -94,8 +94,8 @@ public class YieldOrderServiceImpl extends BaseServiceImpl pageMaterialApply(IPage page, Long wcId, Integer materialType, Integer overHalfMon) { YieldOrder entity = new YieldOrder(); entity.setWorkCenterId(wcId); - //TODO 1. 金钾银钾如何区分 - // 2. 允许使用半月以上的数据是以生产订单的什么时间算 + // TODO 1. 金钾银钾如何区分，使用工艺编制中的物料编号，其中只有金钾、银钾的选项 + // TODO 2. 允许使用半月以上的数据是以生产订单的什么时间算，需查看原来的逻辑 List dataList = baseMapper.selectPage(page, entity, null); return page.setRecords(dataList); } @@ -552,6 +552,26 @@ public class YieldOrderServiceImpl extends BaseServiceImpl orderList = baseMapper.selectList(Wrappers.lambdaQuery(YieldOrder.class).eq(YieldOrder::getCardNo, cardNo)); + if (orderList.size() > 0) { + YieldOrder yieldOrder = orderList.get(0); + switch (statusCode) { + case 15: + yieldOrder.setStatus(YieldOrderEnum.STATUS_COMPLETED.getCode()); + break; + case 21: + yieldOrder.setStatus(YieldOrderEnum.STATUS_CLOSED.getCode()); + break; + default: + break; + } + this.updateById(yieldOrder); + } + } + /** * 验证零件子件信息 * diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/wrapper/YieldPlanWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/wrapper/YieldPlanWrapper.java index 494f1771..fdd54b10 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/wrapper/YieldPlanWrapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/wrapper/YieldPlanWrapper.java @@ -2,9 +2,12 @@ package org.springblade.desk.order.wrapper; import org.springblade.core.mp.support.BaseEntityWrapper; import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.core.tool.utils.Func; import org.springblade.desk.order.pojo.entity.YieldPlan; import org.springblade.desk.order.pojo.enums.YieldPlanEnum; import org.springblade.desk.order.pojo.vo.YieldPlanVo; +import org.springblade.system.cache.UserCache; +import org.springblade.system.pojo.entity.User; import java.util.Objects; @@ -23,6 +26,11 @@ public class YieldPlanWrapper extends BaseEntityWrapper public YieldPlanVo entityVO(YieldPlan entity) { YieldPlanVo vo = Objects.requireNonNull(BeanUtil.copyProperties(entity, YieldPlanVo.class)); vo.setStatusName(YieldPlanEnum.getName(entity.getStatus())); + + User user = UserCache.getUser(entity.getPlanUser()); + if (Func.isNotEmpty(user)) { + vo.setPlanUserName(user.getAccount()); + } return vo; } } diff --git a/blade-service/blade-desk/src/main/resources/Excel/jobTransfer/岗位处理导入模板下载.xls b/blade-service/blade-desk/src/main/resources/Excel/jobTransfer/岗位处理导入模板下载.xls index 125619c0..335e4a9b 100644 Binary files a/blade-service/blade-desk/src/main/resources/Excel/jobTransfer/岗位处理导入模板下载.xls and b/blade-service/blade-desk/src/main/resources/Excel/jobTransfer/岗位处理导入模板下载.xls differ diff --git a/blade-service/blade-desk/src/main/resources/Excel/jobTransfer/证书维护导入模板.xls b/blade-service/blade-desk/src/main/resources/Excel/jobTransfer/证书维护导入模板.xls index 5cd5f217..da162ac7 100644 Binary files a/blade-service/blade-desk/src/main/resources/Excel/jobTransfer/证书维护导入模板.xls and b/blade-service/blade-desk/src/main/resources/Excel/jobTransfer/证书维护导入模板.xls differ diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/SchedulingApplication.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/SchedulingApplication.java index 78d87633..d2edaa32 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/SchedulingApplication.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/SchedulingApplication.java @@ -28,7 +28,6 @@ package org.springblade.scheduling; import org.springblade.common.constant.LauncherConstant; import org.springblade.core.cloud.client.BladeCloudApplication; import org.springblade.core.launch.BladeApplication; -import org.springblade.core.launch.constant.AppConstant; import org.springframework.scheduling.annotation.EnableScheduling; /** diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/EquipAbilityController.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/EquipAbilityController.java index ef3ed22c..6257e3fa 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/EquipAbilityController.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/EquipAbilityController.java @@ -117,7 +117,7 @@ public class EquipAbilityController extends BladeController { } equipAbilityService.save(entity); //初始化设备资源 - equipResourceService.initSingleEquipResource(entity.getWorkCenterId(),entity.getCraftId(),entity.getEquipCode()); + equipResourceService.initSingleEquipResource(entity); return R.status(true); } @@ -130,7 +130,7 @@ public class EquipAbilityController extends BladeController { public R update(@Valid @RequestBody EquipAbilityEntity entity) { equipAbilityService.updateById(entity); //初始化设备资源 - equipResourceService.initSingleEquipResource(entity.getWorkCenterId(),entity.getCraftId(),entity.getEquipCode()); + equipResourceService.initSingleEquipResource(entity); return R.status(true); } diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/PersonAbilityController.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/PersonAbilityController.java index d1e0edcc..bd09de1b 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/PersonAbilityController.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/PersonAbilityController.java @@ -46,6 +46,7 @@ import org.springblade.core.secure.annotation.IsAdmin; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; +import org.springblade.desk.jobtransfer.pojo.entity.CertificateTypeEntity; import org.springblade.scheduling.pojo.entity.PersonAbilityEntity; import org.springblade.scheduling.scheduling.excel.PersonAbilityExcel; import org.springblade.scheduling.scheduling.service.IPersonAbilityService; @@ -160,4 +161,15 @@ public class PersonAbilityController extends BladeController { ExcelUtil.export(response, "人员能力表数据" + DateUtil.time(), "人员能力表数据表", list, PersonAbilityExcel.class); } + + /** + * 获取证书列表 + */ + @GetMapping("/selectCertificateList") + @ApiOperationSupport(order = 2) + public R> selectCertificateList() { + List list = personAbilityService.selectCertificateList(); + return R.data(list); + } + } diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/WorkOrderController.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/WorkOrderController.java index b03d174d..38458de9 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/WorkOrderController.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/WorkOrderController.java @@ -25,6 +25,7 @@ */ package org.springblade.scheduling.scheduling.controller; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; @@ -236,10 +237,20 @@ public class WorkOrderController extends BladeController { */ @PostMapping("/exportBoard") @ApiOperationSupport(order = 9) - @Operation(summary = "导出数据", description = "传入WorkOrder") + @Operation(summary = "导出数据", description = "传入WorkOrder") public void exportSchedulingBoard(@RequestBody WorkOrderDto workOrder, HttpServletResponse response) { List list = workOrderService.exportSchedulingBoard(workOrder); ExcelUtil.export(response, "车间订单表数据" + DateUtil.time(), "车间订单表数据表", list, SchedulingBoardExcel.class); } + /** + * 车间订单 更新调度人员 + */ + @PostMapping("/receiveDispatcherFromOldMes") + @Operation(summary = "更新调度人员", description = "") + public R receiveDispatcherFromOldMes(@RequestBody JSONObject entity) { + workOrderService.receiveDispatcherFromOldMes(entity.getLong("id"), entity.getLong("dispatcher")); + return R.success(); + } + } diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/dto/WorkOrderDto.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/dto/WorkOrderDto.java index f965eb67..bcc6af54 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/dto/WorkOrderDto.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/dto/WorkOrderDto.java @@ -46,6 +46,8 @@ public class WorkOrderDto { private String productIdent; private String receiveTime; private String priorityAps; + private String teamMembers; + private String releaseDate; private List planStatusList; diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/feign/WorkOrderClient.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/feign/WorkOrderClient.java new file mode 100644 index 00000000..980e90be --- /dev/null +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/feign/WorkOrderClient.java @@ -0,0 +1,57 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.scheduling.scheduling.feign; + + +import io.swagger.v3.oas.annotations.Hidden; +import lombok.AllArgsConstructor; +import org.springblade.core.tenant.annotation.NonDS; +import org.springblade.core.tool.api.R; +import org.springblade.scheduling.feign.IWorkOrderClient; +import org.springblade.scheduling.scheduling.service.IWorkOrderService; +import org.springframework.web.bind.annotation.RestController; + + +/** + * 字典服务Feign实现类 + * + * @author Chill + */ +@NonDS +@Hidden +@RestController +@AllArgsConstructor +public class WorkOrderClient implements IWorkOrderClient { + + private final IWorkOrderService workOrderService; + + + @Override + public R scheduling() { + workOrderService.scheduling(); + return R.success(); + } +} diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/PersonAbilityMapper.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/PersonAbilityMapper.java index a6de70ad..5da215fe 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/PersonAbilityMapper.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/PersonAbilityMapper.java @@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Param; +import org.springblade.desk.jobtransfer.pojo.entity.CertificateTypeEntity; import org.springblade.scheduling.pojo.entity.PersonAbilityEntity; import org.springblade.scheduling.scheduling.excel.PersonAbilityExcel; import org.springblade.scheduling.scheduling.vo.PersonAbilityVO; @@ -60,5 +61,7 @@ public interface PersonAbilityMapper extends BaseMapper { */ List export(@Param("ew") Wrapper queryWrapper); + List selectCertificateList(); + } diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/PersonAbilityMapper.xml b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/PersonAbilityMapper.xml index 2b53e6fb..54346ba7 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/PersonAbilityMapper.xml +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/PersonAbilityMapper.xml @@ -42,4 +42,8 @@ + + diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkOrderMapper.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkOrderMapper.java index 92969f78..82c67a93 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkOrderMapper.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkOrderMapper.java @@ -76,4 +76,6 @@ public interface WorkOrderMapper extends BaseMapper { List exportSchedulingBoard(WorkOrderDto workOrderDto); + List selectTeamMember(@Param("teamId") Long teamId,@Param("certificateId") Long certificateId); + } diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkOrderMapper.xml b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkOrderMapper.xml index e4d518c7..66532713 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkOrderMapper.xml +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkOrderMapper.xml @@ -94,6 +94,7 @@ a.card_no AS "cardNO", g.priority_aps AS "priorityAps", g.product_ident AS "productIdent", + to_char(g.release_date,'YYYY-MM-DD') AS "releaseDate", f.name AS "currentProcessName", d.name AS "processName", to_char(b.start_time,'YYYY-MM-DD HH24:MI') AS "startTime", @@ -106,7 +107,8 @@ b.equip_name AS "equipName", b.equip_code AS "equipCode", a.status AS "orderStatus", - b.status AS "planStatus" + b.status AS "planStatus", + b.team_members as "teamMembers" FROM MES_WORK_ORDER a LEFT JOIN MES_WORK_PLAN b ON a.ID = b.WO_ID @@ -149,7 +151,7 @@ - order by b.start_time,a.WO_CODE + order by g.release_date,b.start_time,a.WO_CODE + + diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IEquipResourceService.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IEquipResourceService.java index 5f2168ca..5a5da894 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IEquipResourceService.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IEquipResourceService.java @@ -28,6 +28,7 @@ package org.springblade.scheduling.scheduling.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseService; +import org.springblade.scheduling.pojo.entity.EquipAbilityEntity; import org.springblade.scheduling.pojo.entity.EquipResourceEntity; import org.springblade.scheduling.scheduling.excel.EquipResourceExcel; import org.springblade.scheduling.scheduling.vo.EquipResourceVO; @@ -59,7 +60,7 @@ public interface IEquipResourceService extends BaseService List export(Wrapper queryWrapper); public void initEquipResource(); - public void initSingleEquipResource(Long workCenterId,Long craftId,String equipCode); + public void initSingleEquipResource(EquipAbilityEntity entity); List selectCommonCraftList(); diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IPersonAbilityService.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IPersonAbilityService.java index bae7ae6a..9c77080c 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IPersonAbilityService.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IPersonAbilityService.java @@ -28,6 +28,7 @@ package org.springblade.scheduling.scheduling.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseService; +import org.springblade.desk.jobtransfer.pojo.entity.CertificateTypeEntity; import org.springblade.scheduling.pojo.entity.PersonAbilityEntity; import org.springblade.scheduling.scheduling.excel.PersonAbilityExcel; import org.springblade.scheduling.scheduling.vo.PersonAbilityVO; @@ -58,4 +59,6 @@ public interface IPersonAbilityService extends BaseService */ List export(Wrapper queryWrapper); + List selectCertificateList(); + } diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IWorkOrderService.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IWorkOrderService.java index ed03df74..3a617742 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IWorkOrderService.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IWorkOrderService.java @@ -86,4 +86,13 @@ public interface IWorkOrderService extends BaseService { List selectEquip(); List exportSchedulingBoard(WorkOrderDto workOrder); + + + /** + * 接收旧mes同步的车间订单调度数据 + * + * @param id + * @param userId + */ + void receiveDispatcherFromOldMes(Long id, Long userId); } diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/EquipResourceServiceImpl.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/EquipResourceServiceImpl.java index 6cd82d20..bf7323a2 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/EquipResourceServiceImpl.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/EquipResourceServiceImpl.java @@ -80,13 +80,19 @@ public class EquipResourceServiceImpl extends BaseServiceImpl equipAbilityList = equipAbilityService.list(Wrappers.lambdaQuery().isNotNull(EquipAbilityEntity::getWorkCenterId).isNotNull(EquipAbilityEntity::getCraftId).isNotNull(EquipAbilityEntity::getEquipCode)); for(int i=0;i<7;i++){ String today = DateFormatUtils.format(DateUtils.addDays(date,i),"yyyy-MM-dd"); - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(EquipResourceEntity::getDateTime,today); - List list = this.list(wrapper); - if(CollectionUtils.isEmpty(list)){ - generateData(today,null,null,null); + for(EquipAbilityEntity equipAbility : equipAbilityList){ + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(EquipResourceEntity::getDateTime,today); + wrapper.eq(EquipResourceEntity::getWorkCenterId,equipAbility.getWorkCenterId()); + wrapper.eq(EquipResourceEntity::getCraftId,equipAbility.getCraftId()); + wrapper.eq(EquipResourceEntity::getEquipCode,equipAbility.getEquipCode()); + List list = this.list(wrapper); + if(CollectionUtils.isEmpty(list)){ + generateData(today,equipAbility); + } } } //删除3天之前的数据 @@ -94,12 +100,12 @@ public class EquipResourceServiceImpl extends BaseServiceImpl baseMapper.deleteById(item.getId())); } - public void initSingleEquipResource(Long workCenterId,Long craftId,String equipCode){ + public void initSingleEquipResource(EquipAbilityEntity entity){ //获取包括今天在内未来7天 Date date = new Date(); for(int i=0;i<7;i++){ String today = DateFormatUtils.format(DateUtils.addDays(date,i),"yyyy-MM-dd"); - generateData(today,workCenterId,craftId,equipCode); + generateData(today,entity); } } @@ -108,27 +114,27 @@ public class EquipResourceServiceImpl extends BaseServiceImpl wrapper = new LambdaQueryWrapper<>(); wrapper.isNotNull(EquipAbilityEntity::getStandardTime); - if(workCenterId != null){ - wrapper.eq(EquipAbilityEntity::getWorkCenterId,workCenterId); + if(equipAbility.getWorkCenterId() != null){ + wrapper.eq(EquipAbilityEntity::getWorkCenterId,equipAbility.getWorkCenterId()); } - if(craftId != null){ - wrapper.eq(EquipAbilityEntity::getCraftId,craftId); + if(equipAbility.getCraftId() != null){ + wrapper.eq(EquipAbilityEntity::getCraftId,equipAbility.getCraftId()); } - if(StringUtils.isNotBlank(equipCode)){ - wrapper.eq(EquipAbilityEntity::getEquipCode,equipCode); + if(StringUtils.isNotBlank(equipAbility.getEquipCode())){ + wrapper.eq(EquipAbilityEntity::getEquipCode,equipAbility.getEquipCode()); } List equipAbilityList = equipAbilityService.list(wrapper); if(CollectionUtils.isNotEmpty(equipAbilityList)){ - if(workCenterId != null && craftId != null && StringUtils.isNotBlank(equipCode)){ + if(equipAbility.getWorkCenterId() != null && equipAbility.getCraftId() != null && StringUtils.isNotBlank(equipAbility.getEquipCode())){ List list = this.list(Wrappers.lambdaQuery() - .eq(EquipResourceEntity::getWorkCenterId,workCenterId) - .eq(EquipResourceEntity::getCraftId,craftId) - .eq(EquipResourceEntity::getEquipCode,equipCode) + .eq(EquipResourceEntity::getWorkCenterId,equipAbility.getWorkCenterId()) + .eq(EquipResourceEntity::getCraftId,equipAbility.getCraftId()) + .eq(EquipResourceEntity::getEquipCode,equipAbility.getEquipCode()) .eq(EquipResourceEntity::getDateTime,day)); if(CollectionUtils.isNotEmpty(list)){ list.forEach(item -> baseMapper.deleteById(item.getId())); @@ -139,98 +145,96 @@ public class EquipResourceServiceImpl extends BaseServiceImpl> teamIdList = baseMapper.selectTeamByWorkCenter(equipAbility.getWorkCenterId()); - //0-产线设备 1-普通设备 - if("0".equals(equipAbility.getEquipType())){ - //产线设备根据轮询间隔生成数据，根据轮询间隔判断一天要分成多少段 - int interval = equipAbility.getInterval() == null ? 60 : Integer.parseInt(equipAbility.getInterval().toString()); // 默认60分钟 - int totalMinutes = 24 * 60; // 一天总分钟数 - int totalCount = totalMinutes / interval; // 生成条数 - List resourceList = new ArrayList<>(); - for (int i = 0; i < totalCount; i++) { - LocalDateTime startTime = startOfDay.plusMinutes(i * interval); - LocalDateTime endTime = startTime.plusMinutes(interval); - EquipResourceEntity equipResource = new EquipResourceEntity(); - equipResource.setDateTime(day); - equipResource.setEquipCode(equipAbility.getEquipCode()); - equipResource.setEquipName(equipAbility.getEquipName()); - equipResource.setCraftId(equipAbility.getCraftId().toString()); - equipResource.setCraftName(equipAbility.getCraftName()); - equipResource.setPeriod(startTime.format(timeFormatter) + "-" + endTime.format(timeFormatter)); - equipResource.setTotalCapacity(equipAbility.getStandardProcessAbility()); - equipResource.setRestCapacity(equipAbility.getStandardProcessAbility()); - equipResource.setStartTime(startTime); - equipResource.setEndTime(endTime); - equipResource.setEquipOrder(equipAbility.getEquipOrder()); - equipResource.setStandardTime(equipAbility.getStandardTime()); - equipResource.setIsUsed("0"); - equipResource.setEquipType(equipAbility.getEquipType()); - equipResource.setWorkCenterId(equipAbility.getWorkCenterId()); - - Long teamId = null; - for(Map map : teamIdList){ - - - LocalDateTime teamStartTime = LocalDateTime.parse(day + ' '+ map.get("startTime").toString(), dateTimeFormatter); - LocalDateTime teamEndTime = LocalDateTime.parse(day + ' '+ map.get("endTime").toString(), dateTimeFormatter); - - if((startTime.compareTo(teamStartTime) >=0 && endTime.compareTo(teamEndTime) <= 0) || (startTime.compareTo(teamStartTime) >=0 && startTime.compareTo(teamEndTime) <0)){ - teamId = Long.parseLong(map.get("teamId").toString()); - } - + //获取 + List> teamIdList = baseMapper.selectTeamByWorkCenter(equipAbility.getWorkCenterId()); + //0-产线设备 1-普通设备 + if("0".equals(equipAbility.getEquipType())){ + //产线设备根据轮询间隔生成数据，根据轮询间隔判断一天要分成多少段 + int interval = equipAbility.getInterval() == null ? 60 : Integer.parseInt(equipAbility.getInterval().toString()); // 默认60分钟 + int totalMinutes = 24 * 60; // 一天总分钟数 + int totalCount = totalMinutes / interval; // 生成条数 + List resourceList = new ArrayList<>(); + for (int i = 0; i < totalCount; i++) { + LocalDateTime startTime = startOfDay.plusMinutes(i * interval); + LocalDateTime endTime = startTime.plusMinutes(interval); + EquipResourceEntity equipResource = new EquipResourceEntity(); + equipResource.setDateTime(day); + equipResource.setEquipCode(equipAbility.getEquipCode()); + equipResource.setEquipName(equipAbility.getEquipName()); + equipResource.setCraftId(equipAbility.getCraftId().toString()); + equipResource.setCraftName(equipAbility.getCraftName()); + equipResource.setPeriod(startTime.format(timeFormatter) + "-" + endTime.format(timeFormatter)); + equipResource.setTotalCapacity(equipAbility.getStandardProcessAbility()); + equipResource.setRestCapacity(equipAbility.getStandardProcessAbility()); + equipResource.setStartTime(startTime); + equipResource.setEndTime(endTime); + equipResource.setEquipOrder(equipAbility.getEquipOrder()); + equipResource.setStandardTime(equipAbility.getStandardTime()); + equipResource.setIsUsed("0"); + equipResource.setEquipType(equipAbility.getEquipType()); + equipResource.setWorkCenterId(equipAbility.getWorkCenterId()); + + Long teamId = null; + for(Map map : teamIdList){ + + + LocalDateTime teamStartTime = LocalDateTime.parse(day + ' '+ map.get("startTime").toString(), dateTimeFormatter); + LocalDateTime teamEndTime = LocalDateTime.parse(day + ' '+ map.get("endTime").toString(), dateTimeFormatter); + + if((startTime.compareTo(teamStartTime) >=0 && endTime.compareTo(teamEndTime) <= 0) || (startTime.compareTo(teamStartTime) >=0 && startTime.compareTo(teamEndTime) <0)){ + teamId = Long.parseLong(map.get("teamId").toString()); } - equipResource.setTeamId(teamId); - resourceList.add(equipResource); } - if(CollectionUtils.isNotEmpty(resourceList)){ - this.saveBatch(resourceList); - } - }else{ - //普通设备每30分钟间隔生成数据 - int interval = 30; - int totalMinutes = 24 * 60; // 一天总分钟数 - int totalCount = totalMinutes / interval; // 生成条数 - List resourceList = new ArrayList<>(); - for (int i = 0; i < totalCount; i++) { - LocalDateTime startTime = startOfDay.plusMinutes(i * interval); - LocalDateTime endTime = startTime.plusMinutes(equipAbility.getStandardTime().longValue()); - EquipResourceEntity equipResource = new EquipResourceEntity(); - equipResource.setDateTime(day); - equipResource.setEquipCode(equipAbility.getEquipCode()); - equipResource.setEquipName(equipAbility.getEquipName()); - equipResource.setCraftId(equipAbility.getCraftId().toString()); - equipResource.setCraftName(equipAbility.getCraftName()); - equipResource.setPeriod(startTime.format(timeFormatter) + "-" + endTime.format(timeFormatter)); - equipResource.setTotalCapacity(equipAbility.getStandardProcessAbility()); - equipResource.setRestCapacity(equipAbility.getStandardProcessAbility()); - equipResource.setStartTime(startTime); - equipResource.setEndTime(endTime); - equipResource.setEquipOrder(equipAbility.getEquipOrder()); - equipResource.setStandardTime(equipAbility.getStandardTime()); - equipResource.setIsUsed("0"); - equipResource.setEquipType(equipAbility.getEquipType()); - equipResource.setWorkCenterId(equipAbility.getWorkCenterId()); - Long teamId = null; - for(Map map : teamIdList){ - - - LocalDateTime teamStartTime = LocalDateTime.parse(day + ' '+ map.get("startTime").toString(), dateTimeFormatter); - LocalDateTime teamEndTime = LocalDateTime.parse(day + ' '+ map.get("endTime").toString(), dateTimeFormatter); - - if((startTime.compareTo(teamStartTime) >=0 && endTime.compareTo(teamEndTime) <= 0) || (startTime.compareTo(teamStartTime) >=0 && startTime.compareTo(teamEndTime) <0)){ - teamId = Long.parseLong(map.get("teamId").toString()); - } - } - equipResource.setTeamId(teamId); - resourceList.add(equipResource); + equipResource.setTeamId(teamId); + resourceList.add(equipResource); + } + if(CollectionUtils.isNotEmpty(resourceList)){ + this.saveBatch(resourceList); + } + }else{ + //普通设备每30分钟间隔生成数据 + int interval = equipAbility.getInterval() == null ? 60 : Integer.parseInt(equipAbility.getInterval().toString()); + int totalMinutes = 24 * 60; // 一天总分钟数 + int totalCount = totalMinutes / interval; // 生成条数 + List resourceList = new ArrayList<>(); + for (int i = 0; i < totalCount; i++) { + LocalDateTime startTime = startOfDay.plusMinutes(i * interval); + LocalDateTime endTime = startTime.plusMinutes(equipAbility.getStandardTime().longValue()); + EquipResourceEntity equipResource = new EquipResourceEntity(); + equipResource.setDateTime(day); + equipResource.setEquipCode(equipAbility.getEquipCode()); + equipResource.setEquipName(equipAbility.getEquipName()); + equipResource.setCraftId(equipAbility.getCraftId().toString()); + equipResource.setCraftName(equipAbility.getCraftName()); + equipResource.setPeriod(startTime.format(timeFormatter) + "-" + endTime.format(timeFormatter)); + equipResource.setTotalCapacity(equipAbility.getStandardProcessAbility()); + equipResource.setRestCapacity(equipAbility.getStandardProcessAbility()); + equipResource.setStartTime(startTime); + equipResource.setEndTime(endTime); + equipResource.setEquipOrder(equipAbility.getEquipOrder()); + equipResource.setStandardTime(equipAbility.getStandardTime()); + equipResource.setIsUsed("0"); + equipResource.setEquipType(equipAbility.getEquipType()); + equipResource.setWorkCenterId(equipAbility.getWorkCenterId()); + Long teamId = null; + for(Map map : teamIdList){ + + + LocalDateTime teamStartTime = LocalDateTime.parse(day + ' '+ map.get("startTime").toString(), dateTimeFormatter); + LocalDateTime teamEndTime = LocalDateTime.parse(day + ' '+ map.get("endTime").toString(), dateTimeFormatter); + + if((startTime.compareTo(teamStartTime) >=0 && endTime.compareTo(teamEndTime) <= 0) || (startTime.compareTo(teamStartTime) >=0 && startTime.compareTo(teamEndTime) <0)){ + teamId = Long.parseLong(map.get("teamId").toString()); + } } - if(CollectionUtils.isNotEmpty(resourceList)){ - this.saveBatch(resourceList); - } + equipResource.setTeamId(teamId); + resourceList.add(equipResource); + + } + if(CollectionUtils.isNotEmpty(resourceList)){ + this.saveBatch(resourceList); } } } diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/PersonAbilityServiceImpl.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/PersonAbilityServiceImpl.java index 55bb319a..28c60188 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/PersonAbilityServiceImpl.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/PersonAbilityServiceImpl.java @@ -28,6 +28,7 @@ package org.springblade.scheduling.scheduling.service.impl; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.desk.jobtransfer.pojo.entity.CertificateTypeEntity; import org.springblade.scheduling.pojo.entity.PersonAbilityEntity; import org.springblade.scheduling.scheduling.excel.PersonAbilityExcel; import org.springblade.scheduling.scheduling.mapper.PersonAbilityMapper; @@ -58,4 +59,9 @@ public class PersonAbilityServiceImpl extends BaseServiceImpl selectCertificateList() { + return baseMapper.selectCertificateList(); + } + } diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java index 810a477d..4a3609cd 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java @@ -122,14 +122,43 @@ public class WorkOrderServiceImpl extends BaseServiceImpl errorlist1 = yieldOrderService.list(Wrappers.lambdaQuery() + .in(BaseEntity::getStatus, YieldOrderEnum.STATUS_APS.getCode()) + .isNull(YieldOrderEntity::getWorkCenterId)); + errorlist1.forEach(item -> { + item.setErrorInfo("作业中心为空"); + item.setStatus(YieldOrderEnum.STATUS_PROCESS_ERROR.getCode()); + yieldOrderService.updateById(item); + }); + List errorlist2 = yieldOrderService.list(Wrappers.lambdaQuery() + .in(BaseEntity::getStatus, YieldOrderEnum.STATUS_APS.getCode()) + .isNull(YieldOrderEntity::getReleaseDate)); + errorlist2.forEach(item -> { + item.setErrorInfo("计划下达时间为空"); + item.setStatus(YieldOrderEnum.STATUS_PROCESS_ERROR.getCode()); + yieldOrderService.updateById(item); + }); + List errorlist3 = yieldOrderService.list(Wrappers.lambdaQuery() + .in(BaseEntity::getStatus, YieldOrderEnum.STATUS_APS.getCode()) + .isNull(YieldOrderEntity::getDemandDate)); + errorlist3.forEach(item -> { + item.setErrorInfo("需求交期为空"); + item.setStatus(YieldOrderEnum.STATUS_PROCESS_ERROR.getCode()); + yieldOrderService.updateById(item); + }); //查询待排产订单，状态是3 List list = - yieldOrderService.list(Wrappers.lambdaQuery().in(BaseEntity::getStatus, YieldOrderEnum.STATUS_APS.getCode(),YieldOrderEnum.STATUS_PROCESS_ERROR.getCode()).isNotNull(YieldOrderEntity::getWorkCenterId).isNotNull(YieldOrderEntity::getReleaseDate).isNotNull(YieldOrderEntity::getDemandDate)); + yieldOrderService.list(Wrappers.lambdaQuery() + .in(BaseEntity::getStatus, YieldOrderEnum.STATUS_APS.getCode()) + .isNotNull(YieldOrderEntity::getWorkCenterId) + .isNotNull(YieldOrderEntity::getReleaseDate) + .isNotNull(YieldOrderEntity::getDemandDate)); log.info("待排产订单数量为：" + list.size()); if (CollectionUtils.isNotEmpty(list)) { //校验已排产订单 checkSchedulingOrder(list); - list = yieldOrderService.list(Wrappers.lambdaQuery().in(BaseEntity::getStatus, YieldOrderEnum.STATUS_APS.getCode(),YieldOrderEnum.STATUS_PROCESS_ERROR.getCode()).isNotNull(YieldOrderEntity::getWorkCenterId).isNotNull(YieldOrderEntity::getReleaseDate).isNotNull(YieldOrderEntity::getDemandDate)); + list = yieldOrderService.list(Wrappers.lambdaQuery().in(BaseEntity::getStatus, YieldOrderEnum.STATUS_APS.getCode()).isNotNull(YieldOrderEntity::getWorkCenterId).isNotNull(YieldOrderEntity::getReleaseDate).isNotNull(YieldOrderEntity::getDemandDate)); //初始化人员能力 List personAbilityEntityList = personAbilityService.list(Wrappers.lambdaQuery().isNotNull(PersonAbilityEntity::getWorkCenterId).isNotNull(PersonAbilityEntity::getProcessId).isNotNull(PersonAbilityEntity::getCraftId)); Map personAbilityMap = new HashMap<>(); @@ -269,27 +298,35 @@ public class WorkOrderServiceImpl extends BaseServiceImpl selectEquip() { - return baseMapper.selectEquip(); - } - - @Override - public List exportSchedulingBoard(WorkOrderDto workOrder) { - return baseMapper.exportSchedulingBoard(workOrder); - } - - void calculateCr(List list) { - //查询订单下的工序，计算cr值 - for (YieldOrderEntity entity : list) { - List craftList = yieldOrderCraftService.list(Wrappers.lambdaQuery().eq(YieldOrderCraftEntity::getYoId, entity.getId())); - //定义订单总工时 - BigDecimal total = new BigDecimal(0); - for (YieldOrderCraftEntity craftEntity : craftList) { - total = total.add(craftEntity.getHourQuota()); - } - //换算成天 - total = total.divide(BigDecimal.valueOf(1440), 2, RoundingMode.HALF_UP); + @Override + public List selectEquip() { + return baseMapper.selectEquip(); + } + + @Override + public List exportSchedulingBoard(WorkOrderDto workOrder) { + return baseMapper.exportSchedulingBoard(workOrder); + } + + @Override + public void receiveDispatcherFromOldMes(Long id, Long userId) { + WorkOrderEntity workOrder = new WorkOrderEntity(); + workOrder.setId(id); + workOrder.setDispatcher(userId); + updateById(workOrder); + } + + void calculateCr(List list) { + //查询订单下的工序，计算cr值 + for (YieldOrderEntity entity : list) { + List craftList = yieldOrderCraftService.list(Wrappers.lambdaQuery().eq(YieldOrderCraftEntity::getYoId, entity.getId())); + //定义订单总工时 + BigDecimal total = new BigDecimal(0); + for (YieldOrderCraftEntity craftEntity : craftList) { + total = total.add(craftEntity.getHourQuota()); + } + //换算成天 + total = total.divide(BigDecimal.valueOf(1440), 2, RoundingMode.HALF_UP); if (total.compareTo(new BigDecimal(0)) == 0) { entity.setCrValue(new BigDecimal(0)); continue; @@ -331,7 +368,13 @@ public class WorkOrderServiceImpl extends BaseServiceImpl craftList1 = craftList.stream().filter(item -> item.getIsOutsource() == false).collect(Collectors.toList()); List workCenterList = craftList1.stream().filter(item -> item.getWorkCenterId() != null).map(YieldOrderCraftEntity::getWorkCenterId).collect(Collectors.toList()); if (workCenterList.size() != craftList1.size()) { - order.setErrorInfo("工序信息不完整，含有未匹配作业中心的工序"); + String errorInfo = craftList1.stream().filter(item -> item.getWorkCenterId() == null) + .map(YieldOrderCraftEntity::getPpsId) + .filter(ppsId -> ppsId != null) + .map(ppsId -> processMap.get(ppsId)) + .filter(chineseName -> chineseName != null && !chineseName.isEmpty()) + .collect(Collectors.joining(",")); + order.setErrorInfo("工序信息不完整，工序："+errorInfo+"未匹配作业中心"); order.setStatus(YieldOrderEnum.STATUS_PROCESS_ERROR.getCode()); yieldOrderService.updateById(order); continue; @@ -385,88 +428,19 @@ public class WorkOrderServiceImpl extends BaseServiceImpl sintList = sintMap.get(craft.getPpsId()); - List> sintMaterialList = new ArrayList<>(); - sintList.stream().map(SintTempCurveEntity::getGlassCode).collect(Collectors.toList()).forEach(item -> sintMaterialList.add(Arrays.asList(item.split(",")))); - - //根据零件号获取子件信息 - PartEntity part = new PartEntity(); - part.setPartCode(order.getPartCode()); - List childPartList = partService.selectChildPart(part); - if(CollectionUtils.isNotEmpty(childPartList)){ - //获取子件的所有玻璃粉牌号 - List materialList = childPartList.stream().filter(item -> StringUtils.isNotEmpty(item.getMaterial())).map(PartEntity::getMaterial).collect(Collectors.toList()); - List maxMatchList = null; - int maxCount = 0; - for(List glassCodeList : sintMaterialList){ - int currentCount = (int) glassCodeList.stream().filter(materialList::contains).count(); - if (currentCount > maxCount) { - maxCount = currentCount; - maxMatchList = glassCodeList; - } - } - if(maxMatchList != null){ - glassCodeStr = maxMatchList.stream().collect(Collectors.joining(",")); - log.info("订单："+order.getYoCode()+"，温度曲线是："+glassCodeStr); - } - } - //包含说明之前有过这个温度曲线的订单 - //根据当前时间查询包含玻璃粉牌号的设备资源 - List equipResourceList = equipResourceService.list(Wrappers.lambdaQuery() - .eq(EquipResourceEntity::getWorkCenterId,craft.getWorkCenterId()) - .eq(EquipResourceEntity::getCraftId,craft.getCaId()) - .ge(EquipResourceEntity::getStartTime,prevProcessEnd) - .eq(EquipResourceEntity::getGlassCode,glassCodeStr)); - if(CollectionUtils.isNotEmpty(equipResourceList)){ - //计算生产所需产能，需将m2换算成dm2 - BigDecimal sumCapacity = order.getYpArea().multiply(BigDecimal.valueOf(order.getYpQty())); - Boolean isSameFurnace = false; - for(EquipResourceEntity equipResource : equipResourceList){ - if(equipResource.getRestCapacity().compareTo(sumCapacity) > 0){ - //生成车间订单 - WorkPlanEntity workPlan = new WorkPlanEntity(); - workPlan.setStartTime(equipResource.getStartTime()); - if ("0".equals(equipResource.getEquipType())) { - workPlan.setEndTime(equipResource.getStartTime().plusMinutes(equipResource.getStandardTime().longValue())); - } else { - workPlan.setEndTime(equipResource.getEndTime()); - } - workPlan.setWorkQty(order.getYpQty()); - workPlan.setCaId(craft.getCaId()); - workPlan.setPpsId(craft.getPpsId()); - workPlan.setMakeTeam(equipResource.getTeamId()); - workPlan.setWorkCenterId(craft.getWorkCenterId()); - workPlan.setOrders(craft.getProcessNo()); - workPlan.setWoId(order.getId()); - workPlan.setOem("0"); - workPlan.setTestQty(0); - workPlan.setQualifiedQty(0); - workPlan.setUnqualifiedQty(0); - workPlan.setScrapQty(0); - workPlan.setHourQuota(BigDecimal.valueOf(ChronoUnit.MINUTES.between(workPlan.getStartTime(), workPlan.getEndTime()))); - workPlan.setEquipCode(equipResource.getEquipCode()); - workPlan.setEquipName(equipResource.getEquipName()); - workPlan.setEquipResourceId(equipResource.getId()); - workPlanList.add(workPlan); - - equipResource.setRestCapacity(equipResource.getRestCapacity().subtract(sumCapacity)); - equipResourceService.updateById(equipResource); - isSameFurnace = true; - } - break; - } - //同炉的话就不用走下面的匹配了，直接下一工序 - if(isSameFurnace){ - continue; - } - } - + Boolean isSameFurnace = sameFurnace(order,craft,workPlanList,prevProcessEnd,glassCodeStr,sintMap); + //同炉的话就不用走下面的匹配了，直接下一工序 + if(isSameFurnace){ + continue; } } @@ -493,7 +467,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl personResourceList = personResourceService.list(Wrappers.lambdaQuery() .eq(PersonResourceEntity::getWorkCenterId, craft.getWorkCenterId()) @@ -632,7 +607,16 @@ public class WorkOrderServiceImpl extends BaseServiceImpl memberList = baseMapper.selectTeamMember(workPlan.getMakeTeam(),ability.getCertificateId()); + if(CollectionUtils.isNotEmpty(memberList)){ + workPlan.setTeamMembers(memberList.stream().collect(Collectors.joining(","))); + } + } }else{ prevProcessEnd = prevProcessEnd.plusMinutes(30); totalTime = BigDecimal.valueOf(30); @@ -1176,17 +1160,224 @@ public class WorkOrderServiceImpl extends BaseServiceImpllambdaQuery().eq(SameTroughEntity::getWorkCenterId,yieldOrderCraft.getWorkCenterId()).eq(SameTroughEntity::getCraftId,yieldOrderCraft.getCaId()).eq(SameTroughEntity::getProcessId,yieldOrderCraft.getPpsId())); + public Boolean sameTrough(YieldOrderEntity order,YieldOrderCraftEntity craft,LocalDateTime dateTime,List workPlanList){ + Boolean isSameTrough = false; + SameTroughEntity sameTrough =sameTroughService.getOne(Wrappers.lambdaQuery() + .eq(SameTroughEntity::getWorkCenterId,craft.getWorkCenterId()) + .eq(SameTroughEntity::getCraftId,craft.getCaId()) + .eq(SameTroughEntity::getProcessId,craft.getPpsId())); if(sameTrough != null){ //查询是否有已经排产的计划 - List workPlanList = workPlanService.list(Wrappers.lambdaQuery().eq(WorkPlanEntity::getWorkCenterId,yieldOrderCraft.getWorkCenterId()).eq(WorkPlanEntity::getCaId,yieldOrderCraft.getCaId()).eq(WorkPlanEntity::getPpsId,yieldOrderCraft.getPpsId())); - if(CollectionUtils.isNotEmpty(workPlanList)){ - Map<> + List workPlanOldList = workPlanService.list(Wrappers.lambdaQuery() + .eq(WorkPlanEntity::getWorkCenterId,craft.getWorkCenterId()) + .eq(WorkPlanEntity::getCaId,craft.getCaId()) + .eq(WorkPlanEntity::getPpsId,craft.getPpsId()) + .ge(WorkPlanEntity::getStartTime,dateTime).orderByAsc(WorkPlanEntity::getStartTime)); + if(CollectionUtils.isNotEmpty(workPlanOldList)){ + //总生产量 + BigDecimal sumCapacity = order.getYpArea().multiply(BigDecimal.valueOf(order.getYpQty())); + //可能有多个订单符合要求，按照车间订单、时间分组排序 + Map> workPlanMap = workPlanOldList.stream().collect(Collectors.groupingBy(WorkPlanEntity::getWoId)); + for(Map.Entry> entry : workPlanMap.entrySet()){ + List planList = entry.getValue(); + Boolean isEnough = true; + List resourceList = new ArrayList<>(); + for(WorkPlanEntity workPlan : planList){ + if(workPlan.getEquipResourceId() != null){ + EquipResourceEntity equipResource = equipResourceService.getById(workPlan.getEquipResourceId()); + //判断剩余产能是否满足总产能 + if(sumCapacity.compareTo(equipResource.getRestCapacity()) > 0){ + isEnough = false; + resourceList.clear(); + break; + }else{ + resourceList.add(workPlan.getEquipResourceId()); + } + } + } + //如果产能满足，再判断是否满足同槽条件 + if(isEnough){ + WorkOrderEntity workOrder = this.getById(workPlanOldList.get(0).getWoId()); + YieldOrderEntity yieldOrderEntity = yieldOrderService.getById(workOrder.getYoId()); + List orderCraftList = yieldOrderCraftService.list(Wrappers.lambdaQuery() + .eq(YieldOrderCraftEntity::getYoId,yieldOrderEntity.getId()) + .eq(YieldOrderCraftEntity::getPpsId,craft.getPpsId()) + .eq(YieldOrderCraftEntity::getCaId,craft.getCaId()) + .eq(YieldOrderCraftEntity::getWorkCenterId,craft.getWorkCenterId())); + SameTroughVO voNew = sameTroughService.selectSameTroughInfo(craft.getId()); + SameTroughVO voOld = sameTroughService.selectSameTroughInfo(orderCraftList.get(0).getId()); + //根据同槽因素进行比对 + Boolean isSameTrough2 = true; + //键位 + if("1".equals(sameTrough.getKeyBinding()) && voNew.getPartCode().equals(voOld.getPartCode()) && StringUtils.isNotEmpty(voNew.getKeyBinding()) && StringUtils.isNotEmpty(voOld.getKeyBinding()) && !voNew.getKeyBinding().equals(voOld.getKeyBinding())){ + isSameTrough2 = false; + } + //生产厂家 + if("1".equals(sameTrough.getProducter()) && voNew.getPartCode().equals(voOld.getPartCode()) && StringUtils.isNotEmpty(voNew.getProducter()) && StringUtils.isNotEmpty(voOld.getProducter()) && !voNew.getProducter().equals(voOld.getProducter())){ + isSameTrough2 = false; + } + //检验编号 + if("1".equals(sameTrough.getInspectionCode()) && voNew.getPartCode().equals(voOld.getPartCode()) && StringUtils.isNotEmpty(voNew.getInspectionCode()) && StringUtils.isNotEmpty(voOld.getInspectionCode()) && !voNew.getInspectionCode().equals(voOld.getInspectionCode())){ + isSameTrough2 = false; + } + //材料 + if("1".equals(sameTrough.getMaterial()) && StringUtils.isNotEmpty(voNew.getMaterial()) && StringUtils.isNotEmpty(voOld.getMaterial()) && !voNew.getMaterial().equals(voOld.getMaterial())){ + isSameTrough2 = false; + } + //厚度 + if("1".equals(sameTrough.getThickness()) && StringUtils.isNotEmpty(voNew.getThickness()) && StringUtils.isNotEmpty(voOld.getThickness()) && !voNew.getThickness().equals(voOld.getThickness())){ + isSameTrough2 = false; + } + //钝化 + if("1".equals(sameTrough.getPassivation())){ + if(StringUtils.isNotEmpty(voNew.getPlate()) + && StringUtils.isNotEmpty(voOld.getPlate()) + && ((voNew.getPlate().contains("不钝化") + && !voOld.getPlate().contains("不钝化")) + || (voOld.getPlate().contains("不钝化") + && !voNew.getPlate().contains("不钝化")))){ + isSameTrough2 = false; + } + } + //硬度 + if("1".equals(sameTrough.getHardness()) && StringUtils.isNotEmpty(voNew.getHardness()) && StringUtils.isNotEmpty(voOld.getHardness()) && !voNew.getHardness().equals(voOld.getHardness())){ + isSameTrough2 = false; + } + //生产标识 + if("1".equals(sameTrough.getProductIdent())){ + List highIdentList = Arrays.asList(new String[]{"JHT","JI","JIX","YH","CC","SATA"}); + if(StringUtils.isNotEmpty(order.getProductIdent()) && highIdentList.contains(order.getProductIdent())){ + isSameTrough2 = false; + } + if(!(voNew.getPartCode().equals(voOld.getPartCode()) + && StringUtils.isNotEmpty(voNew.getProductIdent()) + && StringUtils.isNotEmpty(voOld.getProductIdent()) + && voNew.getProductIdent().equals(voOld.getProductIdent()))){ + isSameTrough2 = false; + } + + } + if(isSameTrough2){ + for(Long resourceId : resourceList){ + EquipResourceEntity equipResource = equipResourceService.getById(resourceId); + //生成车间订单 + WorkPlanEntity workPlan = new WorkPlanEntity(); + workPlan.setStartTime(equipResource.getStartTime()); + if ("0".equals(equipResource.getEquipType())) { + workPlan.setEndTime(equipResource.getStartTime().plusMinutes(equipResource.getStandardTime().longValue())); + } else { + workPlan.setEndTime(equipResource.getEndTime()); + } + workPlan.setWorkQty(order.getYpQty()); + workPlan.setCaId(craft.getCaId()); + workPlan.setPpsId(craft.getPpsId()); + workPlan.setMakeTeam(equipResource.getTeamId()); + workPlan.setWorkCenterId(craft.getWorkCenterId()); + workPlan.setOrders(craft.getProcessNo()); + workPlan.setWoId(order.getId()); + workPlan.setOem("0"); + workPlan.setTestQty(0); + workPlan.setQualifiedQty(0); + workPlan.setUnqualifiedQty(0); + workPlan.setScrapQty(0); + workPlan.setHourQuota(BigDecimal.valueOf(ChronoUnit.MINUTES.between(workPlan.getStartTime(), workPlan.getEndTime()))); + workPlan.setEquipCode(equipResource.getEquipCode()); + workPlan.setEquipName(equipResource.getEquipName()); + workPlan.setEquipResourceId(equipResource.getId()); + workPlanList.add(workPlan); + + equipResource.setRestCapacity(equipResource.getRestCapacity().subtract(sumCapacity)); + equipResourceService.updateById(equipResource); + isSameTrough = true; + } + + } + + } + } + } + } + return isSameTrough; + } + public Boolean sameFurnace(YieldOrderEntity order,YieldOrderCraftEntity craft,List workPlanList,LocalDateTime prevProcessEnd,String glassCodeStr,Map> sintMap){ + Boolean isSameFurnace = false; + if(order.getYieldType() == 2 || order.getYieldType() == 3){//烧结订单 + //获取当前工序的所有温度曲线 + List sintList = sintMap.get(craft.getPpsId()); + List> sintMaterialList = new ArrayList<>(); + sintList.stream().map(SintTempCurveEntity::getGlassCode).collect(Collectors.toList()).forEach(item -> sintMaterialList.add(Arrays.asList(item.split(",")))); + + //根据零件号获取子件信息 + PartEntity part = new PartEntity(); + part.setPartCode(order.getPartCode()); + List childPartList = partService.selectChildPart(part); + if(CollectionUtils.isNotEmpty(childPartList)){ + //获取子件的所有玻璃粉牌号 + List materialList = childPartList.stream().filter(item -> StringUtils.isNotEmpty(item.getMaterial())).map(PartEntity::getMaterial).collect(Collectors.toList()); + List maxMatchList = null; + int maxCount = 0; + for(List glassCodeList : sintMaterialList){ + int currentCount = (int) glassCodeList.stream().filter(materialList::contains).count(); + if (currentCount > maxCount) { + maxCount = currentCount; + maxMatchList = glassCodeList; + } + } + if(maxMatchList != null){ + glassCodeStr = maxMatchList.stream().collect(Collectors.joining(",")); + log.info("订单："+order.getYoCode()+"，温度曲线是："+glassCodeStr); + } + } + //包含说明之前有过这个温度曲线的订单 + //根据当前时间查询包含玻璃粉牌号的设备资源 + List equipResourceList = equipResourceService.list(Wrappers.lambdaQuery() + .eq(EquipResourceEntity::getWorkCenterId,craft.getWorkCenterId()) + .eq(EquipResourceEntity::getCraftId,craft.getCaId()) + .ge(EquipResourceEntity::getStartTime,prevProcessEnd) + .eq(EquipResourceEntity::getGlassCode,glassCodeStr)); + if(CollectionUtils.isNotEmpty(equipResourceList)){ + //计算生产所需产能，需将m2换算成dm2 + BigDecimal sumCapacity = order.getYpArea().multiply(BigDecimal.valueOf(order.getYpQty())); + + for(EquipResourceEntity equipResource : equipResourceList){ + if(equipResource.getRestCapacity().compareTo(sumCapacity) > 0){ + //生成车间订单 + WorkPlanEntity workPlan = new WorkPlanEntity(); + workPlan.setStartTime(equipResource.getStartTime()); + if ("0".equals(equipResource.getEquipType())) { + workPlan.setEndTime(equipResource.getStartTime().plusMinutes(equipResource.getStandardTime().longValue())); + } else { + workPlan.setEndTime(equipResource.getEndTime()); + } + workPlan.setWorkQty(order.getYpQty()); + workPlan.setCaId(craft.getCaId()); + workPlan.setPpsId(craft.getPpsId()); + workPlan.setMakeTeam(equipResource.getTeamId()); + workPlan.setWorkCenterId(craft.getWorkCenterId()); + workPlan.setOrders(craft.getProcessNo()); + workPlan.setWoId(order.getId()); + workPlan.setOem("0"); + workPlan.setTestQty(0); + workPlan.setQualifiedQty(0); + workPlan.setUnqualifiedQty(0); + workPlan.setScrapQty(0); + workPlan.setHourQuota(BigDecimal.valueOf(ChronoUnit.MINUTES.between(workPlan.getStartTime(), workPlan.getEndTime()))); + workPlan.setEquipCode(equipResource.getEquipCode()); + workPlan.setEquipName(equipResource.getEquipName()); + workPlan.setEquipResourceId(equipResource.getId()); + workPlanList.add(workPlan); + + equipResource.setRestCapacity(equipResource.getRestCapacity().subtract(sumCapacity)); + equipResourceService.updateById(equipResource); + isSameFurnace = true; + } + break; + } + } - SameTroughVO vo = sameTroughService.selectSameTroughInfo(yieldOrderCraft.getId()); } - }*/ + return isSameFurnace; + } }