From ae6e40362a745caef9ead36f81f38313fb8c2c66 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 12 五月 2025 16:54:46 +0800
Subject: [PATCH] 扣板：2张 双面机只有“扣板”是2张，其他是1张
---
CY_ECommercePlatform/CY.Model/OA/OA_DeliverPlan.cs | 219 ++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 195 insertions(+), 24 deletions(-)
diff --git a/CY_ECommercePlatform/CY.Model/OA/OA_DeliverPlan.cs b/CY_ECommercePlatform/CY.Model/OA/OA_DeliverPlan.cs
index c0ba89d..110e764 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>
@@ -55,6 +61,8 @@
/// 瀹㈡埛id
/// </summary>
public string BuyerName { get; set; }
+
+ public string CompanyName { get; set; }
public string BusinessManager { get; set; }
@@ -137,6 +145,37 @@
get;
set;
}
+
+ /// <summary>
+ /// 鐗╂祦鐘舵��
+ /// </summary>
+ public int? Deliveredstatus
+ {
+ get;
+ set;
+ }
+
+ /// <summary>
+ /// 绉讳氦绫诲瀷 1 瀹㈡埛缁忕悊 2 宸ュ巶鐗╂祦閮�
+ /// </summary>
+ public int? TransferType
+ {
+ get;
+ set;
+ }
+
+
+ /// <summary>
+ /// 绉讳氦绫诲瀷鍚嶇О
+ /// </summary>
+ public string TransferName
+ {
+ get;
+ set;
+ }
+
+
+
/// <summary>
/// 绉讳氦鏃堕棿
/// </summary>
@@ -337,6 +376,13 @@
set;
}
+ //閫佽揣鍗曞浘鐗囩殑灞曠ず
+ public string SonghuodanTupian
+ {
+ get;
+ set;
+ }
+
public int? Paytime
{
get;
@@ -394,6 +440,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;
@@ -595,124 +698,192 @@
this.Lianxiren = isChange ? MyConvert.ConvertToString(value) : Lianxiren;
theValue = this.Lianxiren;
}
- else if ("SumPrice".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 34)
+ else if ("SumPrice".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 35)
{
this.SumPrice = isChange ? MyConvert.ConvertToDecimal(value) : SumPrice;
theValue = this.SumPrice;
}
- else if ("PayedMoney".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 34)
+ else if ("PayedMoney".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 36)
{
this.PayedMoney = isChange ? MyConvert.ConvertToDecimal(value) : PayedMoney;
theValue = this.PayedMoney;
}
- else if ("shoukuanshijian".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 34)
+ else if ("shoukuanshijian".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 37)
{
this.shoukuanshijian = isChange ? MyConvert.ConvertToString(value) : shoukuanshijian;
theValue = this.shoukuanshijian;
}
- else if ("Paytime".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 34)
+ else if ("Paytime".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 38)
{
this.Paytime = isChange ? MyConvert.ConvertToInt32(value) : Paytime;
theValue = this.Paytime;
}
- else if ("OrderId".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 35)
+ else if ("OrderId".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 39)
{
this.OrderId = isChange ? MyConvert.ConvertToInt32(value) : OrderId;
theValue = this.OrderId;
}
- else if ("YujihuikuanTime".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 36)
+ else if ("YujihuikuanTime".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 40)
{
this.YujihuikuanTime = isChange ? MyConvert.ConvertToDateTime(value) : YujihuikuanTime;
theValue = this.YujihuikuanTime;
}
- else if ("YujihuikuanKeyid".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 36)
+ else if ("YujihuikuanKeyid".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 41)
{
this.YujihuikuanKeyid = isChange ? MyConvert.ConvertToGuid(value) : YujihuikuanKeyid;
theValue = this.YujihuikuanKeyid;
}
- else if ("quyu".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 37)
+ else if ("quyu".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 42)
{
this.quyu = isChange ? MyConvert.ConvertToString(value) : quyu;
theValue = this.quyu;
}
- else if ("ContracttypeName".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 38)
+ else if ("ContracttypeName".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 43)
{
this.ContracttypeName = isChange ? MyConvert.ConvertToString(value) : ContracttypeName;
theValue = this.ContracttypeName;
}
- else if ("Contractmoney".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 39)
+ else if ("Contractmoney".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 44)
{
this.Contractmoney = isChange ? MyConvert.ConvertToDecimal(value) : Contractmoney;
theValue = this.Contractmoney;
}
- else if ("ExpiretypeName".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 40)
+ else if ("ExpiretypeName".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 45)
{
this.ExpiretypeName = isChange ? MyConvert.ConvertToString(value) : ExpiretypeName;
theValue = this.ExpiretypeName;
}
- else if ("ExpireTime".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 41)
+ else if ("ExpireTime".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 46)
{
this.ExpireTime = isChange ? MyConvert.ConvertToDateTime(value) : ExpireTime;
theValue = this.ExpireTime;
}
- else if ("gendanshuliang".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 42)
+ else if ("gendanshuliang".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 47)
{
this.gendanshuliang = isChange ? MyConvert.ConvertToDecimal(value) : gendanshuliang;
theValue = this.gendanshuliang;
}
- else if ("xinzengshuliang".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 43)
+ else if ("xinzengshuliang".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 48)
{
this.xinzengshuliang = isChange ? MyConvert.ConvertToDecimal(value) : xinzengshuliang;
theValue = this.xinzengshuliang;
}
- else if ("wanjieshuliang".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 44)
+ else if ("wanjieshuliang".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 49)
{
this.wanjieshuliang = isChange ? MyConvert.ConvertToDecimal(value) : wanjieshuliang;
theValue = this.wanjieshuliang;
}
- else if ("xiadanshuliang".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 45)
+ else if ("xiadanshuliang".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 50)
{
this.xiadanshuliang = isChange ? MyConvert.ConvertToDecimal(value) : xiadanshuliang;
theValue = this.xiadanshuliang;
}
- else if ("kaipiaojine".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 46)
+ else if ("kaipiaojine".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 51)
{
this.kaipiaojine = isChange ? MyConvert.ConvertToDecimal(value) : kaipiaojine;
theValue = this.kaipiaojine;
}
- else if ("huifangshuliang".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 47)
+ else if ("huifangshuliang".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 52)
{
this.huifangshuliang = isChange ? MyConvert.ConvertToDecimal(value) : huifangshuliang;
theValue = this.huifangshuliang;
}
- else if ("chaxuntime".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 48)
+ else if ("chaxuntime".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 53)
{
this.chaxuntime = isChange ? MyConvert.ConvertToDateTime(value) : chaxuntime;
theValue = this.chaxuntime;
}
- else if ("chaxuntimestart".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 49)
+ else if ("chaxuntimestart".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 54)
{
this.chaxuntimestart = isChange ? MyConvert.ConvertToDateTime(value) : chaxuntimestart;
theValue = this.chaxuntimestart;
}
- else if ("chaxuntimeend".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 50)
+ else if ("chaxuntimeend".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 55)
{
this.chaxuntimeend = isChange ? MyConvert.ConvertToDateTime(value) : chaxuntimeend;
theValue = this.chaxuntimeend;
}
- else if ("huikuankehu".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 51)
+ else if ("huikuankehu".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 56)
{
this.huikuankehu = isChange ? MyConvert.ConvertToDecimal(value) : huikuankehu;
theValue = this.huikuankehu;
}
- else if ("weihuikuankehu".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 52)
+ else if ("weihuikuankehu".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 57)
{
this.weihuikuankehu = isChange ? MyConvert.ConvertToDecimal(value) : weihuikuankehu;
theValue = this.weihuikuankehu;
}
+ else if ("CompanyName".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 58)
+ {
+ this.CompanyName = isChange ? MyConvert.ConvertToString(value) : CompanyName;
+ theValue = this.CompanyName;
+ }
+ else if ("Deliveredstatus".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 59)
+ {
+ this.Deliveredstatus = isChange ? MyConvert.ConvertToInt32(value) : Deliveredstatus;
+ theValue = this.Deliveredstatus;
+ }
+
+ else if ("TransferType".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 60)
+ {
+ this.TransferType = isChange ? MyConvert.ConvertToInt32(value) : TransferType;
+ theValue = this.TransferType;
+ }
+
+ else if ("TransferName".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 61)
+ {
+ 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