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

---
 CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx.cs |   21 ++++++++++++++++++---
 1 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx.cs
index 1c2f997..c50de43 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx.cs
@@ -37,6 +37,8 @@
         public string[] Width = new string[7];
         public string[] Lenth = new string[7];
         public string xialapr = "";
+        public string orderIdstrrrr = "";
+
         //鍒濆鍖�
         public AgSpecialOrderEdit()
         {
@@ -167,6 +169,7 @@
                 return false;
             }
 
+            orderIdstrrrr = orderIdStr;
             EC_OrderPrintParameterBLL _eC_OrderPrintParameterBLL = new EC_OrderPrintParameterBLL();
             EC_OrderPrintParameter _eC_OrderPrintParameter = _eC_OrderPrintParameterBLL.GetModel(orderId.Value);
             InquiryCommonModel _inquiryCommonModel = null;
@@ -218,11 +221,11 @@
             this.spanOrderPrintNum.InnerText = _eC_OrderBasic.OrderExtend.PrintNum.ToString2();
             if (_eC_OrderBasic.PrintTypeId == 13)
             {
-                this.spanOrderPrintDemand.InnerText = "鍗板埛鏁伴噺锛�(" + _inquiryCommonModel.PrintBoxNumber + "娆�,姣忔" + _eC_OrderBasic.OrderExtend.PrintNum + "鐩�)锛�" + _inquiryCommonModel.PrintDemand;
+                this.spanOrderPrintDemand.InnerHtml = "鍗板埛鏁伴噺锛�(" + _inquiryCommonModel.PrintBoxNumber + "娆�,姣忔" + _eC_OrderBasic.OrderExtend.PrintNum + "鐩�)锛�" + _inquiryCommonModel.PrintDemand;
             }
             else
             {
-                this.spanOrderPrintDemand.InnerText = "鍗板埛鏁伴噺锛�(" + _eC_OrderBasic.OrderExtend.PrintNum + ")锛�" + _inquiryCommonModel.PrintDemand;
+                this.spanOrderPrintDemand.InnerHtml = "鍗板埛鏁伴噺锛�(" + _eC_OrderBasic.OrderExtend.PrintNum + ")锛�" + _inquiryCommonModel.PrintDemand;
             }
             this.spanOrderAfterWorksDemand.InnerText = _inquiryCommonModel.AfterWorksDemand;
             this.spanOrderDeliveryModeName.InnerText = _inquiryCommonModel.DeliveryModeName;
@@ -236,8 +239,11 @@
             {
                 m_EC_SpecialForumsList = new List<EC_SpecialForums>();
                 EC_SpecialForums m_EC_SpecialForums = new EC_SpecialForums();
+                //m_EC_SpecialForums.PSF_Note = _inquiryCommonModel.AfterWorksDemand;
                 m_EC_SpecialForums.PSF_Forumsid = 1;
+                m_EC_SpecialForums.PSF_CTPCount = 1;
                 m_EC_SpecialForumsList.Add(m_EC_SpecialForums);
+                this.txtPSO_Work.InnerText = _inquiryCommonModel.AfterWorksDemand;
             }
             this.RepClientList.DataSource = m_EC_SpecialForumsList;
             this.RepClientList.DataBind();
@@ -353,6 +359,7 @@
                 string[] PSF_PrintedColorPositive = Request["PSF_PrintedColorPositive"].ToString2().Split(',');
                 string[] PSF_PrintedColorRear = Request["PSF_PrintedColorRear"].ToString2().Split(',');
                 string[] PSF_Typesetting = Request["PSF_Typesetting"].ToString2().Split(',');
+                string[] PSF_Typesettinghide = Request["PSF_Typesettinghide"].ToString2().Split(',');
                 string[] PSF_PrintedCount = Request["PSF_PrintedCount"].ToString2().Split(',');
                 string[] PSF_PrintedPositive = Request["PSF_PrintedPositive"].ToString2().Split(',');
                 string[] PSF_LastNum = Request["PSF_LastNum"].ToString2().Split(',');
@@ -443,7 +450,15 @@
                     m_EC_SpecialForums.PSF_PressesDesk = PSF_PressesDesk[i].ToString2().Replace("锛�+-+锛�", ",");
                     m_EC_SpecialForums.PSF_PrintedColorPositive = PSF_PrintedColorPositive[i].ToString2().Replace("锛�+-+锛�", ",");
                     m_EC_SpecialForums.PSF_PrintedColorRear = PSF_PrintedColorRear[i].ToString2().Replace("锛�+-+锛�", ",");
-                    m_EC_SpecialForums.PSF_Typesetting = PSF_Typesetting[i].ToString2().Replace("锛�+-+锛�", ",");
+                    if (PSF_PressesDesk[i].IndexOf("鏁扮爜") >= 0)
+                    {
+                        m_EC_SpecialForums.PSF_Typesetting = PSF_Typesettinghide[i].ToString2().Replace("锛�+-+锛�", ",");
+                    }
+                    else
+                    {
+                        m_EC_SpecialForums.PSF_Typesetting = PSF_Typesetting[i].ToString2().Replace("锛�+-+锛�", ",");
+                    }
+                       
                     
                     if (PSF_PrintedCount[i].ToInt32() == null)
                     {

--
Gitblit v1.9.1