From 69a1b7107ca42ef46a42e98f7aadd3ea70fb35ed Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 20 十一月 2025 09:19:32 +0800
Subject: [PATCH] 不用再增加一个专门的序号，就按照这个编号，不是列表都有个编号嘛，好，那个送货单就显示就显示那个编号，比如说雷波中学，你在左送货单的左上角2是1或者。或者有三果十一都可以。

---
 CY_ECommercePlatform/CY.Model/OA/OA_DeliverPlan.cs |  141 ++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 139 insertions(+), 2 deletions(-)

diff --git a/CY_ECommercePlatform/CY.Model/OA/OA_DeliverPlan.cs b/CY_ECommercePlatform/CY.Model/OA/OA_DeliverPlan.cs
index 9700251..3c24c8b 100644
--- a/CY_ECommercePlatform/CY.Model/OA/OA_DeliverPlan.cs
+++ b/CY_ECommercePlatform/CY.Model/OA/OA_DeliverPlan.cs
@@ -73,6 +73,8 @@
 
         public int? fapiaoshuliang { get; set; }
 
+        public string fapiaoshuliangName { get; set; }
+
 
 
         /// <summary>
@@ -347,6 +349,16 @@
             set;
         }
 
+
+        /// <summary>
+        /// 鍌璁板綍
+        /// </summary>
+        public string Cuikuanjilu
+        {
+            get;
+            set;
+        }
+
         /// <summary>
         /// 鏈粯娆�
         /// </summary>
@@ -358,14 +370,35 @@
             }
         }
 
+
         /// <summary>
         /// 鏈粯娆�
         /// </summary>
-        public decimal UnorderMoney
+        public decimal? OrAllUnPayedMoney
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 鏈粯娆�
+        /// </summary>
+        public decimal? UnorderMoney
         {
             get
             {
-                return SumPrice.HasValue && Contractmoney.HasValue ? (Contractmoney - SumPrice).Value : 0;
+                var aaaa = SumPrice.HasValue ? SumPrice.Value : 0;
+                if (   Contractmoney.HasValue)
+                {
+                    var sss = Contractmoney.Value - aaaa;
+                    if (sss < 0)
+                    {
+                        return null;
+                    }
+                    return sss;
+                }
+
+                return null;
             }
         }
 
@@ -440,6 +473,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;
@@ -786,9 +876,56 @@
                 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;
+            }
+            else if ("OrAllUnPayedMoney".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 71)
+            {
+                this.OrAllUnPayedMoney = isChange ? MyConvert.ConvertToDecimal(value) : OrAllUnPayedMoney;
+                theValue = this.OrAllUnPayedMoney;
+            }
             
 
 
+
             return theValue;
         }
 

--
Gitblit v1.9.1