From 891207469b41c23d22805876a4e179d75832572f Mon Sep 17 00:00:00 2001
From: leiqunqing <zhengqifeng@hnkhzn.com>
Date: 星期四, 05 三月 2026 11:03:52 +0800
Subject: [PATCH] 完整项目更新
---
代码管理/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/BasicInfo/Dt_Formula.cs | 100 +++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 82 insertions(+), 18 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 eb28322..75cb8be 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"
@@ -1,12 +1,13 @@
-锘縰sing System;
+锘縰sing Magicodes.ExporterAndImporter.Core;
+using OfficeOpenXml.FormulaParsing.Excel.Functions.Numeric;
+using SqlSugar;
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
-using OfficeOpenXml.FormulaParsing.Excel.Functions.Numeric;
-using SqlSugar;
using WIDESEAWCS_Core.DB.Models;
-
+using Magicodes.IE.Core;
namespace WIDESEAWCS_Model.Models
{
[SugarTable(nameof(Dt_Formula), "閰嶆柟淇℃伅琛�")]
@@ -15,107 +16,170 @@
/// <summary>
/// 涓婚敭
/// </summary>
+ ///
+ [ImporterHeader(IsIgnore = true)]
+ [ExporterHeader(null, 11f, null, true, true, false, 0, KnownColor.Empty, DisplayName = "涓婚敭")]
[SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
public int Id { get; set; }
/// <summary>
/// 鎴愬搧缂栧彿
/// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鎴愬搧缂栧彿")]
+ ///
+ [ImporterHeader(Name = "鎴愬搧缂栧彿")]
+ [ExporterHeader(null, 11f, null, true, true, false, 0, KnownColor.Empty, DisplayName = "鎴愬搧缂栧彿")]
+ [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "鎴愬搧缂栧彿")]
public string ProductCode { get; set; }
/// <summary>
/// 鎴愬搧鍚嶇О
/// </summary>
+ [ImporterHeader(Name = "鎴愬搧鍚嶇О")]
+ [ExporterHeader(null, 11f, null, true, true, false, 0, KnownColor.Empty, DisplayName = "鎴愬搧鍚嶇О")]
[SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鎴愬搧鍚嶇О")]
public string ProductName { get; set; }
/// <summary>
/// 鍘嬭浣嶄骇鍝侀暱搴�
/// </summary>
+ [ImporterHeader(Name = "浜у搧闀垮害")]
+ [ExporterHeader(null, 11f, null, true, true, false, 0, KnownColor.Empty, DisplayName = "浜у搧闀垮害")]
[SugarColumn(IsNullable = true, DecimalDigits = 2, ColumnDescription = "鍘嬭浣嶄骇鍝侀暱搴�")]
public decimal? ProductLength { get; set; }
/// <summary>
/// 鍘嬭浣嶄骇鍝佸搴�
/// </summary>
+ [ImporterHeader(Name = "浜у搧瀹藉害")]
+ [ExporterHeader(null, 11f, null, true, true, false, 0, KnownColor.Empty, DisplayName = "浜у搧瀹藉害")]
[SugarColumn(IsNullable = true, DecimalDigits = 2, ColumnDescription = "鍘嬭浣嶄骇鍝佸搴�")]
public decimal? ProductWidth { get; set; }
/// <summary>
/// 鍘嬭浣嶄骇鍝侀珮搴�
/// </summary>
+ [ImporterHeader(Name = "浜у搧楂樺害")]
+ [ExporterHeader(null, 11f, null, true, true, false, 0, KnownColor.Empty, DisplayName = "浜у搧楂樺害")]
[SugarColumn(IsNullable = true, DecimalDigits = 2, ColumnDescription = "鍘嬭浣嶄骇鍝侀珮搴�")]
public decimal? ProductHeight { get; set; }
/// <summary>
/// 鍘嬭浣嶄笉鎷х揣
/// </summary>
+ [ImporterHeader(Name = "涓嶆嫥绱�")]
+ [ExporterHeader(null, 11f, null, true, true, false, 0, KnownColor.Empty, DisplayName = "涓嶆嫥绱�")]
[SugarColumn(IsNullable = true, DefaultValue = "0", ColumnDescription = "鍘嬭浣嶄笉鎷х揣")]
public int? PressNoTighten { get; set; }
/// <summary>
- /// 鍘嬭浣嶆嫥绱т笅闄嶉珮搴�
+ /// 鍘嬭浣嶄笉娴嬪簳鏉�
+ /// 0-妫�娴� 1-涓嶆娴�
/// </summary>
- [SugarColumn(IsNullable = true, DecimalDigits = 2, ColumnDescription = "鍘嬭浣嶆嫥绱т笅闄嶉珮搴�")]
+ [ImporterHeader(Name = "涓嶆祴搴曟澘")]
+ [ExporterHeader(null, 11f, null, true, true, false, 0, KnownColor.Empty, DisplayName = "涓嶆祴搴曟澘")]
+ [SugarColumn(IsNullable = true, DefaultValue = "0", ColumnDescription = "鍘嬭浣嶄笉娴嬪簳鏉�")]
+ public int? PressNoCheckBottomPlate { get; set; }
+
+ /// <summary>
+ /// 淇濆帇鍘嬪姏
+ /// </summary>
+ [ImporterHeader(Name = "淇濆帇鍘嬪姏")]
+ [ExporterHeader(null, 11f, null, true, true, false, 0, KnownColor.Empty, DisplayName = "淇濆帇鍘嬪姏")]
+ [SugarColumn(IsNullable = true, DecimalDigits = 2, ColumnDescription = "淇濆帇鍘嬪姏")]
public decimal? ScrewDownsetDistance { get; set; }
/// <summary>
- /// 鍘嬭浣嶆嫥绱ф壄鍔�
+ /// 涓績楂樺害
/// </summary>
- [SugarColumn(IsNullable = true, DecimalDigits = 2, ColumnDescription = "鍘嬭浣嶆嫥绱ф壄鍔�")]
+ [ImporterHeader(Name = "涓績楂樺害")]
+ [ExporterHeader(null, 11f, null, true, true, false, 0, KnownColor.Empty, DisplayName = "涓績楂樺害")]
+ [SugarColumn(IsNullable = true, DecimalDigits = 2, ColumnDescription = "涓績楂樺害")]
public decimal? ScrewTorqueOutput { get; set; }
/// <summary>
/// 鍘嬭浣嶈嚜鍔ㄦ嫥绱х▼搴忓彿
/// </summary>
+ [ImporterHeader(Name = "鑷姩鎷х揣绋嬪簭鍙�")]
+ [ExporterHeader(null, 11f, null, true, true, false, 0, KnownColor.Empty, DisplayName = "鑷姩鎷х揣绋嬪簭鍙�")]
[SugarColumn(IsNullable = true, ColumnDescription = "鍘嬭浣嶈嚜鍔ㄦ嫥绱х▼搴忓彿")]
public int? DintAutoScrewOn { get; set; }
/// <summary>
/// 鍘嬭浣嶇揣鍥烘壄鐭�
/// </summary>
+ [ImporterHeader(Name = "绱у浐鎵煩")]
+ [ExporterHeader(null, 11f, null, true, true, false, 0, KnownColor.Empty, DisplayName = "绱у浐鎵煩")]
[SugarColumn(IsNullable = true, DecimalDigits = 2, ColumnDescription = "鍘嬭浣嶇揣鍥烘壄鐭�", DefaultValue = "0.00")]
public decimal? PressFastenTorque { get; set; }
/// <summary>
/// P0P1瀹藉害
/// </summary>
+ [ImporterHeader(Name = "P0P1瀹藉害")]
+ [ExporterHeader(null, 11f, null, true, true, false, 0, KnownColor.Empty, DisplayName = "P0P1瀹藉害")]
[SugarColumn(IsNullable = true, DecimalDigits = 2, ColumnDescription = "P0P1瀹藉害")]
public decimal? P0P1Width { get; set; }
/// <summary>
/// P0P2瀹藉害
/// </summary>
+ [ImporterHeader(Name = "P0P2瀹藉害")]
+ [ExporterHeader(null, 11f, null, true, true, false, 0, KnownColor.Empty, DisplayName = "P0P2瀹藉害")]
[SugarColumn(IsNullable = true, DecimalDigits = 2, ColumnDescription = "P0P2瀹藉害")]
public decimal? P0P2Width { get; set; }
/// <summary>
/// P0P3瀹藉害
/// </summary>
+ [ImporterHeader(Name = "P0P3瀹藉害")]
+ [ExporterHeader(null, 11f, null, true, true, false, 0, KnownColor.Empty, DisplayName = "P0P3瀹藉害")]
[SugarColumn(IsNullable = true, DecimalDigits = 2, ColumnDescription = "P0P3瀹藉害")]
public decimal? P0P3Width { get; set; }
/// <summary>
- /// P1P3楂樺害
+ /// 鍨墖楂樺害
/// </summary>
- [SugarColumn(IsNullable = true, DecimalDigits = 2, ColumnDescription = "P1P3楂樺害")]
- public decimal? P1P3Height { get; set; }
+ [ImporterHeader(Name = "鍨墖楂樺害")]
+ [ExporterHeader(null, 11f, null, true, true, false, 0, KnownColor.Empty, DisplayName = "鍨墖楂樺害")]
+ [SugarColumn(IsNullable = true, DecimalDigits = 2, ColumnDescription = "鍨墖楂樺害")]
+ public decimal? GasketHeight { get; set; }
+
/// <summary>
- /// P2P3楂樺害
+ /// 鍘嬭鍘嬪姏宸��
/// </summary>
- [SugarColumn(IsNullable = true, DecimalDigits = 2, ColumnDescription = "P2P3楂樺害")]
- public decimal? P2P3Height { get; set; }
+ [ImporterHeader(Name = "鍘嬪姏宸��")]
+ [ExporterHeader(null, 11f, null, true, true, false, 0, KnownColor.Empty, DisplayName = "鍘嬪姏宸��")]
+ [SugarColumn(IsNullable = true, DecimalDigits = 2, ColumnDescription = "鍘嬭鍘嬪姏宸��")]
+ public decimal? PressPressureDiff { get; set; }
/// <summary>
- /// 浜у搧鍥剧墖璺緞
+ /// 鍘嬭鎵姏宸��
/// </summary>
- [SugarColumn(IsNullable = true, Length = 500, ColumnDescription = "浜у搧鍥剧墖璺緞")]
- public string ProductImagePath { get; set; }
+ [ImporterHeader(Name = "鎵姏宸��")]
+ [ExporterHeader(null, 11f, null, true, true, false, 0, KnownColor.Empty, DisplayName = "鎵姏宸��")]
+ [SugarColumn(IsNullable = true, DecimalDigits = 2, ColumnDescription = "鍘嬭鎵姏宸��")]
+ public decimal? PressTorqueDiff { get; set; }
+
+ /// <summary>
+ /// 妫�娴嬮珮搴﹀樊鍊�
+ /// </summary>
+ [ImporterHeader(Name = "楂樺害宸��")]
+ [ExporterHeader(null, 11f, null, true, true, false, 0, KnownColor.Empty, DisplayName = "楂樺害宸��")]
+ [SugarColumn(IsNullable = true, DecimalDigits = 2, ColumnDescription = "妫�娴嬮珮搴﹀樊鍊�")]
+ public decimal? DetectHeightDiff { get; set; }
+
+ /// <summary>
+ /// 铻虹汗浣嶇疆宸��
+ /// </summary>
+ [ImporterHeader(Name = "铻虹汗宸��")]
+ [ExporterHeader(null, 11f, null, true, true, false, 0, KnownColor.Empty, DisplayName = "铻虹汗宸��")]
+ [SugarColumn(IsNullable = true, DecimalDigits = 2, ColumnDescription = "铻虹汗浣嶇疆宸��")]
+ public decimal? ScrewPositionDiff { 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