From 87266f75ee0c22556fd49e0aaaf3ea89b4d88d9d Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 16 六月 2025 13:40:44 +0800
Subject: [PATCH] 修复状态的保存
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/vo/MachineVO.java | 3 ++-
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/MachineService.java | 1 +
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/StartDispatcher.java | 4 ++--
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/MachineService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/MachineService.java
index 99537db..2c46bf8 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/MachineService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/MachineService.java
@@ -47,6 +47,7 @@
machine.setPollingHours(vo.getPollingHours());
machine.setProgSendDir(vo.getProgSendDir());
machine.setProgReceiveDir(vo.getProgReceiveDir());
+ machine.setStatus(vo.getStatus());
machine.setRemark(vo.getRemark());
return this.updateById(machine);
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/vo/MachineVO.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/vo/MachineVO.java
index 97b34a4..3acd71d 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/vo/MachineVO.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/vo/MachineVO.java
@@ -8,8 +8,9 @@
@Setter
@Getter
public class MachineVO extends BaseVO {
-
+ @Schema(description = "鏈哄簥浠ｇ爜/璁惧缂栫爜")
private String code;
+ @Schema(description = "鏈哄簥鍨嬪彿")
private String name;
/**
* 鎵�灞炴満搴婄粍code
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/StartDispatcher.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/StartDispatcher.java
index ebeb67a..bc6ce9d 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/StartDispatcher.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/StartDispatcher.java
@@ -54,12 +54,12 @@
String partNo = generatePartNo(startVO);
vars.put("partNo",partNo);
- NcProgram curedNcProgram = ncProgramService.getCuredNcProgram(partNo,startVO.getMachineMode());
+ NcProgram curedNcProgram = ncProgramService.getCuredNcProgram(partNo,startVO.getMachineCode());
vars.put("curedNcProgram",curedNcProgram);
//璁剧疆鏄惁鏈夊浐鍖栫▼搴忔爣璁�
vars.put("hasCuredProgram",curedNcProgram != null ? "Y":"N");
-
+
String businessKey = "0";//涓氬姟琛╧ey
identityService.setAuthenticatedUserId(String.valueOf(AuthUtil.getUserId()));//璁剧疆娴佺▼鍙戣捣浜�
--
Gitblit v1.9.3