From 374ce108d737c1e4d6608989090195a7346d10ad Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 26 二月 2026 08:47:21 +0800
Subject: [PATCH] 优化格式美观度。 完成 (1)“印刷、打包、送货要求”放在右边的格子里面;右边格子拉通 (2)“单价”和“总价”的格子比例要调整适中 (3)把“印件名称”放在第一格 (1)操作中增加“问题处理”,进行处理操作  完成 (2)问题反馈除了生成在这个列表中,还要自动推送给对应订单的下单人或者送货安排(发起工作安排)的安排人,显示在他们的“工作提醒”中,处理完了就在列表中变成已完成问题处理,显示“√”,点“√”进去就显示谁处理的、什么时候处理的。  完成 生产施工单中,选“轮转印刷机”的,删除“纸张数量(张)”和“开料规格”  完成

---
 CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanfukuan.aspx.cs |   32 +++++++++++++++++++++++++++++---
 1 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanfukuan.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanfukuan.aspx.cs
index f95e59f..81de6eb 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanfukuan.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanfukuan.aspx.cs
@@ -39,6 +39,7 @@
         LF_OrderFileBLL _lF_OrderFileBLL = null;
         EC_OrderBLL _eC_OrderBLL = null;
         OA_FukuanshenqingBLL oA_FukuanshenqingBLL = null;
+        OA_WorkPlanBll _WorkPlanBll = null;
 
         /// <summary>
         /// 鍒濆鍖栨瀯閫�
@@ -50,6 +51,7 @@
             _lF_OrderFileBLL = new LF_OrderFileBLL();
             _eC_OrderBLL = new EC_OrderBLL();
             oA_FukuanshenqingBLL = new OA_FukuanshenqingBLL();
+            _WorkPlanBll = new OA_WorkPlanBll();
         }
 
         /// <summary>
@@ -461,8 +463,8 @@
 
  
 
-                this.txtSQBeginDate.Value = DateTime.Now.AddDays(-14).ToString("yyyy-MM-dd");
-                this.txtSQEndDate.Value = DateTime.Now.ToString("yyyy-MM-dd");
+                //this.txtSQBeginDate.Value = DateTime.Now.AddDays(-14).ToString("yyyy-MM-dd");
+                //this.txtSQEndDate.Value = DateTime.Now.ToString("yyyy-MM-dd");
                 this.selPayStates.Value = "1";
                 //鍒濇鏁版嵁鍔犺浇
                 btn_Search_Click(btn_Search, new EventArgs());
@@ -557,7 +559,31 @@
                 PageSize = UCPager1.AspNetPager.PageSize,
                 PageIndex = UCPager1.AspNetPager.CurrentPageIndex
             };
-            IEnumerable<OA_Fukuanshenqing> result = oA_FukuanshenqingBLL.SelectModelPage(pagination, CurrentUser.MemberId, this.txtSQBeginDate.Value, this.txtSQEndDate.Value, this.txtCreatorName.Value, this.txtCustormerName.Value,this.selPayStates.Value);
+            IEnumerable<OA_Fukuanshenqing> result = oA_FukuanshenqingBLL.SelectModelPage(pagination, CurrentUser.MemberId, this.txtSQBeginDate.Value, this.txtSQEndDate.Value, this.txtCreatorName.Value, this.txtCustormerName.Value,this.selPayStates.Value, this.selFukuanyongtu.Value);
+            foreach(var oA_Fukuanshenqing in result)
+            {
+               if(oA_Fukuanshenqing.Fukuanyongtu == "澶栧崗鍔犲伐璐�" || oA_Fukuanshenqing.Fukuanyongtu == "閲囪喘浠樻" || oA_Fukuanshenqing.Fukuanyongtu == "璁惧缁翠慨璐�")
+                {
+                    var workPlan  =  _WorkPlanBll.GetModelByFukuanshenqid(oA_Fukuanshenqing.Keyid.ToString(),"");
+                    if (workPlan != null)
+                    {
+                        oA_Fukuanshenqing.WorkPlanId = workPlan.Keyid.ToString();
+                    }
+                }
+                else if (oA_Fukuanshenqing.Fukuanyongtu == "鍏朵粬浠樻"  )
+                {
+                    var workPlan = _WorkPlanBll.GetModelByFukuanshenqid( "", oA_Fukuanshenqing.Keyid.ToString());
+                    if (workPlan != null)
+                    {
+                        oA_Fukuanshenqing.WorkPlanId = workPlan.Keyid.ToString();
+                    }
+                }
+                else
+                {
+                    oA_Fukuanshenqing.WorkPlanId = "";
+                }
+            }
+            
             rptData.DataSource = result;
             rptData.DataBind();
 

--
Gitblit v1.9.1