From b52018589bf6c7ec1d51ce8ad000a7aa993b0ab5 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期一, 13 四月 2026 16:06:15 +0800
Subject: [PATCH] 优化组盘表获取成品编号、流水号、供方代码
---
代码管理/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/BasicInfo/Dt_ProcessInfo.cs | 75 +++++++++++++++++++------------------
1 files changed, 39 insertions(+), 36 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_ProcessInfo.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/BasicInfo/Dt_ProcessInfo.cs"
index cb53c29..473be2e 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/BasicInfo/Dt_ProcessInfo.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/BasicInfo/Dt_ProcessInfo.cs"
@@ -36,75 +36,78 @@
public string ProductName { get; set; }
/// <summary>
- /// 闆朵欢鏁伴噺
+ /// 娴佹按鍙�
/// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "闆朵欢鏁伴噺")]
- public int ComponentQty { get; set; }
+ [SugarColumn(IsNullable = true, Length = 100, ColumnDescription = "娴佹按鍙�")]
+ public string ProductSn { get; set; }
/// <summary>
- /// 鎵姏鍊�
+ /// 鍘嬭鎷х揣_鎷х揣OK
/// </summary>
- [SugarColumn(IsNullable = true, DecimalDigits = 2, ColumnDescription = "鎵姏鍊�")]
- public decimal TorsioValue { get; set; }
+ [SugarColumn(IsNullable = true, DefaultValue = "0", ColumnDescription = "鍘嬭鎷х揣_鎷х揣OK")]
+ public int? PressTightenOk { get; set; }
/// <summary>
- /// 鎵姏鍊兼爣鍑�
+ /// 鍘嬭鎷х揣_鏈鍔犲伐鏈畬鎴�
/// </summary>
- [SugarColumn(IsNullable = true, DecimalDigits = 2, ColumnDescription = "鎵姏鍊兼爣鍑�")]
- public decimal TorsioValueStandard { get; set; }
+ [SugarColumn(IsNullable = true, DefaultValue = "0", ColumnDescription = "鍘嬭鎷х揣_鏈鍔犲伐鏈畬鎴�")]
+ public int? PressTightenUnfinished { get; set; }
/// <summary>
- /// 鍒氬害鍊�
+ /// 浜у搧鐘舵��
+ /// 0 - 涓嶅悎鏍�
+ /// 1 - 鍚堟牸
+ /// 2 - 浜哄伐纭鍚堟牸
/// </summary>
- [SugarColumn(IsNullable = true, DecimalDigits = 2, ColumnDescription = "鍒氬害鍊�")]
- public decimal StiffnessValue { get; set; }
-
- /// <summary>
- /// 鍒氬害鍊兼爣鍑�
- /// </summary>
- [SugarColumn(IsNullable = true, DecimalDigits = 2, ColumnDescription = "鍒氬害鍊兼爣鍑�")]
- public decimal StiffnessValueStandard { get; set; }
-
- /// <summary>
- /// 娴嬭瘯缁撴灉
- /// </summary>
- [SugarColumn(IsNullable = true, DecimalDigits = 2, ColumnDescription = "娴嬭瘯缁撴灉")]
- public int TestResult { get; set; }
-
- /// <summary>
- /// 鍘嬭浣嶄笅鍘嬫娴嬮珮搴�
- /// </summary>
- [SugarColumn(IsNullable = true, DecimalDigits = 2, ColumnDescription = "鍘嬭浣嶄笅鍘嬫娴嬮珮搴�")]
- public decimal PressHeight { get; set; }
+ [SugarColumn(IsNullable = true, DefaultValue = "0", ColumnDescription = "浜у搧鐘舵��")]
+ public int? ProductStatus { get; set; }
/// <summary>
/// 鍘嬭浣嶆嫥绱ф娴嬫壄鍔�
/// </summary>
[SugarColumn(IsNullable = true, DecimalDigits = 2, ColumnDescription = "鍘嬭浣嶆嫥绱ф娴嬫壄鍔�")]
- public decimal ScrewTorque { get; set; }
+ public decimal? ScrewTorque { get; set; }
/// <summary>
/// 鍘嬭浣嶆嫥绱ф娴嬭搴�
/// </summary>
[SugarColumn(IsNullable = true, DecimalDigits = 2, ColumnDescription = "鍘嬭浣嶆嫥绱ф娴嬭搴�")]
- public decimal ScrewAngle { get; set; }
+ public decimal? ScrewAngle { get; set; }
+
+ /// <summary>
+ /// 鍘嬭浣嶄笅鍘嬪帇鍔�
+ /// </summary>
+ [SugarColumn(IsNullable = true, DecimalDigits = 2, ColumnDescription = "鍘嬭浣嶄笅鍘嬪帇鍔�")]
+ public decimal? PressPressure { get; set; }
+
+ /// <summary>
+ /// 浜у搧妫�娴嬮珮搴�
+ /// </summary>
+ [SugarColumn(IsNullable = true, DecimalDigits = 2, ColumnDescription = "浜у搧妫�娴嬮珮搴�")]
+ public decimal? ProductCheckHeight { get; set; }
+
+ /// <summary>
+ /// 铻虹汗浣嶇疆楂樺害
+ /// </summary>
+ [SugarColumn(IsNullable = true, DecimalDigits = 2, ColumnDescription = "铻虹汗浣嶇疆楂樺害")]
+ public decimal? ThreadPositionHeight { get; set; }
/// <summary>
/// 鎷х揣浣嶆娴嬮珮搴�1
/// </summary>
[SugarColumn(IsNullable = true, DecimalDigits = 2, ColumnDescription = "鎷х揣浣嶆娴嬮珮搴�1")]
- public decimal Height1 { get; set; }
+ public decimal? Height1 { get; set; }
/// <summary>
/// 鎷х揣浣嶆娴嬮珮搴�2
/// </summary>
[SugarColumn(IsNullable = true, DecimalDigits = 2, ColumnDescription = "鎷х揣浣嶆娴嬮珮搴�2")]
- public decimal Height2 { get; set; }
+ public decimal? Height2 { get; set; }
/// <summary>
/// 鎷х揣浣嶆娴嬮珮搴�3
/// </summary>
[SugarColumn(IsNullable = true, DecimalDigits = 2, ColumnDescription = "鎷х揣浣嶆娴嬮珮搴�3")]
- public decimal Height3 { get; set; }
+ public decimal? Height3 { get; set; }
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3