page, AllocationDTO entity) {
+ return R.fail("获取数据失败");
+ }
+}
diff --git a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/AllocationDTO.java b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/AllocationDTO.java
new file mode 100644
index 00000000..a3740c33
--- /dev/null
+++ b/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;
+}
diff --git a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/enums/DictBizEnum.java b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/enums/DictBizEnum.java
new file mode 100644
index 00000000..4feac413
--- /dev/null
+++ b/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.
+ *
+ * Use of this software is governed by the Commercial License Agreement
+ * obtained after purchasing a license from BladeX.
+ *
+ * 1. This software is for development use only under a valid license
+ * from BladeX.
+ *
+ * 2. Redistribution of this software's source code to any third party
+ * without a commercial license is strictly prohibited.
+ *
+ * 3. Licensees may copyright their own code but cannot use segments
+ * from this software for such purposes. Copyright of this software
+ * remains with BladeX.
+ *
+ * Using this software signifies agreement to this License, and the software
+ * must not be used for illegal purposes.
+ *
+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
+ * not liable for any claims arising from secondary or illegal development.
+ *
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.erpdata.pojo.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 业务字典枚举类
+ *
+ * @author Chill
+ */
+@Getter
+@AllArgsConstructor
+public enum DictBizEnum {
+
+ /**
+ * 测试
+ */
+ TEST("test"),
+ ;
+
+ final String name;
+
+}
diff --git a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/enums/DictEnum.java b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/enums/DictEnum.java
new file mode 100644
index 00000000..21681cca
--- /dev/null
+++ b/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.
+ *
+ * Use of this software is governed by the Commercial License Agreement
+ * obtained after purchasing a license from BladeX.
+ *
+ * 1. This software is for development use only under a valid license
+ * from BladeX.
+ *
+ * 2. Redistribution of this software's source code to any third party
+ * without a commercial license is strictly prohibited.
+ *
+ * 3. Licensees may copyright their own code but cannot use segments
+ * from this software for such purposes. Copyright of this software
+ * remains with BladeX.
+ *
+ * Using this software signifies agreement to this License, and the software
+ * must not be used for illegal purposes.
+ *
+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
+ * not liable for any claims arising from secondary or illegal development.
+ *
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.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;
+
+}
diff --git a/blade-service-api/pom.xml b/blade-service-api/pom.xml
index dbbd4dad..a86fcf5a 100644
--- a/blade-service-api/pom.xml
+++ b/blade-service-api/pom.xml
@@ -24,6 +24,7 @@
blade-scheduling-api
blade-monitor-api
blade-wms-api
+ blade-erpdata-api
diff --git a/blade-service/blade-desk/pom.xml b/blade-service/blade-desk/pom.xml
index 428c81a2..e99c548c 100644
--- a/blade-service/blade-desk/pom.xml
+++ b/blade-service/blade-desk/pom.xml
@@ -35,6 +35,12 @@
org.springblade
blade-flow-api
+
+ org.springblade
+ blade-erpdata-api
+ 4.6.0.RELEASE
+ compile
+
org.springblade
@@ -45,21 +51,12 @@
io.minio
minio
-
-
-
-
-
org.flowable
flowable-engine
7.1.0
compile
-
@@ -85,6 +82,7 @@
org.springblade
blade-resource-api
+
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/constant/MoldPlanConst.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/constant/MoldPlanConst.java
deleted file mode 100644
index 80ae6649..00000000
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/constant/MoldPlanConst.java
+++ /dev/null
@@ -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
-}
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/constant/PlateGoodsConst.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/constant/PlateGoodsConst.java
deleted file mode 100644
index cb71e363..00000000
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/constant/PlateGoodsConst.java
+++ /dev/null
@@ -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
-}
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/AssayContentController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/AssayContentController.java
index 27f57c6a..eb730132 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/AssayContentController.java
+++ b/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.entity.AssayContentDetail;
-import org.springblade.desk.order.request.AssayContentSave;
+import org.springblade.desk.order.pojo.entity.AssayContent;
+import org.springblade.desk.order.pojo.entity.AssayContentDetail;
+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.*;
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/MoldPlanController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/MoldPlanController.java
index 62038685..42c6a517 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/MoldPlanController.java
+++ b/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.entity.MoldPlan;
-import org.springblade.desk.order.entity.MoldPlanOrder;
-import org.springblade.desk.order.entity.MoldPlanTool;
-import org.springblade.desk.order.request.MoldPlanSave;
+import org.springblade.desk.order.pojo.entity.MoldPlan;
+import org.springblade.desk.order.pojo.entity.MoldPlanOrder;
+import org.springblade.desk.order.pojo.entity.MoldPlanTool;
+import org.springblade.desk.order.pojo.enums.MoldPlanEnum;
+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);
}
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/PlateGoodsApplyController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/PlateGoodsApplyController.java
index 44b88ab3..f875c0f7 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/PlateGoodsApplyController.java
+++ b/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.entity.PlateGoodsApplyDetail;
-import org.springblade.desk.order.request.PlateGoodsApplySave;
+import org.springblade.desk.order.pojo.entity.PlateGoodsApply;
+import org.springblade.desk.order.pojo.entity.PlateGoodsApplyDetail;
+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.*;
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/PlateGoodsRecordController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/PlateGoodsRecordController.java
index fca1df08..5b0ff55f 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/PlateGoodsRecordController.java
+++ b/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.entity.AssayContentDetail;
-import org.springblade.desk.order.entity.PlateGoodsRecord;
-import org.springblade.desk.order.entity.PlateGoodsRecordDetail;
-import org.springblade.desk.order.request.PlateGoodsRecordSave;
+import org.springblade.desk.order.pojo.entity.AssayContentDetail;
+import org.springblade.desk.order.pojo.entity.PlateGoodsRecord;
+import org.springblade.desk.order.pojo.entity.PlateGoodsRecordDetail;
+import org.springblade.desk.order.pojo.enums.PlateGoodsEnum;
+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);
}
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/YieldOrderController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/YieldOrderController.java
index 9debe262..53d38631 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/YieldOrderController.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/YieldOrderController.java
@@ -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.entity.YieldOrderCraft;
+import org.springblade.desk.order.pojo.entity.YieldOrder;
+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.*;
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/YieldPlanController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/YieldPlanController.java
index 0c03e593..25baf9e4 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/YieldPlanController.java
+++ b/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 = "partCode", 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 = "status", description = "状态", in = ParameterIn.QUERY, schema = @Schema(type = "int"))
})
@Operation(summary = "分页", description = "")
- public R> page(@Parameter(hidden = true) YieldPlan entity, Query query) {
+ public R> page(@Parameter(hidden = true) YieldPlan entity, Query query) {
IPage 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> pageAllocation(@Parameter(hidden = true) AllocationDTO entity, Query query) {
+ R> result = getErpDataSearchClient().pageAllocation(Condition.getPage(query), entity);
+ return result;
+ }
}
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/AssayContentDetailMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/AssayContentDetailMapper.java
index 5a62f53a..55e40435 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/AssayContentDetailMapper.java
+++ b/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;
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/AssayContentDetailMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/AssayContentDetailMapper.xml
index afc06e75..41180f0b 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/AssayContentDetailMapper.xml
+++ b/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">
-
+
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/AssayContentMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/AssayContentMapper.java
index ac53b71c..b1c4094a 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/AssayContentMapper.java
+++ b/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 {
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/AssayContentMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/AssayContentMapper.xml
index 38601302..f996cea5 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/AssayContentMapper.xml
+++ b/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">
-
+
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanMapper.java
index 63cd676f..674aca42 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanMapper.java
+++ b/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 {
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanMapper.xml
index 8ce24983..a8192e80 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanMapper.xml
+++ b/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">
-
+
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanOrderMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanOrderMapper.java
index 56d3f7ce..ff287272 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanOrderMapper.java
+++ b/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 {
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanOrderMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanOrderMapper.xml
index 45ca2116..d4c47d7a 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanOrderMapper.xml
+++ b/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">
-
+
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanToolMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanToolMapper.java
index ffa4e077..ef0381f1 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanToolMapper.java
+++ b/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;
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanToolMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanToolMapper.xml
index c19c22fb..3f8b6633 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanToolMapper.xml
+++ b/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">
-
+
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsApplyDetailMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsApplyDetailMapper.java
index 1c1475da..c4874aeb 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsApplyDetailMapper.java
+++ b/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;
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsApplyDetailMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsApplyDetailMapper.xml
index 84a4c33a..f164b010 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsApplyDetailMapper.xml
+++ b/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">
-
+
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsApplyMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsApplyMapper.java
index 4c48dce1..d93db2b7 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsApplyMapper.java
+++ b/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;
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsApplyMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsApplyMapper.xml
index fae254ec..39059f2a 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsApplyMapper.xml
+++ b/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">
-
+
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsRecordDetailMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsRecordDetailMapper.java
index ca169943..f349d2b8 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsRecordDetailMapper.java
+++ b/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;
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsRecordDetailMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsRecordDetailMapper.xml
index 31bdcf9e..2c240c74 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsRecordDetailMapper.xml
+++ b/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">
-
+
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsRecordMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsRecordMapper.java
index 98216a88..0e15c073 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsRecordMapper.java
+++ b/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;
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsRecordMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsRecordMapper.xml
index b756bd58..2d47adda 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsRecordMapper.xml
+++ b/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">
-
+
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderCraftMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderCraftMapper.java
index 538e8986..869710c5 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderCraftMapper.java
+++ b/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;
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderCraftMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderCraftMapper.xml
index 4fdc3989..a6b22c5e 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderCraftMapper.xml
+++ b/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">
-
+
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderMapper.java
index ffb58b03..241f1ff3 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderMapper.java
+++ b/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;
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderMapper.xml
index aa4e660b..8207abef 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderMapper.xml
+++ b/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">
-
+
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldPlanMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldPlanMapper.java
index f6001486..921bf23d 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldPlanMapper.java
+++ b/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;
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldPlanMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldPlanMapper.xml
index 819b2717..e0c0357e 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldPlanMapper.xml
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldPlanMapper.xml
@@ -2,9 +2,23 @@
-
-
-
+
+
+ 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
+
+ AND YP_CODE LIKE CONCAT('%', #{ypCode}, '%')
+
+
+ AND PART_CODE LIKE CONCAT('%', #{partCode}, '%')
+
+
+ AND status = #{status}
+
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IAssayContentDetailService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IAssayContentDetailService.java
index ac287016..2f358e71 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IAssayContentDetailService.java
+++ b/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;
/**
* 服务实现类
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IAssayContentService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IAssayContentService.java
index c9df7079..4b698296 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IAssayContentService.java
+++ b/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.entity.AssayContentDetail;
+import org.springblade.desk.order.pojo.entity.AssayContent;
+import org.springblade.desk.order.pojo.entity.AssayContentDetail;
import java.util.List;
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IMoldPlanOrderService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IMoldPlanOrderService.java
index 5b8e9948..1c9772f5 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IMoldPlanOrderService.java
+++ b/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;
/**
* 服务实现类
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IMoldPlanService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IMoldPlanService.java
index 23dda4b4..9d34d028 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IMoldPlanService.java
+++ b/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.entity.MoldPlanOrder;
-import org.springblade.desk.order.entity.MoldPlanTool;
+import org.springblade.desk.order.pojo.entity.MoldPlan;
+import org.springblade.desk.order.pojo.entity.MoldPlanOrder;
+import org.springblade.desk.order.pojo.entity.MoldPlanTool;
import java.util.List;
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IMoldPlanToolService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IMoldPlanToolService.java
index c0fe7668..6c98ce6b 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IMoldPlanToolService.java
+++ b/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;
/**
* 服务实现类
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IPlateGoodsApplyDetailService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IPlateGoodsApplyDetailService.java
index 65c0a2d8..784e868d 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IPlateGoodsApplyDetailService.java
+++ b/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;
/**
* 服务实现类
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IPlateGoodsApplyService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IPlateGoodsApplyService.java
index 9ac67979..7da55000 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IPlateGoodsApplyService.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IPlateGoodsApplyService.java
@@ -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.entity.PlateGoodsApplyDetail;
+import org.springblade.desk.order.pojo.entity.PlateGoodsApply;
+import org.springblade.desk.order.pojo.entity.PlateGoodsApplyDetail;
import java.util.List;
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IPlateGoodsRecordDetailService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IPlateGoodsRecordDetailService.java
index 2c5337f6..1cb40853 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IPlateGoodsRecordDetailService.java
+++ b/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;
/**
* 服务实现类
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IPlateGoodsRecordService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IPlateGoodsRecordService.java
index e101b47c..bc3b2781 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IPlateGoodsRecordService.java
+++ b/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.entity.PlateGoodsRecordDetail;
+import org.springblade.desk.order.pojo.entity.PlateGoodsRecord;
+import org.springblade.desk.order.pojo.entity.PlateGoodsRecordDetail;
import java.util.List;
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IYieldOrderCraftService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IYieldOrderCraftService.java
index 3a11a68d..d6e65687 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IYieldOrderCraftService.java
+++ b/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;
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IYieldOrderService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IYieldOrderService.java
index 115b3aed..c2610afd 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IYieldOrderService.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IYieldOrderService.java
@@ -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;
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IYieldPlanService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IYieldPlanService.java
index 22d78e8a..4abda397 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IYieldPlanService.java
+++ b/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;
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/AssayContentDetailServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/AssayContentDetailServiceImpl.java
index 0fd29d52..038bff74 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/AssayContentDetailServiceImpl.java
+++ b/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;
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/AssayContentServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/AssayContentServiceImpl.java
index 5796def9..0300cad7 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/AssayContentServiceImpl.java
+++ b/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.entity.AssayContentDetail;
+import org.springblade.desk.order.pojo.entity.AssayContent;
+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;
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/MoldPlanOrderServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/MoldPlanOrderServiceImpl.java
index 9d180814..b60d29e1 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/MoldPlanOrderServiceImpl.java
+++ b/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;
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/MoldPlanServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/MoldPlanServiceImpl.java
index 01f9fe08..37a91f43 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/MoldPlanServiceImpl.java
+++ b/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.entity.MoldPlanOrder;
-import org.springblade.desk.order.entity.MoldPlanTool;
+import org.springblade.desk.order.pojo.entity.MoldPlan;
+import org.springblade.desk.order.pojo.entity.MoldPlanOrder;
+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;
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/MoldPlanToolServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/MoldPlanToolServiceImpl.java
index 51bb1ab8..80674cb8 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/MoldPlanToolServiceImpl.java
+++ b/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;
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsApplyDetailServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsApplyDetailServiceImpl.java
index 3825395e..ae700156 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsApplyDetailServiceImpl.java
+++ b/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;
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsApplyServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsApplyServiceImpl.java
index b606cbd7..4c5e4ae2 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsApplyServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsApplyServiceImpl.java
@@ -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.entity.PlateGoodsApplyDetail;
+import org.springblade.desk.order.pojo.entity.PlateGoodsApply;
+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;
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsRecordDetailServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsRecordDetailServiceImpl.java
index 04b1bc8d..8b614057 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsRecordDetailServiceImpl.java
+++ b/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;
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsRecordServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsRecordServiceImpl.java
index 77c06a0f..38ff4a37 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsRecordServiceImpl.java
+++ b/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.entity.PlateGoodsRecordDetail;
+import org.springblade.desk.order.pojo.entity.PlateGoodsRecord;
+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;
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderCraftServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderCraftServiceImpl.java
index 127ab707..3853d3d9 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderCraftServiceImpl.java
+++ b/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;
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java
index a6733290..df2a831d 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java
@@ -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.entity.YieldOrderCraft;
+import org.springblade.desk.order.constant.YieldOrderConst;
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 {
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 orderList = baseMapper.selectList(Wrappers.lambdaQuery(YieldOrder.class).eq(YieldOrder::getCardNo, yieldOrder.getCardNo()));
@@ -463,14 +464,14 @@ public class YieldOrderServiceImpl extends BaseServiceImpl
+ * Use of this software is governed by the Commercial License Agreement
+ * obtained after purchasing a license from BladeX.
+ *
+ * 1. This software is for development use only under a valid license
+ * from BladeX.
+ *
+ * 2. Redistribution of this software's source code to any third party
+ * without a commercial license is strictly prohibited.
+ *
+ * 3. Licensees may copyright their own code but cannot use segments
+ * from this software for such purposes. Copyright of this software
+ * remains with BladeX.
+ *
+ * Using this software signifies agreement to this License, and the software
+ * must not be used for illegal purposes.
+ *
+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
+ * not liable for any claims arising from secondary or illegal development.
+ *
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.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 {
+
+ 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;
+ }
+}
diff --git a/blade-service/blade-desk/src/main/resources/application-dev.yml b/blade-service/blade-desk/src/main/resources/application-dev.yml
index 068bbd93..7018685f 100644
--- a/blade-service/blade-desk/src/main/resources/application-dev.yml
+++ b/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
diff --git a/blade-service/blade-erpdata/pom.xml b/blade-service/blade-erpdata/pom.xml
index 9e352341..cfd09b4b 100644
--- a/blade-service/blade-erpdata/pom.xml
+++ b/blade-service/blade-erpdata/pom.xml
@@ -30,6 +30,12 @@
4.6.0.RELEASE
compile
+
+ org.springblade
+ blade-erpdata-api
+ 4.6.0.RELEASE
+ compile
+
cn.hutool
diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/feign/ErpDataSearchClient.java b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/feign/ErpDataSearchClient.java
new file mode 100644
index 00000000..f192ad71
--- /dev/null
+++ b/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.
+ *
+ * Use of this software is governed by the Commercial License Agreement
+ * obtained after purchasing a license from BladeX.
+ *
+ * 1. This software is for development use only under a valid license
+ * from BladeX.
+ *
+ * 2. Redistribution of this software's source code to any third party
+ * without a commercial license is strictly prohibited.
+ *
+ * 3. Licensees may copyright their own code but cannot use segments
+ * from this software for such purposes. Copyright of this software
+ * remains with BladeX.
+ *
+ * Using this software signifies agreement to this License, and the software
+ * must not be used for illegal purposes.
+ *
+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
+ * not liable for any claims arising from secondary or illegal development.
+ *
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.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> pageAllocation(IPage page, AllocationDTO entity) {
+ return R.data(dataSearchService.queryAllocation(page, entity));
+ }
+}
diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpYieldPlanSearchMapper.java b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpDataSearchMapper.java
similarity index 54%
rename from blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpYieldPlanSearchMapper.java
rename to blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpDataSearchMapper.java
index 53180231..0c033150 100644
--- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpYieldPlanSearchMapper.java
+++ b/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 queryAllocation(IPage page);
+
/**
* 从ERP视图中获取要同步的生产计划
*
diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpYieldPlanSearchMapper.xml b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpDataSearchMapper.xml
similarity index 56%
rename from blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpYieldPlanSearchMapper.xml
rename to blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpDataSearchMapper.xml
index cd45f1e3..9f01253d 100644
--- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpYieldPlanSearchMapper.xml
+++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpDataSearchMapper.xml
@@ -1,6 +1,12 @@
-
+
+
+
+ select *
+ from v_mes_rb_pkpqry
+ where 1=1
+
SELECT * FROM v_mes_rb_wo WHERE is_deleted = 0
diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/IErpDataSearchService.java b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/IErpDataSearchService.java
index d3b95af5..d2275156 100644
--- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/IErpDataSearchService.java
+++ b/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 queryAllocation(IPage page, AllocationDTO entity);
+
}
diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpDataSearchServiceImpl.java b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpDataSearchServiceImpl.java
index c94c27b9..195915ad 100644
--- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpDataSearchServiceImpl.java
+++ b/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 queryAllocation(IPage page, AllocationDTO entity) {
+ List dataList = dataSearchMapper.queryAllocation(page);
+ return page.setRecords(dataList);
+ }
}
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java
index 38daf2cf..bab51399 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java
@@ -35,10 +35,10 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
-import org.springblade.common.constant.YieldOrderConst;
import org.springblade.core.mp.base.BaseEntity;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.tool.utils.DateUtil;
+import org.springblade.desk.order.pojo.enums.YieldOrderEnum;
import org.springblade.scheduling.scheduling.dto.WorkOrderDto;
import org.springblade.scheduling.scheduling.entity.*;
import org.springblade.scheduling.scheduling.excel.WorkOrderExcel;
@@ -113,12 +113,13 @@ public class WorkOrderServiceImpl extends BaseServiceImpl list = yieldOrderService.list(Wrappers.lambdaQuery().eq(BaseEntity::getStatus, YieldOrderConst.STATUS_APS).isNotNull(YieldOrderEntity::getWorkCenterId).isNotNull(YieldOrderEntity::getReleaseDate));
+ List list =
+ yieldOrderService.list(Wrappers.lambdaQuery().eq(BaseEntity::getStatus, YieldOrderEnum.STATUS_APS.getCategory()).isNotNull(YieldOrderEntity::getWorkCenterId).isNotNull(YieldOrderEntity::getReleaseDate));
log.info("待排产订单数量为：" + list.size());
if (CollectionUtils.isNotEmpty(list)) {
//校验已排产订单
checkSchedulingOrder(list);
- list = yieldOrderService.list(Wrappers.lambdaQuery().eq(BaseEntity::getStatus, YieldOrderConst.STATUS_APS).isNotNull(YieldOrderEntity::getWorkCenterId).isNotNull(YieldOrderEntity::getReleaseDate));
+ list = yieldOrderService.list(Wrappers.lambdaQuery().eq(BaseEntity::getStatus, YieldOrderEnum.STATUS_APS.getCategory()).isNotNull(YieldOrderEntity::getWorkCenterId).isNotNull(YieldOrderEntity::getReleaseDate));
//初始化人员能力
List personAbilityEntityList = personAbilityService.list(Wrappers.lambdaQuery().isNotNull(PersonAbilityEntity::getWorkCenterId).isNotNull(PersonAbilityEntity::getProcessId).isNotNull(PersonAbilityEntity::getCraftId));
Map personAbilityMap = new HashMap<>();