From 5f714d1dfafa201ac52da4ebb2cc3ff7a5e3a31f Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期二, 05 八月 2025 17:36:15 +0800
Subject: [PATCH] 机床新增数据库逐渐重复报错
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/entity/NcNode.java | 114 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 107 insertions(+), 7 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/entity/NcNode.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/entity/NcNode.java
index 6268a00..a992ae6 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/entity/NcNode.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/entity/NcNode.java
@@ -4,14 +4,66 @@
import lombok.Getter;
import lombok.Setter;
import org.springblade.core.mp.base.BizEntity;
+import org.springblade.mdm.flow.entity.FlowProgramFile;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
@Setter
@Getter
@TableName("mdm_nc_node")
public class NcNode extends BizEntity {
+ /**
+ * 鑺傜偣绫诲瀷锛� 绋嬪簭鐘舵�� 10
+ */
+ public static final String TYPE_PROGRAM_STATUS = "10";
+ /*
+ 浜у搧鍨嬪彿
+ */
+ public static final String TYPE_PRODUCT_MODEL = "15";
+ /**
+ * 鑺傜偣绫诲瀷锛� 闆剁粍浠跺彿/鍥惧彿 10
+ */
+ public static final String TYPE_DRAWING_NO = "20";
+ /**
+ * 宸ヨ壓鐗堟
+ *
+ */
+ public static final String TYPE_CRAFT_EDITION = "30";
+ /**
+ * 宸ュ簭鍙�
+ *
+ */
+ public static final String TYPE_PROCESS_NO = "40";
+ /**
+ * 宸ュ簭鐗堟
+ */
+ public static final String TYPE_PROCESS_EDITION = "45";
+ /**
+ * 鍔犲伐鏈哄簥
+ */
+ public static final String TYPE_MACHINE_CODE = "50";
+ /**
+ * 绋嬪簭鍖呭悕
+ */
+ public static final String TYPE_PROGRAM_PACKAGE = "60";
+
+ /**
+ * 绋嬪簭鏂囦欢
+ */
+ public static final String TYPE_PROGRAM_FILE = "70";
+
+ /**
+ * 鏂囦欢鑺傜偣鏂囦欢绫诲瀷锛氱▼搴�
+ */
+ public static final String FILE_CATEGOAY_PROGRAM = "program";
+ /**
+ * 鏂囦欢鑺傜偣鏂囦欢绫诲瀷锛氬叾浠�
+ */
+ public static final String FILE_CATEGORY_OTHER = "other";
+ /**
+ * 鏂囦欢鑺傜偣鏂囦欢绫诲瀷锛氬瓙绋嬪簭
+ */
+ public static final String FILE_CATEGORY_SUBPROGRAM = "subprogram";
+
private String name;
private Long parentId;
@@ -25,7 +77,10 @@
private String machineCode;
-
+ /**
+ * 鏂囦欢绫诲瀷锛屽彧鏈�
+ */
+ //private String fileCategory;
/**
* 宸ュ簭锛屽鈥滅簿閾ｂ��
*/
@@ -41,13 +96,17 @@
*/
private String craftEdition;
/**
+ * 鏄惁鏈�鏂扮増娆★紝1锛氭渶鏂扮増娆★紱0:鍘嗗彶鐗堟
+ */
+ private Integer isLastEdition = 1;
+ /**
* 闆剁粍浠跺彿/鍥惧彿
*/
- private String partNo;
+ private String drawingNo;
/**
* 鍥惧彿鐗堟
*/
- private String partNoEdition;
+ private String drawingNoEdition;
/**
* 鏄惁鍥哄寲
@@ -56,11 +115,11 @@
/**
* 杩囨湡鏃ユ湡
*/
- private LocalDate expireDate;
+ //private LocalDate expireDate;
/**
* 鏄惁閿佸畾
*/
- private Integer isLocked;
+ private Integer isLocked = 0;
/**
* 鑺傜偣绫诲瀷锛氬瓧鍏�
*/
@@ -68,6 +127,47 @@
private String description;
private String remark;
+ //0808鏂板
+ /**
+ * 绋嬪簭鏂囦欢鑺傜偣鐨勬暟鎹�
+ */
+ private String processNo;
+ /**
+ * 浜у搧鍨嬪彿
+ */
+ private String productModel;
+ /**
+ * 绋嬪簭缂栧彿锛堢▼搴忓寘鍚嶈妭鐐归渶瑕侊級
+ */
+ private String programNo;
+ /**
+ * 娴佺▼绋嬪簭鏂囦欢id锛屽彧鏈夌▼搴忔枃浠讹紙70锛夌被鍨嬬殑鑺傜偣鏈夋鍊�
+ */
+ private Long flowProgramFileId;
+
+ /**
+ * 瀹℃壒鏃剁殑娴佺▼瀹炰緥id锛屽彧鏈夌▼搴忓寘鑺傜偣鏈夎繖涓瓧娈靛��
+ */
+ private String processInstanceId;
+
+ /**
+ * 鐗堟湰鍙凤紝鏇存柊涓�娆★紙鍏ュ崌鐗堬紝dnc瀵煎叆锛夛紝灏变細+1
+ */
+ private Integer versionNumber = 1;
+
+ transient FlowProgramFile flowProgramFile;
+
+ /**
+ * 鏍规嵁褰撳墠鐗堟湰鍙凤紝鑾峰彇鏂板鐗堟湰鍙�
+ * @return 鍗囩骇鍚庣殑鐗堟湰鍙�
+ */
+ public int genNewVersionNumber(){
+ if(this.versionNumber == null){
+ return 1;
+ }else{
+ return this.versionNumber + 1;
+ }
+ }
}
--
Gitblit v1.9.3