From a980cd04341d71216e0f59bd4b7327fe9fc50032 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 21 五月 2025 11:41:46 +0800
Subject: [PATCH] 提交

---
 CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx.cs |   12 ++++++++++--
 1 files changed, 10 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 b86a807..773b3ad 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx.cs
@@ -165,8 +165,16 @@
                     {
                         _inquiryCommonModel = SerializationHelper.DeSerialize(typeof(InquiryCommonModel), _eC_OrderPrintParameter.PrintParameter) as InquiryCommonModel;
                     }
-                    var ssss = _inquiryCommonModel.PrintDemand + _inquiryCommonModel.AfterWorksDemand;
-                    if (ssss.Length > 500)
+                    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);
                     }

--
Gitblit v1.9.1