From ba8aa925e7901381ceb394adb53eca8723d1c4c5 Mon Sep 17 00:00:00 2001
From: leiqunqing <zhengqifeng@hnkhzn.com>
Date: 星期一, 19 一月 2026 11:05:49 +0800
Subject: [PATCH] 完善工位界面
---
代码管理/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/BasicInfo/Dt_Formula.cs | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 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..b4d4339 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,7 +33,7 @@
/// <summary>
/// 鍘嬭浣嶄骇鍝侀暱搴�
/// </summary>
- [SugarColumn(IsNullable = true, DecimalDigits = 2, ColumnDescription = "鍘嬭浣嶄骇鍝侀暱搴�")]
+ [SugarColumn(IsNullable = true, DecimalDigits =2, ColumnDescription = "鍘嬭浣嶄骇鍝侀暱搴�")]
public decimal ProductLength { get; set; }
/// <summary>
@@ -63,7 +64,7 @@
/// 鍘嬭浣嶈嚜鍔ㄦ嫥绱ф墦寮�
/// </summary>
[SugarColumn(IsNullable = true, DecimalDigits = 2, ColumnDescription = "鍘嬭浣嶈嚜鍔ㄦ嫥绱ф墦寮�")]
- public decimal DintAutoScrewOn { get; set; }
+ public int DintAutoScrewOn { get; set; }
/// <summary>
/// 妫�娴嬩綅X鍋忕Щ璺濈1
@@ -101,8 +102,8 @@
[SugarColumn(IsNullable = true, DecimalDigits = 2, ColumnDescription = "妫�娴嬩綅Z楂樺害3")]
public decimal 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