+ * 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 org.springblade.core.launch.constant.AppConstant;
+import org.springblade.core.tool.api.R;
+import org.springblade.erpdata.pojo.dto.AllocationDTO;
+import org.springblade.erpdata.pojo.dto.view.MesRbWo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+
+import java.util.List;
+
+/**
+ * Feign接口类
+ *
+ * @author Chill
+ */
+@FeignClient(
+ value = AppConstant.APPLICATION_SYSTEM_NAME,
+ fallback = IErpMesRbWoClientFallback.class
+)
+public interface IErpMesRbWoClient {
+
+ String API_PREFIX = "/feign/erpdata/mesrbwo";
+ String GET_LIST = API_PREFIX + "/getList";
+
+ /**
+ * 查询烧结配套信息
+ *
+ * @param
+ * @param entity
+ * @return
+ */
+ @PostMapping(GET_LIST)
+ R
+ * 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.pojo.dto.view.MesRbWo;
+import org.springblade.erpdata.service.IErpDataSearchService;
+import org.springblade.erpdata.service.IErpMesRbWoService;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+
+/**
+ * 字典服务Feign实现类
+ *
+ * @author Chill
+ */
+@NonDS
+@Hidden
+@RestController
+@AllArgsConstructor
+public class ErpMesRbWoClient implements IErpMesRbWoClient {
+
+ private final IErpMesRbWoService erpMesRbWoService;
+
+
+ @Override
+ public R> getList(MesRbWo entity);
+
+}
diff --git a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpMesRbWoClientFallback.java b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpMesRbWoClientFallback.java
new file mode 100644
index 00000000..3ea6696e
--- /dev/null
+++ b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpMesRbWoClientFallback.java
@@ -0,0 +1,22 @@
+package org.springblade.erpdata.feign;
+
+import org.springblade.core.tool.api.R;
+import org.springblade.erpdata.pojo.dto.view.MesRbWo;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * Feign失败配置
+ *
+ * @author lqk
+ * @date 2025-12-17 15:13
+ */
+@Component
+public class IErpMesRbWoClientFallback implements IErpMesRbWoClient {
+
+ @Override
+ public R
> getList(MesRbWo entity) {
+ return R.fail("获取数据失败");
+ }
+}
diff --git a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbWo.java b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbWo.java
index 42dd68c1..56f5fc2e 100644
--- a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbWo.java
+++ b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbWo.java
@@ -1,10 +1,30 @@
package org.springblade.erpdata.pojo.dto.view;
+import lombok.Data;
+
/**
* 对应ERP中视图 v_mes_rb_wo
*
* @author lqk
* @date 2026-01-16 17:34
*/
+@Data
public class MesRbWo {
+
+ private String wono;
+ private String prtno;
+ private String prtlotno;
+ private String plndept;
+ private String woporqty;
+ private String woreqdat;
+ private String plannerdesc;
+ private String wopordat;
+ private String remark;
+ private String wototqty;
+ private String prtmdept;
+ private String processline;
+ private String warctlrdesc;
+ private String kdofplat;
+ private String processlinedesc;
+ private String prodline;
}
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/feign/ApsClient.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/feign/ApsClient.java
index 62a8d767..12f9f88d 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/feign/ApsClient.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/feign/ApsClient.java
@@ -28,8 +28,11 @@ package org.springblade.desk.order.feign;
import io.swagger.v3.oas.annotations.Hidden;
import lombok.RequiredArgsConstructor;
import org.springblade.core.tenant.annotation.NonDS;
+import org.springblade.desk.order.pojo.entity.YieldPlan;
import org.springblade.desk.order.service.IYieldOrderService;
+import org.springblade.desk.order.service.IYieldPlanService;
import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
@@ -47,6 +50,8 @@ public class ApsClient implements IApsClient {
private final IYieldOrderService yieldOrderService;
+ private final IYieldPlanService yieldPlanService;
+
@Override
@GetMapping(SYNC_ORDER_FROM_OLD_MES)
public Boolean syncOrderFromOldMes() {
@@ -58,4 +63,10 @@ public class ApsClient implements IApsClient {
return Boolean.TRUE;
}
+
+ @Override
+ @PostMapping(SYNC_PLAN_FROM_SAVE)
+ public void saveList(List
> getList(MesRbWo entity) {
+ return R.data(erpMesRbWoService.getList(entity));
+ }
+}
diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbWoMapper.java b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbWoMapper.java
new file mode 100644
index 00000000..1a43be8b
--- /dev/null
+++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbWoMapper.java
@@ -0,0 +1,21 @@
+package org.springblade.erpdata.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.Mapper;
+import org.springblade.erpdata.pojo.dto.view.MesRbWo;
+
+import java.util.List;
+
+/**
+ * Mapper 接口
+ *
+ * @author lqk
+ */
+public interface ErpMesRbWoMapper extends Mapper {
+
+ /**
+ * 从ERP视图中获取要同步的生产计划
+ *
+ * @return
+ */
+ List