diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/CraftAbilityEntity.java b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/CraftAbilityEntity.java
similarity index 97%
rename from blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/CraftAbilityEntity.java
rename to blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/CraftAbilityEntity.java
index c9d7532d..35b7894b 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/CraftAbilityEntity.java
+++ b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/CraftAbilityEntity.java
@@ -23,7 +23,7 @@
  * <p>
  * Author: Chill Zhuang (bladejava@qq.com)
  */
-package org.springblade.scheduling.scheduling.entity;
+package org.springblade.scheduling.pojo.entity;
 
 import lombok.Data;
 import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/EquipAbilityEntity.java b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/EquipAbilityEntity.java
similarity index 98%
rename from blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/EquipAbilityEntity.java
rename to blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/EquipAbilityEntity.java
index 8eaec722..6db4959b 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/EquipAbilityEntity.java
+++ b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/EquipAbilityEntity.java
@@ -23,7 +23,7 @@
  * <p>
  * Author: Chill Zhuang (bladejava@qq.com)
  */
-package org.springblade.scheduling.scheduling.entity;
+package org.springblade.scheduling.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/EquipResourceEntity.java b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/EquipResourceEntity.java
similarity index 98%
rename from blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/EquipResourceEntity.java
rename to blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/EquipResourceEntity.java
index 4faa8ea1..48e23277 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/EquipResourceEntity.java
+++ b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/EquipResourceEntity.java
@@ -23,7 +23,7 @@
  * <p>
  * Author: Chill Zhuang (bladejava@qq.com)
  */
-package org.springblade.scheduling.scheduling.entity;
+package org.springblade.scheduling.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/InspectionItemEntity.java b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/InspectionItemEntity.java
similarity index 97%
rename from blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/InspectionItemEntity.java
rename to blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/InspectionItemEntity.java
index d4c683b1..05ca76f8 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/InspectionItemEntity.java
+++ b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/InspectionItemEntity.java
@@ -23,7 +23,7 @@
  * <p>
  * Author: Chill Zhuang (bladejava@qq.com)
  */
-package org.springblade.scheduling.scheduling.entity;
+package org.springblade.scheduling.pojo.entity;
 
 import lombok.Data;
 import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/MainProducerEntity.java b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/MainProducerEntity.java
similarity index 97%
rename from blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/MainProducerEntity.java
rename to blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/MainProducerEntity.java
index 68676413..9333a463 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/MainProducerEntity.java
+++ b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/MainProducerEntity.java
@@ -23,7 +23,7 @@
  * <p>
  * Author: Chill Zhuang (bladejava@qq.com)
  */
-package org.springblade.scheduling.scheduling.entity;
+package org.springblade.scheduling.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/OutsourceProcessEntity.java b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/OutsourceProcessEntity.java
similarity index 97%
rename from blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/OutsourceProcessEntity.java
rename to blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/OutsourceProcessEntity.java
index 85c062a7..b0589165 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/OutsourceProcessEntity.java
+++ b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/OutsourceProcessEntity.java
@@ -23,7 +23,7 @@
  * <p>
  * Author: Chill Zhuang (bladejava@qq.com)
  */
-package org.springblade.scheduling.scheduling.entity;
+package org.springblade.scheduling.pojo.entity;
 
 import lombok.Data;
 import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/PartEntity.java b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/PartEntity.java
similarity index 99%
rename from blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/PartEntity.java
rename to blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/PartEntity.java
index 19ff5092..e805892f 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/PartEntity.java
+++ b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/PartEntity.java
@@ -23,7 +23,7 @@
  * <p>
  * Author: Chill Zhuang (bladejava@qq.com)
  */
-package org.springblade.scheduling.scheduling.entity;
+package org.springblade.scheduling.pojo.entity;
 
 import lombok.Data;
 import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/PartRelationEntity.java b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/PartRelationEntity.java
similarity index 97%
rename from blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/PartRelationEntity.java
rename to blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/PartRelationEntity.java
index 6868beb1..a82584fd 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/PartRelationEntity.java
+++ b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/PartRelationEntity.java
@@ -23,7 +23,7 @@
  * <p>
  * Author: Chill Zhuang (bladejava@qq.com)
  */
-package org.springblade.scheduling.scheduling.entity;
+package org.springblade.scheduling.pojo.entity;
 
 import lombok.Data;
 import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/PersonAbilityEntity.java b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/PersonAbilityEntity.java
similarity index 97%
rename from blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/PersonAbilityEntity.java
rename to blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/PersonAbilityEntity.java
index 1d02e303..f04edcdb 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/PersonAbilityEntity.java
+++ b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/PersonAbilityEntity.java
@@ -23,7 +23,7 @@
  * <p>
  * Author: Chill Zhuang (bladejava@qq.com)
  */
-package org.springblade.scheduling.scheduling.entity;
+package org.springblade.scheduling.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/PersonResourceEntity.java b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/PersonResourceEntity.java
similarity index 98%
rename from blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/PersonResourceEntity.java
rename to blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/PersonResourceEntity.java
index 791b2c2e..6b4746ce 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/PersonResourceEntity.java
+++ b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/PersonResourceEntity.java
@@ -23,7 +23,7 @@
  * <p>
  * Author: Chill Zhuang (bladejava@qq.com)
  */
-package org.springblade.scheduling.scheduling.entity;
+package org.springblade.scheduling.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/ProcessGroupEntity.java b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/ProcessGroupEntity.java
similarity index 96%
rename from blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/ProcessGroupEntity.java
rename to blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/ProcessGroupEntity.java
index 83fb5693..657905d2 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/ProcessGroupEntity.java
+++ b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/ProcessGroupEntity.java
@@ -23,7 +23,7 @@
  * <p>
  * Author: Chill Zhuang (bladejava@qq.com)
  */
-package org.springblade.scheduling.scheduling.entity;
+package org.springblade.scheduling.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/ProcessSetEntity.java b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/ProcessSetEntity.java
similarity index 98%
rename from blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/ProcessSetEntity.java
rename to blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/ProcessSetEntity.java
index 40556624..ed5fe9bd 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/ProcessSetEntity.java
+++ b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/ProcessSetEntity.java
@@ -23,7 +23,7 @@
  * <p>
  * Author: Chill Zhuang (bladejava@qq.com)
  */
-package org.springblade.scheduling.scheduling.entity;
+package org.springblade.scheduling.pojo.entity;
 
 import lombok.Data;
 import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/QualityGradeEntity.java b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/QualityGradeEntity.java
similarity index 97%
rename from blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/QualityGradeEntity.java
rename to blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/QualityGradeEntity.java
index d5f7ea49..1b3da2cc 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/QualityGradeEntity.java
+++ b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/QualityGradeEntity.java
@@ -23,7 +23,7 @@
  * <p>
  * Author: Chill Zhuang (bladejava@qq.com)
  */
-package org.springblade.scheduling.scheduling.entity;
+package org.springblade.scheduling.pojo.entity;
 
 import lombok.Data;
 import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/SameTroughEntity.java b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/SameTroughEntity.java
similarity index 98%
rename from blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/SameTroughEntity.java
rename to blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/SameTroughEntity.java
index 1272fe24..53625738 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/SameTroughEntity.java
+++ b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/SameTroughEntity.java
@@ -23,7 +23,7 @@
  * <p>
  * Author: Chill Zhuang (bladejava@qq.com)
  */
-package org.springblade.scheduling.scheduling.entity;
+package org.springblade.scheduling.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/SintTempCurveEntity.java b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/SintTempCurveEntity.java
similarity index 97%
rename from blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/SintTempCurveEntity.java
rename to blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/SintTempCurveEntity.java
index 5287a4b2..62dea075 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/SintTempCurveEntity.java
+++ b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/SintTempCurveEntity.java
@@ -23,7 +23,7 @@
  * <p>
  * Author: Chill Zhuang (bladejava@qq.com)
  */
-package org.springblade.scheduling.scheduling.entity;
+package org.springblade.scheduling.pojo.entity;
 
 import lombok.Data;
 import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/TeamSetEntity.java b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/TeamSetEntity.java
similarity index 98%
rename from blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/TeamSetEntity.java
rename to blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/TeamSetEntity.java
index 9275c84a..b5b20889 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/TeamSetEntity.java
+++ b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/TeamSetEntity.java
@@ -23,7 +23,7 @@
  * <p>
  * Author: Chill Zhuang (bladejava@qq.com)
  */
-package org.springblade.scheduling.scheduling.entity;
+package org.springblade.scheduling.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/TeamTimeEntity.java b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/TeamTimeEntity.java
similarity index 97%
rename from blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/TeamTimeEntity.java
rename to blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/TeamTimeEntity.java
index ff2e9f49..ede037a0 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/TeamTimeEntity.java
+++ b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/TeamTimeEntity.java
@@ -23,7 +23,7 @@
  * <p>
  * Author: Chill Zhuang (bladejava@qq.com)
  */
-package org.springblade.scheduling.scheduling.entity;
+package org.springblade.scheduling.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/WorkCenterEntity.java b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/WorkCenterEntity.java
similarity index 98%
rename from blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/WorkCenterEntity.java
rename to blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/WorkCenterEntity.java
index a4f54f77..6825dba2 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/WorkCenterEntity.java
+++ b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/WorkCenterEntity.java
@@ -23,7 +23,7 @@
  * <p>
  * Author: Chill Zhuang (bladejava@qq.com)
  */
-package org.springblade.scheduling.scheduling.entity;
+package org.springblade.scheduling.pojo.entity;
 
 import lombok.Data;
 import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/WorkOrderEntity.java b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/WorkOrderEntity.java
similarity index 99%
rename from blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/WorkOrderEntity.java
rename to blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/WorkOrderEntity.java
index 4855d100..42e2958d 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/WorkOrderEntity.java
+++ b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/WorkOrderEntity.java
@@ -23,7 +23,7 @@
  * <p>
  * Author: Chill Zhuang (bladejava@qq.com)
  */
-package org.springblade.scheduling.scheduling.entity;
+package org.springblade.scheduling.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/WorkOrderRunEntity.java b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/WorkOrderRunEntity.java
similarity index 98%
rename from blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/WorkOrderRunEntity.java
rename to blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/WorkOrderRunEntity.java
index 98a76adc..4f1e64c5 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/WorkOrderRunEntity.java
+++ b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/WorkOrderRunEntity.java
@@ -23,7 +23,7 @@
  * <p>
  * Author: Chill Zhuang (bladejava@qq.com)
  */
-package org.springblade.scheduling.scheduling.entity;
+package org.springblade.scheduling.pojo.entity;
 
 import lombok.Data;
 import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/WorkPlanEntity.java b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/WorkPlanEntity.java
similarity index 99%
rename from blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/WorkPlanEntity.java
rename to blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/WorkPlanEntity.java
index 4bc43943..b64b7447 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/WorkPlanEntity.java
+++ b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/WorkPlanEntity.java
@@ -23,7 +23,7 @@
  * <p>
  * Author: Chill Zhuang (bladejava@qq.com)
  */
-package org.springblade.scheduling.scheduling.entity;
+package org.springblade.scheduling.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/YieldOrderCraftEntity.java b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/YieldOrderCraftEntity.java
similarity index 98%
rename from blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/YieldOrderCraftEntity.java
rename to blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/YieldOrderCraftEntity.java
index 57042575..f16a2656 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/YieldOrderCraftEntity.java
+++ b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/YieldOrderCraftEntity.java
@@ -23,7 +23,7 @@
  * <p>
  * Author: Chill Zhuang (bladejava@qq.com)
  */
-package org.springblade.scheduling.scheduling.entity;
+package org.springblade.scheduling.pojo.entity;
 
 import lombok.Data;
 import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/YieldOrderEntity.java b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/YieldOrderEntity.java
similarity index 99%
rename from blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/YieldOrderEntity.java
rename to blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/YieldOrderEntity.java
index e90fef52..d912464e 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/YieldOrderEntity.java
+++ b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/YieldOrderEntity.java
@@ -1,4 +1,4 @@
-package org.springblade.scheduling.scheduling.entity;
+package org.springblade.scheduling.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/CraftAbilityController.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/CraftAbilityController.java
index 929dbca4..a299c76b 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/CraftAbilityController.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/CraftAbilityController.java
@@ -38,8 +38,7 @@ 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.scheduling.scheduling.entity.CraftAbilityEntity;
-import org.springblade.scheduling.scheduling.entity.WorkCenterEntity;
+import org.springblade.scheduling.pojo.entity.CraftAbilityEntity;
 import org.springblade.scheduling.scheduling.excel.CraftAbilityExcel;
 import org.springblade.scheduling.scheduling.service.ICraftAbilityService;
 import org.springblade.scheduling.scheduling.vo.CraftAbilityVO;
@@ -50,7 +49,7 @@ 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;
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 bab19bde..ef3ed22c 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
@@ -46,7 +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.scheduling.scheduling.entity.EquipAbilityEntity;
+import org.springblade.scheduling.pojo.entity.EquipAbilityEntity;
 import org.springblade.scheduling.scheduling.excel.EquipAbilityExcel;
 import org.springblade.scheduling.scheduling.service.IEquipAbilityService;
 import org.springblade.scheduling.scheduling.service.IEquipResourceService;
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/EquipResourceController.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/EquipResourceController.java
index 62308f2d..cba2491f 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/EquipResourceController.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/EquipResourceController.java
@@ -43,7 +43,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.scheduling.scheduling.entity.EquipResourceEntity;
+import org.springblade.scheduling.pojo.entity.EquipResourceEntity;
 import org.springblade.scheduling.scheduling.excel.EquipResourceExcel;
 import org.springblade.scheduling.scheduling.service.IEquipResourceService;
 import org.springblade.scheduling.scheduling.vo.EquipResourceVO;
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/InspectionItemController.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/InspectionItemController.java
index 0f7ea322..d9eb1eb7 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/InspectionItemController.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/InspectionItemController.java
@@ -43,7 +43,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.scheduling.scheduling.entity.InspectionItemEntity;
+import org.springblade.scheduling.pojo.entity.InspectionItemEntity;
 import org.springblade.scheduling.scheduling.excel.InspectionItemExcel;
 import org.springblade.scheduling.scheduling.service.IInspectionItemService;
 import org.springblade.scheduling.scheduling.vo.InspectionItemVO;
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/MainProducerController.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/MainProducerController.java
index 79c9412d..e9a509fe 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/MainProducerController.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/MainProducerController.java
@@ -46,7 +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.scheduling.scheduling.entity.MainProducerEntity;
+import org.springblade.scheduling.pojo.entity.MainProducerEntity;
 import org.springblade.scheduling.scheduling.excel.MainProducerExcel;
 import org.springblade.scheduling.scheduling.service.IMainProducerService;
 import org.springblade.scheduling.scheduling.vo.MainProducerVO;
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/OutsourceProcessController.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/OutsourceProcessController.java
index 3b2f91da..65edd56c 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/OutsourceProcessController.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/OutsourceProcessController.java
@@ -38,7 +38,7 @@ 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.scheduling.scheduling.entity.OutsourceProcessEntity;
+import org.springblade.scheduling.pojo.entity.OutsourceProcessEntity;
 import org.springblade.scheduling.scheduling.excel.OutsourceProcessExcel;
 import org.springblade.scheduling.scheduling.service.IOutsourceProcessService;
 import org.springblade.scheduling.scheduling.vo.OutsourceProcessVO;
@@ -49,7 +49,7 @@ 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;
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/PartController.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/PartController.java
index 31d91354..117a4047 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/PartController.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/PartController.java
@@ -38,7 +38,7 @@ 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.scheduling.scheduling.entity.PartEntity;
+import org.springblade.scheduling.pojo.entity.PartEntity;
 import org.springblade.scheduling.scheduling.excel.PartExcel;
 import org.springblade.scheduling.scheduling.service.IPartService;
 import org.springblade.scheduling.scheduling.vo.PartVO;
@@ -49,7 +49,7 @@ 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;
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/PartRelationController.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/PartRelationController.java
index d65e168a..be35e5c6 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/PartRelationController.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/PartRelationController.java
@@ -38,7 +38,7 @@ 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.scheduling.scheduling.entity.PartRelationEntity;
+import org.springblade.scheduling.pojo.entity.PartRelationEntity;
 import org.springblade.scheduling.scheduling.excel.PartRelationExcel;
 import org.springblade.scheduling.scheduling.service.IPartRelationService;
 import org.springblade.scheduling.scheduling.vo.PartRelationVO;
@@ -49,7 +49,7 @@ 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;
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 4929865a..d1e0edcc 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,7 +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.scheduling.scheduling.entity.PersonAbilityEntity;
+import org.springblade.scheduling.pojo.entity.PersonAbilityEntity;
 import org.springblade.scheduling.scheduling.excel.PersonAbilityExcel;
 import org.springblade.scheduling.scheduling.service.IPersonAbilityService;
 import org.springblade.scheduling.scheduling.vo.PersonAbilityVO;
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/PersonResourceController.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/PersonResourceController.java
index a04e2f37..11a40038 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/PersonResourceController.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/PersonResourceController.java
@@ -43,7 +43,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.scheduling.scheduling.entity.PersonResourceEntity;
+import org.springblade.scheduling.pojo.entity.PersonResourceEntity;
 import org.springblade.scheduling.scheduling.excel.PersonResourceExcel;
 import org.springblade.scheduling.scheduling.service.IPersonResourceService;
 import org.springblade.scheduling.scheduling.vo.PersonResourceVO;
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/ProcessGroupController.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/ProcessGroupController.java
index 85c8be6b..c22f8c70 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/ProcessGroupController.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/ProcessGroupController.java
@@ -43,7 +43,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.scheduling.scheduling.entity.ProcessGroupEntity;
+import org.springblade.scheduling.pojo.entity.ProcessGroupEntity;
 import org.springblade.scheduling.scheduling.excel.ProcessGroupExcel;
 import org.springblade.scheduling.scheduling.service.IProcessGroupService;
 import org.springblade.scheduling.scheduling.vo.ProcessGroupVO;
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/ProcessSetController.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/ProcessSetController.java
index 773f9389..36363307 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/ProcessSetController.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/ProcessSetController.java
@@ -25,7 +25,6 @@
  */
 package org.springblade.scheduling.scheduling.controller;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
@@ -35,7 +34,6 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;
 import lombok.AllArgsConstructor;
-import org.apache.commons.lang3.StringUtils;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.excel.util.ExcelUtil;
 import org.springblade.core.mp.support.Condition;
@@ -45,7 +43,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.scheduling.scheduling.entity.ProcessSetEntity;
+import org.springblade.scheduling.pojo.entity.ProcessSetEntity;
 import org.springblade.scheduling.scheduling.excel.ProcessSetExcel;
 import org.springblade.scheduling.scheduling.service.IProcessSetService;
 import org.springblade.scheduling.scheduling.vo.ProcessSetVO;
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/QualityGradeController.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/QualityGradeController.java
index f598f551..47a9ba35 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/QualityGradeController.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/QualityGradeController.java
@@ -43,7 +43,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.scheduling.scheduling.entity.QualityGradeEntity;
+import org.springblade.scheduling.pojo.entity.QualityGradeEntity;
 import org.springblade.scheduling.scheduling.excel.QualityGradeExcel;
 import org.springblade.scheduling.scheduling.service.IQualityGradeService;
 import org.springblade.scheduling.scheduling.vo.QualityGradeVO;
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/SameTroughController.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/SameTroughController.java
index 8f0cddbb..46d1c364 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/SameTroughController.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/SameTroughController.java
@@ -38,7 +38,7 @@ 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.scheduling.scheduling.entity.SameTroughEntity;
+import org.springblade.scheduling.pojo.entity.SameTroughEntity;
 import org.springblade.scheduling.scheduling.excel.SameTroughExcel;
 import org.springblade.scheduling.scheduling.service.ISameTroughService;
 import org.springblade.scheduling.scheduling.vo.SameTroughVO;
@@ -49,7 +49,7 @@ 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;
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/SintTempCurveController.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/SintTempCurveController.java
index d80b5314..5cd335c8 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/SintTempCurveController.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/SintTempCurveController.java
@@ -38,7 +38,7 @@ 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.scheduling.scheduling.entity.SintTempCurveEntity;
+import org.springblade.scheduling.pojo.entity.SintTempCurveEntity;
 import org.springblade.scheduling.scheduling.excel.SintTempCurveExcel;
 import org.springblade.scheduling.scheduling.service.ISintTempCurveService;
 import org.springblade.scheduling.scheduling.vo.SintTempCurveVO;
@@ -49,7 +49,7 @@ 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;
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/TeamSetController.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/TeamSetController.java
index f2078905..02e119ea 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/TeamSetController.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/TeamSetController.java
@@ -43,7 +43,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.scheduling.scheduling.entity.TeamSetEntity;
+import org.springblade.scheduling.pojo.entity.TeamSetEntity;
 import org.springblade.scheduling.scheduling.excel.TeamSetExcel;
 import org.springblade.scheduling.scheduling.service.ITeamSetService;
 import org.springblade.scheduling.scheduling.vo.TeamSetVO;
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/WorkCenterController.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/WorkCenterController.java
index d71e854f..ab0897ca 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/WorkCenterController.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/WorkCenterController.java
@@ -43,7 +43,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.scheduling.scheduling.entity.WorkCenterEntity;
+import org.springblade.scheduling.pojo.entity.WorkCenterEntity;
 import org.springblade.scheduling.scheduling.excel.WorkCenterExcel;
 import org.springblade.scheduling.scheduling.service.IWorkCenterService;
 import org.springblade.scheduling.scheduling.vo.WorkCenterVO;
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 332cd8ba..b03d174d 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
@@ -45,14 +45,12 @@ import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.ObjectUtil;
 import org.springblade.scheduling.scheduling.dto.WorkOrderDto;
-import org.springblade.scheduling.scheduling.entity.WorkOrderEntity;
+import org.springblade.scheduling.pojo.entity.WorkOrderEntity;
 import org.springblade.scheduling.scheduling.excel.SchedulingBoardExcel;
 import org.springblade.scheduling.scheduling.vo.WorkOrderVO;
 import org.springblade.scheduling.scheduling.excel.WorkOrderExcel;
 import org.springblade.scheduling.scheduling.service.IWorkOrderService;
 import org.springblade.scheduling.scheduling.wrapper.WorkOrderWrapper;
-import org.springframework.data.redis.core.StringRedisTemplate;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.ArrayList;
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/WorkOrderRunController.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/WorkOrderRunController.java
index d9c3f9ea..89e38f94 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/WorkOrderRunController.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/WorkOrderRunController.java
@@ -38,7 +38,7 @@ 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.scheduling.scheduling.entity.WorkOrderRunEntity;
+import org.springblade.scheduling.pojo.entity.WorkOrderRunEntity;
 import org.springblade.scheduling.scheduling.excel.WorkOrderRunExcel;
 import org.springblade.scheduling.scheduling.service.IWorkOrderRunService;
 import org.springblade.scheduling.scheduling.vo.WorkOrderRunVO;
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/WorkPlanController.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/WorkPlanController.java
index 9e77b28f..9c2e4588 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/WorkPlanController.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/WorkPlanController.java
@@ -44,7 +44,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.scheduling.scheduling.entity.WorkPlanEntity;
+import org.springblade.scheduling.pojo.entity.WorkPlanEntity;
 import org.springblade.scheduling.scheduling.excel.WorkPlanExcel;
 import org.springblade.scheduling.scheduling.service.IWorkPlanService;
 import org.springblade.scheduling.scheduling.vo.WorkPlanVO;
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/YieldOrderController.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/YieldOrderController.java
index 8316d227..ff526345 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/YieldOrderController.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/YieldOrderController.java
@@ -43,7 +43,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.scheduling.scheduling.entity.YieldOrderEntity;
+import org.springblade.scheduling.pojo.entity.YieldOrderEntity;
 import org.springblade.scheduling.scheduling.excel.YieldOrderExcel;
 import org.springblade.scheduling.scheduling.service.IYieldOrderService;
 import org.springblade.scheduling.scheduling.vo.YieldOrderVO;
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/CraftAbilityMapper.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/CraftAbilityMapper.java
index 7797ace8..9c65808b 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/CraftAbilityMapper.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/CraftAbilityMapper.java
@@ -29,7 +29,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
-import org.springblade.scheduling.scheduling.entity.CraftAbilityEntity;
+import org.springblade.scheduling.pojo.entity.CraftAbilityEntity;
 import org.springblade.scheduling.scheduling.excel.CraftAbilityExcel;
 import org.springblade.scheduling.scheduling.vo.CraftAbilityVO;
 
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/CraftAbilityMapper.xml b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/CraftAbilityMapper.xml
index 76362c90..a318974c 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/CraftAbilityMapper.xml
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/CraftAbilityMapper.xml
@@ -3,7 +3,7 @@
 <mapper namespace="org.springblade.scheduling.scheduling.mapper.CraftAbilityMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="craftAbilityResultMap" type="org.springblade.scheduling.scheduling.entity.CraftAbilityEntity">
+    <resultMap id="craftAbilityResultMap" type="org.springblade.scheduling.pojo.entity.CraftAbilityEntity">
         <result column="ID" property="id"/>
         <result column="CA_CODE" property="caCode"/>
         <result column="CA_NAME" property="caName"/>
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/EquipAbilityMapper.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/EquipAbilityMapper.java
index 039ff5d1..10db9aa4 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/EquipAbilityMapper.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/EquipAbilityMapper.java
@@ -29,7 +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.scheduling.scheduling.entity.EquipAbilityEntity;
+import org.springblade.scheduling.pojo.entity.EquipAbilityEntity;
 import org.springblade.scheduling.scheduling.excel.EquipAbilityExcel;
 import org.springblade.scheduling.scheduling.vo.EquipAbilityVO;
 
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/EquipAbilityMapper.xml b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/EquipAbilityMapper.xml
index 38779bb6..a425d963 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/EquipAbilityMapper.xml
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/EquipAbilityMapper.xml
@@ -3,7 +3,7 @@
 <mapper namespace="org.springblade.scheduling.scheduling.mapper.EquipAbilityMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="mesEquipAbilityResultMap" type="org.springblade.scheduling.scheduling.entity.EquipAbilityEntity">
+    <resultMap id="mesEquipAbilityResultMap" type="org.springblade.scheduling.pojo.entity.EquipAbilityEntity">
         <result column="ID" property="id"/>
         <result column="WORK_CENTER_ID" property="workCenterId"/>
         <result column="WORK_CENTER_NAME" property="workCenterName"/>
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/EquipResourceMapper.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/EquipResourceMapper.java
index d09e1157..890a7615 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/EquipResourceMapper.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/EquipResourceMapper.java
@@ -29,7 +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.scheduling.scheduling.entity.EquipResourceEntity;
+import org.springblade.scheduling.pojo.entity.EquipResourceEntity;
 import org.springblade.scheduling.scheduling.excel.EquipResourceExcel;
 import org.springblade.scheduling.scheduling.vo.EquipResourceVO;
 
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/EquipResourceMapper.xml b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/EquipResourceMapper.xml
index 9b8a9997..67093698 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/EquipResourceMapper.xml
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/EquipResourceMapper.xml
@@ -3,7 +3,7 @@
 <mapper namespace="org.springblade.scheduling.scheduling.mapper.EquipResourceMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="equipResourceResultMap" type="org.springblade.scheduling.scheduling.entity.EquipResourceEntity">
+    <resultMap id="equipResourceResultMap" type="org.springblade.scheduling.pojo.entity.EquipResourceEntity">
         <result column="ID" property="id"/>
         <result column="EQUIP_CODE" property="equipCode"/>
         <result column="EQUIP_NAME" property="equipName"/>
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/InspectionItemMapper.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/InspectionItemMapper.java
index 35b2471e..6e93b6fe 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/InspectionItemMapper.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/InspectionItemMapper.java
@@ -29,7 +29,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
-import org.springblade.scheduling.scheduling.entity.InspectionItemEntity;
+import org.springblade.scheduling.pojo.entity.InspectionItemEntity;
 import org.springblade.scheduling.scheduling.excel.InspectionItemExcel;
 import org.springblade.scheduling.scheduling.vo.InspectionItemVO;
 
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/InspectionItemMapper.xml b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/InspectionItemMapper.xml
index dd4570f2..d29114cd 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/InspectionItemMapper.xml
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/InspectionItemMapper.xml
@@ -3,7 +3,7 @@
 <mapper namespace="org.springblade.scheduling.scheduling.mapper.InspectionItemMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="inspectionItemResultMap" type="org.springblade.scheduling.scheduling.entity.InspectionItemEntity">
+    <resultMap id="inspectionItemResultMap" type="org.springblade.scheduling.pojo.entity.InspectionItemEntity">
         <result column="SAMPLING_QUANTITY" property="samplingQuantity"/>
         <result column="STANDARD_TIME" property="standardTime"/>
         <result column="PREPARE_TIME" property="prepareTime"/>
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/MainProducerMapper.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/MainProducerMapper.java
index 0e588006..e308bb55 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/MainProducerMapper.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/MainProducerMapper.java
@@ -29,7 +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.scheduling.scheduling.entity.MainProducerEntity;
+import org.springblade.scheduling.pojo.entity.MainProducerEntity;
 import org.springblade.scheduling.scheduling.excel.MainProducerExcel;
 import org.springblade.scheduling.scheduling.vo.MainProducerVO;
 
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/MainProducerMapper.xml b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/MainProducerMapper.xml
index 783173a9..dbdd5d60 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/MainProducerMapper.xml
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/MainProducerMapper.xml
@@ -3,7 +3,7 @@
 <mapper namespace="org.springblade.scheduling.scheduling.mapper.MainProducerMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="mesMainProducerResultMap" type="org.springblade.scheduling.scheduling.entity.MainProducerEntity">
+    <resultMap id="mesMainProducerResultMap" type="org.springblade.scheduling.pojo.entity.MainProducerEntity">
         <result column="ID" property="id"/>
         <result column="PROCESS_ID" property="processId"/>
         <result column="PROCESS_NAME" property="processName"/>
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/OutsourceProcessMapper.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/OutsourceProcessMapper.java
index acc6407e..063ac78d 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/OutsourceProcessMapper.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/OutsourceProcessMapper.java
@@ -29,7 +29,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
-import org.springblade.scheduling.scheduling.entity.OutsourceProcessEntity;
+import org.springblade.scheduling.pojo.entity.OutsourceProcessEntity;
 import org.springblade.scheduling.scheduling.excel.OutsourceProcessExcel;
 import org.springblade.scheduling.scheduling.vo.OutsourceProcessVO;
 
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/OutsourceProcessMapper.xml b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/OutsourceProcessMapper.xml
index 0f952503..6b3fe591 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/OutsourceProcessMapper.xml
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/OutsourceProcessMapper.xml
@@ -3,7 +3,7 @@
 <mapper namespace="org.springblade.scheduling.scheduling.mapper.OutsourceProcessMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="outsourceProcessResultMap" type="org.springblade.scheduling.scheduling.entity.OutsourceProcessEntity">
+    <resultMap id="outsourceProcessResultMap" type="org.springblade.scheduling.pojo.entity.OutsourceProcessEntity">
         <result column="ID" property="id"/>
         <result column="PROCESS_ID" property="processId"/>
         <result column="PROCESS_NAME" property="processName"/>
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/PartMapper.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/PartMapper.java
index 6f251a88..ca8684c3 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/PartMapper.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/PartMapper.java
@@ -29,7 +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.scheduling.scheduling.entity.PartEntity;
+import org.springblade.scheduling.pojo.entity.PartEntity;
 import org.springblade.scheduling.scheduling.excel.PartExcel;
 import org.springblade.scheduling.scheduling.vo.PartVO;
 
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/PartMapper.xml b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/PartMapper.xml
index 9e0548e3..40c865a5 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/PartMapper.xml
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/PartMapper.xml
@@ -3,7 +3,7 @@
 <mapper namespace="org.springblade.scheduling.scheduling.mapper.PartMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="partResultMap" type="org.springblade.scheduling.scheduling.entity.PartEntity">
+    <resultMap id="partResultMap" type="org.springblade.scheduling.pojo.entity.PartEntity">
         <result column="APPROVE_USER" property="approveUser"/>
         <result column="TSB_NUM" property="tsbNum"/>
         <result column="TSD_NUM" property="tsdNum"/>
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/PartRelationMapper.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/PartRelationMapper.java
index 4f2146e0..1f3773fa 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/PartRelationMapper.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/PartRelationMapper.java
@@ -29,7 +29,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
-import org.springblade.scheduling.scheduling.entity.PartRelationEntity;
+import org.springblade.scheduling.pojo.entity.PartRelationEntity;
 import org.springblade.scheduling.scheduling.excel.PartRelationExcel;
 import org.springblade.scheduling.scheduling.vo.PartRelationVO;
 
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/PartRelationMapper.xml b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/PartRelationMapper.xml
index aa8dce3a..5aab08f6 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/PartRelationMapper.xml
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/PartRelationMapper.xml
@@ -3,7 +3,7 @@
 <mapper namespace="org.springblade.scheduling.scheduling.mapper.PartRelationMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="partRelationResultMap" type="org.springblade.scheduling.scheduling.entity.PartRelationEntity">
+    <resultMap id="partRelationResultMap" type="org.springblade.scheduling.pojo.entity.PartRelationEntity">
         <result column="ID" property="id"/>
         <result column="PART_ID" property="partId"/>
         <result column="PART_CODE" property="partCode"/>
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 8889c81b..a6de70ad 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,7 +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.scheduling.scheduling.entity.PersonAbilityEntity;
+import org.springblade.scheduling.pojo.entity.PersonAbilityEntity;
 import org.springblade.scheduling.scheduling.excel.PersonAbilityExcel;
 import org.springblade.scheduling.scheduling.vo.PersonAbilityVO;
 
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 1acab351..2b53e6fb 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
@@ -3,7 +3,7 @@
 <mapper namespace="org.springblade.scheduling.scheduling.mapper.PersonAbilityMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="mesEquipAbilityResultMap" type="org.springblade.scheduling.scheduling.entity.PersonAbilityEntity">
+    <resultMap id="mesEquipAbilityResultMap" type="org.springblade.scheduling.pojo.entity.PersonAbilityEntity">
         <result column="ID" property="id"/>
         <result column="WORK_CENTER_NAME" property="workCenterName"/>
         <result column="WORK_CENTER_ID" property="workCenterId"/>
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/PersonResourceMapper.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/PersonResourceMapper.java
index e73ca6fa..c20a8c51 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/PersonResourceMapper.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/PersonResourceMapper.java
@@ -29,7 +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.scheduling.scheduling.entity.PersonResourceEntity;
+import org.springblade.scheduling.pojo.entity.PersonResourceEntity;
 import org.springblade.scheduling.scheduling.excel.PersonResourceExcel;
 import org.springblade.scheduling.scheduling.vo.PersonResourceVO;
 
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/PersonResourceMapper.xml b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/PersonResourceMapper.xml
index b059aa64..553533f1 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/PersonResourceMapper.xml
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/PersonResourceMapper.xml
@@ -3,7 +3,7 @@
 <mapper namespace="org.springblade.scheduling.scheduling.mapper.PersonResourceMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="personResourceResultMap" type="org.springblade.scheduling.scheduling.entity.PersonResourceEntity">
+    <resultMap id="personResourceResultMap" type="org.springblade.scheduling.pojo.entity.PersonResourceEntity">
         <result column="ID" property="id"/>
         <result column="CRAFT_ID" property="craftId"/>
         <result column="CRAFT_NAME" property="craftName"/>
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/ProcessGroupMapper.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/ProcessGroupMapper.java
index 2df7ed3b..052e7c29 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/ProcessGroupMapper.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/ProcessGroupMapper.java
@@ -29,7 +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.scheduling.scheduling.entity.ProcessGroupEntity;
+import org.springblade.scheduling.pojo.entity.ProcessGroupEntity;
 import org.springblade.scheduling.scheduling.excel.ProcessGroupExcel;
 import org.springblade.scheduling.scheduling.vo.ProcessGroupVO;
 
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/ProcessGroupMapper.xml b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/ProcessGroupMapper.xml
index 7d607c38..58e3b1d7 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/ProcessGroupMapper.xml
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/ProcessGroupMapper.xml
@@ -3,7 +3,7 @@
 <mapper namespace="org.springblade.scheduling.scheduling.mapper.ProcessGroupMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="mesProcessGroupResultMap" type="org.springblade.scheduling.scheduling.entity.ProcessGroupEntity">
+    <resultMap id="mesProcessGroupResultMap" type="org.springblade.scheduling.pojo.entity.ProcessGroupEntity">
         <result column="ID" property="id"/>
         <result column="PROCESS_GROUP_NAME" property="processGroupName"/>
         <result column="PROCESS_NAME" property="processName"/>
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/ProcessSetMapper.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/ProcessSetMapper.java
index be34dfb6..87d7a706 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/ProcessSetMapper.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/ProcessSetMapper.java
@@ -29,7 +29,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
-import org.springblade.scheduling.scheduling.entity.ProcessSetEntity;
+import org.springblade.scheduling.pojo.entity.ProcessSetEntity;
 import org.springblade.scheduling.scheduling.excel.ProcessSetExcel;
 import org.springblade.scheduling.scheduling.vo.ProcessSetVO;
 
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/ProcessSetMapper.xml b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/ProcessSetMapper.xml
index a8584a33..d2c8a1af 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/ProcessSetMapper.xml
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/ProcessSetMapper.xml
@@ -3,7 +3,7 @@
 <mapper namespace="org.springblade.scheduling.scheduling.mapper.ProcessSetMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="processSetResultMap" type="org.springblade.scheduling.scheduling.entity.ProcessSetEntity">
+    <resultMap id="processSetResultMap" type="org.springblade.scheduling.pojo.entity.ProcessSetEntity">
         <result column="NI_VALUE" property="niValue"/>
         <result column="VI_SPEED" property="viSpeed"/>
         <result column="CYROPACTOR_CONTROL" property="cyropactorControl"/>
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/QualityGradeMapper.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/QualityGradeMapper.java
index 95b446f7..6ca06f44 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/QualityGradeMapper.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/QualityGradeMapper.java
@@ -29,7 +29,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
-import org.springblade.scheduling.scheduling.entity.QualityGradeEntity;
+import org.springblade.scheduling.pojo.entity.QualityGradeEntity;
 import org.springblade.scheduling.scheduling.excel.QualityGradeExcel;
 import org.springblade.scheduling.scheduling.vo.QualityGradeVO;
 
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/QualityGradeMapper.xml b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/QualityGradeMapper.xml
index 8622bd57..73381829 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/QualityGradeMapper.xml
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/QualityGradeMapper.xml
@@ -3,7 +3,7 @@
 <mapper namespace="org.springblade.scheduling.scheduling.mapper.QualityGradeMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="qualityGradeResultMap" type="org.springblade.scheduling.scheduling.entity.QualityGradeEntity">
+    <resultMap id="qualityGradeResultMap" type="org.springblade.scheduling.pojo.entity.QualityGradeEntity">
         <result column="ID" property="id"/>
         <result column="QUALITY_GRADE" property="qualityGrade"/>
         <result column="TYPE" property="type"/>
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/SameTroughMapper.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/SameTroughMapper.java
index 32adaa91..08b38e3e 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/SameTroughMapper.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/SameTroughMapper.java
@@ -29,7 +29,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
-import org.springblade.scheduling.scheduling.entity.SameTroughEntity;
+import org.springblade.scheduling.pojo.entity.SameTroughEntity;
 import org.springblade.scheduling.scheduling.excel.SameTroughExcel;
 import org.springblade.scheduling.scheduling.vo.SameTroughVO;
 
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/SameTroughMapper.xml b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/SameTroughMapper.xml
index 0662df00..90f0a446 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/SameTroughMapper.xml
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/SameTroughMapper.xml
@@ -3,7 +3,7 @@
 <mapper namespace="org.springblade.scheduling.scheduling.mapper.SameTroughMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="sameTroughResultMap" type="org.springblade.scheduling.scheduling.entity.SameTroughEntity">
+    <resultMap id="sameTroughResultMap" type="org.springblade.scheduling.pojo.entity.SameTroughEntity">
         <result column="ID" property="id"/>
         <result column="WORK_CENTER_ID" property="workCenterId"/>
         <result column="WORK_CENTER_NAME" property="workCenterName"/>
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/SintTempCurveMapper.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/SintTempCurveMapper.java
index 5be3e839..eb489e0d 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/SintTempCurveMapper.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/SintTempCurveMapper.java
@@ -29,7 +29,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
-import org.springblade.scheduling.scheduling.entity.SintTempCurveEntity;
+import org.springblade.scheduling.pojo.entity.SintTempCurveEntity;
 import org.springblade.scheduling.scheduling.excel.SintTempCurveExcel;
 import org.springblade.scheduling.scheduling.vo.SintTempCurveVO;
 
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/SintTempCurveMapper.xml b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/SintTempCurveMapper.xml
index 74162fb0..24f09617 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/SintTempCurveMapper.xml
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/SintTempCurveMapper.xml
@@ -3,7 +3,7 @@
 <mapper namespace="org.springblade.scheduling.scheduling.mapper.SintTempCurveMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="sintTempCurveResultMap" type="org.springblade.scheduling.scheduling.entity.SintTempCurveEntity">
+    <resultMap id="sintTempCurveResultMap" type="org.springblade.scheduling.pojo.entity.SintTempCurveEntity">
         <result column="ID" property="id"/>
         <result column="PROCESS_ID" property="processId"/>
         <result column="PROCESS_NAME" property="processName"/>
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/TeamSetMapper.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/TeamSetMapper.java
index 9c8d3a1c..f56436ef 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/TeamSetMapper.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/TeamSetMapper.java
@@ -29,7 +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.scheduling.scheduling.entity.TeamSetEntity;
+import org.springblade.scheduling.pojo.entity.TeamSetEntity;
 import org.springblade.scheduling.scheduling.excel.TeamSetExcel;
 import org.springblade.scheduling.scheduling.vo.TeamSetVO;
 
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/TeamSetMapper.xml b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/TeamSetMapper.xml
index 394f5eda..45ab4d64 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/TeamSetMapper.xml
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/TeamSetMapper.xml
@@ -3,7 +3,7 @@
 <mapper namespace="org.springblade.scheduling.scheduling.mapper.TeamSetMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="bsTeamSetResultMap" type="org.springblade.scheduling.scheduling.entity.TeamSetEntity">
+    <resultMap id="bsTeamSetResultMap" type="org.springblade.scheduling.pojo.entity.TeamSetEntity">
         <result column="ID" property="id"/>
         <result column="TS_CODE" property="tsCode"/>
         <result column="TS_NAME" property="tsName"/>
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/TeamTimeMapper.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/TeamTimeMapper.java
index ffcd2488..3fef923b 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/TeamTimeMapper.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/TeamTimeMapper.java
@@ -29,7 +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.scheduling.scheduling.entity.TeamTimeEntity;
+import org.springblade.scheduling.pojo.entity.TeamTimeEntity;
 import org.springblade.scheduling.scheduling.excel.TeamTimeExcel;
 import org.springblade.scheduling.scheduling.vo.TeamTimeVO;
 
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/TeamTimeMapper.xml b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/TeamTimeMapper.xml
index d81700b1..442b37b5 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/TeamTimeMapper.xml
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/TeamTimeMapper.xml
@@ -3,7 +3,7 @@
 <mapper namespace="org.springblade.scheduling.scheduling.mapper.TeamTimeMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="bsTeamTimeResultMap" type="org.springblade.scheduling.scheduling.entity.TeamTimeEntity">
+    <resultMap id="bsTeamTimeResultMap" type="org.springblade.scheduling.pojo.entity.TeamTimeEntity">
         <result column="ID" property="id"/>
         <result column="TS_ID" property="tsId"/>
         <result column="START_TIME" property="startTime"/>
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkCenterMapper.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkCenterMapper.java
index 974a4e6c..c82001d1 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkCenterMapper.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkCenterMapper.java
@@ -29,7 +29,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
-import org.springblade.scheduling.scheduling.entity.WorkCenterEntity;
+import org.springblade.scheduling.pojo.entity.WorkCenterEntity;
 import org.springblade.scheduling.scheduling.excel.WorkCenterExcel;
 import org.springblade.scheduling.scheduling.vo.WorkCenterVO;
 
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkCenterMapper.xml b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkCenterMapper.xml
index 2a4c0a89..9777c417 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkCenterMapper.xml
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkCenterMapper.xml
@@ -3,7 +3,7 @@
 <mapper namespace="org.springblade.scheduling.scheduling.mapper.WorkCenterMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="workCenterResultMap" type="org.springblade.scheduling.scheduling.entity.WorkCenterEntity">
+    <resultMap id="workCenterResultMap" type="org.springblade.scheduling.pojo.entity.WorkCenterEntity">
         <result column="ID" property="id"/>
         <result column="WC_CODE" property="wcCode"/>
         <result column="WC_NAME" property="wcName"/>
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 dfea78c0..92969f78 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
@@ -30,7 +30,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
 import org.springblade.scheduling.scheduling.dto.WorkOrderDto;
-import org.springblade.scheduling.scheduling.entity.WorkOrderEntity;
+import org.springblade.scheduling.pojo.entity.WorkOrderEntity;
 import org.springblade.scheduling.scheduling.excel.SchedulingBoardExcel;
 import org.springblade.scheduling.scheduling.excel.WorkOrderExcel;
 import org.springblade.scheduling.scheduling.vo.WorkOrderVO;
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 86102c30..e4d518c7 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
@@ -3,7 +3,7 @@
 <mapper namespace="org.springblade.scheduling.scheduling.mapper.WorkOrderMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="workOrderResultMap" type="org.springblade.scheduling.scheduling.entity.WorkOrderEntity">
+    <resultMap id="workOrderResultMap" type="org.springblade.scheduling.pojo.entity.WorkOrderEntity">
         <result column="TS_ID" property="tsId"/>
         <result column="OC_ID" property="ocId"/>
         <result column="TEST_QTY" property="testQty"/>
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkOrderRunMapper.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkOrderRunMapper.java
index d6df3080..aa275332 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkOrderRunMapper.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkOrderRunMapper.java
@@ -29,7 +29,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
-import org.springblade.scheduling.scheduling.entity.WorkOrderRunEntity;
+import org.springblade.scheduling.pojo.entity.WorkOrderRunEntity;
 import org.springblade.scheduling.scheduling.excel.WorkOrderRunExcel;
 import org.springblade.scheduling.scheduling.vo.WorkOrderRunVO;
 
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkOrderRunMapper.xml b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkOrderRunMapper.xml
index 3e4ed70e..5cd4f3d6 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkOrderRunMapper.xml
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkOrderRunMapper.xml
@@ -3,7 +3,7 @@
 <mapper namespace="org.springblade.scheduling.scheduling.mapper.WorkOrderRunMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="workOrderRunResultMap" type="org.springblade.scheduling.scheduling.entity.WorkOrderRunEntity">
+    <resultMap id="workOrderRunResultMap" type="org.springblade.scheduling.pojo.entity.WorkOrderRunEntity">
         <result column="ID" property="id"/>
         <result column="WO_ID" property="woId"/>
         <result column="WO_CODE" property="woCode"/>
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkPlanMapper.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkPlanMapper.java
index a88610b2..ffcadc2d 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkPlanMapper.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkPlanMapper.java
@@ -29,7 +29,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
-import org.springblade.scheduling.scheduling.entity.WorkPlanEntity;
+import org.springblade.scheduling.pojo.entity.WorkPlanEntity;
 import org.springblade.scheduling.scheduling.excel.WorkPlanExcel;
 import org.springblade.scheduling.scheduling.vo.WorkPlanVO;
 
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkPlanMapper.xml b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkPlanMapper.xml
index 1155a66c..724bbbaa 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkPlanMapper.xml
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkPlanMapper.xml
@@ -3,7 +3,7 @@
 <mapper namespace="org.springblade.scheduling.scheduling.mapper.WorkPlanMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="workPlanResultMap" type="org.springblade.scheduling.scheduling.entity.WorkPlanEntity">
+    <resultMap id="workPlanResultMap" type="org.springblade.scheduling.pojo.entity.WorkPlanEntity">
         <result column="ID" property="id"/>
         <result column="WO_ID" property="woId"/>
         <result column="PPS_ID" property="ppsId"/>
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/YieldOrderCraftMapper.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/YieldOrderCraftMapper.java
index bf68b4ce..7b01da5d 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/YieldOrderCraftMapper.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/YieldOrderCraftMapper.java
@@ -25,7 +25,7 @@
  */
 package org.springblade.scheduling.scheduling.mapper;
 
-import org.springblade.scheduling.scheduling.entity.YieldOrderCraftEntity;
+import org.springblade.scheduling.pojo.entity.YieldOrderCraftEntity;
 import org.springblade.scheduling.scheduling.vo.YieldOrderCraftVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/YieldOrderCraftMapper.xml b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/YieldOrderCraftMapper.xml
index f191070f..e13292f9 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/YieldOrderCraftMapper.xml
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/YieldOrderCraftMapper.xml
@@ -3,7 +3,7 @@
 <mapper namespace="org.springblade.scheduling.scheduling.mapper.YieldOrderCraftMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="yieldOrderCraftResultMap" type="org.springblade.scheduling.scheduling.entity.YieldOrderCraftEntity">
+    <resultMap id="yieldOrderCraftResultMap" type="org.springblade.scheduling.pojo.entity.YieldOrderCraftEntity">
         <result column="ID" property="id"/>
         <result column="TENANT_ID" property="tenantId"/>
         <result column="CREATE_USER" property="createUser"/>
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/YieldOrderMapper.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/YieldOrderMapper.java
index 64d1608d..58b0dd15 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/YieldOrderMapper.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/YieldOrderMapper.java
@@ -25,7 +25,7 @@
  */
 package org.springblade.scheduling.scheduling.mapper;
 
-import org.springblade.scheduling.scheduling.entity.YieldOrderEntity;
+import org.springblade.scheduling.pojo.entity.YieldOrderEntity;
 import org.springblade.scheduling.scheduling.vo.YieldOrderVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/YieldOrderMapper.xml b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/YieldOrderMapper.xml
index 10108696..5548ee42 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/YieldOrderMapper.xml
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/YieldOrderMapper.xml
@@ -3,7 +3,7 @@
 <mapper namespace="org.springblade.scheduling.scheduling.mapper.YieldOrderMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="yieldOrderResultMap" type="org.springblade.scheduling.scheduling.entity.YieldOrderEntity">
+    <resultMap id="yieldOrderResultMap" type="org.springblade.scheduling.pojo.entity.YieldOrderEntity">
         <result column="ID" property="id"/>
         <result column="TENANT_ID" property="tenantId"/>
         <result column="CREATE_USER" property="createUser"/>
@@ -66,16 +66,17 @@
                 and status = #{yieldOrder.status}
             </if>
             <if test="yieldOrder.batchNo != null and yieldOrder.batchNo != ''">
-                and batch_no = #{yieldOrder.batchNo}
+                and batch_no LIKE CONCAT('%', CONCAT(#{yieldOrder.batchNo}, '%'))
+
             </if>
             <if test="yieldOrder.yoCode != null and yieldOrder.yoCode != ''">
-                and yo_code = #{yieldOrder.yoCode}
+                and yo_code LIKE CONCAT('%', CONCAT(#{yieldOrder.yoCode}, '%'))
             </if>
             <if test="yieldOrder.partCode != null and yieldOrder.partCode != ''">
-                and part_code = #{yieldOrder.partCode}
+                and part_code LIKE CONCAT('%', CONCAT(#{yieldOrder.partCode}, '%'))
             </if>
             <if test="yieldOrder.roamNo != null and yieldOrder.roamNo != ''">
-                and roam_no = #{yieldOrder.roamNo}
+                and roam_no LIKE CONCAT('%', CONCAT(#{yieldOrder.roamNo}, '%'))
             </if>
             <if test="yieldOrder.startTime !=null and yieldOrder.startTime != ''">
                 and receive_time <![CDATA[ >= ]]> to_date(concat(#{yieldOrder.startTime},' 00:00:00'),'YYYY-MM-DD HH24:MI:SS')
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/ICraftAbilityService.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/ICraftAbilityService.java
index e925b172..c0cba958 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/ICraftAbilityService.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/ICraftAbilityService.java
@@ -28,7 +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.scheduling.entity.CraftAbilityEntity;
+import org.springblade.scheduling.pojo.entity.CraftAbilityEntity;
 import org.springblade.scheduling.scheduling.excel.CraftAbilityExcel;
 import org.springblade.scheduling.scheduling.vo.CraftAbilityVO;
 
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IEquipAbilityService.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IEquipAbilityService.java
index 2ca7b697..cfe92fe3 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IEquipAbilityService.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IEquipAbilityService.java
@@ -28,7 +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.scheduling.entity.EquipAbilityEntity;
+import org.springblade.scheduling.pojo.entity.EquipAbilityEntity;
 import org.springblade.scheduling.scheduling.excel.EquipAbilityExcel;
 import org.springblade.scheduling.scheduling.vo.EquipAbilityVO;
 
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 2a56c1d0..5f2168ca 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,7 +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.scheduling.entity.EquipResourceEntity;
+import org.springblade.scheduling.pojo.entity.EquipResourceEntity;
 import org.springblade.scheduling.scheduling.excel.EquipResourceExcel;
 import org.springblade.scheduling.scheduling.vo.EquipResourceVO;
 
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IInspectionItemService.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IInspectionItemService.java
index e3967379..48f2bfe0 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IInspectionItemService.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IInspectionItemService.java
@@ -28,7 +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.scheduling.entity.InspectionItemEntity;
+import org.springblade.scheduling.pojo.entity.InspectionItemEntity;
 import org.springblade.scheduling.scheduling.excel.InspectionItemExcel;
 import org.springblade.scheduling.scheduling.vo.InspectionItemVO;
 
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IMainProducerService.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IMainProducerService.java
index 2de9a3e6..4c553464 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IMainProducerService.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IMainProducerService.java
@@ -28,7 +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.scheduling.entity.MainProducerEntity;
+import org.springblade.scheduling.pojo.entity.MainProducerEntity;
 import org.springblade.scheduling.scheduling.excel.MainProducerExcel;
 import org.springblade.scheduling.scheduling.vo.MainProducerVO;
 
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IOutsourceProcessService.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IOutsourceProcessService.java
index 96526dc7..f97e6f68 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IOutsourceProcessService.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IOutsourceProcessService.java
@@ -28,7 +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.scheduling.entity.OutsourceProcessEntity;
+import org.springblade.scheduling.pojo.entity.OutsourceProcessEntity;
 import org.springblade.scheduling.scheduling.excel.OutsourceProcessExcel;
 import org.springblade.scheduling.scheduling.vo.OutsourceProcessVO;
 
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IPartRelationService.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IPartRelationService.java
index d5952882..6b37e915 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IPartRelationService.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IPartRelationService.java
@@ -28,7 +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.scheduling.entity.PartRelationEntity;
+import org.springblade.scheduling.pojo.entity.PartRelationEntity;
 import org.springblade.scheduling.scheduling.excel.PartRelationExcel;
 import org.springblade.scheduling.scheduling.vo.PartRelationVO;
 
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IPartService.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IPartService.java
index 9d255c53..8905fe6e 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IPartService.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IPartService.java
@@ -28,7 +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.scheduling.entity.PartEntity;
+import org.springblade.scheduling.pojo.entity.PartEntity;
 import org.springblade.scheduling.scheduling.excel.PartExcel;
 import org.springblade.scheduling.scheduling.vo.PartVO;
 
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 1f2b1490..bae7ae6a 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,7 +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.scheduling.entity.PersonAbilityEntity;
+import org.springblade.scheduling.pojo.entity.PersonAbilityEntity;
 import org.springblade.scheduling.scheduling.excel.PersonAbilityExcel;
 import org.springblade.scheduling.scheduling.vo.PersonAbilityVO;
 
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IPersonResourceService.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IPersonResourceService.java
index 3a05d2dc..bc4cd218 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IPersonResourceService.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IPersonResourceService.java
@@ -28,7 +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.scheduling.entity.PersonResourceEntity;
+import org.springblade.scheduling.pojo.entity.PersonResourceEntity;
 import org.springblade.scheduling.scheduling.excel.PersonResourceExcel;
 import org.springblade.scheduling.scheduling.vo.PersonResourceVO;
 
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IProcessGroupService.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IProcessGroupService.java
index 4da6928d..4129d24c 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IProcessGroupService.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IProcessGroupService.java
@@ -28,7 +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.scheduling.entity.ProcessGroupEntity;
+import org.springblade.scheduling.pojo.entity.ProcessGroupEntity;
 import org.springblade.scheduling.scheduling.excel.ProcessGroupExcel;
 import org.springblade.scheduling.scheduling.vo.ProcessGroupVO;
 
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IProcessSetService.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IProcessSetService.java
index 343758fa..b9e63619 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IProcessSetService.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IProcessSetService.java
@@ -28,7 +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.scheduling.entity.ProcessSetEntity;
+import org.springblade.scheduling.pojo.entity.ProcessSetEntity;
 import org.springblade.scheduling.scheduling.excel.ProcessSetExcel;
 import org.springblade.scheduling.scheduling.vo.ProcessSetVO;
 
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IQualityGradeService.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IQualityGradeService.java
index d79e49f9..72948df7 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IQualityGradeService.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IQualityGradeService.java
@@ -28,7 +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.scheduling.entity.QualityGradeEntity;
+import org.springblade.scheduling.pojo.entity.QualityGradeEntity;
 import org.springblade.scheduling.scheduling.excel.QualityGradeExcel;
 import org.springblade.scheduling.scheduling.vo.QualityGradeVO;
 
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/ISameTroughService.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/ISameTroughService.java
index ec21d8d0..aed3019e 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/ISameTroughService.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/ISameTroughService.java
@@ -28,7 +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.scheduling.entity.SameTroughEntity;
+import org.springblade.scheduling.pojo.entity.SameTroughEntity;
 import org.springblade.scheduling.scheduling.excel.SameTroughExcel;
 import org.springblade.scheduling.scheduling.vo.SameTroughVO;
 
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/ISintTempCurveService.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/ISintTempCurveService.java
index 12344822..899e6ea6 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/ISintTempCurveService.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/ISintTempCurveService.java
@@ -28,7 +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.scheduling.entity.SintTempCurveEntity;
+import org.springblade.scheduling.pojo.entity.SintTempCurveEntity;
 import org.springblade.scheduling.scheduling.excel.SintTempCurveExcel;
 import org.springblade.scheduling.scheduling.vo.SintTempCurveVO;
 
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/ITeamSetService.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/ITeamSetService.java
index 6b0d3263..2d6d7351 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/ITeamSetService.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/ITeamSetService.java
@@ -28,7 +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.scheduling.entity.TeamSetEntity;
+import org.springblade.scheduling.pojo.entity.TeamSetEntity;
 import org.springblade.scheduling.scheduling.excel.TeamSetExcel;
 import org.springblade.scheduling.scheduling.vo.TeamSetVO;
 
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/ITeamTimeService.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/ITeamTimeService.java
index ae5763ab..2d11f75e 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/ITeamTimeService.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/ITeamTimeService.java
@@ -28,7 +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.scheduling.entity.TeamTimeEntity;
+import org.springblade.scheduling.pojo.entity.TeamTimeEntity;
 import org.springblade.scheduling.scheduling.excel.TeamTimeExcel;
 import org.springblade.scheduling.scheduling.vo.TeamTimeVO;
 
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IWorkCenterService.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IWorkCenterService.java
index d2335e62..49784b75 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IWorkCenterService.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IWorkCenterService.java
@@ -28,7 +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.scheduling.entity.WorkCenterEntity;
+import org.springblade.scheduling.pojo.entity.WorkCenterEntity;
 import org.springblade.scheduling.scheduling.excel.WorkCenterExcel;
 import org.springblade.scheduling.scheduling.vo.WorkCenterVO;
 
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IWorkOrderRunService.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IWorkOrderRunService.java
index ca7b696d..96ef8fbd 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IWorkOrderRunService.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IWorkOrderRunService.java
@@ -28,7 +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.scheduling.entity.WorkOrderRunEntity;
+import org.springblade.scheduling.pojo.entity.WorkOrderRunEntity;
 import org.springblade.scheduling.scheduling.excel.WorkOrderRunExcel;
 import org.springblade.scheduling.scheduling.vo.WorkOrderRunVO;
 
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 0afcc1fb..ed03df74 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
@@ -29,13 +29,12 @@ 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.scheduling.dto.WorkOrderDto;
-import org.springblade.scheduling.scheduling.entity.WorkOrderEntity;
+import org.springblade.scheduling.pojo.entity.WorkOrderEntity;
 import org.springblade.scheduling.scheduling.excel.SchedulingBoardExcel;
 import org.springblade.scheduling.scheduling.excel.WorkOrderExcel;
 import org.springblade.scheduling.scheduling.vo.WorkOrderVO;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * 车间订单表 服务类
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IWorkPlanService.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IWorkPlanService.java
index e0e5df74..a84b567b 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IWorkPlanService.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IWorkPlanService.java
@@ -28,7 +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.scheduling.entity.WorkPlanEntity;
+import org.springblade.scheduling.pojo.entity.WorkPlanEntity;
 import org.springblade.scheduling.scheduling.excel.WorkPlanExcel;
 import org.springblade.scheduling.scheduling.vo.WorkPlanVO;
 
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IYieldOrderCraftService.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IYieldOrderCraftService.java
index d99c16b8..faf446c7 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IYieldOrderCraftService.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IYieldOrderCraftService.java
@@ -28,7 +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.scheduling.entity.YieldOrderCraftEntity;
+import org.springblade.scheduling.pojo.entity.YieldOrderCraftEntity;
 import org.springblade.scheduling.scheduling.excel.YieldOrderCraftExcel;
 import org.springblade.scheduling.scheduling.vo.YieldOrderCraftVO;
 
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IYieldOrderService.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IYieldOrderService.java
index 33e13b0d..01546ce9 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IYieldOrderService.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IYieldOrderService.java
@@ -26,7 +26,7 @@
 package org.springblade.scheduling.scheduling.service;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import org.springblade.scheduling.scheduling.entity.YieldOrderEntity;
+import org.springblade.scheduling.pojo.entity.YieldOrderEntity;
 import org.springblade.scheduling.scheduling.vo.YieldOrderVO;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/CraftAbilityServiceImpl.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/CraftAbilityServiceImpl.java
index 2a6bb025..9f4c2103 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/CraftAbilityServiceImpl.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/CraftAbilityServiceImpl.java
@@ -25,7 +25,7 @@
  */
 package org.springblade.scheduling.scheduling.service.impl;
 
-import org.springblade.scheduling.scheduling.entity.CraftAbilityEntity;
+import org.springblade.scheduling.pojo.entity.CraftAbilityEntity;
 import org.springblade.scheduling.scheduling.excel.CraftAbilityExcel;
 import org.springblade.scheduling.scheduling.mapper.CraftAbilityMapper;
 import org.springblade.scheduling.scheduling.service.ICraftAbilityService;
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/EquipAbilityServiceImpl.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/EquipAbilityServiceImpl.java
index 0c689933..a7bc9d5e 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/EquipAbilityServiceImpl.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/EquipAbilityServiceImpl.java
@@ -28,7 +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.scheduling.scheduling.entity.EquipAbilityEntity;
+import org.springblade.scheduling.pojo.entity.EquipAbilityEntity;
 import org.springblade.scheduling.scheduling.excel.EquipAbilityExcel;
 import org.springblade.scheduling.scheduling.mapper.EquipAbilityMapper;
 import org.springblade.scheduling.scheduling.service.IEquipAbilityService;
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 6af721de..6cd82d20 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
@@ -34,10 +34,9 @@ import lombok.AllArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.DateFormatUtils;
 import org.apache.commons.lang3.time.DateUtils;
-import org.springblade.core.mp.base.BaseEntity;
 import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.scheduling.scheduling.entity.EquipAbilityEntity;
-import org.springblade.scheduling.scheduling.entity.EquipResourceEntity;
+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.mapper.EquipResourceMapper;
 import org.springblade.scheduling.scheduling.service.IEquipAbilityService;
@@ -45,7 +44,6 @@ import org.springblade.scheduling.scheduling.service.IEquipResourceService;
 import org.springblade.scheduling.scheduling.vo.EquipResourceVO;
 import org.springframework.stereotype.Service;
 
-import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
@@ -54,7 +52,6 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * 工艺能力表 服务实现类
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/InspectionItemServiceImpl.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/InspectionItemServiceImpl.java
index 7fd3028d..39ce5b6a 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/InspectionItemServiceImpl.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/InspectionItemServiceImpl.java
@@ -28,7 +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.scheduling.scheduling.entity.InspectionItemEntity;
+import org.springblade.scheduling.pojo.entity.InspectionItemEntity;
 import org.springblade.scheduling.scheduling.excel.InspectionItemExcel;
 import org.springblade.scheduling.scheduling.mapper.InspectionItemMapper;
 import org.springblade.scheduling.scheduling.service.IInspectionItemService;
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/MainProducerServiceImpl.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/MainProducerServiceImpl.java
index e6fbd3b0..85e114a6 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/MainProducerServiceImpl.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/MainProducerServiceImpl.java
@@ -28,7 +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.scheduling.scheduling.entity.MainProducerEntity;
+import org.springblade.scheduling.pojo.entity.MainProducerEntity;
 import org.springblade.scheduling.scheduling.excel.MainProducerExcel;
 import org.springblade.scheduling.scheduling.mapper.MainProducerMapper;
 import org.springblade.scheduling.scheduling.service.IMainProducerService;
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/OutsourceProcessServiceImpl.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/OutsourceProcessServiceImpl.java
index 036da6a9..e0772363 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/OutsourceProcessServiceImpl.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/OutsourceProcessServiceImpl.java
@@ -25,7 +25,7 @@
  */
 package org.springblade.scheduling.scheduling.service.impl;
 
-import org.springblade.scheduling.scheduling.entity.OutsourceProcessEntity;
+import org.springblade.scheduling.pojo.entity.OutsourceProcessEntity;
 import org.springblade.scheduling.scheduling.excel.OutsourceProcessExcel;
 import org.springblade.scheduling.scheduling.mapper.OutsourceProcessMapper;
 import org.springblade.scheduling.scheduling.service.IOutsourceProcessService;
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/PartRelationServiceImpl.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/PartRelationServiceImpl.java
index d6d3eb94..86c2b26d 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/PartRelationServiceImpl.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/PartRelationServiceImpl.java
@@ -25,7 +25,7 @@
  */
 package org.springblade.scheduling.scheduling.service.impl;
 
-import org.springblade.scheduling.scheduling.entity.PartRelationEntity;
+import org.springblade.scheduling.pojo.entity.PartRelationEntity;
 import org.springblade.scheduling.scheduling.excel.PartRelationExcel;
 import org.springblade.scheduling.scheduling.mapper.PartRelationMapper;
 import org.springblade.scheduling.scheduling.service.IPartRelationService;
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/PartServiceImpl.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/PartServiceImpl.java
index 6efeff71..782efe47 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/PartServiceImpl.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/PartServiceImpl.java
@@ -25,7 +25,7 @@
  */
 package org.springblade.scheduling.scheduling.service.impl;
 
-import org.springblade.scheduling.scheduling.entity.PartEntity;
+import org.springblade.scheduling.pojo.entity.PartEntity;
 import org.springblade.scheduling.scheduling.excel.PartExcel;
 import org.springblade.scheduling.scheduling.mapper.PartMapper;
 import org.springblade.scheduling.scheduling.service.IPartService;
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 3fa341ea..55bb319a 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,7 +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.scheduling.scheduling.entity.PersonAbilityEntity;
+import org.springblade.scheduling.pojo.entity.PersonAbilityEntity;
 import org.springblade.scheduling.scheduling.excel.PersonAbilityExcel;
 import org.springblade.scheduling.scheduling.mapper.PersonAbilityMapper;
 import org.springblade.scheduling.scheduling.service.IPersonAbilityService;
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/PersonResourceServiceImpl.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/PersonResourceServiceImpl.java
index cfbd2508..e58133e3 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/PersonResourceServiceImpl.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/PersonResourceServiceImpl.java
@@ -30,12 +30,12 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.time.DateFormatUtils;
 import org.apache.commons.lang3.time.DateUtils;
 import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.scheduling.scheduling.entity.EquipResourceEntity;
-import org.springblade.scheduling.scheduling.entity.PersonAbilityEntity;
-import org.springblade.scheduling.scheduling.entity.PersonResourceEntity;
+import org.springblade.scheduling.pojo.entity.PersonAbilityEntity;
+import org.springblade.scheduling.pojo.entity.PersonResourceEntity;
 import org.springblade.scheduling.scheduling.excel.PersonResourceExcel;
 import org.springblade.scheduling.scheduling.mapper.PersonResourceMapper;
 import org.springblade.scheduling.scheduling.service.IPersonAbilityService;
@@ -57,6 +57,7 @@ import java.util.*;
  */
 @Service
 @AllArgsConstructor
+@Slf4j
 public class PersonResourceServiceImpl extends BaseServiceImpl<PersonResourceMapper, PersonResourceEntity> implements IPersonResourceService {
 
 	private final IPersonAbilityService personAbilityService;
@@ -87,11 +88,10 @@ public class PersonResourceServiceImpl extends BaseServiceImpl<PersonResourceMap
 	public void generateData(String day){
 
 		//获取设备能力列表
-//		List<String> workCenterList = Arrays.asList("86","85");
 		List<PersonAbilityEntity> personAbilityList = personAbilityService.list();
+		log.info("获取到的人员能力数量是：" + personAbilityList.size());
 		if(CollectionUtils.isNotEmpty(personAbilityList)){
 			DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-			DateTimeFormatter timeFormatter = DateTimeFormatter.ofPattern("HH:mm");
 			DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
 			LocalDate targetDate = LocalDate.parse(day, dateFormatter);
 			LocalDateTime startOfDay = LocalDateTime.of(targetDate, LocalTime.MIDNIGHT);
@@ -149,6 +149,7 @@ public class PersonResourceServiceImpl extends BaseServiceImpl<PersonResourceMap
 					personResource.setWorkCenterName(personAbility.getWorkCenterName());
 					resourceList.add(personResource);
 				}
+				log.info("人员资源数量是：" + resourceList.size());
 				if(CollectionUtils.isNotEmpty(resourceList)){
 					this.saveBatch(resourceList);
 				}
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/ProcessGroupServiceImpl.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/ProcessGroupServiceImpl.java
index 08ac5680..c81ad893 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/ProcessGroupServiceImpl.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/ProcessGroupServiceImpl.java
@@ -28,7 +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.scheduling.scheduling.entity.ProcessGroupEntity;
+import org.springblade.scheduling.pojo.entity.ProcessGroupEntity;
 import org.springblade.scheduling.scheduling.excel.ProcessGroupExcel;
 import org.springblade.scheduling.scheduling.mapper.ProcessGroupMapper;
 import org.springblade.scheduling.scheduling.service.IProcessGroupService;
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/ProcessSetServiceImpl.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/ProcessSetServiceImpl.java
index ec88cf9f..3ea6bf6e 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/ProcessSetServiceImpl.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/ProcessSetServiceImpl.java
@@ -25,7 +25,7 @@
  */
 package org.springblade.scheduling.scheduling.service.impl;
 
-import org.springblade.scheduling.scheduling.entity.ProcessSetEntity;
+import org.springblade.scheduling.pojo.entity.ProcessSetEntity;
 import org.springblade.scheduling.scheduling.excel.ProcessSetExcel;
 import org.springblade.scheduling.scheduling.mapper.ProcessSetMapper;
 import org.springblade.scheduling.scheduling.service.IProcessSetService;
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/QualityGradeServiceImpl.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/QualityGradeServiceImpl.java
index 299c14c9..e84b381b 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/QualityGradeServiceImpl.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/QualityGradeServiceImpl.java
@@ -28,7 +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.scheduling.scheduling.entity.QualityGradeEntity;
+import org.springblade.scheduling.pojo.entity.QualityGradeEntity;
 import org.springblade.scheduling.scheduling.excel.QualityGradeExcel;
 import org.springblade.scheduling.scheduling.mapper.QualityGradeMapper;
 import org.springblade.scheduling.scheduling.service.IQualityGradeService;
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/SameTroughServiceImpl.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/SameTroughServiceImpl.java
index 24895acc..9e1692fe 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/SameTroughServiceImpl.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/SameTroughServiceImpl.java
@@ -25,7 +25,7 @@
  */
 package org.springblade.scheduling.scheduling.service.impl;
 
-import org.springblade.scheduling.scheduling.entity.SameTroughEntity;
+import org.springblade.scheduling.pojo.entity.SameTroughEntity;
 import org.springblade.scheduling.scheduling.excel.SameTroughExcel;
 import org.springblade.scheduling.scheduling.mapper.SameTroughMapper;
 import org.springblade.scheduling.scheduling.service.ISameTroughService;
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/SintTempCurveServiceImpl.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/SintTempCurveServiceImpl.java
index 412fdfe8..49240faa 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/SintTempCurveServiceImpl.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/SintTempCurveServiceImpl.java
@@ -25,7 +25,7 @@
  */
 package org.springblade.scheduling.scheduling.service.impl;
 
-import org.springblade.scheduling.scheduling.entity.SintTempCurveEntity;
+import org.springblade.scheduling.pojo.entity.SintTempCurveEntity;
 import org.springblade.scheduling.scheduling.excel.SintTempCurveExcel;
 import org.springblade.scheduling.scheduling.mapper.SintTempCurveMapper;
 import org.springblade.scheduling.scheduling.service.ISintTempCurveService;
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/TeamSetServiceImpl.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/TeamSetServiceImpl.java
index 92f0d9b9..195acac2 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/TeamSetServiceImpl.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/TeamSetServiceImpl.java
@@ -28,7 +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.scheduling.scheduling.entity.TeamSetEntity;
+import org.springblade.scheduling.pojo.entity.TeamSetEntity;
 import org.springblade.scheduling.scheduling.excel.TeamSetExcel;
 import org.springblade.scheduling.scheduling.mapper.TeamSetMapper;
 import org.springblade.scheduling.scheduling.service.ITeamSetService;
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/TeamTimeServiceImpl.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/TeamTimeServiceImpl.java
index a72c29c9..3db25ef9 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/TeamTimeServiceImpl.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/TeamTimeServiceImpl.java
@@ -28,7 +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.scheduling.scheduling.entity.TeamTimeEntity;
+import org.springblade.scheduling.pojo.entity.TeamTimeEntity;
 import org.springblade.scheduling.scheduling.excel.TeamTimeExcel;
 import org.springblade.scheduling.scheduling.mapper.TeamTimeMapper;
 import org.springblade.scheduling.scheduling.service.ITeamTimeService;
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkCenterServiceImpl.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkCenterServiceImpl.java
index 41ffb13a..cbb1b14d 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkCenterServiceImpl.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkCenterServiceImpl.java
@@ -25,7 +25,7 @@
  */
 package org.springblade.scheduling.scheduling.service.impl;
 
-import org.springblade.scheduling.scheduling.entity.WorkCenterEntity;
+import org.springblade.scheduling.pojo.entity.WorkCenterEntity;
 import org.springblade.scheduling.scheduling.excel.WorkCenterExcel;
 import org.springblade.scheduling.scheduling.mapper.WorkCenterMapper;
 import org.springblade.scheduling.scheduling.service.IWorkCenterService;
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderRunServiceImpl.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderRunServiceImpl.java
index f3d83c47..ab24182d 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderRunServiceImpl.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderRunServiceImpl.java
@@ -28,7 +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.scheduling.scheduling.entity.WorkOrderRunEntity;
+import org.springblade.scheduling.pojo.entity.WorkOrderRunEntity;
 import org.springblade.scheduling.scheduling.excel.WorkOrderRunExcel;
 import org.springblade.scheduling.scheduling.mapper.WorkOrderRunMapper;
 import org.springblade.scheduling.scheduling.service.IWorkOrderRunService;
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 b718e50a..effbd420 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
@@ -39,8 +39,8 @@ import org.springblade.core.mp.base.BaseEntity;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.desk.order.pojo.enums.YieldOrderEnum;
+import org.springblade.scheduling.pojo.entity.*;
 import org.springblade.scheduling.scheduling.dto.WorkOrderDto;
-import org.springblade.scheduling.scheduling.entity.*;
 import org.springblade.scheduling.scheduling.excel.SchedulingBoardExcel;
 import org.springblade.scheduling.scheduling.excel.WorkOrderExcel;
 import org.springblade.scheduling.scheduling.mapper.WorkOrderMapper;
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkPlanServiceImpl.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkPlanServiceImpl.java
index b4d16ad7..52f3dfc9 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkPlanServiceImpl.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkPlanServiceImpl.java
@@ -26,7 +26,7 @@
 package org.springblade.scheduling.scheduling.service.impl;
 
 import org.apache.commons.lang3.ObjectUtils;
-import org.springblade.scheduling.scheduling.entity.WorkPlanEntity;
+import org.springblade.scheduling.pojo.entity.WorkPlanEntity;
 import org.springblade.scheduling.scheduling.excel.WorkPlanExcel;
 import org.springblade.scheduling.scheduling.mapper.WorkPlanMapper;
 import org.springblade.scheduling.scheduling.service.IWorkPlanService;
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/YieldOrderCraftServiceImpl.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/YieldOrderCraftServiceImpl.java
index b3b78de1..697b2ae1 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/YieldOrderCraftServiceImpl.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/YieldOrderCraftServiceImpl.java
@@ -25,7 +25,7 @@
  */
 package org.springblade.scheduling.scheduling.service.impl;
 
-import org.springblade.scheduling.scheduling.entity.YieldOrderCraftEntity;
+import org.springblade.scheduling.pojo.entity.YieldOrderCraftEntity;
 import org.springblade.scheduling.scheduling.excel.YieldOrderCraftExcel;
 import org.springblade.scheduling.scheduling.mapper.YieldOrderCraftMapper;
 import org.springblade.scheduling.scheduling.service.IYieldOrderCraftService;
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/YieldOrderServiceImpl.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/YieldOrderServiceImpl.java
index e0e33f12..9f536122 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/YieldOrderServiceImpl.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/YieldOrderServiceImpl.java
@@ -29,19 +29,15 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import org.springblade.desk.order.pojo.enums.YieldOrderEnum;
-import org.springblade.scheduling.scheduling.entity.TeamSetEntity;
-import org.springblade.scheduling.scheduling.entity.WorkOrderEntity;
-import org.springblade.scheduling.scheduling.entity.YieldOrderEntity;
+import org.springblade.scheduling.pojo.entity.TeamSetEntity;
+import org.springblade.scheduling.pojo.entity.YieldOrderEntity;
 import org.springblade.scheduling.scheduling.mapper.TeamSetMapper;
-import org.springblade.scheduling.scheduling.mapper.WorkOrderMapper;
-import org.springblade.scheduling.scheduling.service.IWorkOrderService;
 import org.springblade.scheduling.scheduling.vo.YieldOrderVO;
 import org.springblade.scheduling.scheduling.excel.YieldOrderExcel;
 import org.springblade.scheduling.scheduling.mapper.YieldOrderMapper;
 import org.springblade.scheduling.scheduling.service.IYieldOrderService;
 import org.springblade.system.cache.UserCache;
 import org.springblade.system.pojo.entity.User;
-import org.springblade.system.pojo.entity.UserInfo;
 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-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/CraftAbilityVO.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/CraftAbilityVO.java
index 90c73a87..7aa92080 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/CraftAbilityVO.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/CraftAbilityVO.java
@@ -27,7 +27,7 @@ package org.springblade.scheduling.scheduling.vo;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.scheduling.scheduling.entity.CraftAbilityEntity;
+import org.springblade.scheduling.pojo.entity.CraftAbilityEntity;
 
 import java.io.Serial;
 
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/EquipAbilityVO.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/EquipAbilityVO.java
index 4eed2aea..0f86560c 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/EquipAbilityVO.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/EquipAbilityVO.java
@@ -27,7 +27,7 @@ package org.springblade.scheduling.scheduling.vo;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.scheduling.scheduling.entity.EquipAbilityEntity;
+import org.springblade.scheduling.pojo.entity.EquipAbilityEntity;
 
 import java.io.Serial;
 
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/EquipResourceVO.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/EquipResourceVO.java
index 71c66d5f..363afbfb 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/EquipResourceVO.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/EquipResourceVO.java
@@ -27,7 +27,7 @@ package org.springblade.scheduling.scheduling.vo;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.scheduling.scheduling.entity.EquipResourceEntity;
+import org.springblade.scheduling.pojo.entity.EquipResourceEntity;
 
 import java.io.Serial;
 
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/InspectionItemVO.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/InspectionItemVO.java
index 0d3ed567..2ad71dc2 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/InspectionItemVO.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/InspectionItemVO.java
@@ -27,7 +27,7 @@ package org.springblade.scheduling.scheduling.vo;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.scheduling.scheduling.entity.InspectionItemEntity;
+import org.springblade.scheduling.pojo.entity.InspectionItemEntity;
 
 import java.io.Serial;
 
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/MainProducerVO.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/MainProducerVO.java
index 7f479015..bdf492f1 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/MainProducerVO.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/MainProducerVO.java
@@ -27,7 +27,7 @@ package org.springblade.scheduling.scheduling.vo;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.scheduling.scheduling.entity.MainProducerEntity;
+import org.springblade.scheduling.pojo.entity.MainProducerEntity;
 
 import java.io.Serial;
 
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/OutsourceProcessVO.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/OutsourceProcessVO.java
index 9044c12e..36a7ad8f 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/OutsourceProcessVO.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/OutsourceProcessVO.java
@@ -27,7 +27,7 @@ package org.springblade.scheduling.scheduling.vo;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.scheduling.scheduling.entity.OutsourceProcessEntity;
+import org.springblade.scheduling.pojo.entity.OutsourceProcessEntity;
 
 import java.io.Serial;
 
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/PartRelationVO.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/PartRelationVO.java
index a59e5194..5c0c7a0a 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/PartRelationVO.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/PartRelationVO.java
@@ -27,7 +27,7 @@ package org.springblade.scheduling.scheduling.vo;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.scheduling.scheduling.entity.PartRelationEntity;
+import org.springblade.scheduling.pojo.entity.PartRelationEntity;
 
 import java.io.Serial;
 
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/PartVO.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/PartVO.java
index e098ed6f..1b37421b 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/PartVO.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/PartVO.java
@@ -27,7 +27,7 @@ package org.springblade.scheduling.scheduling.vo;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.scheduling.scheduling.entity.PartEntity;
+import org.springblade.scheduling.pojo.entity.PartEntity;
 
 import java.io.Serial;
 
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/PersonAbilityVO.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/PersonAbilityVO.java
index 0bb2b109..2887f127 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/PersonAbilityVO.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/PersonAbilityVO.java
@@ -27,7 +27,7 @@ package org.springblade.scheduling.scheduling.vo;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.scheduling.scheduling.entity.PersonAbilityEntity;
+import org.springblade.scheduling.pojo.entity.PersonAbilityEntity;
 
 import java.io.Serial;
 
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/PersonResourceVO.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/PersonResourceVO.java
index 89f850d2..65a66237 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/PersonResourceVO.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/PersonResourceVO.java
@@ -27,8 +27,7 @@ package org.springblade.scheduling.scheduling.vo;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.scheduling.scheduling.entity.EquipResourceEntity;
-import org.springblade.scheduling.scheduling.entity.PersonResourceEntity;
+import org.springblade.scheduling.pojo.entity.PersonResourceEntity;
 
 import java.io.Serial;
 
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/ProcessGroupVO.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/ProcessGroupVO.java
index 17492e87..a392e6fa 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/ProcessGroupVO.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/ProcessGroupVO.java
@@ -27,7 +27,7 @@ package org.springblade.scheduling.scheduling.vo;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.scheduling.scheduling.entity.ProcessGroupEntity;
+import org.springblade.scheduling.pojo.entity.ProcessGroupEntity;
 
 import java.io.Serial;
 
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/ProcessSetVO.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/ProcessSetVO.java
index 678ebc46..c45da094 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/ProcessSetVO.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/ProcessSetVO.java
@@ -27,7 +27,7 @@ package org.springblade.scheduling.scheduling.vo;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.scheduling.scheduling.entity.ProcessSetEntity;
+import org.springblade.scheduling.pojo.entity.ProcessSetEntity;
 
 import java.io.Serial;
 
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/QualityGradeVO.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/QualityGradeVO.java
index 80569836..1b636132 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/QualityGradeVO.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/QualityGradeVO.java
@@ -27,7 +27,7 @@ package org.springblade.scheduling.scheduling.vo;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.scheduling.scheduling.entity.QualityGradeEntity;
+import org.springblade.scheduling.pojo.entity.QualityGradeEntity;
 
 import java.io.Serial;
 
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/SameTroughVO.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/SameTroughVO.java
index 1b4efaa3..fdaad7b5 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/SameTroughVO.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/SameTroughVO.java
@@ -26,7 +26,7 @@
 package org.springblade.scheduling.scheduling.vo;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.scheduling.scheduling.entity.SameTroughEntity;
+import org.springblade.scheduling.pojo.entity.SameTroughEntity;
 
 import java.io.Serial;
 
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/SintTempCurveVO.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/SintTempCurveVO.java
index eec6a748..32a31431 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/SintTempCurveVO.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/SintTempCurveVO.java
@@ -27,7 +27,7 @@ package org.springblade.scheduling.scheduling.vo;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.scheduling.scheduling.entity.SintTempCurveEntity;
+import org.springblade.scheduling.pojo.entity.SintTempCurveEntity;
 
 import java.io.Serial;
 
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/TeamSetVO.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/TeamSetVO.java
index b750ec48..acdfb238 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/TeamSetVO.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/TeamSetVO.java
@@ -27,7 +27,7 @@ package org.springblade.scheduling.scheduling.vo;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.scheduling.scheduling.entity.TeamSetEntity;
+import org.springblade.scheduling.pojo.entity.TeamSetEntity;
 
 import java.io.Serial;
 
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/TeamTimeVO.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/TeamTimeVO.java
index abd2a71b..92296f43 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/TeamTimeVO.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/TeamTimeVO.java
@@ -27,7 +27,7 @@ package org.springblade.scheduling.scheduling.vo;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.scheduling.scheduling.entity.TeamTimeEntity;
+import org.springblade.scheduling.pojo.entity.TeamTimeEntity;
 
 import java.io.Serial;
 
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/WorkCenterVO.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/WorkCenterVO.java
index 84a0c547..2bdc92c7 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/WorkCenterVO.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/WorkCenterVO.java
@@ -27,7 +27,7 @@ package org.springblade.scheduling.scheduling.vo;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.scheduling.scheduling.entity.WorkCenterEntity;
+import org.springblade.scheduling.pojo.entity.WorkCenterEntity;
 
 import java.io.Serial;
 
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/WorkOrderRunVO.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/WorkOrderRunVO.java
index b33960c2..ec2dbe67 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/WorkOrderRunVO.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/WorkOrderRunVO.java
@@ -27,7 +27,7 @@ package org.springblade.scheduling.scheduling.vo;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.scheduling.scheduling.entity.WorkOrderRunEntity;
+import org.springblade.scheduling.pojo.entity.WorkOrderRunEntity;
 
 import java.io.Serial;
 
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/WorkOrderVO.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/WorkOrderVO.java
index c020d6bb..c7767b4d 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/WorkOrderVO.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/WorkOrderVO.java
@@ -27,7 +27,7 @@ package org.springblade.scheduling.scheduling.vo;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.scheduling.scheduling.entity.WorkOrderEntity;
+import org.springblade.scheduling.pojo.entity.WorkOrderEntity;
 
 import java.io.Serial;
 
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/WorkPlanVO.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/WorkPlanVO.java
index 2975fa40..a5d8acfc 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/WorkPlanVO.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/WorkPlanVO.java
@@ -27,7 +27,7 @@ package org.springblade.scheduling.scheduling.vo;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.scheduling.scheduling.entity.WorkPlanEntity;
+import org.springblade.scheduling.pojo.entity.WorkPlanEntity;
 
 import java.io.Serial;
 
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/YieldOrderCraftVO.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/YieldOrderCraftVO.java
index c3119d3f..2b393a84 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/YieldOrderCraftVO.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/YieldOrderCraftVO.java
@@ -27,7 +27,7 @@ package org.springblade.scheduling.scheduling.vo;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.scheduling.scheduling.entity.YieldOrderCraftEntity;
+import org.springblade.scheduling.pojo.entity.YieldOrderCraftEntity;
 
 import java.io.Serial;
 
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/YieldOrderVO.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/YieldOrderVO.java
index 3de8cfc9..e37eb018 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/YieldOrderVO.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/YieldOrderVO.java
@@ -25,10 +25,9 @@
  */
 package org.springblade.scheduling.scheduling.vo;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.scheduling.scheduling.entity.YieldOrderEntity;
+import org.springblade.scheduling.pojo.entity.YieldOrderEntity;
 
 import java.io.Serial;
 
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/CraftAbilityWrapper.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/CraftAbilityWrapper.java
index 63f8a89a..9c7f9a58 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/CraftAbilityWrapper.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/CraftAbilityWrapper.java
@@ -27,7 +27,7 @@ package org.springblade.scheduling.scheduling.wrapper;
 
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
-import org.springblade.scheduling.scheduling.entity.CraftAbilityEntity;
+import org.springblade.scheduling.pojo.entity.CraftAbilityEntity;
 import org.springblade.scheduling.scheduling.vo.CraftAbilityVO;
 
 import java.util.Objects;
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/EquipAbilityWrapper.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/EquipAbilityWrapper.java
index 11e5b5d7..a81de4eb 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/EquipAbilityWrapper.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/EquipAbilityWrapper.java
@@ -27,7 +27,7 @@ package org.springblade.scheduling.scheduling.wrapper;
 
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
-import org.springblade.scheduling.scheduling.entity.EquipAbilityEntity;
+import org.springblade.scheduling.pojo.entity.EquipAbilityEntity;
 import org.springblade.scheduling.scheduling.vo.EquipAbilityVO;
 
 import java.util.Objects;
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/EquipResourceWrapper.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/EquipResourceWrapper.java
index 47e5fde4..6adbe8ac 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/EquipResourceWrapper.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/EquipResourceWrapper.java
@@ -27,7 +27,7 @@ package org.springblade.scheduling.scheduling.wrapper;
 
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
-import org.springblade.scheduling.scheduling.entity.EquipResourceEntity;
+import org.springblade.scheduling.pojo.entity.EquipResourceEntity;
 import org.springblade.scheduling.scheduling.vo.EquipResourceVO;
 
 import java.util.Objects;
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/InspectionItemWrapper.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/InspectionItemWrapper.java
index 92d82b40..63eb94f2 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/InspectionItemWrapper.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/InspectionItemWrapper.java
@@ -27,7 +27,7 @@ package org.springblade.scheduling.scheduling.wrapper;
 
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
-import org.springblade.scheduling.scheduling.entity.InspectionItemEntity;
+import org.springblade.scheduling.pojo.entity.InspectionItemEntity;
 import org.springblade.scheduling.scheduling.vo.InspectionItemVO;
 
 import java.util.Objects;
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/MainProducerWrapper.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/MainProducerWrapper.java
index 117970c7..078030c7 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/MainProducerWrapper.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/MainProducerWrapper.java
@@ -27,7 +27,7 @@ package org.springblade.scheduling.scheduling.wrapper;
 
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
-import org.springblade.scheduling.scheduling.entity.MainProducerEntity;
+import org.springblade.scheduling.pojo.entity.MainProducerEntity;
 import org.springblade.scheduling.scheduling.vo.MainProducerVO;
 
 import java.util.Objects;
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/OutsourceProcessWrapper.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/OutsourceProcessWrapper.java
index f3a2a78b..2ea58634 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/OutsourceProcessWrapper.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/OutsourceProcessWrapper.java
@@ -27,7 +27,7 @@ package org.springblade.scheduling.scheduling.wrapper;
 
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
-import org.springblade.scheduling.scheduling.entity.OutsourceProcessEntity;
+import org.springblade.scheduling.pojo.entity.OutsourceProcessEntity;
 import org.springblade.scheduling.scheduling.vo.OutsourceProcessVO;
 
 import java.util.Objects;
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/PartRelationWrapper.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/PartRelationWrapper.java
index d835b969..57f7b8e9 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/PartRelationWrapper.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/PartRelationWrapper.java
@@ -27,7 +27,7 @@ package org.springblade.scheduling.scheduling.wrapper;
 
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
-import org.springblade.scheduling.scheduling.entity.PartRelationEntity;
+import org.springblade.scheduling.pojo.entity.PartRelationEntity;
 import org.springblade.scheduling.scheduling.vo.PartRelationVO;
 
 import java.util.Objects;
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/PartWrapper.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/PartWrapper.java
index 860ffcfc..21938bfa 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/PartWrapper.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/PartWrapper.java
@@ -27,7 +27,7 @@ package org.springblade.scheduling.scheduling.wrapper;
 
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
-import org.springblade.scheduling.scheduling.entity.PartEntity;
+import org.springblade.scheduling.pojo.entity.PartEntity;
 import org.springblade.scheduling.scheduling.vo.PartVO;
 
 import java.util.Objects;
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/PersonAbilityWrapper.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/PersonAbilityWrapper.java
index 4ba594a1..72b8ff53 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/PersonAbilityWrapper.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/PersonAbilityWrapper.java
@@ -27,7 +27,7 @@ package org.springblade.scheduling.scheduling.wrapper;
 
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
-import org.springblade.scheduling.scheduling.entity.PersonAbilityEntity;
+import org.springblade.scheduling.pojo.entity.PersonAbilityEntity;
 import org.springblade.scheduling.scheduling.vo.PersonAbilityVO;
 
 import java.util.Objects;
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/PersonResourceWrapper.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/PersonResourceWrapper.java
index fc5b3ecf..d0fb5a6b 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/PersonResourceWrapper.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/PersonResourceWrapper.java
@@ -27,7 +27,7 @@ package org.springblade.scheduling.scheduling.wrapper;
 
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
-import org.springblade.scheduling.scheduling.entity.PersonResourceEntity;
+import org.springblade.scheduling.pojo.entity.PersonResourceEntity;
 import org.springblade.scheduling.scheduling.vo.PersonResourceVO;
 
 import java.util.Objects;
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/ProcessGroupWrapper.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/ProcessGroupWrapper.java
index 335cf5ab..b0dacd46 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/ProcessGroupWrapper.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/ProcessGroupWrapper.java
@@ -27,7 +27,7 @@ package org.springblade.scheduling.scheduling.wrapper;
 
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
-import org.springblade.scheduling.scheduling.entity.ProcessGroupEntity;
+import org.springblade.scheduling.pojo.entity.ProcessGroupEntity;
 import org.springblade.scheduling.scheduling.vo.ProcessGroupVO;
 
 import java.util.Objects;
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/ProcessSetWrapper.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/ProcessSetWrapper.java
index 0eb855c1..36c8e8e1 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/ProcessSetWrapper.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/ProcessSetWrapper.java
@@ -27,7 +27,7 @@ package org.springblade.scheduling.scheduling.wrapper;
 
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
-import org.springblade.scheduling.scheduling.entity.ProcessSetEntity;
+import org.springblade.scheduling.pojo.entity.ProcessSetEntity;
 import org.springblade.scheduling.scheduling.vo.ProcessSetVO;
 
 import java.util.Objects;
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/QualityGradeWrapper.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/QualityGradeWrapper.java
index ff50595e..ca6652aa 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/QualityGradeWrapper.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/QualityGradeWrapper.java
@@ -27,7 +27,7 @@ package org.springblade.scheduling.scheduling.wrapper;
 
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
-import org.springblade.scheduling.scheduling.entity.QualityGradeEntity;
+import org.springblade.scheduling.pojo.entity.QualityGradeEntity;
 import org.springblade.scheduling.scheduling.vo.QualityGradeVO;
 
 import java.util.Objects;
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/SameTroughWrapper.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/SameTroughWrapper.java
index 6c3dad37..130ede9c 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/SameTroughWrapper.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/SameTroughWrapper.java
@@ -27,7 +27,7 @@ package org.springblade.scheduling.scheduling.wrapper;
 
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
-import org.springblade.scheduling.scheduling.entity.SameTroughEntity;
+import org.springblade.scheduling.pojo.entity.SameTroughEntity;
 import org.springblade.scheduling.scheduling.vo.SameTroughVO;
 
 import java.util.Objects;
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/SintTempCurveWrapper.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/SintTempCurveWrapper.java
index 6c587473..4fcf3cde 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/SintTempCurveWrapper.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/SintTempCurveWrapper.java
@@ -27,7 +27,7 @@ package org.springblade.scheduling.scheduling.wrapper;
 
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
-import org.springblade.scheduling.scheduling.entity.SintTempCurveEntity;
+import org.springblade.scheduling.pojo.entity.SintTempCurveEntity;
 import org.springblade.scheduling.scheduling.vo.SintTempCurveVO;
 
 import java.util.Objects;
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/TeamSetWrapper.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/TeamSetWrapper.java
index c896a12c..65cf74df 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/TeamSetWrapper.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/TeamSetWrapper.java
@@ -27,7 +27,7 @@ package org.springblade.scheduling.scheduling.wrapper;
 
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
-import org.springblade.scheduling.scheduling.entity.TeamSetEntity;
+import org.springblade.scheduling.pojo.entity.TeamSetEntity;
 import org.springblade.scheduling.scheduling.vo.TeamSetVO;
 
 import java.util.Objects;
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/TeamTimeWrapper.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/TeamTimeWrapper.java
index e5e3f424..678516b2 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/TeamTimeWrapper.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/TeamTimeWrapper.java
@@ -27,7 +27,7 @@ package org.springblade.scheduling.scheduling.wrapper;
 
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
-import org.springblade.scheduling.scheduling.entity.TeamTimeEntity;
+import org.springblade.scheduling.pojo.entity.TeamTimeEntity;
 import org.springblade.scheduling.scheduling.vo.TeamTimeVO;
 
 import java.util.Objects;
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/WorkCenterWrapper.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/WorkCenterWrapper.java
index abe7a159..aa3c6a4e 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/WorkCenterWrapper.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/WorkCenterWrapper.java
@@ -27,7 +27,7 @@ package org.springblade.scheduling.scheduling.wrapper;
 
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
-import org.springblade.scheduling.scheduling.entity.WorkCenterEntity;
+import org.springblade.scheduling.pojo.entity.WorkCenterEntity;
 import org.springblade.scheduling.scheduling.vo.WorkCenterVO;
 
 import java.util.Objects;
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/WorkOrderRunWrapper.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/WorkOrderRunWrapper.java
index 0c5dc06f..3933e28f 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/WorkOrderRunWrapper.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/WorkOrderRunWrapper.java
@@ -27,7 +27,7 @@ package org.springblade.scheduling.scheduling.wrapper;
 
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
-import org.springblade.scheduling.scheduling.entity.WorkOrderRunEntity;
+import org.springblade.scheduling.pojo.entity.WorkOrderRunEntity;
 import org.springblade.scheduling.scheduling.vo.WorkOrderRunVO;
 
 import java.util.Objects;
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/WorkOrderWrapper.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/WorkOrderWrapper.java
index 1b2938c0..d06ae61e 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/WorkOrderWrapper.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/WorkOrderWrapper.java
@@ -27,7 +27,7 @@ package org.springblade.scheduling.scheduling.wrapper;
 
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
-import org.springblade.scheduling.scheduling.entity.WorkOrderEntity;
+import org.springblade.scheduling.pojo.entity.WorkOrderEntity;
 import org.springblade.scheduling.scheduling.vo.WorkOrderVO;
 
 import java.util.Objects;
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/WorkPlanWrapper.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/WorkPlanWrapper.java
index b79e6a02..fca74543 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/WorkPlanWrapper.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/WorkPlanWrapper.java
@@ -27,7 +27,7 @@ package org.springblade.scheduling.scheduling.wrapper;
 
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
-import org.springblade.scheduling.scheduling.entity.WorkPlanEntity;
+import org.springblade.scheduling.pojo.entity.WorkPlanEntity;
 import org.springblade.scheduling.scheduling.vo.WorkPlanVO;
 
 import java.util.Objects;
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/YieldOrderCraftWrapper.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/YieldOrderCraftWrapper.java
index 21422a75..47a668c0 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/YieldOrderCraftWrapper.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/YieldOrderCraftWrapper.java
@@ -27,7 +27,7 @@ package org.springblade.scheduling.scheduling.wrapper;
 
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
-import org.springblade.scheduling.scheduling.entity.YieldOrderCraftEntity;
+import org.springblade.scheduling.pojo.entity.YieldOrderCraftEntity;
 import org.springblade.scheduling.scheduling.vo.YieldOrderCraftVO;
 import java.util.Objects;
 
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/YieldOrderWrapper.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/YieldOrderWrapper.java
index 01138fee..1ac1c3d7 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/YieldOrderWrapper.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/YieldOrderWrapper.java
@@ -27,7 +27,7 @@ package org.springblade.scheduling.scheduling.wrapper;
 
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
-import org.springblade.scheduling.scheduling.entity.YieldOrderEntity;
+import org.springblade.scheduling.pojo.entity.YieldOrderEntity;
 import org.springblade.scheduling.scheduling.vo.YieldOrderVO;
 
 import java.util.Objects;