From abdd1a1d8802a93ad9307b0b42020beae9147f62 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 30 十月 2025 08:44:30 +0800
Subject: [PATCH] 把这个放到开票管理中,就是财务管理的付款未票啊,付款未开票啊,把它放到开票管理中,同时在后面加一个开票说明,这个就有。经办人自己填,就是这个好久开开不开得到那个个进度。

---
 CY_ECommercePlatform/CY.Model/OA/OA_DeliverPlan.cs |  125 ++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 122 insertions(+), 3 deletions(-)

diff --git a/CY_ECommercePlatform/CY.Model/OA/OA_DeliverPlan.cs b/CY_ECommercePlatform/CY.Model/OA/OA_DeliverPlan.cs
index 9700251..be3745d 100644
--- a/CY_ECommercePlatform/CY.Model/OA/OA_DeliverPlan.cs
+++ b/CY_ECommercePlatform/CY.Model/OA/OA_DeliverPlan.cs
@@ -347,6 +347,16 @@
             set;
         }
 
+
+        /// <summary>
+        /// 鍌璁板綍
+        /// </summary>
+        public string Cuikuanjilu
+        {
+            get;
+            set;
+        }
+
         /// <summary>
         /// 鏈粯娆�
         /// </summary>
@@ -361,11 +371,22 @@
         /// <summary>
         /// 鏈粯娆�
         /// </summary>
-        public decimal UnorderMoney
+        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 +461,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,7 +864,48 @@
                 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