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.WebForm/Pages/business/DeliverPlanEdit.aspx.cs | 29 +++++++++++++++++++++++------
1 files changed, 23 insertions(+), 6 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanEdit.aspx.cs
index 0ef63b2..1cf2cda 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanEdit.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanEdit.aspx.cs
@@ -95,9 +95,10 @@
this.selBuyerId.DataBind();
this.selBuyerId.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
-
-
+ this.txtDeliverTime.Value = DateTime.Now.AddDays(1).ToString("yyyy-MM-dd");
+
+
}
}
@@ -145,6 +146,7 @@
_oA_CustomerCommunications.DegreeImportanId = m_OA_CorporateClients.DegreeImportanId;
_oA_CustomerCommunications.AccountManagerId = m_OA_CorporateClients.AccountManagerId;
_oA_CustomerCommunications.BusinessManagerId = m_OA_CorporateClients.BusinessManagerId;
+ _oA_CustomerCommunications.CompanyName = m_OA_CorporateClients.CompanyName;
Response.Write(null == _oA_CustomerCommunications ? "" : JsonHelper.GetJsonStringByObject(_oA_CustomerCommunications));
}
@@ -178,7 +180,7 @@
SellerOrderId = ssss + (aaaaaaaaaaaa.ToInt32().Value + 1).ToString("000");
}
//this.SellerOrderId.InnerText = SellerOrderId;
- OA_CorporateClients oA_CorporateClients = _oA_CorporateClientsBLL.SelectModelByFirmIdandMemberId(CurrentUser.MemberId, this.selBuyerId.Value.ToGuid2());
+
OA_DeliverPlan oA_DeliverPlan = new OA_DeliverPlan();
@@ -186,7 +188,22 @@
oA_DeliverPlan.Keyid = Guid.NewGuid();
oA_DeliverPlan.FirmId = CurrentUser.MemberId;
oA_DeliverPlan.DeliverTime = DateTime.Parse(this.txtDeliverTime.Value);
- oA_DeliverPlan.BuyerId = this.selBuyerId.Value.ToGuid2();
+ if (string.IsNullOrWhiteSpace(this.selBuyerId.Value))
+ {
+ oA_DeliverPlan.BuyerId = Guid.Empty;
+ oA_DeliverPlan.BusinessManagerId = 0;
+ oA_DeliverPlan.Biddingcompany = 0;
+
+ }
+ else
+ {
+ oA_DeliverPlan.BuyerId = this.selBuyerId.Value.ToGuid2();
+ OA_CorporateClients oA_CorporateClients = _oA_CorporateClientsBLL.SelectModelByFirmIdandMemberId(CurrentUser.MemberId, this.selBuyerId.Value.ToGuid2());
+ oA_DeliverPlan.BusinessManagerId = oA_CorporateClients.BusinessManagerId ?? 0;
+ oA_DeliverPlan.Biddingcompany = oA_CorporateClients.Biddingcompany ?? 0;
+
+ }
+
oA_DeliverPlan.DeliveredTime = null;
oA_DeliverPlan.Zhuyishixiang = "";
oA_DeliverPlan.Gongzuokaoping = "";
@@ -204,9 +221,9 @@
oA_DeliverPlan.Dianhua = this.txtDianhua.Value;
oA_DeliverPlan.Dizhi = this.txtDizhi.Value;
oA_DeliverPlan.Remark = this.txtRemark.Value;
- oA_DeliverPlan.BusinessManagerId = oA_CorporateClients.BusinessManagerId ?? 0;
- oA_DeliverPlan.Biddingcompany = oA_CorporateClients.Biddingcompany ?? 0;
+
oA_DeliverPlan.shifouDelivery = 1;
+ oA_DeliverPlan.CompanyName = this.txtCompanyName.Value;
isWin = oA_DeliverPlanBLL.InsertModel(oA_DeliverPlan);
}
--
Gitblit v1.9.1