排产相关-sjx

5 months ago · 9999b44ca6
parent 1df70a1e4f
commit 9999b44ca6
182 changed files with 200 additions and 213 deletions
--- a/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/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;
--- a/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/EquipAbilityEntity.java
+++ b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/EquipAbilityEntity.java
@ -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;
--- a/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/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;
--- a/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/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;
--- a/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/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;
--- a/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/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;
--- a/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/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;
--- a/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/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;
--- a/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/PersonAbilityEntity.java
+++ b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/PersonAbilityEntity.java
@ -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;
--- a/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/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;
--- a/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/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;
--- a/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/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;
--- a/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/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;
--- a/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/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;
--- a/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/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;
--- a/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/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;
--- a/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/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;
--- a/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/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;
--- a/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/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;
--- a/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/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;
--- a/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/WorkPlanEntity.java
+++ b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/WorkPlanEntity.java
@ -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;
--- a/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/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;
--- a/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/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;
--- 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.pojo.entity.CraftAbilityEntity;
 import org.springblade.scheduling.scheduling.entity.WorkCenterEntity;
 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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"/>
--- 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;
--- 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"/>
--- 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;
--- 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"/>
--- 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;
--- 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"/>
--- 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;
--- 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"/>
--- 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;
--- 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"/>
--- 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;
--- 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"/>
--- 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;
--- 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"/>
--- 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;
--- 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"/>
--- 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;
--- 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"/>
--- 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;
--- 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"/>
--- 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;
--- 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"/>
--- 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;
--- 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"/>
--- 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;
--- 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"/>
--- 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;
--- 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"/>
--- 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;
--- 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"/>
--- 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;
--- 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"/>
--- 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;
--- 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"/>
--- 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;
--- 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"/>
--- 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;
--- 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"/>
--- 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;
--- 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"/>
--- 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;
--- 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"/>
--- 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;
--- 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')
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- a/Show More
+++ b/Show More