From 2de09bec5cc05bf875543fa8956167ca7db73021 Mon Sep 17 00:00:00 2001
From: 刘磊 <1161824510@qq.com>
Date: 星期三, 25 六月 2025 11:36:44 +0800
Subject: [PATCH] 合并
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/GZ_ZC/OldWheelsStock/Dt_WheelsStock_Old.cs | 67 +++++++++++++++++++--------------
1 files changed, 38 insertions(+), 29 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/GZ_ZC/OldWheelsStock/Dt_WheelsStock_Old.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/GZ_ZC/OldWheelsStock/Dt_WheelsStock_Old.cs"
index b9a9299..ade86ea 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/GZ_ZC/OldWheelsStock/Dt_WheelsStock_Old.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/GZ_ZC/OldWheelsStock/Dt_WheelsStock_Old.cs"
@@ -16,15 +16,15 @@
/// <summary>
/// 涓婚敭
/// </summary>
- //[SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
- //public int Wheels_ID { get; set; }
+ [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
+ public int Wheels_ID { get; set; }
/// <summary>
/// 杞﹁疆缂栧彿
/// </summary>
[ImporterHeader(Name = "杞﹁疆缂栧彿")]
[ExporterHeader(DisplayName = "杞﹁疆缂栧彿")]
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "杞﹁疆缂栧彿")]
+ [SugarColumn(IsNullable = false,ColumnName = "wheel_code", Length = 50, ColumnDescription = "杞﹁疆缂栧彿")]
public string wheel_code { get; set; }
@@ -33,7 +33,7 @@
/// </summary>
[ImporterHeader(Name = "杞鍙�")]
[ExporterHeader(DisplayName = "杞鍙�")]
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "杞鍙�")]
+ [SugarColumn(IsNullable = false, ColumnName = "feedbackno", Length = 50, ColumnDescription = "杞鍙�")]
public string feedbackno { get; set; }
/// <summary>
@@ -41,7 +41,7 @@
/// </summary>
[ImporterHeader(Name = "杞︾粍鍙�")]
[ExporterHeader(DisplayName = "杞︾粍鍙�")]
- [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "杞︾粍鍙�")]
+ [SugarColumn(IsNullable = false, ColumnName = "axes_code", Length = 20, ColumnDescription = "杞︾粍鍙�")]
public string axes_code { get; set; }
/// <summary>
@@ -49,7 +49,7 @@
/// </summary>
[ImporterHeader(Name = "鏂�/鏃�")]
[ExporterHeader(DisplayName = "鏂�/鏃�")]
- [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "鏂�/鏃�")]
+ [SugarColumn(IsNullable = false, ColumnName = "repair_item", Length = 20, ColumnDescription = "鏂�/鏃�")]
public string repair_item { get; set; }
/// <summary>
@@ -57,7 +57,7 @@
/// </summary>
[ImporterHeader(Name = "杞﹁疆绫诲埆(M/T)")]
[ExporterHeader(DisplayName = "杞﹁疆绫诲埆(M/T)")]
- [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "杞﹁疆绫诲埆(M/T)")]
+ [SugarColumn(IsNullable = false, ColumnName = "dqtz_state", Length = 20, ColumnDescription = "杞﹁疆绫诲埆(M/T)")]
public string dqtz_state { get; set; }
/// <summary>
@@ -65,7 +65,7 @@
/// </summary>
[ImporterHeader(Name = "杞﹁疆鍨嬪彿")]
[ExporterHeader(DisplayName = "杞﹁疆鍨嬪彿")]
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "杞﹁疆鍨嬪彿")]
+ [SugarColumn(IsNullable = false, ColumnName = "axes_type", Length = 50, ColumnDescription = "杞﹁疆鍨嬪彿")]
public string axes_type { get; set; }
/// <summary>
@@ -73,7 +73,7 @@
/// </summary>
[ImporterHeader(Name = "姣傚瓟绛夌骇")]
[ExporterHeader(DisplayName = "姣傚瓟绛夌骇")]
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "姣傚瓟绛夌骇")]
+ [SugarColumn(IsNullable = false, ColumnName = "venderno", Length = 50, ColumnDescription = "姣傚瓟绛夌骇")]
public string venderno { get; set; }
/// <summary>
@@ -81,7 +81,7 @@
/// </summary>
[ImporterHeader(Name = "杞�/鐩樼被鍨�")]
[ExporterHeader(DisplayName = "杞�/鐩樼被鍨�")]
- [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "杞�/鐩樼被鍨�")]
+ [SugarColumn(IsNullable = false, ColumnName = "bearing_type", Length = 20, ColumnDescription = "杞�/鐩樼被鍨�")]
public string bearing_type { get; set; }
/// <summary>
@@ -89,7 +89,7 @@
/// </summary>
[ImporterHeader(Name = "鍒跺姩鐩樻潗璐�")]
[ExporterHeader(DisplayName = "鍒跺姩鐩樻潗璐�")]
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鍒跺姩鐩樻潗璐�")]
+ [SugarColumn(IsNullable = false, ColumnName = "matertextrue", Length = 50, ColumnDescription = "鍒跺姩鐩樻潗璐�")]
public string matertextrue { get; set; }
/// <summary>
@@ -97,7 +97,7 @@
/// </summary>
[ImporterHeader(Name = "杞﹀瀷")]
[ExporterHeader(DisplayName = "杞﹀瀷")]
- [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "杞﹀瀷")]
+ [SugarColumn(IsNullable = false, ColumnName = "model", Length = 20, ColumnDescription = "杞﹀瀷")]
public string model { get; set; }
/// <summary>
@@ -105,7 +105,7 @@
/// </summary>
[ImporterHeader(Name = "鍒堕�犲巶")]
[ExporterHeader(DisplayName = "鍒堕�犲巶")]
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鍒堕�犲巶")]
+ [SugarColumn(IsNullable = false, ColumnName = "wheel_from", Length = 50, ColumnDescription = "鍒堕�犲巶")]
public string wheel_from { get; set; }
/// <summary>
@@ -113,7 +113,7 @@
/// </summary>
[ImporterHeader(Name = "閰嶅睘灞�")]
[ExporterHeader(DisplayName = "閰嶅睘灞�")]
- [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "閰嶅睘灞�")]
+ [SugarColumn(IsNullable = false, ColumnName = "wheel_pan", Length = 20, ColumnDescription = "閰嶅睘灞�")]
public string wheel_pan { get; set; }
/// <summary>
@@ -121,7 +121,7 @@
/// </summary>
[ImporterHeader(Name = "杞瘋瀛旂洿寰�")]
[ExporterHeader(DisplayName = "杞瘋瀛旂洿寰�")]
- [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "杞瘋瀛旂洿寰�")]
+ [SugarColumn(IsNullable = false, ColumnName = "zjj", Length = 20, ColumnDescription = "杞瘋瀛旂洿寰�")]
public string zjj { get; set; }
/// <summary>
@@ -129,7 +129,7 @@
/// </summary>
[ImporterHeader(Name = "棰勪及闀熶慨鍚庤疆寰勫��")]
[ExporterHeader(DisplayName = "棰勪及闀熶慨鍚庤疆寰勫��")]
- [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "棰勪及闀熶慨鍚庤疆寰勫��")]
+ [SugarColumn(IsNullable = false, ColumnName = "zszj", Length = 20, ColumnDescription = "棰勪及闀熶慨鍚庤疆寰勫��")]
public string zszj { get; set; }
/// <summary>
@@ -137,7 +137,7 @@
/// </summary>
[ImporterHeader(Name = "杞紭鍘�")]
[ExporterHeader(DisplayName = "杞紭鍘�")]
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "杞紭鍘�")]
+ [SugarColumn(IsNullable = false, ColumnName = "zcd", Length = 50, ColumnDescription = "杞紭鍘�")]
public string zcd { get; set; }
/// <summary>
@@ -145,14 +145,14 @@
/// </summary>
[ImporterHeader(Name = "杞磋/杞鍒跺姩鐩樺墿浣欑（鑰�")]
[ExporterHeader(DisplayName = "杞磋/杞鍒跺姩鐩樺墿浣欑（鑰�")]
- [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "杞磋/杞鍒跺姩鐩樺墿浣欑（鑰�")]
+ [SugarColumn(IsNullable = false, ColumnName = "m_zdpzzj", Length = 20, ColumnDescription = "杞磋/杞鍒跺姩鐩樺墿浣欑（鑰�")]
public string m_zdpzzj { get; set; }
/// <summary>
/// 澶囨敞
/// </summary>
[ImporterHeader(Name = "澶囨敞")]
[ExporterHeader(DisplayName = "澶囨敞")]
- [SugarColumn(IsNullable = false, Length = 100, ColumnDescription = "澶囨敞")]
+ [SugarColumn(IsNullable = false, ColumnName = "remarks", Length = 100, ColumnDescription = "澶囨敞")]
public string remarks { get; set; }
/// <summary>
/// 淇濆吇鍛ㄦ湡鎻愰啋
@@ -160,7 +160,7 @@
[ImporterHeader(Name = "淇濆吇鍛ㄦ湡鎻愰啋")]
[ExporterHeader(DisplayName = "淇濆吇鍛ㄦ湡鎻愰啋")]
- [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "淇濆吇鍛ㄦ湡鎻愰啋")]
+ [SugarColumn(IsNullable = false, ColumnName = "mqtz_state", Length = 20, ColumnDescription = "淇濆吇鍛ㄦ湡鎻愰啋")]
public string mqtz_state { get; set; }
/// <summary>
@@ -168,7 +168,7 @@
/// </summary>
[ImporterHeader(Name = "涓婃淇濆吇鏃堕棿")]
[ExporterHeader(DisplayName = "涓婃淇濆吇鏃堕棿")]
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "涓婃淇濆吇鏃堕棿")]
+ [SugarColumn(IsNullable = false, ColumnName = "dt_bearing_dx", Length = 50, ColumnDescription = "涓婃淇濆吇鏃堕棿")]
public string dt_bearing_dx { get; set; }
/// <summary>
@@ -176,7 +176,7 @@
/// </summary>
[ImporterHeader(Name = "涓嬫淇濆吇鏃堕棿")]
[ExporterHeader(DisplayName = "涓嬫淇濆吇鏃堕棿")]
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "涓嬫淇濆吇鏃堕棿")]
+ [SugarColumn(IsNullable = false, ColumnName = "dt_rtn", Length = 50, ColumnDescription = "涓嬫淇濆吇鏃堕棿")]
public string dt_rtn { get; set; }
/// <summary>
@@ -185,7 +185,7 @@
[ImporterHeader(Name = "棰勪及杞緞鍊�")]
[ExporterHeader(DisplayName = "棰勪及杞緞鍊�")]
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "棰勪及杞緞鍊�")]
+ [SugarColumn(IsNullable = false, ColumnName = "Wheels_ygljz", Length = 50, ColumnDescription = "棰勪及杞緞鍊�")]
public string Wheels_ygljz { get; set; }
/// <summary>
@@ -193,7 +193,7 @@
/// </summary>
[ImporterHeader(Name = "鍏ュ簱鏃ユ湡")]
[ExporterHeader(DisplayName = "鍏ュ簱鏃ユ湡")]
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鍏ュ簱鏃ユ湡")]
+ [SugarColumn(IsNullable = false, ColumnName = "dt_ins", Length = 50, ColumnDescription = "鍏ュ簱鏃ユ湡")]
public string dt_ins { get; set; }
/// <summary>
@@ -201,7 +201,7 @@
/// </summary>
[ImporterHeader(Name = "浜ゆ鏃ユ湡")]
[ExporterHeader(DisplayName = "浜ゆ鏃ユ湡")]
- [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "浜ゆ鏃ユ湡")]
+ [SugarColumn(IsNullable = false, ColumnName = "dt_detect", Length = 20, ColumnDescription = "浜ゆ鏃ユ湡")]
public string dt_detect { get; set; }
/// <summary>
@@ -209,7 +209,7 @@
/// </summary>
[ImporterHeader(Name = "浜ゆ浜�")]
[ExporterHeader(DisplayName = "浜ゆ浜�")]
- [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "浜ゆ浜�")]
+ [SugarColumn(IsNullable = false, ColumnName = "wheel_type", Length = 20, ColumnDescription = "浜ゆ浜�")]
public string wheel_type { get; set; }
/// <summary>
@@ -217,7 +217,7 @@
/// </summary>
[ImporterHeader(Name = "鍏ュ簱浜�")]
[ExporterHeader(DisplayName = "鍏ュ簱浜�")]
- [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "鍏ュ簱浜�")]
+ [SugarColumn(IsNullable = false, ColumnName = "dept_code", Length = 20, ColumnDescription = "鍏ュ簱浜�")]
public string dept_code { get; set; }
/// <summary>
@@ -225,7 +225,7 @@
/// </summary>
[ImporterHeader(Name = "澶囩敤鐘舵��1")]
[ExporterHeader(DisplayName = "澶囩敤鐘舵��1")]
- [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "澶囩敤鐘舵��1")]
+ [SugarColumn(IsNullable = false, ColumnName = "spare_state1", Length = 20, ColumnDescription = "澶囩敤鐘舵��1")]
public string spare_state1 { get; set; }
/// <summary>
@@ -233,8 +233,17 @@
/// </summary>
[ImporterHeader(Name = "璐т綅鍙�")]
[ExporterHeader(DisplayName = "璐т綅鍙�")]
- [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "璐т綅鍙�")]
+ [SugarColumn(IsNullable = false, ColumnName = "Locate", Length = 20, ColumnDescription = "璐т綅鍙�")]
public string Locate { get; set; }
+ /// <summary>
+ /// 鐘舵�� 0-鍒涘缓 1-鍦ㄥ簱 2-宸查�夐厤 3-棰勯�夐厤 4-鎸囧畾鍑哄簱
+ /// </summary>
+ [ImporterHeader(Name = "鐘舵��")]
+ [ExporterHeader(DisplayName = "鐘舵��")]
+ [SugarColumn(IsNullable = false, ColumnName = "Wheels_CurrentStatue", Length = 50, ColumnDescription = "鐘舵��")]
+ public int? Wheels_CurrentStatue { get; set; } = 1;
+
+
}
}
--
Gitblit v1.9.3