From b1ac791a0e8896ee3d2016949911d44c9f0fb7a9 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 16 三月 2026 13:17:23 +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