From 0dd76c2492f1afbe335b50a8ffb76e4af94271df Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 10 十月 2025 15:16:51 +0800
Subject: [PATCH] 新增设备 人员增加模糊查询 完成 日期默认当天 完成
---
CY_ECommercePlatform/CY.Model/OA/OA_DeliverPlan.cs | 133 +++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 130 insertions(+), 3 deletions(-)
diff --git a/CY_ECommercePlatform/CY.Model/OA/OA_DeliverPlan.cs b/CY_ECommercePlatform/CY.Model/OA/OA_DeliverPlan.cs
index f8e0a1a..1aa25b2 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>
@@ -355,16 +361,34 @@
/// <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;
}
}
public string shoukuanshijian
+ {
+ get;
+ set;
+ }
+
+ //閫佽揣鍗曞浘鐗囩殑灞曠ず
+ public string SonghuodanTupian
{
get;
set;
@@ -427,6 +451,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;
@@ -768,6 +849,52 @@
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;
+ }
--
Gitblit v1.9.1