From a737eb14fe1b705b07f017e0edc002fae6f857c3 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 03 四月 2026 12:59:20 +0800
Subject: [PATCH] 发版套数再增加自定义填写数字 补单的生产施工单不要默认开料规格的数据 "付款未开票”列表中的金额合计放在“金额”格子下面，既要单页合计，又要每页的全部合计 生产要求跟“数量： ”的宽度一样 印刷数量的填写格子跟后道工序一样长
---
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx.cs | 67 ++++++++++++++++++++++++++++++---
1 files changed, 60 insertions(+), 7 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx.cs
index f03b91a..799f80e 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx.cs
@@ -20,6 +20,8 @@
{
EC_SpecialOrdersBLL bll_EC_SpecialOrdersBLL = null;
string orderIdStr = string.Empty;
+ public string PrintTypeId = "";
+ public string therowspan = "";
//鍒濆鍖�
public AgSpecialOrderDetail()
{
@@ -95,7 +97,7 @@
{
_inquiryCommonModel = SerializationHelper.DeSerialize(typeof(InquiryCommonModel), _eC_OrderPrintParameter.PrintParameter) as InquiryCommonModel;
}
-
+ PrintTypeId = _eC_OrderBasic.PrintTypeId.ToString();
#endregion
EC_SpecialOrders m_EC_SpecialOrders = bll_EC_SpecialOrdersBLL.GetModelByOrderId(orderId);
@@ -109,7 +111,7 @@
this.spanSpecialNum.InnerText = string.IsNullOrEmpty(m_EC_SpecialOrders.PSO_OrderNum) ? bll_EC_SpecialOrdersBLL.GetPSO_OrderNum(CurrentUser.MemberId) : m_EC_SpecialOrders.PSO_OrderNum;
this.spanSpecialExigency.InnerText = _eC_OrderBasic.OrderExtend.ExigencyCase.Name;
- this.spanSpecialTime.InnerText = m_EC_SpecialOrders.PSO_OrderTime == null ? DateTime.Now.ToString("yyyy-MM-dd HH:mm") : m_EC_SpecialOrders.PSO_OrderTime.Value.ToString("yyyy-MM-dd HH:mm");
+ this.spanSpecialTime.InnerText = m_EC_SpecialOrders.PSO_OrderTime == null ? DateTime.Now.ToString("yyyy-MM-dd") : m_EC_SpecialOrders.PSO_OrderTime.Value.ToString("yyyy-MM-dd");
this.spanSpecialOprator.InnerText = string.IsNullOrEmpty(m_EC_SpecialOrders.Operator) ? CurrentUser.ShortName : m_EC_SpecialOrders.Operator;
if (string.IsNullOrEmpty(m_EC_SpecialOrders.PSO_Work))
@@ -120,10 +122,10 @@
{
this.txtPSO_Work_o.InnerText = m_EC_SpecialOrders.PSO_Work;
}
-
+ this.txtPSO_Work_o_TR.Visible = false;
if (string.IsNullOrEmpty(m_EC_SpecialOrders.PSO_Remarks))
{
- this.txtPSO_Remarks_o_TR.Visible = false;
+ // this.txtPSO_Remarks_o_TR.Visible = false;
}
else
{
@@ -131,9 +133,10 @@
}
this.spanOrderNum.InnerText = _eC_OrderBasic.SellerOrderId;
+ this.spanPrintNum.InnerText = m_EC_SpecialOrders.OrderNum.ToString2() ;
//this.spanOrderType.InnerText = _eC_OrderBasic.OrderType.Name;
this.spanOrderTitle.InnerText = _eC_OrderBasic.DocumentName;
- this.spanOrderDeliveryTime.InnerText = _eC_OrderBasic.DeliveryTime == null ? "" : _eC_OrderBasic.DeliveryTime.Value.ToString("yyyy-MM-dd HH:mm");
+ this.spanOrderDeliveryTime.InnerText = _eC_OrderBasic.DeliveryTime == null ? "" : _eC_OrderBasic.DeliveryTime.Value.ToString("yyyy-MM-dd");
this.spanOrderCustormName.InnerText = _eC_OrderBasic.BuyerName;
this.spanOrderCustormLevel.InnerText = _eC_OrderBasic.OrderExtend.CustomerLevel.Name;
@@ -149,11 +152,11 @@
if (_eC_OrderBasic.PrintTypeId == 13)
{
- this.spanOrderPrintDemand.InnerText = "鍗板埛鏁伴噺锛�(" + _inquiryCommonModel.PrintBoxNumber + "娆�,姣忔" + _eC_OrderBasic.OrderExtend.PrintNum + "鐩�)锛�" + _inquiryCommonModel.PrintDemand;
+ this.spanOrderPrintDemand.InnerHtml = "鍗板埛鏁伴噺锛�(" + _inquiryCommonModel.PrintBoxNumber + "娆�,姣忔" + _eC_OrderBasic.OrderExtend.PrintNum + "鐩�)锛�" + _inquiryCommonModel.PrintDemand;
}
else
{
- this.spanOrderPrintDemand.InnerText = "鍗板埛鏁伴噺锛�(" + _eC_OrderBasic.OrderExtend.PrintNum + ")锛�" + _inquiryCommonModel.PrintDemand;
+ this.spanOrderPrintDemand.InnerHtml = "鍗板埛鏁伴噺锛�(" + _eC_OrderBasic.OrderExtend.PrintNum + ")锛�" + _inquiryCommonModel.PrintDemand;
}
this.spanOrderAfterWorksDemand.InnerText = _inquiryCommonModel.AfterWorksDemand;
@@ -170,8 +173,58 @@
m_EC_SpecialForums.PSF_Forumsid = 1;
m_EC_SpecialForumsList.Add(m_EC_SpecialForums);
}
+
+ foreach (var eC_SpecialForums in m_EC_SpecialForumsList)
+ {
+ if (eC_SpecialForums.PSF_PressesDesk.IndexOf("鏁扮爜")>=0 || eC_SpecialForums.PSF_PressesDesk.IndexOf("鐩存帴淇垏") >= 0)
+ {
+ eC_SpecialForums.shifouxianshi = "display:none;";
+ }
+
+ if (eC_SpecialForums.PSF_PressesDesk.IndexOf("涓庡叾浠栬鍗曞悎鐗�") >= 0 )
+ {
+ eC_SpecialForums.shifouxianshi = "display:none;";
+ eC_SpecialForums.shifouxianshiheban = "display:none;";
+ eC_SpecialForums.shifouqitadingdan = "";
+ }
+ else
+ {
+ eC_SpecialForums.shifouqitadingdan = "display:none;";
+ }
+
+ if (eC_SpecialForums.PSF_PressesDesk.IndexOf("杞浆") >= 0)
+ {
+ eC_SpecialForums.shifouxianshilunzhuan = "display:none;";
+
+ }
+ else
+ {
+ eC_SpecialForums.shifouxianshilunzhuan = "";
+ }
+
+ }
this.RepClientList.DataSource = m_EC_SpecialForumsList;
this.RepClientList.DataBind();
+
+
+ List<EC_SpecialHoudaos> m_EC_SpecialHoudaosList = bll_EC_SpecialOrdersBLL.GetEC_SpecialHoudaosListByKeyid(m_EC_SpecialOrders.Keyid) as List<EC_SpecialHoudaos>;
+ this.RepeaterHoudaoList.DataSource = m_EC_SpecialHoudaosList;
+ this.RepeaterHoudaoList.DataBind();
+
+ if (m_EC_SpecialHoudaosList == null || m_EC_SpecialHoudaosList.Count <= 0)
+ {
+ this.Tr1.Visible = false;
+ }
+ if(m_EC_SpecialHoudaosList != null)
+ {
+ therowspan = (m_EC_SpecialHoudaosList.Count + 1) + "";
+ }
+ else
+ {
+ therowspan = "1";
+ }
+
+
return true;
}
/// <summary>
--
Gitblit v1.9.1