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