From ddafa0375398053baaafdee8612f68c1b75ff7cb Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 22 八月 2025 13:37:54 +0800
Subject: [PATCH] 机床导入1

---
 blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/entity/Machine.java |   24 ++++++++++++++++++++++--
 1 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/entity/Machine.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/entity/Machine.java
index c768300..560accc 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/entity/Machine.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/entity/Machine.java
@@ -10,12 +10,20 @@
 @Getter
 @TableName("mdm_machine")
 public class Machine extends BizEntity {
+	/**
+	 * 鐘舵�侊細1 鍚敤
+	 */
+	public static final int STATUS_ENABLE = 1;
+	/**
+	 * 鐘舵�侊細2 绂佺敤
+	 */
+	public static final int STATUS_DISABLED = 2;
 	private String name;
 	private String code;
 	/**
-	 * 鎵�灞炴満搴婄粍ID
+	 * 鎵�灞炴満搴婄粍code锛屽瓧鍏竚achine_group
  	 */
-	private Long machineGroupId;
+	private String machineGroupCode;
 	/**
 	 * 鏈哄櫒瑙勬牸:01杞﹀簥/02閾e簥,鍦ㄤ笟鍔″瓧鍏搁厤缃紙key=machine_spec锛�
 	 */
@@ -45,10 +53,22 @@
 	 */
 	private String progSendDir;
 	/**
+	 * send鏂囦欢澶逛繚鎸佹椂闂� 灏忔椂
+	 */
+	private Integer sendDirExpiryHours;
+	/**
 	 * 绋嬪簭鍥炰紶鐩綍',
 	 */
 	private String progReceiveDir;
 	/**
+	 *  receive鏂囦欢澶逛繚鎸佹椂闂� 灏忔椂
+	 */
+	private Integer receiveDirExpiryHours;
+	/**
+	 * 绋嬪簭闀挎湡瀛樺偍鐩綍
+	 */
+	private String progTempDir;
+	/**
 	 * 澶囨敞
 	 */
 	private String remark;

--
Gitblit v1.9.3