From 15b3879cd259108e7ebb755fe02c190f28f1e20c Mon Sep 17 00:00:00 2001
From: leiqunqing <zhengqifeng@hnkhzn.com>
Date: 星期五, 06 二月 2026 14:46:23 +0800
Subject: [PATCH] 完善项目
---
代码管理/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/BasicInfo/Dt_Formula.cs | 68 ++++++++++++++++++++--------------
1 files changed, 40 insertions(+), 28 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/BasicInfo/Dt_Formula.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/BasicInfo/Dt_Formula.cs"
index b4d4339..eb28322 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/BasicInfo/Dt_Formula.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/BasicInfo/Dt_Formula.cs"
@@ -33,77 +33,89 @@
/// <summary>
/// 鍘嬭浣嶄骇鍝侀暱搴�
/// </summary>
- [SugarColumn(IsNullable = true, DecimalDigits =2, ColumnDescription = "鍘嬭浣嶄骇鍝侀暱搴�")]
- public decimal ProductLength { get; set; }
+ [SugarColumn(IsNullable = true, DecimalDigits = 2, ColumnDescription = "鍘嬭浣嶄骇鍝侀暱搴�")]
+ public decimal? ProductLength { get; set; }
/// <summary>
/// 鍘嬭浣嶄骇鍝佸搴�
/// </summary>
[SugarColumn(IsNullable = true, DecimalDigits = 2, ColumnDescription = "鍘嬭浣嶄骇鍝佸搴�")]
- public decimal ProductWidth { get; set; }
+ public decimal? ProductWidth { get; set; }
/// <summary>
/// 鍘嬭浣嶄骇鍝侀珮搴�
/// </summary>
[SugarColumn(IsNullable = true, DecimalDigits = 2, ColumnDescription = "鍘嬭浣嶄骇鍝侀珮搴�")]
- public decimal ProductHeight { get; set; }
+ public decimal? ProductHeight { get; set; }
+
+ /// <summary>
+ /// 鍘嬭浣嶄笉鎷х揣
+ /// </summary>
+ [SugarColumn(IsNullable = true, DefaultValue = "0", ColumnDescription = "鍘嬭浣嶄笉鎷х揣")]
+ public int? PressNoTighten { get; set; }
/// <summary>
/// 鍘嬭浣嶆嫥绱т笅闄嶉珮搴�
/// </summary>
[SugarColumn(IsNullable = true, DecimalDigits = 2, ColumnDescription = "鍘嬭浣嶆嫥绱т笅闄嶉珮搴�")]
- public decimal ScrewDownsetDistance { get; set; }
+ public decimal? ScrewDownsetDistance { get; set; }
/// <summary>
/// 鍘嬭浣嶆嫥绱ф壄鍔�
/// </summary>
[SugarColumn(IsNullable = true, DecimalDigits = 2, ColumnDescription = "鍘嬭浣嶆嫥绱ф壄鍔�")]
- public decimal ScrewTorqueOutput { get; set; }
+ public decimal? ScrewTorqueOutput { get; set; }
/// <summary>
- /// 鍘嬭浣嶈嚜鍔ㄦ嫥绱ф墦寮�
+ /// 鍘嬭浣嶈嚜鍔ㄦ嫥绱х▼搴忓彿
/// </summary>
- [SugarColumn(IsNullable = true, DecimalDigits = 2, ColumnDescription = "鍘嬭浣嶈嚜鍔ㄦ嫥绱ф墦寮�")]
- public int DintAutoScrewOn { get; set; }
+ [SugarColumn(IsNullable = true, ColumnDescription = "鍘嬭浣嶈嚜鍔ㄦ嫥绱х▼搴忓彿")]
+ public int? DintAutoScrewOn { get; set; }
/// <summary>
- /// 妫�娴嬩綅X鍋忕Щ璺濈1
+ /// 鍘嬭浣嶇揣鍥烘壄鐭�
/// </summary>
- [SugarColumn(IsNullable = true, DecimalDigits = 2, ColumnDescription = "妫�娴嬩綅X鍋忕Щ璺濈1")]
- public decimal XDirectionDistance1 { get; set; }
+ [SugarColumn(IsNullable = true, DecimalDigits = 2, ColumnDescription = "鍘嬭浣嶇揣鍥烘壄鐭�", DefaultValue = "0.00")]
+ public decimal? PressFastenTorque { get; set; }
/// <summary>
- /// 妫�娴嬩綅Z楂樺害1
+ /// P0P1瀹藉害
/// </summary>
- [SugarColumn(IsNullable = true, DecimalDigits = 2, ColumnDescription = "妫�娴嬩綅Z楂樺害1")]
- public decimal YDirectionHeight1 { get; set; }
+ [SugarColumn(IsNullable = true, DecimalDigits = 2, ColumnDescription = "P0P1瀹藉害")]
+ public decimal? P0P1Width { get; set; }
/// <summary>
- /// 妫�娴嬩綅X鍋忕Щ璺濈2
+ /// P0P2瀹藉害
/// </summary>
- [SugarColumn(IsNullable = true, DecimalDigits = 2, ColumnDescription = "妫�娴嬩綅X鍋忕Щ璺濈2")]
- public decimal XDirectionDistance2 { get; set; }
+ [SugarColumn(IsNullable = true, DecimalDigits = 2, ColumnDescription = "P0P2瀹藉害")]
+ public decimal? P0P2Width { get; set; }
/// <summary>
- /// 妫�娴嬩綅Z楂樺害2
+ /// P0P3瀹藉害
/// </summary>
- [SugarColumn(IsNullable = true, DecimalDigits = 2, ColumnDescription = "妫�娴嬩綅Z楂樺害2")]
- public decimal YDirectionHeight2 { get; set; }
+ [SugarColumn(IsNullable = true, DecimalDigits = 2, ColumnDescription = "P0P3瀹藉害")]
+ public decimal? P0P3Width { get; set; }
/// <summary>
- /// 妫�娴嬩綅X鍋忕Щ璺濈3
+ /// P1P3楂樺害
/// </summary>
- [SugarColumn(IsNullable = true, DecimalDigits = 2, ColumnDescription = "妫�娴嬩綅X鍋忕Щ璺濈3")]
- public decimal XDirectionDistance3 { get; set; }
+ [SugarColumn(IsNullable = true, DecimalDigits = 2, ColumnDescription = "P1P3楂樺害")]
+ public decimal? P1P3Height { get; set; }
/// <summary>
- /// 妫�娴嬩綅Z楂樺害3
+ /// P2P3楂樺害
/// </summary>
- [SugarColumn(IsNullable = true, DecimalDigits = 2, ColumnDescription = "妫�娴嬩綅Z楂樺害3")]
- public decimal YDirectionHeight3 { get; set; }
+ [SugarColumn(IsNullable = true, DecimalDigits = 2, ColumnDescription = "P2P3楂樺害")]
+ public decimal? P2P3Height { get; set; }
+
+ /// <summary>
+ /// 浜у搧鍥剧墖璺緞
+ /// </summary>
+ [SugarColumn(IsNullable = true, Length = 500, ColumnDescription = "浜у搧鍥剧墖璺緞")]
+ public string ProductImagePath { get; set; }
[SugarColumn(IsIgnore = true)]//涓嶅弬涓庢暟鎹簱鏄犲皠锛屾祴璇曚娇鐢�
[Navigate(NavigateType.OneToMany, nameof(Dt_FormulaDetail.FormulaId), nameof(Id))]
public List<Dt_FormulaDetail> Details { get; set; }
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3