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/work/RequestReplyAdd.aspx.cs | 64 +++++++++++++++++++++++++++++++
1 files changed, 63 insertions(+), 1 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.cs
index d4c73fb..01ef6e9 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.cs
@@ -24,12 +24,17 @@
OA_KaipiaoshenqingBLL _oA_KaipiaoshenqingBLL = null;
EC_OrderBLL _eC_OrderBLL = null;
OA_FukuanshenqingBLL _oA_FukuanshenqingBLL = null;
+ EC_MemberBasicBLL _eC_MemberBasicBLL = null;
+ public string planDataType = "";
+ OA_WorkPlan_attachmentBLL oA_WorkPlan_AttachmentBLL = null;
public RequestReplyAdd()
{
oA_WorkReminderBll = new OA_WorkPlanBll();
_oA_KaipiaoshenqingBLL = new OA_KaipiaoshenqingBLL();
_eC_OrderBLL = new EC_OrderBLL();
_oA_FukuanshenqingBLL = new OA_FukuanshenqingBLL();
+ _eC_MemberBasicBLL = new EC_MemberBasicBLL();
+ oA_WorkPlan_AttachmentBLL = new OA_WorkPlan_attachmentBLL();
}
//椤甸潰鍔犺浇
@@ -52,6 +57,7 @@
}
if (m_OA_WorkPlan != null)
{
+ planDataType = m_OA_WorkPlan.PlanDataType.Value.ToString();
this.spanPlanDataType.InnerText = m_OA_WorkPlan.PlanDataTypeName.ToString();
this.spanPlanMoney.InnerText = m_OA_WorkPlan.PlanMoney.Value.ToString("0.00");
this.spanPlanPeople.InnerText = m_OA_WorkPlan.PlanPeople.ToString();
@@ -59,6 +65,18 @@
this.spanPlanRemark.InnerText = m_OA_WorkPlan.PlanRemark.ToString();
this.spanPlanTitle.InnerText = m_OA_WorkPlan.PlanTitle.ToString();
this.spanPlanContent.InnerText = m_OA_WorkPlan.PlanContent.ToString();
+ this.spanShoukuandanwei.InnerText = m_OA_WorkPlan.PlanComplany;
+
+ if (m_OA_WorkPlan.PlanDataType == 14)
+ {
+ this.RepClientList.DataSource = oA_WorkPlan_AttachmentBLL.GetModelByKaipiaoIdandType(Request["keyid"].ToInt32().Value, 14);
+ this.RepClientList.DataBind();
+ }
+ else if (m_OA_WorkPlan.PlanDataType == 15)
+ {
+ this.RepClientList.DataSource = oA_WorkPlan_AttachmentBLL.GetModelByKaipiaoIdandType(Request["keyid"].ToInt32().Value, 15);
+ this.RepClientList.DataBind();
+ }
}
}
@@ -98,13 +116,57 @@
}
- if (m_OA_WorkPlan.ApprovalStatus == 1 && m_OA_WorkPlan.PlanDataType == 14)
+ if (m_OA_WorkPlan.ApprovalStatus == 1 && (m_OA_WorkPlan.PlanDataType == 14 || m_OA_WorkPlan.PlanDataType == 16))
{//鎵瑰噯鍙嶅啓
var fukuanshenqing = _oA_FukuanshenqingBLL.GetModelByKeyid(m_OA_WorkPlan.PlanComplany.ToInt32().Value);
fukuanshenqing.ApprovalStatus = 1;
_oA_FukuanshenqingBLL.UpdateModel(fukuanshenqing);
}
+
+ if (m_OA_WorkPlan.ApprovalStatus == 1 && m_OA_WorkPlan.PlanDataType == 15)
+ {//鎵瑰噯鏂板浠樻鐢宠
+ OA_Fukuanshenqing oA_Fukuanshenqing = new OA_Fukuanshenqing();
+
+
+
+ oA_Fukuanshenqing.FirmId = CurrentUser.MemberId;
+ oA_Fukuanshenqing.SupplierId = "0";
+ oA_Fukuanshenqing.Fukuanshenqingstatus = 0;
+ oA_Fukuanshenqing.ApprovalStatus = 1;
+ oA_Fukuanshenqing.Fukuanmoney = m_OA_WorkPlan.PlanMoney;
+
+ oA_Fukuanshenqing.Bank = "";
+ oA_Fukuanshenqing.Huming = m_OA_WorkPlan.PlanComplany;
+ oA_Fukuanshenqing.SupplierName = m_OA_WorkPlan.PlanComplany;
+ oA_Fukuanshenqing.AccountID = "";
+ oA_Fukuanshenqing.Yishoumoney = 0;
+ oA_Fukuanshenqing.Youwufapiao = 0;
+ oA_Fukuanshenqing.Fukuanyongtu = "鍏朵粬浠樻";
+ oA_Fukuanshenqing.FukuanStatus = 1;
+ oA_Fukuanshenqing.remark = "";
+ oA_Fukuanshenqing.DindanId = "";
+
+ var eC_MemberBasic = _eC_MemberBasicBLL.GetMemberByMemberId(m_OA_WorkPlan.SentStaffId);
+ if (eC_MemberBasic != null)
+ {
+ oA_Fukuanshenqing.Creater = CurrentUser.ShortName;
+ oA_Fukuanshenqing.Updater = CurrentUser.ShortName;
+ }
+ else
+ {
+ oA_Fukuanshenqing.Creater = "";
+ oA_Fukuanshenqing.Updater = "";
+ }
+
+
+ oA_Fukuanshenqing.CreateTime = DateTime.Now;
+
+ oA_Fukuanshenqing.LastUpdateTime = DateTime.Now;
+
+ var id = _oA_FukuanshenqingBLL.InsertModel(oA_Fukuanshenqing);
+ }
+
if (Request["keyid"].ToInt32() > 0)
{
if (oA_WorkReminderBll.UpdateModel(m_OA_WorkPlan))
--
Gitblit v1.9.1