From 4ab2cb495ccece311bbd8d0ecb992c7de0bc8500 Mon Sep 17 00:00:00 2001 From: yangys <y_ys79@sina.com> Date: 星期二, 22 七月 2025 11:43:10 +0800 Subject: [PATCH] 审批表打印 --- blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/entity/NcProgram.java | 48 ++++++++++++++++++++++++++++++++++-------------- 1 files changed, 34 insertions(+), 14 deletions(-) diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/entity/NcProgram.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/entity/NcProgram.java index c7ccacf..6f2c0d5 100644 --- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/entity/NcProgram.java +++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/entity/NcProgram.java @@ -26,9 +26,9 @@ */ private long ncNodeId; /** - * 绋嬪簭鍖呭悕 - */ - //private String packageName; + * 鍚屽悕缁戝畾鑺傜偣id + */ + private Long bindNcNodeId; /** * 鏂囦欢鍦板潃 */ @@ -42,14 +42,16 @@ * 鏄惁涓烘枃鏈被鍨� */ private Boolean isTextFile; - /** - * 鍥惧彿 - */ - private String drawingNo; + /** * 宸ュ簭锛屽鈥滅簿閾b�� */ - //private String processName; + private String processName; + + /** + * 宸ュ簭鍙� + */ + private String processNo; /** * 澶囨敞 */ @@ -59,14 +61,18 @@ */ private String machineCode; /** - * 闆剁粍浠跺彿 + * 闆剁粍浠跺彿/鍥惧彿 */ - //private String partNo; + private String drawingNo; + /** + * 鎻忚堪 + */ + private String description; /** * 鏄惁鍥哄寲 */ - //private Integer isCured; + private Integer isCured; /** * 杩囨湡鏃ユ湡 */ @@ -74,21 +80,35 @@ /** * 宸ュ簭鐗堟 */ - //private String processEdition; + private String processEdition; + + /** + * 宸ヨ壓鐗堟 + */ + private String craftEdition; /** * 鏄惁鏈�鏂扮増娆★紝1锛氭渶鏂扮増娆★紱0:鍘嗗彶鐗堟 */ - //private Integer isLastEdition; + private Integer isLastEdition = 1; /** * 鏄惁閿佸畾 */ - private Integer isLocked; + private Integer isLocked = 0; + /** + * 鏄惁娴嬭瘯绋嬪簭 + */ + private Integer isTest = 0; /** * 浠诲姟鍒嗘淳鏃堕棿 */ private LocalDateTime taskAssignTime; /** + * 鐗堟湰鍙凤紝涓婁紶涓�娆$▼搴忥紝灏变細+1 + */ + private Integer versionNumber; + + /** * 鏄惁鍦ㄦ湁鏁堟湡鍐� * @param effectiveMonths 鏈夋晥鏃堕暱锛堟湀鏁帮級锛屽湪绯荤粺鍙傛暟涓厤缃� * @return -- Gitblit v1.9.3