From 86c8efdb19a2f4be79a947650ef62ed79382011b Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 30 八月 2025 20:55:31 +0800
Subject: [PATCH] 重构机床回传文件；撤回后禁用撤回按钮
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/machinefile/entity/MachineFile.java | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/gkw/programnode/entity/MachineFile.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machinefile/entity/MachineFile.java
similarity index 76%
rename from blade-service/blade-mdm/src/main/java/org/springblade/mdm/gkw/programnode/entity/MachineFile.java
rename to blade-service/blade-mdm/src/main/java/org/springblade/mdm/machinefile/entity/MachineFile.java
index 9d75d89..894cd84 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/gkw/programnode/entity/MachineFile.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machinefile/entity/MachineFile.java
@@ -1,10 +1,9 @@
-package org.springblade.mdm.gkw.programnode.entity;
+package org.springblade.mdm.machinefile.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Getter;
import lombok.Setter;
import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang3.StringUtils;
import org.springblade.core.mp.base.BizEntity;
import java.util.Date;
@@ -32,6 +31,23 @@
* 鏂囦欢琚竻闄�(琚畾鏃朵换鍔℃爣璁�)
*/
public static final int STATUS_REMOVED = 4;
+
+ /**
+ * 绋嬪簭鐘舵�侊紝璇曞垏
+ */
+ public static final int PROGRAM_STATUS_TRY = 1;
+ /**
+ * 绋嬪簭鐘舵�侊紝鍥哄寲
+ */
+ public static final int PROGRAM_STATUS_CURED = 2;
+ /**
+ * 绋嬪簭鐘舵�侊紝鍋忕
+ */
+ public static final int PROGRAM_STATUS_DIVIASTION = 3;
+ /**
+ * 绋嬪簭鐘舵�侊紝鏈煡
+ */
+ public static final int PROGRAM_STATUS_UNKNOWN = 4;
/**
* 鑺傜偣绫诲瀷锛� REC鐩綍
*/
@@ -87,13 +103,15 @@
*/
private Date determineTime;
/**
+ * 绋嬪簭鐘舵�侊紙1璇曞垏锛�2鍥哄寲锛�3鍋忕锛�4鏈煡锛�
+ */
+ private Integer programStatus;
+ /**
* 鐢熸垚鏂囦欢澶у皬鐨勬樉绀烘枃鏈�
* @return 鏄剧ず鏂囨湰
*/
public String getFileSizeDisplay(){
- String disp = FileUtils.byteCountToDisplaySize(fileSize);
- //disp = StringUtils.replace(disp,"bytes","瀛楄妭");
- return disp;
+ return FileUtils.byteCountToDisplaySize(fileSize);
}
/**
--
Gitblit v1.9.3