From e8e3122fdc4844202fb9e05477d47139e47a8aae Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 12 十二月 2025 08:59:47 +0800
Subject: [PATCH] 作业本送货变二级菜单

---
 CY_ECommercePlatform/CY.WebForm/Pages/financial/OrderFinancial.aspx.cs |   22 ++++++++++++++++++++--
 1 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/OrderFinancial.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/financial/OrderFinancial.aspx.cs
index 6a16b29..16e7bf8 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/financial/OrderFinancial.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/OrderFinancial.aspx.cs
@@ -32,6 +32,7 @@
 
         EC_OrderBasicBLL _eC_OrderBasicBLL = null;
         OA_StaffBLL bll_OA_StaffBLL = null;
+        OA_KaipiaoshenqingBLL bLL_OA_KaipiaoshenqingBLL = null;
 
         /// <summary>
         /// 鍒濆鍖栨瀯閫�
@@ -40,6 +41,7 @@
         {
             _eC_OrderBasicBLL = new EC_OrderBasicBLL();
             bll_OA_StaffBLL = new OA_StaffBLL();
+            bLL_OA_KaipiaoshenqingBLL = new OA_KaipiaoshenqingBLL();
         }
 
         /// <summary>
@@ -120,14 +122,14 @@
                 this.selBusinessManagerId.DataValueField = "Keyid";
                 this.selBusinessManagerId.DataBind();
                 this.selBusinessManagerId.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
-                this.selBusinessManagerId.Items.Insert(1, new ListItem(CurrentUser.ShortName, "0"));
+                //this.selBusinessManagerId.Items.Insert(1, new ListItem(CurrentUser.ShortName, "0"));
                 //瀹㈡埛缁忕悊
                 this.selAccountManagerId.DataSource = bll_OA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId, false, true);
                 this.selAccountManagerId.DataTextField = "Name";
                 this.selAccountManagerId.DataValueField = "Keyid";
                 this.selAccountManagerId.DataBind();
                 this.selAccountManagerId.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
-                this.selAccountManagerId.Items.Insert(1, new ListItem(CurrentUser.ShortName, "0"));
+                //this.selAccountManagerId.Items.Insert(1, new ListItem(CurrentUser.ShortName, "0"));
 
                 //鍒濇鏁版嵁鍔犺浇
                 btn_Search_Click(btn_Search, new EventArgs());
@@ -204,6 +206,22 @@
                 PageIndex = UCPager1.AspNetPager.CurrentPageIndex
             };
             IEnumerable<EC_OrderBasic> result = _eC_OrderBasicBLL.SelectModelPage_Financial(pagination, SearchParam);
+            foreach (var eC_OrderBasic in result)
+            {
+                if(eC_OrderBasic.KaipiaoshenqingId.HasValue )
+                {
+                    var oA_Kaipiaoshenqing = bLL_OA_KaipiaoshenqingBLL.GetModelByKeyid(eC_OrderBasic.KaipiaoshenqingId);
+                    if (oA_Kaipiaoshenqing == null)
+                    {
+                        eC_OrderBasic.KaipiaoshenqingId = null;
+                    }
+                    else if (string.IsNullOrEmpty(oA_Kaipiaoshenqing.Fapiaohao))
+                    {
+                        eC_OrderBasic.KaipiaoshenqingId = null;
+                    }
+                }
+            }
+           
             rptData.DataSource = result;
             rptData.DataBind();
 

--
Gitblit v1.9.1