1. 订单api结构修改

2. 状态常量类修改为枚举

blade-common/src/main/java/org/springblade/common/constant/YieldOrderConst.java

@@ -1,182 +0,0 @@
-package org.springblade.common.constant;
-
-/**
- * 生产计划相关常量
- *
- * @author lqk
- * @date 2025-11-27 10:40
- */
-public interface YieldOrderConst {
-	//region 生产订单状态相关常量
-	/**
-	 * 已同步，刚同步订单的默认状态
-	 */
-	Integer STATUS_NORMAL = 0;
-	/**
-	 * 订单异常
-	 */
-	Integer STATUS_EXCEPTION = 1;
-	/**
-	 * 未下达，订单数据验证通过，等待确认后排产
-	 * 特殊零件，需要手动确认后，再进行排产
-	 */
-	Integer STATUS_NO_ISSUED = 2;
-	/**
-	 * 待排产，订单数据验证通过，等待排产
-	 * 非特殊零件，订单数据验证通过后，默认为本状态
-	 */
-	Integer STATUS_APS = 3;
-	/**
-	 * 待生产，排产完成，等待生产
-	 */
-	Integer STATUS_PROCESS_WAITING = 4;
-	/**
-	 * 加工中
-	 */
-	Integer STATUS_PROCESSING = 5;
-
-	/**
-	 * 排产异常
-	 */
-	Integer STATUS_PROCESS_ERROR = 6;
-	/**
-	 * 已完工
-	 */
-	Integer STATUS_COMPLETED = 15;
-	/**
-	 * 已关闭
-	 */
-	Integer STATUS_CLOSED = 21;
-	//endregion
-
-	//region 生产订单接收状态
-	/**
-	 * 未接收
-	 */
-	Integer RECEIVE_STATUS_NO = 0;
-	/**
-	 * 已接收，订单接收后才可进行排产，对接物流系统后，可废弃该状态
-	 */
-	Integer RECEIVE_STATUS_YES = 1;
-	//endregion
-
-	//region 生产订单订单类型
-	/**
-	 * 热表订单
-	 */
-	Integer YIELD_TYPE_1 = 1;
-	/**
-	 * 烧结订单
-	 */
-	Integer YIELD_TYPE_2 = 2;
-	/**
-	 * 玻璃饼
-	 */
-	Integer YIELD_TYPE_3 = 3;
-	/**
-	 * 壳体
-	 */
-	Integer YIELD_TYPE_4 = 4;
-	/**
-	 * 插针
-	 */
-	Integer YIELD_TYPE_5 = 5;
-	/**
-	 * 石墨模
-	 */
-	Integer YIELD_TYPE_6 = 6;
-	//endregion
-
-	//region 生产订单业务类型
-	/**
-	 * 热表
-	 */
-	Integer BUSINESS_TYPE_RB = 1;
-	/**
-	 * 外协
-	 */
-	Integer BUSINESS_TYPE_WX = 2;
-	/**
-	 * 烧结
-	 */
-	Integer BUSINESS_TYPE_SJ = 3;
-	//endregion
-
-	//region 生产订单 ERP优先级
-	/**
-	 * 正常
-	 */
-	Integer PRIORITY_ERP_NORMAL = 1;
-	/**
-	 * 项目要求日期急件
-	 */
-	Integer PRIORITY_ERP_PRO_IMP = 2;
-	/**
-	 * 合同急件
-	 */
-	Integer PRIORITY_ERP_PACT_IMP = 3;
-	/**
-	 * 会议绩效急件
-	 */
-	Integer PRIORITY_ERP_PERF_IMP = 4;
-	/**
-	 * 调度标注急件
-	 */
-	Integer PRIORITY_ERP_SCH_IMP = 5;
-	//endregion
-
-	//region 生产订单 排产优先级
-	/**
-	 * 1 级（极高紧急度 / 灾难性故障）
-	 */
-	Integer PRIORITY_APS_CRITICAL = 1;
-	/**
-	 * 2 级（高紧急度 / 严重故障）
-	 */
-	Integer PRIORITY_APS_HIGH = 2;
-	/**
-	 * 3 级（中紧急度）
-	 */
-	Integer PRIORITY_APS_MEDIUM = 3;
-	/**
-	 * 4 级（低紧急度）
-	 */
-	Integer PRIORITY_APS_LOW = 4;
-	/**
-	 * 5 级（正常）
-	 */
-	Integer PRIORITY_APS_NORMAL = 5;
-	//endregion
-
-	//region 生产订单 校验结果，0：未验证，1：数据缺失，2：工艺缺失，3：资源缺失，4：交期冲突, 5:验证完成
-	/**
-	 * 未验证
-	 */
-	Integer VALIDATION_NO = 0;
-
-	/**
-	 * 数据缺失
-	 */
-	Integer VALIDATION_RESULT_LESS_DATA = 1;
-	/**
-	 * 工艺缺失
-	 */
-	Integer VALIDATION_RESULT_LESS_CRAFT = 2;
-	/**
-	 * 资源缺失
-	 */
-	Integer VALIDATION_RESULT_LESS_RESOURCE = 3;
-	/**
-	 * 交期冲突
-	 */
-	Integer VALIDATION_RESULT_DELIVERY = 4;
-
-	/**
-	 * 验证完成
-	 */
-	Integer VALIDATION_RESULT_PASS = 5;
-	//endregion
-
-	String PRIMARY_CRAFT_WG = "外购";
-	String ROAMNO_TEXT_FJ = "封接";
-}

blade-common/src/main/java/org/springblade/common/constant/YieldPlanConst.java

@@ -1,40 +0,0 @@
-package org.springblade.common.constant;
-
-/**
- * 生产订单相关常量
- *
- * @author lqk
- * @date 2025-11-27 10:40
- */
-public interface YieldPlanConst {
-	//region 生产计划状态相关常量
-	/**
-	 * 正常
-	 */
-	Integer STATUS_NORMAL = 1;
-	/**
-	 * 已退回
-	 */
-	Integer STATUS_RETURNED = 2;
-	/**
-	 * 无工艺
-	 */
-	Integer STATUS_NO_CRAFT = 3;
-	/**
-	 * 已派工
-	 */
-	Integer STATUS_DISPATCHED = 4;
-	/**
-	 * 加工中
-	 */
-	Integer STATUS_PROCESSING = 5;
-	/**
-	 * 已完工
-	 */
-	Integer STATUS_COMPLETED = 15;
-	/**
-	 * 已关闭
-	 */
-	Integer STATUS_CLOSED = 21;
-	//endregion
-}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/constant/YieldOrderConst.java

@@ -0,0 +1,12 @@
+package org.springblade.desk.order.constant;
+
+/**
+ * 生产计划相关常量
+ *
+ * @author lqk
+ * @date 2025-11-27 10:40
+ */
+public interface YieldOrderConst {
+	String PRIMARY_CRAFT_WG = "外购";
+	String ROAMNO_TEXT_FJ = "封接";
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/AssayContent.java

@@ -1,4 +1,4 @@
-package org.springblade.desk.order.entity;
+package org.springblade.desk.order.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/AssayContentDetail.java

@@ -1,4 +1,4 @@
-package org.springblade.desk.order.entity;
+package org.springblade.desk.order.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/MoldPlan.java

@@ -1,4 +1,4 @@
-package org.springblade.desk.order.entity;
+package org.springblade.desk.order.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/MoldPlanOrder.java

@@ -1,4 +1,4 @@
-package org.springblade.desk.order.entity;
+package org.springblade.desk.order.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/MoldPlanTool.java

@@ -1,4 +1,4 @@
-package org.springblade.desk.order.entity;
+package org.springblade.desk.order.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/PlateGoodsApply.java

@@ -1,4 +1,4 @@
-package org.springblade.desk.order.entity;
+package org.springblade.desk.order.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/PlateGoodsApplyDetail.java

@@ -1,4 +1,4 @@
-package org.springblade.desk.order.entity;
+package org.springblade.desk.order.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/PlateGoodsRecord.java

@@ -1,4 +1,4 @@
-package org.springblade.desk.order.entity;
+package org.springblade.desk.order.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/PlateGoodsRecordDetail.java

@@ -1,4 +1,4 @@
-package org.springblade.desk.order.entity;
+package org.springblade.desk.order.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/YieldOrder.java

@@ -1,4 +1,4 @@
-package org.springblade.desk.order.entity;
+package org.springblade.desk.order.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/YieldOrderCraft.java

@@ -1,4 +1,4 @@
-package org.springblade.desk.order.entity;
+package org.springblade.desk.order.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/YieldPlan.java

@@ -1,4 +1,4 @@
-package org.springblade.desk.order.entity;
+package org.springblade.desk.order.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/enums/MoldPlanEnum.java

@@ -0,0 +1,59 @@
+package org.springblade.desk.order.pojo.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import org.springblade.core.tool.utils.ObjectUtil;
+import org.springblade.core.tool.utils.StringPool;
+
+import java.util.Arrays;
+
+/**
+ * 烧结模具计划枚举
+ *
+ * @author lqk
+ * @date 2025-12-19 9:25
+ */
+@Getter
+@AllArgsConstructor
+public enum MoldPlanEnum {
+	EMPTY(StringPool.EMPTY, -1),
+
+	/**
+	 * 状态枚举
+	 */
+	STATUS_WAITING("待出库", 10000),
+	STATUS_OUT_STORE("已出库", 10001),
+	STATUS_DONE("完成", 10002),
+	STATUS_CLOSE("关闭", 10003),
+	;
+	final String name;
+	final int category;
+
+	/**
+	 * 匹配枚举值
+	 *
+	 * @param name 名称
+	 * @return BladeUserEnum
+	 */
+	public static MoldPlanEnum of(String name) {
+		return Arrays.stream(MoldPlanEnum.values())
+			.filter(userEnum -> userEnum.getName().equalsIgnoreCase(name != null ? name : "web"))
+			.findFirst()
+			// 在没有找到匹配项时返回默认值
+			.orElse(MoldPlanEnum.EMPTY);
+	}
+
+	/**
+	 * 根据值获取名称
+	 *
+	 * @param category
+	 * @return
+	 */
+	public static String getName(int category) {
+		MoldPlanEnum item = Arrays.stream(MoldPlanEnum.values())
+			.filter(enumItem -> enumItem.getCategory() == category)
+			.findFirst()
+			.orElse(null);
+		return ObjectUtil.isEmpty(item) ? StringPool.EMPTY : item.getName();
+	}
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/enums/PlateGoodsEnum.java

@@ -0,0 +1,62 @@
+package org.springblade.desk.order.pojo.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import org.springblade.core.tool.utils.ObjectUtil;
+import org.springblade.core.tool.utils.StringPool;
+
+import java.util.Arrays;
+
+/**
+ * 镀层物料需求枚举
+ *
+ * @author lqk
+ * @date 2025-12-19 9:25
+ */
+@Getter
+@AllArgsConstructor
+public enum PlateGoodsEnum {
+	EMPTY(StringPool.EMPTY, -1),
+
+	/**
+	 * 状态枚举
+	 */
+	STATUS_WAITING("待审核", 10000),
+	STATUS_PASS("审核通过", 10001),
+	STATUS_USING("使用中", 10002),
+	STATUS_OUT_DATE("已超期", 10003),
+	STATUS_DONE("已完成", 10004),
+	STATUS_NOT_PASS("审核未通过", 10005),
+	STATUS_CLOSE("已关闭", 10006),
+	;
+	final String name;
+	final int category;
+
+	/**
+	 * 匹配枚举值
+	 *
+	 * @param name 名称
+	 * @return BladeUserEnum
+	 */
+	public static PlateGoodsEnum of(String name) {
+		return Arrays.stream(PlateGoodsEnum.values())
+			.filter(userEnum -> userEnum.getName().equalsIgnoreCase(name != null ? name : "web"))
+			.findFirst()
+			// 在没有找到匹配项时返回默认值
+			.orElse(PlateGoodsEnum.EMPTY);
+	}
+
+	/**
+	 * 根据值获取名称
+	 *
+	 * @param category
+	 * @return
+	 */
+	public static String getName(int category) {
+		PlateGoodsEnum item = Arrays.stream(PlateGoodsEnum.values())
+			.filter(enumItem -> enumItem.getCategory() == category)
+			.findFirst()
+			.orElse(null);
+		return ObjectUtil.isEmpty(item) ? StringPool.EMPTY : item.getName();
+	}
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/enums/YieldOrderEnum.java

@@ -0,0 +1,115 @@
+package org.springblade.desk.order.pojo.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import org.springblade.core.tool.utils.ObjectUtil;
+import org.springblade.core.tool.utils.StringPool;
+
+import java.util.Arrays;
+
+/**
+ * 生产订单枚举
+ *
+ * @author lqk
+ * @date 2025-12-19 9:25
+ */
+@Getter
+@AllArgsConstructor
+public enum YieldOrderEnum {
+	EMPTY(StringPool.EMPTY, -1),
+
+	/**
+	 * 状态枚举
+	 */
+	STATUS_NORMAL("已同步", 10000),
+	STATUS_EXCEPTION("订单异常", 10001),
+	STATUS_NO_ISSUED("未下达", 10002),
+	STATUS_APS("待排产", 10003),
+	STATUS_PROCESS_WAITING("待生产", 10004),
+	STATUS_PROCESSING("加工中", 10005),
+	STATUS_PROCESS_ERROR("排产异常", 10006),
+	STATUS_COMPLETED("已完工", 100015),
+	STATUS_CLOSED("已关闭", 100021),
+
+	/**
+	 * 生产订单接收状态
+	 */
+	RECEIVE_STATUS_NO("未接收", 11000),
+	RECEIVE_STATUS_YES("已接收", 11001),
+
+	/**
+	 * 生产订单订单类型
+	 */
+	YIELD_TYPE_1("热表订单", 12001),
+	YIELD_TYPE_2("烧结订单", 12002),
+	YIELD_TYPE_3("玻璃饼", 12003),
+	YIELD_TYPE_4("壳体", 12004),
+	YIELD_TYPE_5("插针", 12005),
+	YIELD_TYPE_6("石墨模", 12006),
+
+	/**
+	 * 生产订单业务类型
+	 */
+	BUSINESS_TYPE_RB("热表", 13001),
+	BUSINESS_TYPE_WX("外协", 13002),
+	BUSINESS_TYPE_SJ("烧结", 13003),
+
+	/**
+	 * 生产订单 ERP优先级
+	 */
+	PRIORITY_ERP_NORMAL("正常", 14001),
+	PRIORITY_ERP_PRO_IMP("项目要求日期急件", 14002),
+	PRIORITY_ERP_PACT_IMP("合同急件", 14003),
+	PRIORITY_ERP_PERF_IMP("会议绩效急件", 14004),
+	PRIORITY_ERP_SCH_IMP("调度标注急件", 14005),
+
+	/**
+	 * 生产订单 排产优先级
+	 */
+	PRIORITY_APS_CRITICAL("1级-极高紧急度", 15001),
+	PRIORITY_APS_HIGH("2级-高紧急度", 15002),
+	PRIORITY_APS_MEDIUM("3级-中紧急度", 15003),
+	PRIORITY_APS_LOW("4级-低紧急度", 15004),
+	PRIORITY_APS_NORMAL("5级-正常", 15005),
+
+	/**
+	 * 生产订单 校验结果，0：未验证，1：数据缺失，2：工艺缺失，3：资源缺失，4：交期冲突, 5:验证完成
+	 */
+	VALIDATION_NO("未验证", 16001),
+	VALIDATION_RESULT_LESS_DATA("数据缺失", 16002),
+	VALIDATION_RESULT_LESS_CRAFT("工艺缺失", 16003),
+	VALIDATION_RESULT_LESS_RESOURCE("资源缺失", 16004),
+	VALIDATION_RESULT_DELIVERY("交期冲突", 16005),
+	VALIDATION_RESULT_PASS("验证完成", 16006),
+	;
+	final String name;
+	final int category;
+
+	/**
+	 * 匹配枚举值
+	 *
+	 * @param name 名称
+	 * @return BladeUserEnum
+	 */
+	public static YieldOrderEnum of(String name) {
+		return Arrays.stream(YieldOrderEnum.values())
+			.filter(userEnum -> userEnum.getName().equalsIgnoreCase(name != null ? name : "web"))
+			.findFirst()
+			// 在没有找到匹配项时返回默认值
+			.orElse(YieldOrderEnum.EMPTY);
+	}
+
+	/**
+	 * 根据值获取名称
+	 *
+	 * @param category
+	 * @return
+	 */
+	public static String getName(int category) {
+		YieldOrderEnum item = Arrays.stream(YieldOrderEnum.values())
+			.filter(enumItem -> enumItem.getCategory() == category)
+			.findFirst()
+			.orElse(null);
+		return ObjectUtil.isEmpty(item) ? StringPool.EMPTY : item.getName();
+	}
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/enums/YieldPlanEnum.java

@@ -0,0 +1,62 @@
+package org.springblade.desk.order.pojo.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import org.springblade.core.tool.utils.ObjectUtil;
+import org.springblade.core.tool.utils.StringPool;
+
+import java.util.Arrays;
+
+/**
+ * 生产计划枚举
+ *
+ * @author lqk
+ * @date 2025-12-19 9:25
+ */
+@Getter
+@AllArgsConstructor
+public enum YieldPlanEnum {
+	EMPTY(StringPool.EMPTY, -1),
+
+	/**
+	 * 状态枚举
+	 */
+	STATUS_NORMAL("正常", 10001),
+	STATUS_RETURNED("已退回", 10002),
+	STATUS_NO_CRAFT("无工艺", 10003),
+	STATUS_DISPATCHED("已派工", 10004),
+	STATUS_PROCESSING("加工中", 10005),
+	STATUS_COMPLETED("已完工", 100015),
+	STATUS_CLOSED("已关闭", 100021),
+	;
+	final String name;
+	final int category;
+
+	/**
+	 * 匹配枚举值
+	 *
+	 * @param name 名称
+	 * @return BladeUserEnum
+	 */
+	public static YieldPlanEnum of(String name) {
+		return Arrays.stream(YieldPlanEnum.values())
+			.filter(userEnum -> userEnum.getName().equalsIgnoreCase(name != null ? name : "web"))
+			.findFirst()
+			// 在没有找到匹配项时返回默认值
+			.orElse(YieldPlanEnum.EMPTY);
+	}
+
+	/**
+	 * 根据值获取名称
+	 *
+	 * @param category
+	 * @return
+	 */
+	public static String getName(int category) {
+		YieldPlanEnum item = Arrays.stream(YieldPlanEnum.values())
+			.filter(enumItem -> enumItem.getCategory() == category)
+			.findFirst()
+			.orElse(null);
+		return ObjectUtil.isEmpty(item) ? StringPool.EMPTY : item.getName();
+	}
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/request/AssayContentSave.java

@@ -1,8 +1,8 @@
-package org.springblade.desk.order.request;
+package org.springblade.desk.order.pojo.request;
 
 import lombok.Data;
-import org.springblade.desk.order.entity.AssayContent;
+import org.springblade.desk.order.pojo.entity.AssayContent;
-import org.springblade.desk.order.entity.AssayContentDetail;
+import org.springblade.desk.order.pojo.entity.AssayContentDetail;
 
 import java.util.List;
 

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/request/MoldPlanSave.java

@@ -1,9 +1,9 @@
-package org.springblade.desk.order.request;
+package org.springblade.desk.order.pojo.request;
 
 import lombok.Data;
-import org.springblade.desk.order.entity.MoldPlan;
+import org.springblade.desk.order.pojo.entity.MoldPlan;
-import org.springblade.desk.order.entity.MoldPlanOrder;
+import org.springblade.desk.order.pojo.entity.MoldPlanOrder;
-import org.springblade.desk.order.entity.MoldPlanTool;
+import org.springblade.desk.order.pojo.entity.MoldPlanTool;
 
 import java.util.List;
 

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/request/PlateGoodsApplySave.java

@@ -1,8 +1,8 @@
-package org.springblade.desk.order.request;
+package org.springblade.desk.order.pojo.request;
 
 import lombok.Data;
-import org.springblade.desk.order.entity.PlateGoodsApply;
+import org.springblade.desk.order.pojo.entity.PlateGoodsApply;
-import org.springblade.desk.order.entity.PlateGoodsApplyDetail;
+import org.springblade.desk.order.pojo.entity.PlateGoodsApplyDetail;
 
 import java.util.List;
 

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/request/PlateGoodsRecordSave.java

@@ -1,8 +1,8 @@
-package org.springblade.desk.order.request;
+package org.springblade.desk.order.pojo.request;
 
 import lombok.Data;
-import org.springblade.desk.order.entity.PlateGoodsRecord;
+import org.springblade.desk.order.pojo.entity.PlateGoodsRecord;
-import org.springblade.desk.order.entity.PlateGoodsRecordDetail;
+import org.springblade.desk.order.pojo.entity.PlateGoodsRecordDetail;
 
 import java.util.List;
 

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/YieldPlanVo.java

@@ -0,0 +1,30 @@
+package org.springblade.desk.order.pojo.vo;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import lombok.Data;
+import org.springblade.desk.order.pojo.entity.YieldPlan;
+
+import java.io.Serial;
+
+/**
+ * 生产计划-视图类
+ *
+ * @author lqk
+ */
+@Data
+public class YieldPlanVo extends YieldPlan {
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 主键ID
+	 */
+	@JsonSerialize(using = ToStringSerializer.class)
+	private Long id;
+
+	/**
+	 * 状态名称
+	 */
+	String statusName;
+}

blade-service-api/blade-erpdata-api/.gitignore

@@ -0,0 +1,39 @@
+# maven #
+target
+logs
+!.mvn/wrapper/maven-wrapper.jar
+
+# gradle
+.gradle
+/build/
+!gradle/wrapper/gradle-wrapper.jar
+
+# windows #
+Thumbs.db
+
+# Mac #
+.DS_Store
+
+# eclipse #
+.settings
+.project
+.classpath
+.log
+*.class
+
+# vscode #
+.vscode
+
+# idea #
+.idea
+*.iml
+
+# Package Files #
+*.jar
+*.war
+*.ear
+/target
+
+# Flattened pom
+.flattened-pom.xml
+/**/.flattened-pom.xml

blade-service-api/blade-erpdata-api/pom.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>blade-service-api</artifactId>
+        <groupId>org.springblade</groupId>
+        <version>${revision}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>blade-erpdata-api</artifactId>
+    <name>${project.artifactId}</name>
+    <packaging>jar</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-starter-cache</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>

blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpDataSearchClient.java

@@ -0,0 +1,60 @@
+/**
+ * BladeX Commercial License Agreement
+ * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
+ * <p>
+ * Use of this software is governed by the Commercial License Agreement
+ * obtained after purchasing a license from BladeX.
+ * <p>
+ * 1. This software is for development use only under a valid license
+ * from BladeX.
+ * <p>
+ * 2. Redistribution of this software's source code to any third party
+ * without a commercial license is strictly prohibited.
+ * <p>
+ * 3. Licensees may copyright their own code but cannot use segments
+ * from this software for such purposes. Copyright of this software
+ * remains with BladeX.
+ * <p>
+ * Using this software signifies agreement to this License, and the software
+ * must not be used for illegal purposes.
+ * <p>
+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
+ * not liable for any claims arising from secondary or illegal development.
+ * <p>
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.erpdata.feign;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.launch.constant.AppConstant;
+import org.springblade.core.tool.api.R;
+import org.springblade.erpdata.pojo.dto.AllocationDTO;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+
+/**
+ * Feign接口类
+ *
+ * @author Chill
+ */
+@FeignClient(
+	value = AppConstant.APPLICATION_SYSTEM_NAME,
+	fallback = IErpDataSearchClientFallback.class
+)
+public interface IErpDataSearchClient {
+
+	String API_PREFIX = "/feign/erpdata/client";
+	String PAGE_ALLOCATION = API_PREFIX + "/pageAllocation";
+
+	/**
+	 * 查询烧结配套信息
+	 *
+	 * @param page
+	 * @param entity
+	 * @return
+	 */
+	@PostMapping(PAGE_ALLOCATION)
+	R<IPage<AllocationDTO>> pageAllocation(IPage<AllocationDTO> page, AllocationDTO entity);
+
+}

blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpDataSearchClientFallback.java

@@ -0,0 +1,21 @@
+package org.springblade.erpdata.feign;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.tool.api.R;
+import org.springblade.erpdata.pojo.dto.AllocationDTO;
+import org.springframework.stereotype.Component;
+
+/**
+ * Feign失败配置
+ *
+ * @author lqk
+ * @date 2025-12-17 15:13
+ */
+@Component
+public class IErpDataSearchClientFallback implements IErpDataSearchClient {
+
+	@Override
+	public R<IPage<AllocationDTO>> pageAllocation(IPage<AllocationDTO> page, AllocationDTO entity) {
+		return R.fail("获取数据失败");
+	}
+}

blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/AllocationDTO.java

@@ -0,0 +1,92 @@
+package org.springblade.erpdata.pojo.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 配套信息查询
+ *
+ * @author lqk
+ */
+@Data
+public class AllocationDTO implements Serializable {
+
+	/**
+	 * 配套单号
+	 */
+	private String pkno;
+	/**
+	 * 父件号
+	 */
+	private String prntno;
+	/**
+	 * 型号
+	 */
+	private String mtltmrk;
+	/**
+	 * 生产标识
+	 */
+	private String prtlotno;
+	/**
+	 * 需求日期
+	 */
+	private String pkreqdat;
+	/**
+	 * 父件批次
+	 */
+	private String fjSplcode;
+	/**
+	 * 父件配套数
+	 */
+	private String fjPkavqty;
+	/**
+	 * 配套序号
+	 */
+	private String serialno;
+	/**
+	 * 主制部门
+	 */
+	private String prtmdept;
+	/**
+	 * 计划标记
+	 */
+	private String plnsign;
+	/**
+	 * 制造订单号
+	 */
+	private String mono;
+	/**
+	 * 计划员
+	 */
+	private String schemer;
+	/**
+	 * 调度员
+	 */
+	private String planner1;
+	/**
+	 * 配套日期
+	 */
+	private String subpkdate;
+
+	/**
+	 * 保管员
+	 */
+	private String warctlr;
+	/**
+	 * 条码序号
+	 */
+	private String barcodeno;
+	/**
+	 * 计划部门
+	 */
+	private String plandept;
+	/**
+	 * 备注
+	 */
+	private String remark;
+	/**
+	 * 物料标识
+	 */
+	private String prtclass;
+}

blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/enums/DictBizEnum.java

@@ -0,0 +1,48 @@
+/**
+ * BladeX Commercial License Agreement
+ * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
+ * <p>
+ * Use of this software is governed by the Commercial License Agreement
+ * obtained after purchasing a license from BladeX.
+ * <p>
+ * 1. This software is for development use only under a valid license
+ * from BladeX.
+ * <p>
+ * 2. Redistribution of this software's source code to any third party
+ * without a commercial license is strictly prohibited.
+ * <p>
+ * 3. Licensees may copyright their own code but cannot use segments
+ * from this software for such purposes. Copyright of this software
+ * remains with BladeX.
+ * <p>
+ * Using this software signifies agreement to this License, and the software
+ * must not be used for illegal purposes.
+ * <p>
+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
+ * not liable for any claims arising from secondary or illegal development.
+ * <p>
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.erpdata.pojo.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 业务字典枚举类
+ *
+ * @author Chill
+ */
+@Getter
+@AllArgsConstructor
+public enum DictBizEnum {
+
+	/**
+	 * 测试
+	 */
+	TEST("test"),
+	;
+
+	final String name;
+
+}

blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/enums/DictEnum.java

@@ -0,0 +1,104 @@
+/**
+ * BladeX Commercial License Agreement
+ * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
+ * <p>
+ * Use of this software is governed by the Commercial License Agreement
+ * obtained after purchasing a license from BladeX.
+ * <p>
+ * 1. This software is for development use only under a valid license
+ * from BladeX.
+ * <p>
+ * 2. Redistribution of this software's source code to any third party
+ * without a commercial license is strictly prohibited.
+ * <p>
+ * 3. Licensees may copyright their own code but cannot use segments
+ * from this software for such purposes. Copyright of this software
+ * remains with BladeX.
+ * <p>
+ * Using this software signifies agreement to this License, and the software
+ * must not be used for illegal purposes.
+ * <p>
+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
+ * not liable for any claims arising from secondary or illegal development.
+ * <p>
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.erpdata.pojo.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 系统字典枚举类
+ *
+ * @author Chill
+ */
+@Getter
+@AllArgsConstructor
+public enum DictEnum {
+
+	/**
+	 * 性别
+	 */
+	SEX("sex"),
+	/**
+	 * 通知类型
+	 */
+	NOTICE("notice"),
+	/**
+	 * 菜单类型
+	 */
+	MENU_CATEGORY("menu_category"),
+	/**
+	 * 按钮功能
+	 */
+	BUTTON_FUNC("button_func"),
+	/**
+	 * 是否
+	 */
+	YES_NO("yes_no"),
+	/**
+	 * 流程类型
+	 */
+	FLOW("flow"),
+	/**
+	 * 机构类型
+	 */
+	ORG_CATEGORY("org_category"),
+	/**
+	 * 数据权限
+	 */
+	DATA_SCOPE_TYPE("data_scope_type"),
+	/**
+	 * 接口权限
+	 */
+	API_SCOPE_TYPE("api_scope_type"),
+	/**
+	 * 权限类型
+	 */
+	SCOPE_CATEGORY("scope_category"),
+	/**
+	 * 对象存储类型
+	 */
+	OSS("oss"),
+	/**
+	 * 短信服务类型
+	 */
+	SMS("sms"),
+	/**
+	 * 岗位类型
+	 */
+	POST_CATEGORY("post_category"),
+	/**
+	 * 行政区划
+	 */
+	REGION("region"),
+	/**
+	 * 用户平台
+	 */
+	USER_TYPE("user_type"),
+	;
+
+	final String name;
+
+}

blade-service-api/pom.xml

@@ -24,6 +24,7 @@
         <module>blade-scheduling-api</module>
         <module>blade-monitor-api</module>
         <module>blade-wms-api</module>
+        <module>blade-erpdata-api</module>
     </modules>
 
     <dependencies>

blade-service/blade-desk/pom.xml

@@ -35,6 +35,12 @@
             <groupId>org.springblade</groupId>
             <artifactId>blade-flow-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-erpdata-api</artifactId>
+            <version>4.6.0.RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
         <!--Oss-->
         <dependency>
             <groupId>org.springblade</groupId>
@@ -45,21 +51,12 @@
             <groupId>io.minio</groupId>
             <artifactId>minio</artifactId>
         </dependency>
-        <!--QiNiu-->
-        <!--        <dependency>-->
-        <!--            <groupId>com.qiniu</groupId>-->
-        <!--            <artifactId>qiniu-java-sdk</artifactId>-->
-        <!--        </dependency>-->
         <dependency>
             <groupId>org.flowable</groupId>
             <artifactId>flowable-engine</artifactId>
             <version>7.1.0</version>
             <scope>compile</scope>
         </dependency>
-        <!--<dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>blade-starter-transaction</artifactId>
-        </dependency>-->
 
         <!-- blade excel starter -->
         <dependency>
@@ -85,6 +82,7 @@
             <groupId>org.springblade</groupId>
             <artifactId>blade-resource-api</artifactId>
         </dependency>
+
     </dependencies>
 
     <build>

blade-service/blade-desk/src/main/java/org/springblade/desk/order/constant/MoldPlanConst.java

@@ -1,28 +0,0 @@
-package org.springblade.desk.order.constant;
-
-/**
- * 烧结模具计划相关常量
- *
- * @author lqk
- * @date 2025-11-27 10:40
- */
-public interface MoldPlanConst {
-	//region 状态相关常量
-	/**
-	 * 待出库
-	 */
-	Integer STATUS_WAITING = 0;
-	/**
-	 * 已出库
-	 */
-	Integer STATUS_OUT_STORE = 1;
-	/**
-	 * 完成
-	 */
-	Integer STATUS_DONE = 2;
-	/**
-	 * 关闭
-	 */
-	Integer STATUS_CLOSE = 3;
-	//endregion
-}

blade-service/blade-desk/src/main/java/org/springblade/desk/order/constant/PlateGoodsConst.java

@@ -1,40 +0,0 @@
-package org.springblade.desk.order.constant;
-
-/**
- * 镀层物料需求相关常量
- *
- * @author lqk
- * @date 2025-11-27 10:40
- */
-public interface PlateGoodsConst {
-	//region 状态相关常量
-	/**
-	 * 待审核
-	 */
-	Integer STATUS_WAITING = 0;
-	/**
-	 * 审核通过
-	 */
-	Integer STATUS_PASS = 1;
-	/**
-	 * 使用中
-	 */
-	Integer STATUS_USING = 2;
-	/**
-	 * 已超期
-	 */
-	Integer STATUS_OUT_DATE = 2;
-	/**
-	 * 已完成
-	 */
-	Integer STATUS_DONE = 3;
-	/**
-	 * 审核未通过
-	 */
-	Integer STATUS_NOT_PASS = 3;
-	/**
-	 * 已关闭
-	 */
-	Integer STATUS_CLOSE = 3;
-	//endregion
-}

blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/AssayContentController.java

@@ -11,9 +11,9 @@ import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.desk.order.entity.AssayContent;
+import org.springblade.desk.order.pojo.entity.AssayContent;
-import org.springblade.desk.order.entity.AssayContentDetail;
+import org.springblade.desk.order.pojo.entity.AssayContentDetail;
-import org.springblade.desk.order.request.AssayContentSave;
+import org.springblade.desk.order.pojo.request.AssayContentSave;
 import org.springblade.desk.order.service.IAssayContentDetailService;
 import org.springblade.desk.order.service.IAssayContentService;
 import org.springframework.web.bind.annotation.*;

blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/MoldPlanController.java

@@ -11,11 +11,11 @@ import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.desk.order.constant.MoldPlanConst;
+import org.springblade.desk.order.pojo.entity.MoldPlan;
-import org.springblade.desk.order.entity.MoldPlan;
+import org.springblade.desk.order.pojo.entity.MoldPlanOrder;
-import org.springblade.desk.order.entity.MoldPlanOrder;
+import org.springblade.desk.order.pojo.entity.MoldPlanTool;
-import org.springblade.desk.order.entity.MoldPlanTool;
+import org.springblade.desk.order.pojo.enums.MoldPlanEnum;
-import org.springblade.desk.order.request.MoldPlanSave;
+import org.springblade.desk.order.pojo.request.MoldPlanSave;
 import org.springblade.desk.order.service.IMoldPlanOrderService;
 import org.springblade.desk.order.service.IMoldPlanService;
 import org.springblade.desk.order.service.IMoldPlanToolService;
@@ -101,7 +101,7 @@ public class MoldPlanController extends BladeController {
     @PostMapping("/closeBatch")
     @Operation(summary = "批量关闭", description = "传入ids")
     public R closeBatch(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
-        Boolean result = moldPlanService.changeStatus(Func.toLongList(ids), MoldPlanConst.STATUS_CLOSE);
+        Boolean result = moldPlanService.changeStatus(Func.toLongList(ids), MoldPlanEnum.STATUS_CLOSE.getCategory());
         return R.status(result);
     }
 

blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/PlateGoodsApplyController.java

@@ -12,9 +12,9 @@ import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.desk.order.entity.PlateGoodsApply;
+import org.springblade.desk.order.pojo.entity.PlateGoodsApply;
-import org.springblade.desk.order.entity.PlateGoodsApplyDetail;
+import org.springblade.desk.order.pojo.entity.PlateGoodsApplyDetail;
-import org.springblade.desk.order.request.PlateGoodsApplySave;
+import org.springblade.desk.order.pojo.request.PlateGoodsApplySave;
 import org.springblade.desk.order.service.IPlateGoodsApplyDetailService;
 import org.springblade.desk.order.service.IPlateGoodsApplyService;
 import org.springframework.web.bind.annotation.*;

blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/PlateGoodsRecordController.java

@@ -11,11 +11,11 @@ import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.desk.order.constant.PlateGoodsConst;
+import org.springblade.desk.order.pojo.entity.AssayContentDetail;
-import org.springblade.desk.order.entity.AssayContentDetail;
+import org.springblade.desk.order.pojo.entity.PlateGoodsRecord;
-import org.springblade.desk.order.entity.PlateGoodsRecord;
+import org.springblade.desk.order.pojo.entity.PlateGoodsRecordDetail;
-import org.springblade.desk.order.entity.PlateGoodsRecordDetail;
+import org.springblade.desk.order.pojo.enums.PlateGoodsEnum;
-import org.springblade.desk.order.request.PlateGoodsRecordSave;
+import org.springblade.desk.order.pojo.request.PlateGoodsRecordSave;
 import org.springblade.desk.order.service.IPlateGoodsRecordDetailService;
 import org.springblade.desk.order.service.IPlateGoodsRecordService;
 import org.springframework.web.bind.annotation.*;
@@ -108,7 +108,7 @@ public class PlateGoodsRecordController extends BladeController {
     @PostMapping("/closeBatch")
     @Operation(summary = "批量关闭", description = "传入ids")
     public R closeBatch(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
-        Boolean result = goodsRecordService.changeStatus(Func.toLongList(ids), PlateGoodsConst.STATUS_CLOSE);
+        Boolean result = goodsRecordService.changeStatus(Func.toLongList(ids), PlateGoodsEnum.STATUS_CLOSE.getCategory());
         return R.status(result);
     }
 

blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/YieldOrderController.java

@@ -14,8 +14,8 @@ import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.desk.order.entity.YieldOrder;
+import org.springblade.desk.order.pojo.entity.YieldOrder;
-import org.springblade.desk.order.entity.YieldOrderCraft;
+import org.springblade.desk.order.pojo.entity.YieldOrderCraft;
 import org.springblade.desk.order.service.IYieldOrderCraftService;
 import org.springblade.desk.order.service.IYieldOrderService;
 import org.springframework.web.bind.annotation.*;

blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/YieldPlanController.java

@@ -10,14 +10,19 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
-import org.springblade.common.constant.YieldPlanConst;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.desk.order.entity.YieldPlan;
+import org.springblade.core.tool.utils.SpringUtil;
+import org.springblade.desk.order.pojo.entity.YieldPlan;
+import org.springblade.desk.order.pojo.enums.YieldPlanEnum;
+import org.springblade.desk.order.pojo.vo.YieldPlanVo;
 import org.springblade.desk.order.service.IYieldPlanService;
+import org.springblade.desk.order.wrapper.YieldPlanWrapper;
+import org.springblade.erpdata.feign.IErpDataSearchClient;
+import org.springblade.erpdata.pojo.dto.AllocationDTO;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -35,18 +40,29 @@ public class YieldPlanController extends BladeController {
 
 	private final IYieldPlanService yieldPlanService;
 
+	private static IErpDataSearchClient erpDataSearchClient;
+
+	private static IErpDataSearchClient getErpDataSearchClient() {
+		if (erpDataSearchClient == null) {
+			erpDataSearchClient = SpringUtil.getBean(IErpDataSearchClient.class);
+		}
+		return erpDataSearchClient;
+	}
+
+
 	/**
 	 * 分页查询列表
 	 */
 	@GetMapping("/page")
 	@Parameters({
-			@Parameter(name = "ypCode", description = "计划单号", in = ParameterIn.QUERY, schema = @Schema(type = "string")),
+		@Parameter(name = "ypCode", description = "计划单号", in = ParameterIn.QUERY, schema = @Schema(type = "string")),
-			@Parameter(name = "partCode", description = "零件号", in = ParameterIn.QUERY, schema = @Schema(type = "string"))
+		@Parameter(name = "partCode", description = "零件号", in = ParameterIn.QUERY, schema = @Schema(type = "string")),
+		@Parameter(name = "status", description = "状态", in = ParameterIn.QUERY, schema = @Schema(type = "int"))
 	})
 	@Operation(summary = "分页", description = "")
-	public R<IPage<YieldPlan>> page(@Parameter(hidden = true) YieldPlan entity, Query query) {
+	public R<IPage<YieldPlanVo>> page(@Parameter(hidden = true) YieldPlan entity, Query query) {
 		IPage<YieldPlan> page = yieldPlanService.selectPage(Condition.getPage(query), entity);
-		return R.data(page);
+		return R.data(YieldPlanWrapper.build().pageVO(page));
 	}
 
 	/**
@@ -121,7 +137,7 @@ public class YieldPlanController extends BladeController {
 	@PostMapping("/closeBatch")
 	@Operation(summary = "批量关闭", description = "传入ids")
 	public R closeBatch(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
-		Boolean result = yieldPlanService.changeStatus(Func.toLongList(ids), YieldPlanConst.STATUS_CLOSED);
+		Boolean result = yieldPlanService.changeStatus(Func.toLongList(ids), YieldPlanEnum.STATUS_CLOSED.getCategory());
 		return R.status(result);
 	}
 
@@ -150,4 +166,22 @@ public class YieldPlanController extends BladeController {
 		Boolean result = yieldPlanService.checkCode(yieldPlanId, yieldPlanCode);
 		return R.data(result);
 	}
+
+	/**
+	 * 分页查询配套信息
+	 *
+	 * @param entity
+	 * @param query
+	 * @return
+	 */
+	@GetMapping("/pageAllocation")
+	@Parameters({
+		@Parameter(name = "ypCode", description = "计划单号", in = ParameterIn.QUERY, schema = @Schema(type = "string")),
+		@Parameter(name = "partCode", description = "零件号", in = ParameterIn.QUERY, schema = @Schema(type = "string"))
+	})
+	@Operation(summary = "分页查询配套信息", description = "")
+	public R<IPage<AllocationDTO>> pageAllocation(@Parameter(hidden = true) AllocationDTO entity, Query query) {
+		R<IPage<AllocationDTO>> result = getErpDataSearchClient().pageAllocation(Condition.getPage(query), entity);
+		return result;
+	}
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/AssayContentDetailMapper.java

@@ -2,7 +2,7 @@ package org.springblade.desk.order.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.desk.order.entity.AssayContentDetail;
+import org.springblade.desk.order.pojo.entity.AssayContentDetail;
 
 import java.util.List;
 

blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/AssayContentDetailMapper.xml

@@ -3,7 +3,7 @@
     PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace = "org.springblade.desk.order.mapper.AssayContentDetailMapper">
-    <select id = "selectPage" resultType = "org.springblade.desk.order.entity.AssayContentDetail">
+    <select id = "selectPage" resultType = "org.springblade.desk.order.pojo.entity.AssayContentDetail">
 
     </select>
 </mapper>

blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/AssayContentMapper.java

@@ -2,7 +2,7 @@ package org.springblade.desk.order.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.desk.order.entity.AssayContent;
+import org.springblade.desk.order.pojo.entity.AssayContent;
 
 import java.util.List;
 
@@ -10,7 +10,7 @@ import java.util.List;
  * @author lqk
  * @description 针对表【MES_ASSAY_CONTENT(化验含量)】的数据库操作Mapper
  * @createDate 2025-11-24 11:41:58
- * @Entity org.springblade.desk.order.entity.AssayContent
+ * @Entity org.springblade.desk.order.pojo.entity.AssayContent
  */
 public interface AssayContentMapper extends BaseMapper<AssayContent> {
 

blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/AssayContentMapper.xml

@@ -3,7 +3,7 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.springblade.desk.order.mapper.AssayContentMapper">
-    <select id = "selectPage" resultType = "org.springblade.desk.order.entity.AssayContent">
+    <select id = "selectPage" resultType = "org.springblade.desk.order.pojo.entity.AssayContent">
 
     </select>
 </mapper>

blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanMapper.java

@@ -2,7 +2,7 @@ package org.springblade.desk.order.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.desk.order.entity.MoldPlan;
+import org.springblade.desk.order.pojo.entity.MoldPlan;
 
 import java.util.List;
 
@@ -10,7 +10,7 @@ import java.util.List;
  * @author lqk
  * @description 针对表【MES_MOLD_PLAN(烧结模具计划)】的数据库操作Mapper
  * @createDate 2025-11-24 11:41:58
- * @Entity org.springblade.desk.order.entity.MoldPlan
+ * @Entity org.springblade.desk.order.pojo.entity.MoldPlan
  */
 public interface MoldPlanMapper extends BaseMapper<MoldPlan> {
 

blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanMapper.xml

@@ -3,7 +3,7 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.springblade.desk.order.mapper.MoldPlanMapper">
-    <select id = "selectPage" resultType = "org.springblade.desk.order.entity.MoldPlan">
+    <select id = "selectPage" resultType = "org.springblade.desk.order.pojo.entity.MoldPlan">
 
     </select>
 </mapper>

blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanOrderMapper.java

@@ -2,7 +2,7 @@ package org.springblade.desk.order.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.desk.order.entity.MoldPlanOrder;
+import org.springblade.desk.order.pojo.entity.MoldPlanOrder;
 
 import java.util.List;
 
@@ -10,7 +10,7 @@ import java.util.List;
  * @author lqk
  * @description 针对表【MES_MOLD_PLAN_ORDER(烧结模具计划-订单关联表)】的数据库操作Mapper
  * @createDate 2025-11-24 11:41:58
- * @Entity org.springblade.desk.order.entity.MoldPlanOrder
+ * @Entity org.springblade.desk.order.pojo.entity.MoldPlanOrder
  */
 public interface MoldPlanOrderMapper extends BaseMapper<MoldPlanOrder> {
 

blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanOrderMapper.xml

@@ -3,7 +3,7 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.springblade.desk.order.mapper.MoldPlanOrderMapper">
-    <select id = "selectPage" resultType = "org.springblade.desk.order.entity.MoldPlanOrder">
+    <select id = "selectPage" resultType = "org.springblade.desk.order.pojo.entity.MoldPlanOrder">
 
     </select>
 </mapper>

blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanToolMapper.java

@@ -2,7 +2,7 @@ package org.springblade.desk.order.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.desk.order.entity.MoldPlanTool;
+import org.springblade.desk.order.pojo.entity.MoldPlanTool;
 
 import java.util.List;
 

blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanToolMapper.xml

@@ -3,7 +3,7 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.springblade.desk.order.mapper.MoldPlanToolMapper">
-    <select id = "selectPage" resultType = "org.springblade.desk.order.entity.MoldPlanTool">
+    <select id = "selectPage" resultType = "org.springblade.desk.order.pojo.entity.MoldPlanTool">
 
     </select>
 </mapper>

blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsApplyDetailMapper.java

@@ -2,7 +2,7 @@ package org.springblade.desk.order.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.desk.order.entity.PlateGoodsApplyDetail;
+import org.springblade.desk.order.pojo.entity.PlateGoodsApplyDetail;
 
 import java.util.List;
 

blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsApplyDetailMapper.xml

@@ -3,7 +3,7 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.springblade.desk.order.mapper.PlateGoodsApplyDetailMapper">
-    <select id = "selectPage" resultType = "org.springblade.desk.order.entity.PlateGoodsApplyDetail">
+    <select id = "selectPage" resultType = "org.springblade.desk.order.pojo.entity.PlateGoodsApplyDetail">
 
     </select>
 </mapper>

blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsApplyMapper.java

@@ -2,7 +2,7 @@ package org.springblade.desk.order.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.desk.order.entity.PlateGoodsApply;
+import org.springblade.desk.order.pojo.entity.PlateGoodsApply;
 
 import java.util.List;
 

blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsApplyMapper.xml

@@ -3,7 +3,7 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.springblade.desk.order.mapper.PlateGoodsApplyMapper">
-    <select id = "selectPage" resultType = "org.springblade.desk.order.entity.PlateGoodsApply">
+    <select id = "selectPage" resultType = "org.springblade.desk.order.pojo.entity.PlateGoodsApply">
 
     </select>
 </mapper>

blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsRecordDetailMapper.java

@@ -2,7 +2,7 @@ package org.springblade.desk.order.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.desk.order.entity.PlateGoodsRecordDetail;
+import org.springblade.desk.order.pojo.entity.PlateGoodsRecordDetail;
 
 import java.util.List;
 

blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsRecordDetailMapper.xml

@@ -3,7 +3,7 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.springblade.desk.order.mapper.PlateGoodsRecordDetailMapper">
-    <select id = "selectPage" resultType = "org.springblade.desk.order.entity.PlateGoodsRecordDetail">
+    <select id = "selectPage" resultType = "org.springblade.desk.order.pojo.entity.PlateGoodsRecordDetail">
 
     </select>
 </mapper>

blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsRecordMapper.java

@@ -2,7 +2,7 @@ package org.springblade.desk.order.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.desk.order.entity.PlateGoodsRecord;
+import org.springblade.desk.order.pojo.entity.PlateGoodsRecord;
 
 import java.util.List;
 

blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsRecordMapper.xml

@@ -3,7 +3,7 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.springblade.desk.order.mapper.PlateGoodsRecordMapper">
-    <select id = "selectPage" resultType = "org.springblade.desk.order.entity.PlateGoodsRecord">
+    <select id = "selectPage" resultType = "org.springblade.desk.order.pojo.entity.PlateGoodsRecord">
 
     </select>
 </mapper>

blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderCraftMapper.java

@@ -2,7 +2,7 @@ package org.springblade.desk.order.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.desk.order.entity.YieldOrderCraft;
+import org.springblade.desk.order.pojo.entity.YieldOrderCraft;
 
 import java.util.List;
 

blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderCraftMapper.xml

@@ -3,7 +3,7 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.springblade.desk.order.mapper.YieldOrderCraftMapper">
-    <select id = "selectPage" resultType = "org.springblade.desk.order.entity.YieldOrderCraft">
+    <select id = "selectPage" resultType = "org.springblade.desk.order.pojo.entity.YieldOrderCraft">
 
     </select>
 </mapper>

blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderMapper.java

@@ -2,7 +2,7 @@ package org.springblade.desk.order.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.desk.order.entity.YieldOrder;
+import org.springblade.desk.order.pojo.entity.YieldOrder;
 
 import java.util.List;
 

blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderMapper.xml

@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace = "org.springblade.desk.order.mapper.YieldOrderMapper">
 
-    <select id = "selectPage" resultType = "org.springblade.desk.order.entity.YieldOrder">
+    <select id = "selectPage" resultType = "org.springblade.desk.order.pojo.entity.YieldOrder">
 
     </select>
 </mapper>

blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldPlanMapper.java

@@ -2,7 +2,7 @@ package org.springblade.desk.order.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.desk.order.entity.YieldPlan;
+import org.springblade.desk.order.pojo.entity.YieldPlan;
 
 import java.util.List;
 

blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldPlanMapper.xml

@@ -2,9 +2,23 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.springblade.desk.order.mapper.YieldPlanMapper">
+<mapper namespace = "org.springblade.desk.order.mapper.YieldPlanMapper">
-
-    <select id = "selectPage" resultType = "org.springblade.desk.order.entity.YieldPlan">
 
+    <select id = "selectPage" resultType = "org.springblade.desk.order.pojo.entity.YieldPlan">
+        SELECT ID, TENANT_ID, CREATE_USER, CREATE_DEPT, CREATE_TIME, UPDATE_USER, UPDATE_TIME, STATUS, IS_DELETED,
+            YP_CODE, PART_CODE, PRODUCT_TYPE, PART_NAME, PLATE, PRODUCT_IDENT, USE_DEPT, YP_QTY, YP_AREA, DEMAND_DATE,
+            PLAN_USER, RELEASE_DATE, ROAM_NO, DELIVERY_QTY, ALREADY_BRANCH_QTY, PRIMARY_CRAFT, DOMINANT_DEPT, MEMO,
+            ROUTE_NO, CUSTODIAN, BPS_ID, PRIORITY, PLAN_TYPE, SURE_TYPE, CLOSE_MAN, CLOSE_TIME, PRODUCT_LINE
+        FROM MES_YIELD_PLAN
+        WHERE IS_DELETED = 0
+        <if test = "ypCode != null and ypCode != ''">
+            AND YP_CODE LIKE CONCAT('%', #{ypCode}, '%')
+        </if>
+        <if test = "partCode != null and partCode != ''">
+            AND PART_CODE LIKE CONCAT('%', #{partCode}, '%')
+        </if>
+        <if test = "status != null and status != ''">
+            AND status = #{status}
+        </if>
     </select>
 </mapper>

blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IAssayContentDetailService.java

@@ -2,7 +2,7 @@ package org.springblade.desk.order.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
-import org.springblade.desk.order.entity.AssayContentDetail;
+import org.springblade.desk.order.pojo.entity.AssayContentDetail;
 
 /**
  * 服务实现类

blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IAssayContentService.java

@@ -2,8 +2,8 @@ package org.springblade.desk.order.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
-import org.springblade.desk.order.entity.AssayContent;
+import org.springblade.desk.order.pojo.entity.AssayContent;
-import org.springblade.desk.order.entity.AssayContentDetail;
+import org.springblade.desk.order.pojo.entity.AssayContentDetail;
 
 import java.util.List;
 

blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IMoldPlanOrderService.java

@@ -2,7 +2,7 @@ package org.springblade.desk.order.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
-import org.springblade.desk.order.entity.MoldPlanOrder;
+import org.springblade.desk.order.pojo.entity.MoldPlanOrder;
 
 /**
  * 服务实现类

blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IMoldPlanService.java

@@ -2,9 +2,9 @@ package org.springblade.desk.order.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
-import org.springblade.desk.order.entity.MoldPlan;
+import org.springblade.desk.order.pojo.entity.MoldPlan;
-import org.springblade.desk.order.entity.MoldPlanOrder;
+import org.springblade.desk.order.pojo.entity.MoldPlanOrder;
-import org.springblade.desk.order.entity.MoldPlanTool;
+import org.springblade.desk.order.pojo.entity.MoldPlanTool;
 
 import java.util.List;
 

blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IMoldPlanToolService.java

@@ -2,7 +2,7 @@ package org.springblade.desk.order.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
-import org.springblade.desk.order.entity.MoldPlanTool;
+import org.springblade.desk.order.pojo.entity.MoldPlanTool;
 
 /**
  * 服务实现类

blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IPlateGoodsApplyDetailService.java

@@ -2,7 +2,7 @@ package org.springblade.desk.order.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
-import org.springblade.desk.order.entity.PlateGoodsApplyDetail;
+import org.springblade.desk.order.pojo.entity.PlateGoodsApplyDetail;
 
 /**
  * 服务实现类

blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IPlateGoodsApplyService.java

@@ -2,8 +2,8 @@ package org.springblade.desk.order.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
-import org.springblade.desk.order.entity.PlateGoodsApply;
+import org.springblade.desk.order.pojo.entity.PlateGoodsApply;
-import org.springblade.desk.order.entity.PlateGoodsApplyDetail;
+import org.springblade.desk.order.pojo.entity.PlateGoodsApplyDetail;
 
 import java.util.List;
 

blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IPlateGoodsRecordDetailService.java

@@ -2,7 +2,7 @@ package org.springblade.desk.order.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
-import org.springblade.desk.order.entity.PlateGoodsRecordDetail;
+import org.springblade.desk.order.pojo.entity.PlateGoodsRecordDetail;
 
 /**
  * 服务实现类

blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IPlateGoodsRecordService.java

@@ -2,8 +2,8 @@ package org.springblade.desk.order.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
-import org.springblade.desk.order.entity.PlateGoodsRecord;
+import org.springblade.desk.order.pojo.entity.PlateGoodsRecord;
-import org.springblade.desk.order.entity.PlateGoodsRecordDetail;
+import org.springblade.desk.order.pojo.entity.PlateGoodsRecordDetail;
 
 import java.util.List;
 

blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IYieldOrderCraftService.java

@@ -2,7 +2,7 @@ package org.springblade.desk.order.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
-import org.springblade.desk.order.entity.YieldOrderCraft;
+import org.springblade.desk.order.pojo.entity.YieldOrderCraft;
 
 import java.util.List;
 

blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IYieldOrderService.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import jakarta.validation.constraints.NotEmpty;
 import org.springblade.common.exception.BusinessException;
 import org.springblade.core.mp.base.BaseService;
-import org.springblade.desk.order.entity.YieldOrder;
+import org.springblade.desk.order.pojo.entity.YieldOrder;
 
 import java.util.List;
 

blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IYieldPlanService.java

@@ -3,7 +3,7 @@ package org.springblade.desk.order.service;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
-import org.springblade.desk.order.entity.YieldPlan;
+import org.springblade.desk.order.pojo.entity.YieldPlan;
 
 import java.util.List;
 

blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/AssayContentDetailServiceImpl.java

@@ -2,7 +2,7 @@ package org.springblade.desk.order.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.desk.order.entity.AssayContentDetail;
+import org.springblade.desk.order.pojo.entity.AssayContentDetail;
 import org.springblade.desk.order.mapper.AssayContentDetailMapper;
 import org.springblade.desk.order.service.IAssayContentDetailService;
 import org.springframework.stereotype.Service;

blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/AssayContentServiceImpl.java

@@ -3,8 +3,8 @@ package org.springblade.desk.order.service.impl;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import lombok.RequiredArgsConstructor;
 import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.desk.order.entity.AssayContent;
+import org.springblade.desk.order.pojo.entity.AssayContent;
-import org.springblade.desk.order.entity.AssayContentDetail;
+import org.springblade.desk.order.pojo.entity.AssayContentDetail;
 import org.springblade.desk.order.mapper.AssayContentMapper;
 import org.springblade.desk.order.service.IAssayContentDetailService;
 import org.springblade.desk.order.service.IAssayContentService;

blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/MoldPlanOrderServiceImpl.java

@@ -2,7 +2,7 @@ package org.springblade.desk.order.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.desk.order.entity.MoldPlanOrder;
+import org.springblade.desk.order.pojo.entity.MoldPlanOrder;
 import org.springblade.desk.order.mapper.MoldPlanOrderMapper;
 import org.springblade.desk.order.service.IMoldPlanOrderService;
 import org.springframework.stereotype.Service;

blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/MoldPlanServiceImpl.java

@@ -3,9 +3,9 @@ package org.springblade.desk.order.service.impl;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import lombok.RequiredArgsConstructor;
 import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.desk.order.entity.MoldPlan;
+import org.springblade.desk.order.pojo.entity.MoldPlan;
-import org.springblade.desk.order.entity.MoldPlanOrder;
+import org.springblade.desk.order.pojo.entity.MoldPlanOrder;
-import org.springblade.desk.order.entity.MoldPlanTool;
+import org.springblade.desk.order.pojo.entity.MoldPlanTool;
 import org.springblade.desk.order.mapper.MoldPlanMapper;
 import org.springblade.desk.order.service.IMoldPlanOrderService;
 import org.springblade.desk.order.service.IMoldPlanService;

blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/MoldPlanToolServiceImpl.java

@@ -2,7 +2,7 @@ package org.springblade.desk.order.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.desk.order.entity.MoldPlanTool;
+import org.springblade.desk.order.pojo.entity.MoldPlanTool;
 import org.springblade.desk.order.mapper.MoldPlanToolMapper;
 import org.springblade.desk.order.service.IMoldPlanToolService;
 import org.springframework.stereotype.Service;

blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsApplyDetailServiceImpl.java

@@ -2,7 +2,7 @@ package org.springblade.desk.order.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.desk.order.entity.PlateGoodsApplyDetail;
+import org.springblade.desk.order.pojo.entity.PlateGoodsApplyDetail;
 import org.springblade.desk.order.mapper.PlateGoodsApplyDetailMapper;
 import org.springblade.desk.order.service.IPlateGoodsApplyDetailService;
 import org.springframework.stereotype.Service;

blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsApplyServiceImpl.java

@@ -6,8 +6,8 @@ import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.utils.DateUtil;
-import org.springblade.desk.order.entity.PlateGoodsApply;
+import org.springblade.desk.order.pojo.entity.PlateGoodsApply;
-import org.springblade.desk.order.entity.PlateGoodsApplyDetail;
+import org.springblade.desk.order.pojo.entity.PlateGoodsApplyDetail;
 import org.springblade.desk.order.mapper.PlateGoodsApplyMapper;
 import org.springblade.desk.order.service.IPlateGoodsApplyDetailService;
 import org.springblade.desk.order.service.IPlateGoodsApplyService;

blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsRecordDetailServiceImpl.java

@@ -2,7 +2,7 @@ package org.springblade.desk.order.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.desk.order.entity.PlateGoodsRecordDetail;
+import org.springblade.desk.order.pojo.entity.PlateGoodsRecordDetail;
 import org.springblade.desk.order.mapper.PlateGoodsRecordDetailMapper;
 import org.springblade.desk.order.service.IPlateGoodsRecordDetailService;
 import org.springframework.stereotype.Service;

blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsRecordServiceImpl.java

@@ -6,8 +6,8 @@ import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.utils.DateUtil;
-import org.springblade.desk.order.entity.PlateGoodsRecord;
+import org.springblade.desk.order.pojo.entity.PlateGoodsRecord;
-import org.springblade.desk.order.entity.PlateGoodsRecordDetail;
+import org.springblade.desk.order.pojo.entity.PlateGoodsRecordDetail;
 import org.springblade.desk.order.mapper.PlateGoodsRecordMapper;
 import org.springblade.desk.order.service.IPlateGoodsRecordDetailService;
 import org.springblade.desk.order.service.IPlateGoodsRecordService;

blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderCraftServiceImpl.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.springblade.common.constant.CommonConstant;
 import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.desk.order.entity.YieldOrderCraft;
+import org.springblade.desk.order.pojo.entity.YieldOrderCraft;
 import org.springblade.desk.order.mapper.YieldOrderCraftMapper;
 import org.springblade.desk.order.service.IYieldOrderCraftService;
 import org.springframework.stereotype.Service;

blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java

@@ -10,7 +10,6 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.springblade.common.constant.CommonConstant;
-import org.springblade.common.constant.YieldOrderConst;
 import org.springblade.common.exception.BusinessException;
 import org.springblade.common.utils.StringPrefixUtils;
 import org.springblade.core.mp.base.BaseServiceImpl;
@@ -26,9 +25,11 @@ import org.springblade.desk.dashboard.pojo.entity.DsProcessEntity;
 import org.springblade.desk.dashboard.service.IDsCraftService;
 import org.springblade.desk.dashboard.service.IDsPartService;
 import org.springblade.desk.dashboard.service.IDsProcessService;
-import org.springblade.desk.order.entity.YieldOrder;
+import org.springblade.desk.order.constant.YieldOrderConst;
-import org.springblade.desk.order.entity.YieldOrderCraft;
 import org.springblade.desk.order.mapper.YieldOrderMapper;
+import org.springblade.desk.order.pojo.entity.YieldOrder;
+import org.springblade.desk.order.pojo.entity.YieldOrderCraft;
+import org.springblade.desk.order.pojo.enums.YieldOrderEnum;
 import org.springblade.desk.order.service.IYieldOrderCraftService;
 import org.springblade.desk.order.service.IYieldOrderService;
 import org.springframework.beans.factory.annotation.Value;
@@ -76,7 +77,7 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
 		ids.forEach(id -> {
 			YieldOrder yieldOrder = new YieldOrder();
 			yieldOrder.setId(id);
-			yieldOrder.setReceiveStatus(YieldOrderConst.RECEIVE_STATUS_YES);
+			yieldOrder.setReceiveStatus(YieldOrderEnum.RECEIVE_STATUS_YES.getCategory());
 			yieldOrderList.add(yieldOrder);
 		});
 
@@ -114,7 +115,7 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
 			.ne(YieldOrder::getId, yieldOrder.getId());
 		YieldOrder yieldOrderCheck = baseMapper.selectOne(wrapper);
 		if (ObjectUtil.isNotEmpty(yieldOrderCheck)) {
-			yieldOrder.setValidationResult(YieldOrderConst.VALIDATION_RESULT_LESS_DATA);
+			yieldOrder.setValidationResult(YieldOrderEnum.VALIDATION_RESULT_LESS_DATA.getCategory());
 			yieldOrder.setValidationTime(DateUtil.now());
 			yieldOrder.setValidationMomo("已存在该流程卡号的数据");
 			this.updateById(yieldOrder);
@@ -122,9 +123,9 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
 		}
 
 		// 2. 当生产订单类型为：表处理，壳体，插针订单，当镀种为空或面积为0时，不得自动分派并提示
-		if (YieldOrderConst.YIELD_TYPE_1.equals(yieldOrder.getYieldType()) || YieldOrderConst.YIELD_TYPE_4.equals(yieldOrder.getYieldType()) || YieldOrderConst.YIELD_TYPE_5.equals(yieldOrder.getYieldType())) {
+		if (YieldOrderEnum.YIELD_TYPE_1.equals(yieldOrder.getYieldType()) || YieldOrderEnum.YIELD_TYPE_4.equals(yieldOrder.getYieldType()) || YieldOrderEnum.YIELD_TYPE_5.equals(yieldOrder.getYieldType())) {
 			if (StringUtils.isBlank(yieldOrder.getPlate()) || yieldOrder.getYpArea() == 0) {
-				yieldOrder.setValidationResult(YieldOrderConst.VALIDATION_RESULT_LESS_DATA);
+				yieldOrder.setValidationResult(YieldOrderEnum.VALIDATION_RESULT_LESS_DATA.getCategory());
 				yieldOrder.setValidationTime(DateUtil.now());
 				yieldOrder.setValidationMomo("生产订单中镀种或面积为空，请维护基础数据");
 				this.updateById(yieldOrder);
@@ -133,8 +134,8 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
 		}
 
 		// 3. 玻璃饼订单工艺路线包含外购不再自动分派，直接关闭订单
-		if (YieldOrderConst.YIELD_TYPE_3.equals(yieldOrder.getYieldType()) && yieldOrder.getPrimaryCraft().contains(YieldOrderConst.PRIMARY_CRAFT_WG)) {
+		if (YieldOrderEnum.YIELD_TYPE_3.equals(yieldOrder.getYieldType()) && yieldOrder.getPrimaryCraft().contains(YieldOrderConst.PRIMARY_CRAFT_WG)) {
-			yieldOrder.setStatus(YieldOrderConst.STATUS_CLOSED);
+			yieldOrder.setStatus(YieldOrderEnum.STATUS_CLOSED.getCategory());
 			yieldOrder.setValidationTime(DateUtil.now());
 			yieldOrder.setValidationMomo("玻璃饼订单工艺路线包含外购，关闭订单无需自动分派");
 			this.updateById(yieldOrder);
@@ -142,10 +143,10 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
 		}
 
 		// 4. 如果是烧结订单并且不是返工单据，则需要验证子件清单是否存在，存在跳过，不存在则新增
-		if (YieldOrderConst.YIELD_TYPE_2.equals(yieldOrder.getYieldType()) && StringUtils.isBlank(yieldOrder.getReworkCode())) {
+		if (YieldOrderEnum.YIELD_TYPE_2.equals(yieldOrder.getYieldType()) && StringUtils.isBlank(yieldOrder.getReworkCode())) {
 			//验证订单是否存在当前B号，如果不存在则不能下发
 			if (StringUtils.isBlank(yieldOrder.getRoamNo())) {
-				yieldOrder.setValidationResult(YieldOrderConst.VALIDATION_RESULT_LESS_DATA);
+				yieldOrder.setValidationResult(YieldOrderEnum.VALIDATION_RESULT_LESS_DATA.getCategory());
 				yieldOrder.setValidationTime(DateUtil.now());
 				yieldOrder.setValidationMomo("订单不存在B号，请手动匹配B号！");
 				this.updateById(yieldOrder);
@@ -154,7 +155,7 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
 
 			String roamNoText = dsPartService.findNameByRoamNo(yieldOrder.getPartCode(), yieldOrder.getRoamNo());
 			if (StringUtils.isBlank(roamNoText)) {
-				yieldOrder.setValidationResult(YieldOrderConst.VALIDATION_RESULT_LESS_DATA);
+				yieldOrder.setValidationResult(YieldOrderEnum.VALIDATION_RESULT_LESS_DATA.getCategory());
 				yieldOrder.setValidationTime(DateUtil.now());
 				yieldOrder.setValidationMomo("未找到ERP一级B号路线，请核查！");
 				this.updateById(yieldOrder);
@@ -164,7 +165,7 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
 				try {
 					this.saveSubYieldOrder(yieldOrder, Boolean.FALSE, yieldOrder.getReceiveUser());
 				} catch (BusinessException e) {
-					yieldOrder.setValidationResult(YieldOrderConst.VALIDATION_RESULT_LESS_DATA);
+					yieldOrder.setValidationResult(YieldOrderEnum.VALIDATION_RESULT_LESS_DATA.getCategory());
 					yieldOrder.setValidationTime(DateUtil.now());
 					yieldOrder.setValidationMomo(e.getErrorMessage());
 					this.updateById(yieldOrder);
@@ -192,7 +193,7 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
 
 		DsCraftEntity craft = null;
 		//石墨模零件不考虑B号匹配因素
-//		if (YieldOrderConst.YIELD_TYPE_6.equals(yieldOrder.getYieldType())) {
+//		if (YieldOrderEnum.YIELD_TYPE_6.equals(yieldOrder.getYieldType())) {
 //			craft = dsCraftService.getCraft(partCode, null, prodIdent, DsCraft.RANK_TWO);
 //		} else {
 //			Short rank = judgeRank(yieldOrder);
@@ -211,7 +212,7 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
 
 		if (ObjectUtil.isEmpty(craft)) {
 			String errMsg = StringUtils.isNotBlank(roamNo) ? "订单流转单号匹配失败，请联系工艺员！" : "未找到B号工艺，请核实订单是否存在B号！";
-			yieldOrder.setValidationResult(YieldOrderConst.VALIDATION_RESULT_LESS_CRAFT);
+			yieldOrder.setValidationResult(YieldOrderEnum.VALIDATION_RESULT_LESS_CRAFT.getCategory());
 			yieldOrder.setValidationTime(DateUtil.now());
 			yieldOrder.setValidationMomo(errMsg);
 			this.updateById(yieldOrder);
@@ -221,7 +222,7 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
 		DsPartEntity part = dsPartService.getById(craft.getPartId());
 		//验证零件是否已经被删除
 		if (CommonConstant.DELETE_TRUE.equals(part.getIsDeleted())) {
-			yieldOrder.setValidationResult(YieldOrderConst.VALIDATION_RESULT_LESS_CRAFT);
+			yieldOrder.setValidationResult(YieldOrderEnum.VALIDATION_RESULT_LESS_CRAFT.getCategory());
 			yieldOrder.setValidationTime(DateUtil.now());
 			yieldOrder.setValidationMomo("零件信息已删除，工艺匹配失败，请联系工艺员！");
 			this.updateById(yieldOrder);
@@ -229,10 +230,10 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
 		}
 
 		//石墨模不参与验证
-		if (!YieldOrderConst.YIELD_TYPE_2.equals(yieldOrder.getYieldType())
+		if (!YieldOrderEnum.YIELD_TYPE_2.equals(yieldOrder.getYieldType())
-			&& !YieldOrderConst.YIELD_TYPE_6.equals(yieldOrder.getYieldType())
+			&& !YieldOrderEnum.YIELD_TYPE_6.equals(yieldOrder.getYieldType())
 			&& ObjectUtil.isEmpty(part.getArea())) {
-			yieldOrder.setValidationResult(YieldOrderConst.VALIDATION_RESULT_LESS_CRAFT);
+			yieldOrder.setValidationResult(YieldOrderEnum.VALIDATION_RESULT_LESS_CRAFT.getCategory());
 			yieldOrder.setValidationTime(DateUtil.now());
 			yieldOrder.setValidationMomo("零件面积为空，工艺匹配失败，请联系工艺员！");
 			this.updateById(yieldOrder);
@@ -354,17 +355,17 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
 				yieldOrder.setProductIdent(yieldJson.getString("prodIdent"));
 				yieldOrder.setRoamNoNext(yieldJson.getString("nextRoam"));
 				yieldOrder.setPriorityErp(yieldJson.getInteger("priority"));
-				if (YieldOrderConst.PRIORITY_ERP_NORMAL.equals(yieldOrder.getPriorityErp())) {
+				if (YieldOrderEnum.PRIORITY_ERP_NORMAL.equals(yieldOrder.getPriorityErp())) {
-					yieldOrder.setPriorityAps(YieldOrderConst.PRIORITY_APS_NORMAL);
+					yieldOrder.setPriorityAps(YieldOrderEnum.PRIORITY_APS_NORMAL.getCategory());
 				} else {
-					yieldOrder.setPriorityAps(YieldOrderConst.PRIORITY_APS_LOW);
+					yieldOrder.setPriorityAps(YieldOrderEnum.PRIORITY_APS_LOW.getCategory());
 				}
 				yieldOrder.setNewLevFlag(yieldJson.getString("newlevFlag"));
 				yieldOrder.setUseDeptCode(yieldJson.getString("useDeptcode"));
-				yieldOrder.setReceiveStatus(YieldOrderConst.RECEIVE_STATUS_YES);
+				yieldOrder.setReceiveStatus(YieldOrderEnum.RECEIVE_STATUS_YES.getCategory());
 				yieldOrder.setReceiveUser(yieldJson.getLong("failureMan"));
 				yieldOrder.setReceiveTime(yieldJson.getDate("failureTime"));
-				yieldOrder.setStatus(YieldOrderConst.STATUS_APS);
+				yieldOrder.setStatus(YieldOrderEnum.STATUS_APS.getCategory());
 
 				// 先根据流程卡号验证订单是否重复，如果重复则不保存
 				List<YieldOrder> orderList = baseMapper.selectList(Wrappers.lambdaQuery(YieldOrder.class).eq(YieldOrder::getCardNo, yieldOrder.getCardNo()));
@@ -463,14 +464,14 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
 				String errMsg = MessageFormat.format("子件{0}未编制！", dsPartSub.getPartCode());
 				throw new BusinessException(errMsg);
 			}
-			Integer yieldType = YieldOrderConst.YIELD_TYPE_6;
+			Integer yieldType = YieldOrderEnum.YIELD_TYPE_6.getCategory();
 			if (DsPartConst.SIN_TER_TYPE_KT.equals(dsPartSub.getSinTerType())) {
-				yieldType = YieldOrderConst.YIELD_TYPE_4;
+				yieldType = YieldOrderEnum.YIELD_TYPE_4.getCategory();
 			} else if (DsPartConst.SIN_TER_TYPE_CZ.equals(dsPartSub.getSinTerType())) {
-				yieldType = YieldOrderConst.YIELD_TYPE_5;
+				yieldType = YieldOrderEnum.YIELD_TYPE_5.getCategory();
 			}
 			//非石墨模子件，面积不允许为空
-			if (!yieldType.equals(YieldOrderConst.YIELD_TYPE_6) && dsPart.getArea() == null) {
+			if (!yieldType.equals(YieldOrderEnum.YIELD_TYPE_6) && dsPart.getArea() == null) {
 				String errMsg = "非石墨模子件面积为空无法创建生产订单！";
 				throw new BusinessException(errMsg);
 			}
@@ -507,7 +508,7 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
 			subYield.setYpQty(yieldOrder.getYpQty() * dsPartSub.getQuota().intValue());
 			subYield.setPrimaryCraft(dsPart.getCraftWay());
 			subYield.setRoamNo(roamNo);
-			subYield.setStatus(YieldOrderConst.STATUS_NORMAL);
+			subYield.setStatus(YieldOrderEnum.STATUS_NORMAL.getCategory());
 			subYield.setYieldType(yieldType);
 			subYield.setEntrustDept("热表分厂");
 			subYield.setBusinessType(-1);

blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldPlanServiceImpl.java

@@ -8,7 +8,7 @@ import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.tool.utils.ObjectUtil;
-import org.springblade.desk.order.entity.YieldPlan;
+import org.springblade.desk.order.pojo.entity.YieldPlan;
 import org.springblade.desk.order.mapper.YieldPlanMapper;
 import org.springblade.desk.order.service.IYieldOrderService;
 import org.springblade.desk.order.service.IYieldPlanService;

blade-service/blade-desk/src/main/java/org/springblade/desk/order/wrapper/YieldPlanWrapper.java

@@ -0,0 +1,53 @@
+/**
+ * BladeX Commercial License Agreement
+ * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
+ * <p>
+ * Use of this software is governed by the Commercial License Agreement
+ * obtained after purchasing a license from BladeX.
+ * <p>
+ * 1. This software is for development use only under a valid license
+ * from BladeX.
+ * <p>
+ * 2. Redistribution of this software's source code to any third party
+ * without a commercial license is strictly prohibited.
+ * <p>
+ * 3. Licensees may copyright their own code but cannot use segments
+ * from this software for such purposes. Copyright of this software
+ * remains with BladeX.
+ * <p>
+ * Using this software signifies agreement to this License, and the software
+ * must not be used for illegal purposes.
+ * <p>
+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
+ * not liable for any claims arising from secondary or illegal development.
+ * <p>
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.desk.order.wrapper;
+
+import org.springblade.core.mp.support.BaseEntityWrapper;
+import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.desk.order.pojo.entity.YieldPlan;
+import org.springblade.desk.order.pojo.enums.YieldPlanEnum;
+import org.springblade.desk.order.pojo.vo.YieldPlanVo;
+
+import java.util.Objects;
+
+/**
+ * 包装类,返回视图层所需的字段
+ *
+ * @author Chill
+ */
+public class YieldPlanWrapper extends BaseEntityWrapper<YieldPlan, YieldPlanVo> {
+
+	public static YieldPlanWrapper build() {
+		return new YieldPlanWrapper();
+	}
+
+	@Override
+	public YieldPlanVo entityVO(YieldPlan entity) {
+		YieldPlanVo vo = Objects.requireNonNull(BeanUtil.copyProperties(entity, YieldPlanVo.class));
+		vo.setStatusName(YieldPlanEnum.getName(entity.getStatus()));
+		return vo;
+	}
+}

blade-service/blade-desk/src/main/resources/application-dev.yml

@@ -12,7 +12,8 @@ spring:
 business:
   oldMes:
     jobEnable: true
-    url: 192.168.169.172:9000
+#    url: 192.168.169.172:9000
+    url: 127.0.0.1:32111
     syncOrderList: /zhgd-rb/aiWebapi/syncApsOrderData/化学镀镍
 #    syncOrderList: /zhgd-rb/aiWebapi/syncApsOrderData/all
     pushSyncResult: /zhgd-rb/aiWebapi/syncApsOrderDataResult

blade-service/blade-erpdata/pom.xml

@@ -30,6 +30,12 @@
             <version>4.6.0.RELEASE</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-erpdata-api</artifactId>
+            <version>4.6.0.RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
         <!-- 添加Hutool依赖-->
         <dependency>
             <groupId>cn.hutool</groupId>

blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/feign/ErpDataSearchClient.java

@@ -0,0 +1,58 @@
+/**
+ * BladeX Commercial License Agreement
+ * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
+ * <p>
+ * Use of this software is governed by the Commercial License Agreement
+ * obtained after purchasing a license from BladeX.
+ * <p>
+ * 1. This software is for development use only under a valid license
+ * from BladeX.
+ * <p>
+ * 2. Redistribution of this software's source code to any third party
+ * without a commercial license is strictly prohibited.
+ * <p>
+ * 3. Licensees may copyright their own code but cannot use segments
+ * from this software for such purposes. Copyright of this software
+ * remains with BladeX.
+ * <p>
+ * Using this software signifies agreement to this License, and the software
+ * must not be used for illegal purposes.
+ * <p>
+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
+ * not liable for any claims arising from secondary or illegal development.
+ * <p>
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.erpdata.feign;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import io.swagger.v3.oas.annotations.Hidden;
+import lombok.AllArgsConstructor;
+import org.springblade.core.tenant.annotation.NonDS;
+import org.springblade.core.tool.api.R;
+import org.springblade.erpdata.pojo.dto.AllocationDTO;
+import org.springblade.erpdata.service.IErpDataSearchService;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+/**
+ * 字典服务Feign实现类
+ *
+ * @author Chill
+ */
+@NonDS
+@Hidden
+@RestController
+@AllArgsConstructor
+public class ErpDataSearchClient implements IErpDataSearchClient {
+
+	private final IErpDataSearchService dataSearchService;
+
+	@Override
+	@GetMapping(PAGE_ALLOCATION)
+	public R<IPage<AllocationDTO>> pageAllocation(IPage<AllocationDTO> page, AllocationDTO entity) {
+		return R.data(dataSearchService.queryAllocation(page, entity));
+	}
+}

blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpDataSearchMapper.java

@@ -1,6 +1,8 @@
 package org.springblade.erpdata.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.Mapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.erpdata.pojo.dto.AllocationDTO;
 import org.springblade.erpdata.pojo.dto.YieldPlanErpDTO;
 
 import java.util.List;
@@ -10,7 +12,15 @@ import java.util.List;
  *
  * @author lqk
  */
-public interface ErpYieldPlanSearchMapper extends Mapper {
+public interface ErpDataSearchMapper extends Mapper {
+	/**
+	 * 查询烧结配套信息
+	 *
+	 * @param page
+	 * @return
+	 */
+	List<AllocationDTO> queryAllocation(IPage page);
+
 	/**
 	 * 从ERP视图中获取要同步的生产计划
 	 *

blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpDataSearchMapper.xml

@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace = "org.springblade.erpdata.mapper.ErpYieldPlanSearchMapper">
+<mapper namespace = "org.springblade.erpdata.mapper.ErpDataSearchMapper">
+
+    <select id = "queryAllocation" resultType = "org.springblade.erpdata.pojo.dto.AllocationDTO">
+        select *
+        from v_mes_rb_pkpqry
+        where 1=1
+    </select>
 
     <select id = "getYieldPlanErpList" resultType = "org.springblade.erpdata.pojo.dto.YieldPlanErpDTO">
         SELECT * FROM v_mes_rb_wo WHERE is_deleted = 0

blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/IErpDataSearchService.java

@@ -1,5 +1,8 @@
 package org.springblade.erpdata.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.erpdata.pojo.dto.AllocationDTO;
+
 /**
  * ERP数据查询service
  *
@@ -7,4 +10,13 @@ package org.springblade.erpdata.service;
  */
 public interface IErpDataSearchService {
 
+	/**
+	 * 查询烧结配套信息
+	 *
+	 * @param page
+	 * @param entity
+	 * @return
+	 */
+	IPage<AllocationDTO> queryAllocation(IPage page, AllocationDTO entity);
+
 }

blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpDataSearchServiceImpl.java

@@ -1,15 +1,29 @@
 package org.springblade.erpdata.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springblade.erpdata.mapper.ErpDataSearchMapper;
+import org.springblade.erpdata.pojo.dto.AllocationDTO;
 import org.springblade.erpdata.service.IErpDataSearchService;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * @author lqk
  * @date 2025-11-26 9:39
  */
 @Slf4j
+@RequiredArgsConstructor
 @Service
 public class ErpDataSearchServiceImpl implements IErpDataSearchService {
 
+	private final ErpDataSearchMapper dataSearchMapper;
+
+	@Override
+	public IPage<AllocationDTO> queryAllocation(IPage page, AllocationDTO entity) {
+		List<AllocationDTO> dataList = dataSearchMapper.queryAllocation(page);
+		return page.setRecords(dataList);
+	}
 }