From 5782e6fb084441dcf26db0b1aaf33e39204142b8 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 15 四月 2025 08:52:33 +0800
Subject: [PATCH] 20250220设计订单菜单 会员菜单下 设计管理 12 会员菜单下 设计管理 01 会员菜单下 设计管理下 设计记件 /Pages/business/ShejijijianList.aspx 05 会员菜单下 设计管理下 新增订单 /Pages/business/ShejiOrderEdit.aspx 01 会员菜单下 设计管理下 订单管理 /Pages/business/ShejiOrderList.aspx 02
---
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverOrderPrint.aspx.cs | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverOrderPrint.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverOrderPrint.aspx.cs
index d90af40..7fbcf55 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverOrderPrint.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverOrderPrint.aspx.cs
@@ -114,8 +114,9 @@
+ this.spnRemark.InnerText = oA_DeliverPlan.Remark;
-
+
@@ -134,7 +135,11 @@
if (m_EC_AwbInfo != null)
{
- this.spnRemark.InnerText = m_EC_AwbInfo.Remark;
+ if (string.IsNullOrWhiteSpace(this.spnRemark.InnerText))
+ {
+ this.spnRemark.InnerText = m_EC_AwbInfo.Remark;
+ }
+
}
}
@@ -158,10 +163,7 @@
}
}
}
- else
- {
- this.spnRemark.InnerText = oA_DeliverPlan.Remark;
- }
+
rptData.DataSource = eC_OrderBasics;
rptData.DataBind();
--
Gitblit v1.9.1