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/AgMergerOrderEdit.aspx.cs |   33 +++++++++++++++++++++++++++++++--
 1 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx.cs
index 6ae7ab1..773b3ad 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx.cs
@@ -27,6 +27,7 @@
         OA_InventoryBLL bll_OA_InventoryBLL = null;
         OA_OutOfStorageBLL bll_OA_OutOfStorageBLL = null;
         public Guid targetid = Guid.Empty;
+        public string xialapr = "";
 
         //鍒濆鍖�
         public AgMergerOrderEdit()
@@ -92,6 +93,20 @@
             this.selFilmSpec.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
             //this.selFilmSpec.Visible = false;
 
+            //this.PlateSpec.DataSource = bll_EC_MemberDictionaryBLL.SelectListByMemberIdAndParType(CurrentUser.MemberId, "鐗堟潗瑙勬牸");
+            //this.PlateSpec.DataValueField = "ParName";
+            //this.PlateSpec.DataTextField = "ParName";
+            //this.PlateSpec.DataBind();
+            //this.PlateSpec.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
+            var sss = bll_EC_MemberDictionaryBLL.SelectListByMemberIdAndParType(CurrentUser.MemberId, "鐗堟潗瑙勬牸");
+            foreach (var eC_MemberDictionary in sss)
+            {
+                xialapr += " <div class=\"xialapr\">"+ eC_MemberDictionary.ParName + "</div>";
+                
+            }
+
+           
+
             Pagination pa = new Pagination();
             pa.PageSize = 500;
             pa.PageIndex = 1;
@@ -150,7 +165,20 @@
                     {
                         _inquiryCommonModel = SerializationHelper.DeSerialize(typeof(InquiryCommonModel), _eC_OrderPrintParameter.PrintParameter) as InquiryCommonModel;
                     }
-                    _eC_OrderBasic.PrintDemandAfterWorksDemand = _inquiryCommonModel.PrintDemand + _inquiryCommonModel.AfterWorksDemand;
+                    var ssss = "";
+                    if (!string.IsNullOrEmpty(_inquiryCommonModel.AfterWorksDemand))
+                    {
+                        ssss = /*_inquiryCommonModel.PrintDemand +*/ _inquiryCommonModel.AfterWorksDemand.Replace("灏侀潰鍚庨亾锛�", "").Replace("鍐呴〉鍚庨亾锛�", "");
+                    }
+                    if(_eC_OrderBasic.PrintTypeId == -1)
+                    {
+                        ssss = _inquiryCommonModel.PrintDemand;
+                    }
+                    if (!string.IsNullOrEmpty(ssss) && ssss.Length > 500)
+                    {
+                        ssss.Substring(0,499);
+                    }
+                    _eC_OrderBasic.PrintDemandAfterWorksDemand = ssss;
 
                     string strPrintSizeName;
                     strPrintSizeName = _inquiryCommonModel.PrintSizeName;
@@ -327,6 +355,7 @@
                 RepMergerEdit.Visible = false;
                 this.RepClientList.DataSource = mEC_OrderBasicList;
                 this.RepClientList.DataBind();
+                this.selOutFirm.Value = "-1";
             }
             return true;
         }
@@ -676,7 +705,7 @@
                     m_EC_OrderBasicNew.BuyerName = CurrentUser.Name;
                     m_EC_OrderBasicNew.Creater = CurrentUser.ShortName;
                     m_EC_OrderBasicNew.Operator = CurrentUser.ShortName;
-                    m_EC_OrderBasicNew.DeliveryTime = _eC_OrderBasic.DeliveryTime.Value.ToDateTime2();
+                    m_EC_OrderBasicNew.DeliveryTime = _eC_OrderBasic.DeliveryTime.ToDateTime2();
                     m_EC_OrderBasicNew.DocumentName = _eC_OrderBasic.PrintType.PrintName;
                     m_EC_OrderBasicNew.OrderTypeId = 3;
                     m_EC_OrderBasicNew.PrintTypeId = _eC_OrderBasic.PrintTypeId;

--
Gitblit v1.9.1