From 374ce108d737c1e4d6608989090195a7346d10ad Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 26 二月 2026 08:47:21 +0800
Subject: [PATCH] 优化格式美观度。 完成 (1)“印刷、打包、送货要求”放在右边的格子里面;右边格子拉通 (2)“单价”和“总价”的格子比例要调整适中 (3)把“印件名称”放在第一格 (1)操作中增加“问题处理”,进行处理操作 完成 (2)问题反馈除了生成在这个列表中,还要自动推送给对应订单的下单人或者送货安排(发起工作安排)的安排人,显示在他们的“工作提醒”中,处理完了就在列表中变成已完成问题处理,显示“√”,点“√”进去就显示谁处理的、什么时候处理的。 完成 生产施工单中,选“轮转印刷机”的,删除“纸张数量(张)”和“开料规格” 完成
---
CY_ECommercePlatform/CY.Model/OA/OA_DeliverPlan.cs | 185 +++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 182 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..2b4e16b 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;
}
}
@@ -440,6 +473,91 @@
}
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? Chulistatus
+ {
+ get;
+ set;
+ }
+ public string ChulistatusName
+ {
+ get
+ {
+ return Chulistatus.HasValue && Chulistatus.Value == 1 ? "鈭�" : "脳";
+ }
+
+ }
+
+ public DateTime? ChuliTime
+ {
+ get;
+ set;
+ }
+
+ public string Chuliren
+ {
+ 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 +904,68 @@
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;
+ }
+ else if ("OrAllUnPayedMoney".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 71)
+ {
+ this.OrAllUnPayedMoney = isChange ? MyConvert.ConvertToDecimal(value) : OrAllUnPayedMoney;
+ theValue = this.OrAllUnPayedMoney;
+ }
+ else if ("Chulistatus".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 72)
+ {
+ this.Chulistatus = isChange ? MyConvert.ConvertToInt32(value) : Chulistatus;
+ theValue = this.Chulistatus;
+ }
+ else if ("ChuliTime".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 73)
+ {
+ this.ChuliTime = isChange ? MyConvert.ConvertToDateTime(value) : ChuliTime;
+ theValue = this.ChuliTime;
+ }
+ else if ("Chuliren".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 74)
+ {
+ this.Chuliren = isChange ? MyConvert.ConvertToString(value) : Chuliren;
+ theValue = this.Chuliren;
+ }
+
return theValue;
--
Gitblit v1.9.1