生产订单工艺查询、烧结配套查询

blade-gateway/src/main/resources/bootstrap.yml

@@ -1,5 +1,5 @@
 server:
-  port: 80
+  port: 81
 
 spring:
   cloud:

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

@@ -1,8 +1,6 @@
 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;
 
 /**

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

@@ -1,60 +0,0 @@
-/**
- * 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

@@ -1,21 +0,0 @@
-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/feign/IErpMesRbPkpqryClient.java

@@ -0,0 +1,36 @@
+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.MesRbPkpqryDTO;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+
+/**
+ * Feign接口类
+ *
+ * @author liuqingkun
+ */
+@FeignClient(
+	value = AppConstant.APPLICATION_SYSTEM_NAME,
+	fallback = IErpMesRbPkpqryClientFallback.class
+)
+public interface IErpMesRbPkpqryClient {
+
+	String API_PREFIX = "/feign/erpdata/mesRbPkpqry/";
+	String SELECT_PAGE = API_PREFIX + "selectPage";
+
+	/**
+	 * 查询配置结果
+	 *
+	 * @param page           分页参数
+	 * @param pkno           配套单号
+	 * @param prtmdept       主制部门
+	 * @param subpkdateStart 配套开始时间
+	 * @param subpkdateEnd   配套结束时间
+	 * @return
+	 */
+	@GetMapping(SELECT_PAGE)
+	R<IPage<MesRbPkpqryDTO>> selectPage(IPage<MesRbPkpqryDTO> page, String pkno, String prtmdept, String subpkdateStart, String subpkdateEnd);
+}

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

@@ -0,0 +1,19 @@
+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.MesRbPkpqryDTO;
+
+/**
+ * Feign接口类
+ *
+ * @author liuqingkun
+ */
+public class IErpMesRbPkpqryClientFallback implements IErpMesRbPkpqryClient {
+
+	@Override
+	public R<IPage<MesRbPkpqryDTO>> selectPage(IPage<MesRbPkpqryDTO> page, String pkno, String prtmdept, String subpkdateStart, String subpkdateEnd) {
+		return R.fail("获取数据失败");
+	}
+}

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

@@ -0,0 +1,34 @@
+package org.springblade.erpdata.feign;
+
+
+import org.springblade.core.launch.constant.AppConstant;
+import org.springblade.core.tool.api.R;
+import org.springblade.erpdata.pojo.dto.PartoplinkFirseqDTO;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+
+import java.util.List;
+
+/**
+ * Feign接口类
+ *
+ * @author liuqingkun
+ */
+@FeignClient(
+	value = AppConstant.APPLICATION_SYSTEM_NAME,
+	fallback = IErpPartoplinkFirseqClientFallback.class
+)
+public interface IErpPartoplinkFirseqClient {
+
+	String API_PREFIX = "/feign/erpdata/partoplinkFirseq/";
+	String LIST_BY_PART_CODE = API_PREFIX + "listByPartCode";
+
+	/**
+	 * 根据物料号查询一级工序
+	 *
+	 * @param partCode
+	 * @return
+	 */
+	@GetMapping(LIST_BY_PART_CODE)
+	R<List<PartoplinkFirseqDTO>> listByPartCode(String partCode);
+}

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

@@ -0,0 +1,20 @@
+package org.springblade.erpdata.feign;
+
+
+import org.springblade.core.tool.api.R;
+import org.springblade.erpdata.pojo.dto.PartoplinkFirseqDTO;
+
+import java.util.List;
+
+/**
+ * Feign接口类
+ *
+ * @author liuqingkun
+ */
+public class IErpPartoplinkFirseqClientFallback implements IErpPartoplinkFirseqClient {
+
+	@Override
+	public R<List<PartoplinkFirseqDTO>> listByPartCode(String partCode) {
+		return R.fail("获取数据失败");
+	}
+}

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

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

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

@@ -0,0 +1,48 @@
+package org.springblade.erpdata.pojo.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author liuqingkun
+ */
+@Data
+@NoArgsConstructor
+public class PartoplinkFirseqDTO {
+	/**
+	 * 零件号
+	 */
+	@Schema(description = "零件号")
+	private String partcode;
+	/**
+	 * 零件名称
+	 */
+	@Schema(description = "零件名称")
+	private String partname;
+	/**
+	 * 一级工艺计划(A)号
+	 */
+	@Schema(description = "一级工艺计划(A)号")
+	private String firpp;
+	/**
+	 * 一级工艺计划名称
+	 */
+	@Schema(description = "一级工艺计划名称")
+	private String firppname;
+	/**
+	 * 一级工序
+	 */
+	@Schema(description = "一级工序")
+	private String firseq;
+	/**
+	 * 一级工序名称
+	 */
+	@Schema(description = "一级工序名称")
+	private String firseqname;
+	/**
+	 * 一级工序序号
+	 */
+	@Schema(description = "一级工序序号")
+	private String firseqno;
+}

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsPartServiceImpl.java

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.core.mp.support.Condition;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.SpringUtil;
@@ -17,8 +16,6 @@ import org.springblade.desk.dashboard.pojo.entity.*;
 import org.springblade.desk.dashboard.pojo.vo.*;
 import org.springblade.desk.dashboard.service.*;
 import org.springblade.erpdata.feign.IErpDataPartClient;
-import org.springblade.erpdata.feign.IErpDataSearchClient;
-import org.springblade.erpdata.pojo.dto.AllocationDTO;
 import org.springblade.system.feign.IUserClient;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -15,14 +15,13 @@ 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.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.springblade.erpdata.feign.IErpMesRbPkpqryClient;
+import org.springblade.erpdata.pojo.dto.MesRbPkpqryDTO;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -40,14 +39,7 @@ 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;
-	}
+	private final IErpMesRbPkpqryClient mesRbPkpqryClient;
 
 	/**
 	 * 分页查询列表-电镀
@@ -186,18 +178,21 @@ public class YieldPlanController extends BladeController {
 	/**
 	 * 分页查询配套信息
 	 *
-	 * @param entity
+	 * @param pkno
+	 * @param prtmdept
+	 * @param subpkdateStart
+	 * @param subpkdateEnd
 	 * @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);
+	public R<IPage<MesRbPkpqryDTO>> pageAllocation(@Parameter(description = "配套单号", required = false) @RequestParam String pkno,
+												   @Parameter(description = "主制部门", required = false) @RequestParam String prtmdept,
+												   @Parameter(description = "配套开始时间", required = false) @RequestParam String subpkdateStart,
+												   @Parameter(description = "配套结束时间", required = false) @RequestParam String subpkdateEnd,
+												   Query query) {
+		R<IPage<MesRbPkpqryDTO>> result = mesRbPkpqryClient.selectPage(Condition.getPage(query), pkno, prtmdept, subpkdateStart, subpkdateEnd);
 		return result;
 	}
 }

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

@@ -9,6 +9,8 @@ import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.api.ResultCode;
 import org.springblade.core.tool.utils.ObjectUtil;
 import org.springblade.desk.dashboard.pojo.entity.DsPartEntity;
 import org.springblade.desk.dashboard.service.IDsPartService;
@@ -19,12 +21,15 @@ import org.springblade.desk.order.pojo.enums.YieldPlanEnum;
 import org.springblade.desk.order.pojo.vo.LineMemoVo;
 import org.springblade.desk.order.service.IYieldOrderService;
 import org.springblade.desk.order.service.IYieldPlanService;
+import org.springblade.erpdata.feign.IErpPartoplinkFirseqClient;
+import org.springblade.erpdata.pojo.dto.PartoplinkFirseqDTO;
 import org.springframework.stereotype.Service;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 服务实现类
@@ -79,11 +84,19 @@ public class YieldPlanServiceImpl extends BaseServiceImpl<YieldPlanMapper, Yield
 		return resultJson;
 	}
 
+	private final IErpPartoplinkFirseqClient partoplinkFirseqClient;
+
 	@Override
 	public List<JSONObject> getFirstProcess(String partCode) {
 		List<JSONObject> resultList = new ArrayList<>();
-		//TODO 根据物料号， 调用ERP方法查询一级工序
-		// select * from dba_mgr.v_partoplink_firseq@erp_mes_link a where prtno=:partCode
+
+		// 根据物料号， 调用ERP方法查询一级工序
+		R<List<PartoplinkFirseqDTO>> result = partoplinkFirseqClient.listByPartCode(partCode);
+		if (ResultCode.SUCCESS.getCode() == result.getCode()) {
+			resultList = result.getData().stream()
+				.map(item -> JSONObject.parseObject(JSONObject.toJSONString(item)))
+				.collect(Collectors.toList());
+		}
 		return resultList;
 	}
 

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

@@ -1,15 +1,10 @@
 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.common.exception.BusinessException;
 import org.springblade.core.tenant.annotation.NonDS;
-import org.springblade.core.tool.api.R;
 import org.springblade.desk.dashboard.pojo.entity.DsPartEntity;
-import org.springblade.erpdata.pojo.dto.AllocationDTO;
-import org.springblade.erpdata.service.IErpDataSearchService;
 import org.springblade.erpdata.service.IErpPartService;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;

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

@@ -1,35 +0,0 @@
-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.desk.dashboard.pojo.entity.DsPartEntity;
-import org.springblade.erpdata.pojo.dto.AllocationDTO;
-import org.springblade.erpdata.service.IErpDataSearchService;
-import org.springblade.erpdata.service.IErpPartService;
-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/feign/ErpMesRbPkpqryClient.java

@@ -0,0 +1,33 @@
+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.MesRbPkpqryDTO;
+import org.springblade.erpdata.service.IErpMesRbPkpqryService;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+/**
+ * 字典服务Feign实现类
+ *
+ * @author liuqingkun
+ */
+@NonDS
+@Hidden
+@RestController
+@AllArgsConstructor
+public class ErpMesRbPkpqryClient implements IErpMesRbPkpqryClient {
+
+	private final IErpMesRbPkpqryService mesRbPkpqryService;
+
+	@GetMapping(SELECT_PAGE)
+	@Override
+	public R<IPage<MesRbPkpqryDTO>> selectPage(IPage<MesRbPkpqryDTO> page, String pkno, String prtmdept, String subpkdateStart, String subpkdateEnd) {
+		return R.data(mesRbPkpqryService.page(page, pkno, prtmdept, subpkdateStart, subpkdateEnd));
+	}
+}

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

@@ -0,0 +1,35 @@
+package org.springblade.erpdata.feign;
+
+
+import io.swagger.v3.oas.annotations.Hidden;
+import lombok.AllArgsConstructor;
+import org.springblade.core.tenant.annotation.NonDS;
+import org.springblade.core.tool.api.R;
+import org.springblade.erpdata.pojo.dto.PartoplinkFirseqDTO;
+import org.springblade.erpdata.service.IErpPartoplinkFirseqService;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+
+/**
+ * 字典服务Feign实现类
+ *
+ * @author liuqingkun
+ */
+@NonDS
+@Hidden
+@RestController
+@AllArgsConstructor
+public class ErpPartoplinkFirseqClient implements IErpPartoplinkFirseqClient {
+
+	private final IErpPartoplinkFirseqService partoplinkFirseqService;
+
+	@GetMapping(LIST_BY_PART_CODE)
+	@Override
+	public R<List<PartoplinkFirseqDTO>> listByPartCode(String partCode) {
+		List<PartoplinkFirseqDTO> dataList = partoplinkFirseqService.listByPartCode(partCode);
+		return R.data(dataList);
+	}
+}

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

@@ -1,30 +0,0 @@
-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.view.MesRbWo;
-
-import java.util.List;
-
-/**
- * Mapper 接口
- *
- * @author lqk
- */
-public interface ErpDataSearchMapper extends Mapper {
-	/**
-	 * 查询烧结配套信息
-	 *
-	 * @param page
-	 * @return
-	 */
-	List<AllocationDTO> queryAllocation(IPage page);
-
-	/**
-	 * 从ERP视图中获取要同步的生产计划
-	 *
-	 * @return
-	 */
-	List<MesRbWo> getYieldPlanErpList();
-}

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

@@ -1,15 +0,0 @@
-<?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.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.view.MesRbWo">
-        SELECT * FROM v_mes_rb_wo WHERE is_deleted = 0
-    </select>
-
-</mapper>

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

@@ -0,0 +1,27 @@
+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.MesRbPkpqryDTO;
+
+import java.util.List;
+
+/**
+ * Mapper 接口
+ *
+ * @author lqk
+ */
+public interface ErpMesRbPkpqryMapper extends Mapper {
+
+	/**
+	 * 自定义分页 - 查询配置结果
+	 *
+	 * @param page           分页参数
+	 * @param pkno           配套单号
+	 * @param prtmdept       主制部门
+	 * @param subpkdateStart 配套开始时间
+	 * @param subpkdateEnd   配套结束时间
+	 * @return
+	 */
+	List<MesRbPkpqryDTO> selectPage(IPage page, String pkno, String prtmdept, String subpkdateStart, String subpkdateEnd);
+}

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

@@ -0,0 +1,22 @@
+<?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.ErpMesRbPkpqryMapper">
+    <select id = "selectPage" resultType = "org.springblade.erpdata.pojo.dto.MesRbPkpqryDTO">
+		SELECT *
+		FROM v_mes_rb_pkpqry
+		<where>
+			<if test = "pkno != null and pkno != ''">
+				AND pkno LIKE CONCAT('%', CONCAT(#{pkno}, '%'))
+			</if>
+			<if test = "prtmdept != null and pkno != ''">
+				AND prtmdept LIKE CONCAT('%', CONCAT(#{prtmdept}, '%'))
+			</if>
+			<if test = "subpkdateStart != null and subpkdateStart != ''">
+				AND subpkdate &gt;= TO_DATE(CONCAT(#{subpkdateStart}, ' 00:00:00'), 'yyyy-mm-dd hh24:mi:ss')
+			</if>
+			<if test = "subpkdateEnd != null and subpkdateEnd != ''">
+				AND subpkdate &lt;= TO_DATE(CONCAT(#{subpkdateEnd}, ' 23:59:59'), 'yyyy-mm-dd hh24:mi:ss')
+			</if>
+		</where>
+    </select>
+</mapper>

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

@@ -0,0 +1,22 @@
+package org.springblade.erpdata.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.Mapper;
+import org.springblade.erpdata.pojo.dto.PartoplinkFirseqDTO;
+
+import java.util.List;
+
+/**
+ * Mapper 接口
+ *
+ * @author lqk
+ */
+public interface ErpPartoplinkFirseqMapper extends Mapper {
+
+	/**
+	 * 根据物料号查询一级工序
+	 *
+	 * @param partCode
+	 * @return
+	 */
+	List<PartoplinkFirseqDTO> listByPartCode(String partCode);
+}

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

@@ -0,0 +1,9 @@
+<?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.ErpPartoplinkFirseqMapper">
+    <select id = "listByPartCode" resultType = "org.springblade.erpdata.pojo.dto.PartoplinkFirseqDTO">
+        select a.partcode, a.partname, a.firpp, a.firppname, a.firseq, a.firseqname, a.firseqno
+        from v_partoplink_firseq a
+        where prtno = #{partCode}
+    </select>
+</mapper>

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

@@ -1,22 +0,0 @@
-package org.springblade.erpdata.service;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.erpdata.pojo.dto.AllocationDTO;
-
-/**
- * ERP数据查询service
- *
- * @author lqk
- */
-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/IErpMesRbPkpqryService.java

@@ -0,0 +1,25 @@
+package org.springblade.erpdata.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.erpdata.pojo.dto.MesRbPkpqryDTO;
+
+/**
+ * ERP数据查询service
+ *
+ * @author liuqingkun
+ */
+public interface IErpMesRbPkpqryService {
+
+	/**
+	 * 查询配置结果
+	 *
+	 * @param page           分页参数
+	 * @param pkno           配套单号
+	 * @param prtmdept       主制部门
+	 * @param subpkdateStart 配套开始时间
+	 * @param subpkdateEnd   配套结束时间
+	 * @return
+	 */
+	IPage<MesRbPkpqryDTO> page(IPage<MesRbPkpqryDTO> page, String pkno, String prtmdept, String subpkdateStart, String subpkdateEnd);
+
+}

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

@@ -0,0 +1,22 @@
+package org.springblade.erpdata.service;
+
+import org.springblade.erpdata.pojo.dto.PartoplinkFirseqDTO;
+
+import java.util.List;
+
+/**
+ * ERP数据查询service
+ *
+ * @author liuqingkun
+ */
+public interface IErpPartoplinkFirseqService {
+
+    /**
+     * 根据物料号查询一级工序
+     *
+     * @param partCode
+     * @return
+     */
+    List<PartoplinkFirseqDTO> listByPartCode(String partCode);
+
+}

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

@@ -1,29 +0,0 @@
-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);
-	}
-}

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

@@ -0,0 +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.ErpMesRbPkpqryMapper;
+import org.springblade.erpdata.pojo.dto.MesRbPkpqryDTO;
+import org.springblade.erpdata.service.IErpMesRbPkpqryService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author liuqingkun
+ * @date 2026-1-31
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class ErpMesRbPkpqryServiceImpl implements IErpMesRbPkpqryService {
+
+	private final ErpMesRbPkpqryMapper mesRbPkpqryMapper;
+
+	@Override
+	public IPage<MesRbPkpqryDTO> page(IPage<MesRbPkpqryDTO> page, String pkno, String prtmdept, String subpkdateStart, String subpkdateEnd) {
+		List<MesRbPkpqryDTO> dataList = mesRbPkpqryMapper.selectPage(page, pkno, prtmdept, subpkdateStart, subpkdateEnd);
+		return page.setRecords(dataList);
+	}
+}

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

@@ -0,0 +1,32 @@
+package org.springblade.erpdata.service.impl;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springblade.erpdata.mapper.ErpPartoplinkFirseqMapper;
+import org.springblade.erpdata.pojo.dto.PartoplinkFirseqDTO;
+import org.springblade.erpdata.service.IErpPartoplinkFirseqService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author liuqingkun
+ * @date 2026-1-31
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class ErpPartoplinkFirseqServiceImpl implements IErpPartoplinkFirseqService {
+
+	private final ErpPartoplinkFirseqMapper erpPartoplinkFirseqMapper;
+
+	@Override
+	public List<PartoplinkFirseqDTO> listByPartCode(String partCode) {
+		if (StringUtils.isEmpty(partCode)) {
+			return null;
+		}
+
+		return erpPartoplinkFirseqMapper.listByPartCode(partCode);
+	}
+}