From 58a5a9af83492c5bbb4fba88b4443f08fa4becfc Mon Sep 17 00:00:00 2001
From: 刘磊 <1161824510@qq.com>
Date: 星期二, 17 十二月 2024 19:53:14 +0800
Subject: [PATCH] 解决冲突
---
Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/ProcessParameters/Dt_EquipmentProcess.cs | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/ProcessParameters/Dt_EquipmentProcess.cs b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/ProcessParameters/Dt_EquipmentProcess.cs
index eea6103..5a38046 100644
--- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/ProcessParameters/Dt_EquipmentProcess.cs
+++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/ProcessParameters/Dt_EquipmentProcess.cs
@@ -33,6 +33,22 @@
public string EquipmentType { get; set; }
/// <summary>
+ /// 宸ュ崟缂栧彿
+ /// </summary>
+ [ImporterHeader(Name = "宸ュ崟缂栧彿")]
+ [ExporterHeader(DisplayName = "宸ュ崟缂栧彿")]
+ [SugarColumn(IsNullable = false, Length = 100, ColumnDescription = "宸ュ崟缂栧彿")]
+ public string WipOrderNo { get; set; }
+
+ /// <summary>
+ /// 宸ヨ壓鍨嬪彿
+ /// </summary>
+ [ImporterHeader(Name = "宸ヨ壓鍨嬪彿")]
+ [ExporterHeader(DisplayName = "宸ヨ壓鍨嬪彿")]
+ [SugarColumn(IsNullable = false, Length = 100, ColumnDescription = "宸ヨ壓鍨嬪彿")]
+ public string ProductDesc { get; set; }
+
+ /// <summary>
/// 宸ヨ壓鍙傛暟鍊�
/// </summary>
[ImporterHeader(Name = "宸ヨ壓鍙傛暟鍊�")]
--
Gitblit v1.9.3