From 2605af51ca4787434c8c5f2b10dc0adc78a2fdb0 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 14 三月 2025 17:17:45 +0800
Subject: [PATCH] 外协管理，外协订单，你列表操作后面增加一个完工点，完工就进行。就是说，已完工处理好，前面呢，有个批量完工，好检索查询条件，也加个完工。
---
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverOrderPrint.aspx.cs | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverOrderPrint.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverOrderPrint.aspx.cs
index 861021a..7fbcf55 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverOrderPrint.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverOrderPrint.aspx.cs
@@ -104,7 +104,7 @@
this.spnBuyerName.InnerText = oA_DeliverPlan.CompanyName;
this.spnBuyerAddress.InnerText = oA_DeliverPlan.Dizhi;
- this.spnNowTime.InnerText = oA_DeliverPlan.DeliverTime.Value.ToString("yyyy-Mm-dd");
+ this.spnNowTime.InnerText = oA_DeliverPlan.DeliverTime.Value.ToString("yyyy-MM-dd");
this.SellerOrderId.InnerText = oA_DeliverPlan.SellerOrderId;
this.spnBuyerPhone.InnerText = oA_DeliverPlan.Dianhua;
@@ -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