From 1032e7e409dff2134a4a1086fda34a55f025dcbc Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 31 十月 2025 11:46:43 +0800
Subject: [PATCH] 提交
---
CY_ECommercePlatform/CY.Model/OA/OA_DeliverPlan.cs | 41 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 39 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..0e88c8b 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>
@@ -358,14 +368,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 +915,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