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/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