From e254b1f4efa18b3c84ce75e9da2aeff64a1c7cbe Mon Sep 17 00:00:00 2001
From: zhengqifeng <zhengqifeng@hnkhzn.com>
Date: 星期二, 30 十二月 2025 11:18:01 +0800
Subject: [PATCH] 添加前端
---
代码管理/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/BasicInfo/Dt_Formula.cs | 59 ++++++++++++++++++++++++++++++-----------------------------
1 files changed, 30 insertions(+), 29 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 95357c8..4665677 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,9 +1,10 @@
-锘縰sing SqlSugar;
-using System;
+锘縰sing 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;
namespace WIDESEAWCS_Model.Models
@@ -32,77 +33,77 @@
/// <summary>
/// 鍘嬭浣嶄骇鍝侀暱搴�
/// </summary>
- [SugarColumn(IsNullable = true, DecimalDigits = 2, ColumnDescription = "鍘嬭浣嶄骇鍝侀暱搴�")]
- public decimal ProductLength { get; set; }
+ [SugarColumn(IsNullable = true, ColumnDescription = "鍘嬭浣嶄骇鍝侀暱搴�")]
+ public float ProductLength { get; set; }
/// <summary>
/// 鍘嬭浣嶄骇鍝佸搴�
/// </summary>
- [SugarColumn(IsNullable = true, DecimalDigits = 2, ColumnDescription = "鍘嬭浣嶄骇鍝佸搴�")]
- public decimal ProductWidth { get; set; }
+ [SugarColumn(IsNullable = true, ColumnDescription = "鍘嬭浣嶄骇鍝佸搴�")]
+ public float ProductWidth { get; set; }
/// <summary>
/// 鍘嬭浣嶄骇鍝侀珮搴�
/// </summary>
- [SugarColumn(IsNullable = true, DecimalDigits = 2, ColumnDescription = "鍘嬭浣嶄骇鍝侀珮搴�")]
- public decimal ProductHeight { get; set; }
+ [SugarColumn(IsNullable = true, ColumnDescription = "鍘嬭浣嶄骇鍝侀珮搴�")]
+ public float ProductHeight { get; set; }
/// <summary>
/// 鍘嬭浣嶆嫥绱т笅闄嶉珮搴�
/// </summary>
- [SugarColumn(IsNullable = true, DecimalDigits = 2, ColumnDescription = "鍘嬭浣嶆嫥绱т笅闄嶉珮搴�")]
- public decimal ScrewDownsetDistance { get; set; }
+ [SugarColumn(IsNullable = true, ColumnDescription = "鍘嬭浣嶆嫥绱т笅闄嶉珮搴�")]
+ public float ScrewDownsetDistance { get; set; }
/// <summary>
/// 鍘嬭浣嶆嫥绱ф壄鍔�
/// </summary>
- [SugarColumn(IsNullable = true, DecimalDigits = 2, ColumnDescription = "鍘嬭浣嶆嫥绱ф壄鍔�")]
- public decimal ScrewTorqueOutput { get; set; }
+ [SugarColumn(IsNullable = true, ColumnDescription = "鍘嬭浣嶆嫥绱ф壄鍔�")]
+ public float ScrewTorqueOutput { get; set; }
/// <summary>
/// 鍘嬭浣嶈嚜鍔ㄦ嫥绱ф墦寮�
/// </summary>
- [SugarColumn(IsNullable = true, DecimalDigits = 2, ColumnDescription = "鍘嬭浣嶈嚜鍔ㄦ嫥绱ф墦寮�")]
- public decimal 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, ColumnDescription = "妫�娴嬩綅X鍋忕Щ璺濈1")]
+ public float XDirectionDistance1 { get; set; }
/// <summary>
/// 妫�娴嬩綅Z楂樺害1
/// </summary>
- [SugarColumn(IsNullable = true, DecimalDigits = 2, ColumnDescription = "妫�娴嬩綅Z楂樺害1")]
- public decimal YDirectionHeight1 { get; set; }
+ [SugarColumn(IsNullable = true, ColumnDescription = "妫�娴嬩綅Z楂樺害1")]
+ public float YDirectionHeight1 { get; set; }
/// <summary>
/// 妫�娴嬩綅X鍋忕Щ璺濈2
/// </summary>
- [SugarColumn(IsNullable = true, DecimalDigits = 2, ColumnDescription = "妫�娴嬩綅X鍋忕Щ璺濈2")]
- public decimal XDirectionDistance2 { get; set; }
+ [SugarColumn(IsNullable = true, ColumnDescription = "妫�娴嬩綅X鍋忕Щ璺濈2")]
+ public float XDirectionDistance2 { get; set; }
/// <summary>
/// 妫�娴嬩綅Z楂樺害2
/// </summary>
- [SugarColumn(IsNullable = true, DecimalDigits = 2, ColumnDescription = "妫�娴嬩綅Z楂樺害2")]
- public decimal YDirectionHeight2 { get; set; }
+ [SugarColumn(IsNullable = true, ColumnDescription = "妫�娴嬩綅Z楂樺害2")]
+ public float YDirectionHeight2 { get; set; }
/// <summary>
/// 妫�娴嬩綅X鍋忕Щ璺濈3
/// </summary>
- [SugarColumn(IsNullable = true, DecimalDigits = 2, ColumnDescription = "妫�娴嬩綅X鍋忕Щ璺濈3")]
- public decimal XDirectionDistance3 { get; set; }
+ [SugarColumn(IsNullable = true, ColumnDescription = "妫�娴嬩綅X鍋忕Щ璺濈3")]
+ public float XDirectionDistance3 { get; set; }
/// <summary>
/// 妫�娴嬩綅Z楂樺害3
/// </summary>
- [SugarColumn(IsNullable = true, DecimalDigits = 2, ColumnDescription = "妫�娴嬩綅Z楂樺害3")]
- public decimal YDirectionHeight3 { get; set; }
+ [SugarColumn(IsNullable = true, ColumnDescription = "妫�娴嬩綅Z楂樺害3")]
+ public float YDirectionHeight3 { get; set; }
-
- [Navigate(NavigateType.OneToMany, nameof(Dt_BoxingDetail.BoxingId), nameof(Id))]
- public List<Dt_BoxingDetail> Details { get; set; }
+ [SugarColumn(IsIgnore = true)]//涓嶅弬涓庢暟鎹簱鏄犲皠锛屾祴璇曚娇鐢�
+ [Navigate(NavigateType.OneToMany, nameof(Dt_FormulaDetail.FormulaId), nameof(Id))]
+ public List<Dt_FormulaDetail> Details { get; set; }
}
}
--
Gitblit v1.9.3