From 92a92c2fc694810fdba050f1034ef107ad5c858f Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 07 十一月 2025 09:05:16 +0800
Subject: [PATCH] 那个作业本送货,查看明细或查看送货情况。这个列表中,比如说某个品种,它本来就没得的, 、那个格子里头不显零,格子里头就不要任何数据。不然,我们要要混乱好写了0的 ,我们才晓得这是有好已经送了的,就这样子修改,就某个品种,它本来就没得的格子头就是空白, 不不要写的,你这样子修改一下。

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

diff --git a/CY_ECommercePlatform/CY.Model/OA/OA_DeliverPlan.cs b/CY_ECommercePlatform/CY.Model/OA/OA_DeliverPlan.cs
index 110e764..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;
             }
         }
 
@@ -884,6 +917,12 @@
                 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;
+            }
+            
 
 
 

--
Gitblit v1.9.1