From 9be7596c0b251c392ab0788f3d18806502c6ee76 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 15 五月 2025 08:49:50 +0800
Subject: [PATCH] 提交

---
 CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.cs |   22 ++++++++++++++++++----
 1 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.cs
index 7a6f07f..e342fc6 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.cs
@@ -26,6 +26,7 @@
         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();
@@ -33,6 +34,7 @@
             _eC_OrderBLL = new EC_OrderBLL();
             _oA_FukuanshenqingBLL = new OA_FukuanshenqingBLL();
             _eC_MemberBasicBLL = new EC_MemberBasicBLL();
+            oA_WorkPlan_AttachmentBLL = new OA_WorkPlan_attachmentBLL();
         }
 
         //椤甸潰鍔犺浇
@@ -64,6 +66,17 @@
                 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();
+                }
             }
         }
 
@@ -103,7 +116,7 @@
                 }
 
 
-                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;
@@ -118,13 +131,14 @@
 
 
                     oA_Fukuanshenqing.FirmId = CurrentUser.MemberId;
-                    oA_Fukuanshenqing.SupplierId = 0;
+                    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;
@@ -136,8 +150,8 @@
                    var eC_MemberBasic = _eC_MemberBasicBLL.GetMemberByMemberId(m_OA_WorkPlan.SentStaffId);
                     if (eC_MemberBasic != null)
                     {
-                        oA_Fukuanshenqing.Creater = CurrentUser.ShortName;
-                        oA_Fukuanshenqing.Updater = CurrentUser.ShortName;
+                        oA_Fukuanshenqing.Creater = eC_MemberBasic.Name;
+                        oA_Fukuanshenqing.Updater = eC_MemberBasic.Name;
                     }
                     else
                     {

--
Gitblit v1.9.1