From 4a717cbc6d776a2910a48e804f1b857873643f53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E6=B6=9B?= <a15234804788@163.com>
Date: Mon, 25 May 2026 20:05:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=BA=8F=E6=8E=A5=E6=94=B6=E8=80=90?=
 =?UTF-8?q?=E8=9A=80=E6=80=A7=E6=A3=80=E6=B5=8B=E9=A1=B9=E7=9B=AE=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../desk/produce/feign/IDisTaskingClient.java          |  8 ++++++++
 .../desk/produce/feign/DisTaskingClient.java           | 10 ++++++++++
 .../desk/produce/service/IWorkOrderService.java        |  2 +-
 .../produce/service/impl/WorkOrderServiceImpl.java     |  6 +++++-
 4 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/feign/IDisTaskingClient.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/feign/IDisTaskingClient.java
index ccc10cca3..7e479377f 100644
--- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/feign/IDisTaskingClient.java
+++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/feign/IDisTaskingClient.java
@@ -3,6 +3,7 @@ package org.springblade.desk.produce.feign;
 import org.springblade.core.launch.constant.AppConstant;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 
 /**
  * 调度任务同步接口
@@ -20,6 +21,7 @@ public interface IDisTaskingClient {
     String RECEIVE_ORDER = API_PREFIX + "/receiveOrder";
     String RB_TRANSFER_ORDER = API_PREFIX + "/rbTransferOrder";
     String UN_BIND_EC = API_PREFIX + "/unBindEc";
+    String SAVE_WORK_ORDER_RUN = API_PREFIX + "/saveWorkOrderRun";
 
 
     /**
@@ -43,4 +45,10 @@ public interface IDisTaskingClient {
 
     @GetMapping(UN_BIND_EC)
     boolean unBindEc();
+
+    /**
+     * 保存生产运行记录
+     */
+    @GetMapping(SAVE_WORK_ORDER_RUN)
+    boolean saveWorkOrderRun(@RequestParam String woId);
 }
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/feign/DisTaskingClient.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/feign/DisTaskingClient.java
index 1e5838a27..7e204021e 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/feign/DisTaskingClient.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/feign/DisTaskingClient.java
@@ -6,6 +6,7 @@ import org.springblade.core.tenant.annotation.NonDS;
 import org.springblade.desk.produce.service.IDisTaskingService;
 import org.springblade.desk.produce.service.IHandoverRecordService;
 import org.springblade.desk.produce.service.IPdaSaveService;
+import org.springblade.desk.produce.service.IWorkOrderService;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -25,6 +26,8 @@ public class DisTaskingClient implements IDisTaskingClient {
 
 	private final IHandoverRecordService handoverRecordService;
 
+	private final IWorkOrderService workOrderService;
+
 	@Override
 	public boolean syncDisTasking() {
 		return disTaskingService.syncDisTasking(false);
@@ -44,4 +47,11 @@ public class DisTaskingClient implements IDisTaskingClient {
 	public boolean unBindEc() {
 		return pdaSaveServiceImpl.unBindEc();
 	}
+
+	@Override
+	public boolean saveWorkOrderRun(String woId) {
+		workOrderService.addPrWorkOrderRun(woId);
+		return true;
+	}
+
 }
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/IWorkOrderService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/IWorkOrderService.java
index cef1c2a7a..897d4449c 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/IWorkOrderService.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/IWorkOrderService.java
@@ -295,5 +295,5 @@ public interface IWorkOrderService extends BaseService<WorkOrder> {
 	/**
 	 * 生产运行记录
 	 */
-	void addPrWorkOrderRun(WorkOrder workOrder);
+	void addPrWorkOrderRun(String woId);
 }
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java
index 14c084140..886d4758c 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java
@@ -2910,7 +2910,11 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
     }
 
     @Override
-    public void addPrWorkOrderRun(WorkOrder workOrder) {
+    public void addPrWorkOrderRun(String woId) {
+        WorkOrder workOrder = this.getById(woId);
+        if (workOrder == null) {
+            throw new ServiceException("请核实车间订单[" + woId + "]信息是否有误!!!!");
+        }
         WorkPlan prWorkPlan = workPlanService.getById(workOrder.getWpId());
         if (prWorkPlan.getOcId() != null) {
             //产生外协生产进度记录信息