From 82662b0e9ab839c72ec3734f18b691d5f037c0a3 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 12 二月 2025 08:43:36 +0800
Subject: [PATCH] 外协订单不要松活信息   新增采购信息改为新增采购订单    角色查询增加查询条件,有效无效

---
 CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx.cs |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx.cs
index e47b8b9..e487dc5 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx.cs
@@ -165,7 +165,16 @@
                     {
                         _inquiryCommonModel = SerializationHelper.DeSerialize(typeof(InquiryCommonModel), _eC_OrderPrintParameter.PrintParameter) as InquiryCommonModel;
                     }
-                    _eC_OrderBasic.PrintDemandAfterWorksDemand = _inquiryCommonModel.PrintDemand + _inquiryCommonModel.AfterWorksDemand;
+                    var ssss = /*_inquiryCommonModel.PrintDemand +*/ _inquiryCommonModel.AfterWorksDemand;
+                    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;

--
Gitblit v1.9.1