From a7e05ebe00fdcb649c012e5afc4a42a8d631e824 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 02 四月 2025 08:38:24 +0800
Subject: [PATCH] 删除客户管理查询条件中的“客户编号” 完成 新增订单---黑白印件 的后道工序最右边增加一个“口 竖式”，同前面套号、压痕一样，默认不勾选，是竖式的业务经理自己下单时勾选 完成提交外协付款申请时，增加上传审批证明的上传图片功能，可以添加多张图片；查询列表中增加“付款状态：全部、已付款、未付款”查询条件，默认全部；“完工状态”改为默认未完工 完成请示批复----付款申请 中也要向上面的需求一样，增加上传审批证明的上传图片功能，可以添加多张图片 完成在“请示批复”中进行“批复”操作的时候要能查看上传的审批图片 完成包装要求”要显示在打印的订单中 完成包装要求”要显示在打印的订单中 完成收据联单的新增订单中，纸张选无碳纸时，不显示“品牌”、“克重”，在联数的后面增加颜色选择：“颜色：上白下红”（匹配联数）订单管理中的“订单状态”删除，删除后新增两个状态：“完工状态：全部、未完工、已完工”和“送货状态：全部、已送货、未送货” 完成请示批复中默认“未批复” 完成请示批复中默认“未批复” 完成
---
CY_ECommercePlatform/CY.Model/OA/OA_DeliverPlan.cs | 173 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 151 insertions(+), 22 deletions(-)
diff --git a/CY_ECommercePlatform/CY.Model/OA/OA_DeliverPlan.cs b/CY_ECommercePlatform/CY.Model/OA/OA_DeliverPlan.cs
index fea6baf..9700251 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>
@@ -56,6 +62,8 @@
/// </summary>
public string BuyerName { get; set; }
+ public string CompanyName { get; set; }
+
public string BusinessManager { get; set; }
public string DizhiLianxirenDianhua { get; set; }
@@ -63,7 +71,9 @@
public int? shuliang { get; set; }
-
+ public int? fapiaoshuliang { get; set; }
+
+
/// <summary>
/// 瑕佹眰鍒拌揪鏃堕棿
@@ -135,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>
@@ -271,6 +312,42 @@
}
/// <summary>
+ /// 淇敼鏃堕棿
+ /// </summary>
+ public DateTime? chaxuntimestart
+ {
+ get;
+ set;
+ }
+
+ /// <summary>
+ /// 淇敼鏃堕棿
+ /// </summary>
+ public DateTime? chaxuntimeend
+ {
+ get;
+ set;
+ }
+
+ /// <summary>
+ /// 鍥炴瀹㈡埛
+ /// </summary>
+ public decimal? huikuankehu
+ {
+ get;
+ set;
+ }
+
+ /// <summary>
+ /// 鏈洖娆惧鎴�
+ /// </summary>
+ public decimal? weihuikuankehu
+ {
+ get;
+ set;
+ }
+
+ /// <summary>
/// 鏈粯娆�
/// </summary>
public decimal UnPayedMoney
@@ -294,6 +371,13 @@
public string shoukuanshijian
+ {
+ get;
+ set;
+ }
+
+ //閫佽揣鍗曞浘鐗囩殑灞曠ず
+ public string SonghuodanTupian
{
get;
set;
@@ -557,107 +641,152 @@
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 == 54)
+ {
+ this.chaxuntimestart = isChange ? MyConvert.ConvertToDateTime(value) : chaxuntimestart;
+ theValue = this.chaxuntimestart;
+ }
+ 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 == 56)
+ {
+ this.huikuankehu = isChange ? MyConvert.ConvertToDecimal(value) : huikuankehu;
+ theValue = this.huikuankehu;
+ }
+ 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;
+ }
-
return theValue;
--
Gitblit v1.9.1