From 675d66f1cbc7e92cc0fb4897664ee3a851072334 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 20 九月 2025 00:06:35 +0800
Subject: [PATCH] 优化固化流程
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/vo/TaskAssignVO.java | 4 +++-
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/service/MachineService.java | 17 ++++++++++++++---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/entity/TaskDispatch.java | 6 +++++-
blade-service/blade-mdm/src/main/java/org/springblade/mdm/thirdpart/controller/MesController.java | 11 ++++++++++-
4 files changed, 32 insertions(+), 6 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/service/MachineService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/service/MachineService.java
index 5a321dc..6915e01 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/service/MachineService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/service/MachineService.java
@@ -355,14 +355,25 @@
if(StringUtils.isBlank(sendPathLine)){
return null;
}
- //鍘绘帀棣栦綅鎷彿锛屾帓闄ゅ彂閭ｇ鏈哄簥娉ㄩ噴
- String sendPath = escapeSqlWildcard(StringUtils.trim(StringUtils.removeEnd(StringUtils.removeStart(sendPathLine,"("),")")));
+ //鍘绘帀鏈熬鎷彿(鍙戦偅绉�) ,鏈熬璺緞鍒嗛殧绗�
+ String tempPath = StringUtils.removeEnd(StringUtils.removeEnd(StringUtils.removeEnd(sendPathLine,")"),"/"),"\\");
+ //鍘绘帀鍓�2浣嶅彲鑳界殑娉ㄩ噴(*-)銆�
+ String sendPath = escapeSqlWildcard(StringUtils.trim(StringUtils.substring(tempPath,2)));
- List<Machine> machines = lambdaQuery().eq(Machine::getStatus,Machine.STATUS_ENABLE).likeLeft(Machine::getProgSendDir,sendPath).list();
+ List<Machine> machines = lambdaQuery().eq(Machine::getStatus,Machine.STATUS_ENABLE).like(Machine::getProgSendDir,sendPath).list();
if(machines.isEmpty()){
return null;
}else{
return machines.get(0);
}
}
+
+ /**
+ * 鏍规嵁璁惧缂栧彿鏌ヨ鏈哄簥
+ * @param equipmentCode 璁惧缂栧彿
+ * @return 鏈哄簥瀵硅薄
+ */
+ public Machine getByEquipmentCode(String equipmentCode) {
+ return this.lambdaQuery().eq(Machine::getEquipmentCode, equipmentCode).one();
+ }
}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/entity/TaskDispatch.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/entity/TaskDispatch.java
index c6d02f3..7e5aa49 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/entity/TaskDispatch.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/entity/TaskDispatch.java
@@ -37,10 +37,14 @@
public static final int STATUS_EXCEPTION = 5;
/**
- * 璁惧缂栧彿
+ * 鏈哄簥缂栧彿
*/
private String machineCode;
/**
+ * 璁惧缂栧彿锛坢es娲惧彂鐨勪换鍔′細浼犻�掞級
+ */
+ private String equipmentCode;
+ /**
* 宸ュ簭鍚嶇О锛屽鈥滅簿閾ｂ��
*/
private String processName;
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/vo/TaskAssignVO.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/vo/TaskAssignVO.java
index b7ff1e0..e750191 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/vo/TaskAssignVO.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/vo/TaskAssignVO.java
@@ -28,8 +28,10 @@
@Schema(description = "宸ヨ壓鐗堟")
private String craftEdition;
- @Schema(description = "璁惧缂栧彿")
+ @Schema(description = "鏈哄簥缂栧彿")
private String machineCode;
+ @Schema(description = "璁惧缂栧彿(mes鎺ュ彛浼犻��)")
+ private String equipmentCode;
@Schema(description = "璁惧鍨嬪彿")
private String machineMode;
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