From c0ccbb980be6975389f09ad13dcabd7d3156dae3 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 22 九月 2025 19:03:56 +0800
Subject: [PATCH] 更新提醒-》只提醒编程员;工控网显示临时更改单号

---
 blade-service/blade-mdm/src/main/java/org/springblade/mdm/thirdpart/service/MesTaskService.java |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/thirdpart/service/MesTaskService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/thirdpart/service/MesTaskService.java
index dd224fa..d3cf586 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/thirdpart/service/MesTaskService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/thirdpart/service/MesTaskService.java
@@ -49,14 +49,22 @@
 
 	/**
 	 * mes 瀹屾垚鎺ㄩ��
-	 * @param finishTaskVO
+	 * @param finishTaskVO mes瀹屽伐鏁版嵁
 	 */
 	public void finishTask(MesTaskFinishVO finishTaskVO) {
 		TaskDispatch taskDispatch = taskDispatchService.getByOperationId(finishTaskVO.getOperationId());
 		if(taskDispatch != null && taskDispatch.getProcessInstanceId() != null){
 			taskDispatch.setProcessCard(finishTaskVO.getProcessCard());
-			taskDispatch.setInspector(finishTaskVO.getInspector());
-			taskDispatch.setCheckTime(finishTaskVO.getAcruslEndEime());
+			if(finishTaskVO.getInspector() != null) {
+				taskDispatch.setInspector(finishTaskVO.getInspector());
+			}
+			if(finishTaskVO.getOperationFeedbackTime() != null){
+				taskDispatch.setOperateTime(finishTaskVO.getOperationFeedbackTime());
+			}
+
+			if(finishTaskVO.getAcruslEndTime() !=null ) {
+				taskDispatch.setCheckTime(finishTaskVO.getAcruslEndTime());
+			}
 			taskDispatchService.updateById(taskDispatch);
 
 			ProcessInstance inst = runtimeService.createProcessInstanceQuery()

--
Gitblit v1.9.3