From edecbd9cb1b31ded46b8592634780d999db6b6f0 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 22 九月 2025 14:19:21 +0800
Subject: [PATCH] 文件下发，回传文件处理的查看下载
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/thirdpart/controller/MesController.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/thirdpart/controller/MesController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/thirdpart/controller/MesController.java
index 38edc92..39531b9 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/thirdpart/controller/MesController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/thirdpart/controller/MesController.java
@@ -6,6 +6,8 @@
import org.apache.commons.lang3.StringUtils;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.DateUtil;
+import org.springblade.mdm.basesetting.machine.entity.Machine;
+import org.springblade.mdm.basesetting.machine.service.MachineService;
import org.springblade.mdm.basesetting.producedivision.entity.QinzheFgb;
import org.springblade.mdm.basesetting.producedivision.service.QinzheFgbService;
import org.springblade.mdm.flow.constants.FlowConstant;
@@ -37,6 +39,8 @@
private TaskDispatchService taskDispatchService;
@Autowired
private QinzheFgbService qinzheFgbService;
+ @Autowired
+ private MachineService machineService;
/**
* 鏂板
*/
@@ -130,7 +134,12 @@
taskAssignVO.setCraftEdition(mesTaskVO.getRoutingVersion());
taskAssignVO.setProcessEdition(mesTaskVO.getOperationVersion());
taskAssignVO.setOperationId(mesTaskVO.getOperationId());
- taskAssignVO.setMachineCode(mesTaskVO.getEquipmentCode());
+
+ taskAssignVO.setEquipmentCode(mesTaskVO.getEquipmentCode());
+ Machine machine = this.machineService.getByEquipmentCode(mesTaskVO.getEquipmentCode());
+ if(machine != null) {
+ taskAssignVO.setMachineCode(machine.getCode());
+ }
taskAssignVO.setMachineMode(mesTaskVO.getEquipmentModel());
taskAssignVO.setDispatchBy(mesTaskVO.getDspatchBy());
if (mesTaskVO.getProductModel() != null) {
--
Gitblit v1.9.3