From 10cada58c5ea2aa95b8eaaa1731b543582d618dc Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 20 五月 2025 08:43:55 +0800
Subject: [PATCH] 提交
---
CY_ECommercePlatform/CY.Model/OA/OA_DeliverPlan.cs | 168 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 166 insertions(+), 2 deletions(-)
diff --git a/CY_ECommercePlatform/CY.Model/OA/OA_DeliverPlan.cs b/CY_ECommercePlatform/CY.Model/OA/OA_DeliverPlan.cs
index c13d29f..110e764 100644
--- a/CY_ECommercePlatform/CY.Model/OA/OA_DeliverPlan.cs
+++ b/CY_ECommercePlatform/CY.Model/OA/OA_DeliverPlan.cs
@@ -38,7 +38,13 @@
public Guid Keyid { get; set; }
public Guid? YujihuikuanKeyid { get; set; }
-
+
+
+ /// <summary>
+ /// 鍚堝苟閫佽揣鍗昳d
+ /// </summary>
+ public Guid? DeliverPlanPaicheid { get; set; }
+
/// <summary>
/// OrderId
/// </summary>
@@ -139,6 +145,37 @@
get;
set;
}
+
+ /// <summary>
+ /// 鐗╂祦鐘舵��
+ /// </summary>
+ public int? Deliveredstatus
+ {
+ get;
+ set;
+ }
+
+ /// <summary>
+ /// 绉讳氦绫诲瀷 1 瀹㈡埛缁忕悊 2 宸ュ巶鐗╂祦閮�
+ /// </summary>
+ public int? TransferType
+ {
+ get;
+ set;
+ }
+
+
+ /// <summary>
+ /// 绉讳氦绫诲瀷鍚嶇О
+ /// </summary>
+ public string TransferName
+ {
+ get;
+ set;
+ }
+
+
+
/// <summary>
/// 绉讳氦鏃堕棿
/// </summary>
@@ -339,6 +376,13 @@
set;
}
+ //閫佽揣鍗曞浘鐗囩殑灞曠ず
+ public string SonghuodanTupian
+ {
+ get;
+ set;
+ }
+
public int? Paytime
{
get;
@@ -396,6 +440,63 @@
}
public decimal? huifangshuliang
+ {
+ get;
+ set;
+ }
+
+ public int? Wanjiestatus
+ {
+ get;
+ set;
+ }
+ public string WanjiestatusName
+ {
+ get
+ {
+ return Wanjiestatus.HasValue&& Wanjiestatus.Value==1 ? "鈭�" : "脳";
+ }
+
+ }
+
+ public DateTime? WanjieTime
+ {
+ get;
+ set;
+ }
+
+ public string Wanjieren
+ {
+ get;
+ set;
+ }
+
+ public int? Zerenren
+ {
+ get;
+ set;
+ }
+
+ public string ZerenrenName
+ {
+ get;
+ set;
+ }
+
+ public decimal? Fakuan
+ {
+ get;
+ set;
+ }
+
+
+ public DateTime? ZerenTime
+ {
+ get;
+ set;
+ }
+
+ public string Zerenoperater
{
get;
set;
@@ -720,7 +821,70 @@
this.CompanyName = isChange ? MyConvert.ConvertToString(value) : CompanyName;
theValue = this.CompanyName;
}
-
+ else if ("Deliveredstatus".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 59)
+ {
+ this.Deliveredstatus = isChange ? MyConvert.ConvertToInt32(value) : Deliveredstatus;
+ theValue = this.Deliveredstatus;
+ }
+
+ else if ("TransferType".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 60)
+ {
+ this.TransferType = isChange ? MyConvert.ConvertToInt32(value) : TransferType;
+ theValue = this.TransferType;
+ }
+
+ else if ("TransferName".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 61)
+ {
+ this.TransferName = isChange ? MyConvert.ConvertToString(value) : TransferName;
+ theValue = this.TransferName;
+ }
+ else if ("DeliverPlanPaicheid".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 62)
+ {
+ this.DeliverPlanPaicheid = isChange ? MyConvert.ConvertToGuid(value) : DeliverPlanPaicheid;
+ theValue = this.DeliverPlanPaicheid;
+ }
+
+ else if ("Wanjiestatus".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 63)
+ {
+ this.Wanjiestatus = isChange ? MyConvert.ConvertToInt32(value) : Wanjiestatus;
+ theValue = this.Wanjiestatus;
+ }
+ else if ("WanjieTime".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 64)
+ {
+ this.WanjieTime = isChange ? MyConvert.ConvertToDateTime(value) : WanjieTime;
+ theValue = this.WanjieTime;
+ }
+ else if ("Wanjieren".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 65)
+ {
+ this.Wanjieren = isChange ? MyConvert.ConvertToString(value) : Wanjieren;
+ theValue = this.Wanjieren;
+ }
+ else if ("Zerenren".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 66)
+ {
+ this.Zerenren = isChange ? MyConvert.ConvertToInt32(value) : Zerenren;
+ theValue = this.Zerenren;
+ }
+ else if ("ZerenrenName".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 67)
+ {
+ this.ZerenrenName = isChange ? MyConvert.ConvertToString(value) : ZerenrenName;
+ theValue = this.ZerenrenName;
+ }
+ else if ("Fakuan".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 68)
+ {
+ this.Fakuan = isChange ? MyConvert.ConvertToDecimal(value) : Fakuan;
+ theValue = this.Fakuan;
+ }
+ else if ("ZerenTime".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 69)
+ {
+ this.ZerenTime = isChange ? MyConvert.ConvertToDateTime(value) : ZerenTime;
+ theValue = this.ZerenTime;
+ }
+ else if ("Zerenoperater".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 70)
+ {
+ this.Zerenoperater = isChange ? MyConvert.ConvertToString(value) : Zerenoperater;
+ theValue = this.Zerenoperater;
+ }
+
return theValue;
--
Gitblit v1.9.1