From 8e1cb074113fad90a5de21d994521439795a1b63 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 06 三月 2026 12:35:04 +0800
Subject: [PATCH] 20260305 报纸的施工单修改报纸生产施工单的“构建”改为“成品尺寸”、“P数”改为版数 默认订单数据可以改。 这个是报纸新增的字段，替换构件和p数
---
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx.cs | 4 +
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx.designer.cs | 9 ++++
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx.designer.cs | 9 ++++
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx.cs | 20 ++++++++-
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx | 18 +++++++-
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx | 12 +++++-
6 files changed, 63 insertions(+), 9 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx
index 35739c7..a6d1686 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx
@@ -209,6 +209,14 @@
</tr>
<tr>
<td class="ali03">
+ 鍗板埛鏁伴噺锛�
+ </td>
+ <td colspan="5">
+ <span id="spanPrintNum" runat="server"></span>
+ </td>
+ </tr>
+ <tr>
+ <td class="ali03">
澶囨敞锛�
</td>
<td colspan="5">
@@ -227,10 +235,10 @@
</tr>
<tr class=" price_tabbg" style="font-weight: bold; background-color: #E4E4E4;">
<td rowspan="2">
- 鏋勪欢
+ <%=PrintTypeId=="7"?"鎴愬搧灏哄":"鏋勪欢" %>
</td>
<td rowspan="2" colspan="2">
- P鏁�
+ <%=PrintTypeId=="7"?"鐗堟暟":"P鏁�" %>
</td>
<td rowspan="2" colspan="2">
鍗板埛鏈哄彴
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx.cs
index c4e340e..dabb175 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx.cs
@@ -20,6 +20,7 @@
{
EC_SpecialOrdersBLL bll_EC_SpecialOrdersBLL = null;
string orderIdStr = string.Empty;
+ public string PrintTypeId = "";
//鍒濆鍖�
public AgSpecialOrderDetail()
{
@@ -95,7 +96,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);
@@ -131,6 +132,7 @@
}
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");
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx.designer.cs
index 7afaa43..ae75632 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx.designer.cs
@@ -213,6 +213,15 @@
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanOrderBillModeName;
/// <summary>
+ /// spanPrintNum 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPrintNum;
+
+ /// <summary>
/// spanOrderRemarks 鎺т欢銆�
/// </summary>
/// <remarks>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx
index 6c9dcb5..f98dd33 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx
@@ -175,6 +175,14 @@
</tr>
<tr>
<td class="ali03">
+ 鍗板埛鏁伴噺锛�
+ </td>
+ <td colspan="5">
+ <input type="text" id="txtOrderNum" class=" w120px int" min="0" runat="server" />
+ </td>
+ </tr>
+ <tr>
+ <td class="ali03">
澶囨敞锛�
</td>
<td colspan="5">
@@ -195,10 +203,10 @@
</thead>
<tr class=" price_tabbg" style="font-weight: bold; background-color: #E6E6E6; width: 100%">
<td rowspan="2" style="width: 195px;">
- 鏋勪欢
+ <%=PrintTypeId=="7"?"鎴愬搧灏哄":"鏋勪欢" %>
</td>
<td rowspan="2" colspan="2" >
- P鏁�
+ <%=PrintTypeId=="7"?"鐗堟暟":"P鏁�" %>
</td>
<td rowspan="2" colspan="2">
鍗板埛鏈哄彴
@@ -221,11 +229,13 @@
</tr>
<tr>
<td>
- <select keepdefaultstyle="true" class="" name="PSF_Component" value_ppwaerid="<%#Container.ItemIndex + 1%>">
+ <select keepdefaultstyle="true" class="" name="PSF_Component" value_ppwaerid="<%#Container.ItemIndex + 1%>" <%=PrintTypeId=="7"?"style=\"display:none;\"":"" %> >
<option value="" selected="selected">-鏃�-</option>
<option value="灏侀潰">灏侀潰</option>
<option value="鍐呴〉">鍐呴〉</option>
</select>
+
+ <input type="text" class=" w120px " maxlength="50" name="PSF_Chengpinchicun" value_ppwaerid="<%#Container.ItemIndex + 1%>" value="<%#Eval("PSF_Component")%>" <%=PrintTypeId=="7"?"":"style=\"display:none;\"" %> />
</td>
<td colspan="2">
<input type="text" class=" w80px int " msg="璇峰～鍐欐暟瀛�" name="PSF_PNum" value="<%#Eval("PSF_PNum")%>" value_ppwaerid="<%#Container.ItemIndex + 1%>" />
@@ -607,6 +617,7 @@
$("input[name='PSF_Qitadingdanhao']").last().attr("value_ppwaerid", value_id + 1);
$("select[name='PSF_Component']").last().attr("value_ppwaerid", value_id + 1);
$("input[name='PSF_PNum']").last().attr("value_ppwaerid", value_id + 1);
+ $("input[name='PSF_Chengpinchicun']").last().attr("value_ppwaerid", value_id + 1);
$(".tdCTPCount").last().attr("value_ppwaerid", value_id + 1);
$(".selCTPSpec").last().attr("value_ppwaerid", value_id + 1);
$(".selFilmSpec").last().attr("value_ppwaerid", value_id + 1);
@@ -1436,6 +1447,7 @@
}
if (keyid != "") {
$(vv).parent().parent().parent().parent().parent().find("select[name='PSF_Component']").val($(vv).attr("value_hide_psf_component"));
+ //$(vv).parent().parent().parent().parent().parent().find("input[name='PSF_Chengpinchicun']").val($(vv).attr("value_hide_psf_component"));
$(vv).parent().parent().parent().parent().parent().find("select[name='PSF_PressesDesk']").val($(vv).attr("value_hide_psf_pressesdesk"));
$(vv).parent().parent().parent().parent().parent().find("select[name='PSF_PrintedColorPositive']").val($(vv).attr("value_hide_psf_printedcolorpositive"));
$(vv).parent().parent().parent().parent().parent().find("select[name='PSF_PrintedColorRear']").val($(vv).attr("value_hide_psf_printedcolorrear"));
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx.cs
index 2db5bab..65e8bb1 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx.cs
@@ -191,7 +191,7 @@
_inquiryCommonModel = SerializationHelper.DeSerialize(typeof(InquiryCommonModel), _eC_OrderPrintParameter.PrintParameter) as InquiryCommonModel;
}
PrintTypeId = _eC_OrderBasic.PrintTypeId.ToString();
-
+ this.txtOrderNum.Value = _eC_OrderBasic.OrderExtend.SurplusPrintNum.ToString2();
#endregion
@@ -243,6 +243,10 @@
{
shukuanhuace = "false";
}
+ }
+ else
+ {
+ this.txtOrderNum.Value = m_EC_SpecialOrders.OrderNum.ToString2(); ;
}
@@ -301,6 +305,11 @@
m_EC_SpecialForums.PSF_CTPCount = 1;
m_EC_SpecialForumsList.Add(m_EC_SpecialForums);
this.txtPSO_Work.InnerText = _inquiryCommonModel.AfterWorksDemand;
+ if (_eC_OrderBasic.PrintTypeId == 7)
+ {
+ m_EC_SpecialForums.PSF_PNum = _inquiryCommonModel.PageNum;
+ m_EC_SpecialForums.PSF_Component = _inquiryCommonModel.PrintSizeName;
+ }
}
this.RepClientList.DataSource = m_EC_SpecialForumsList;
this.RepClientList.DataBind();
@@ -411,6 +420,7 @@
}
string[] PSF_Component = Request["PSF_Component"].ToString2().Split(',');
+ string[] PSF_Chengpinchicun = Request["PSF_Chengpinchicun"].ToString2().Split(',');
string[] PSF_PNum = Request["PSF_PNum"].ToString2().Split(',');
string[] PSF_PressesDesk = Request["PSF_PressesDesk"].ToString2().Split(',');
string[] PSF_PrintedColorPositive = Request["PSF_PrintedColorPositive"].ToString2().Split(',');
@@ -497,6 +507,10 @@
{
EC_SpecialForums m_EC_SpecialForums = new EC_SpecialForums();
m_EC_SpecialForums.PSF_Component = PSF_Component[i].ToString2().Replace("锛�+-+锛�", ",");
+ if (_eC_OrderBasic.PrintTypeId == 7 )
+ {
+ m_EC_SpecialForums.PSF_Component = PSF_Chengpinchicun[i];
+ }
if (PSF_PNum[i].ToInt32() == null)
{
m_EC_SpecialForums.PSF_PNum = 0;
@@ -736,7 +750,7 @@
m_EC_SpecialOrders.Operator = CurrentUser.ShortName;
m_EC_SpecialOrders.PSO_Remarks = this.txtPSO_Remarks.InnerText;
m_EC_SpecialOrders.PSO_Work = this.txtPSO_Work.InnerText;
-
+ m_EC_SpecialOrders.OrderNum = this.txtOrderNum.Value.ToInt32();
if (m_EC_SpecialOrders.Keyid > 0)
{
@@ -752,7 +766,7 @@
else
{
m_EC_SpecialOrders.Memberid = CurrentUser.MemberId;
- m_EC_SpecialOrders.OrderNum = 0;
+ m_EC_SpecialOrders.OrderNum = this.txtOrderNum.Value.ToInt32();
m_EC_SpecialOrders.PO_OrderId = orderId;
m_EC_SpecialOrders.PO_OrderNum = _eC_OrderBasic.SellerOrderId;
m_EC_SpecialOrders.PSO_OrderNum = bll_EC_SpecialOrdersBLL.GetPSO_OrderNum(CurrentUser.MemberId);
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx.designer.cs
index a4f0397..84d95d5 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx.designer.cs
@@ -213,6 +213,15 @@
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanOrderBillModeName;
/// <summary>
+ /// txtOrderNum 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtOrderNum;
+
+ /// <summary>
/// spanOrderRemarks 鎺т欢銆�
/// </summary>
/// <remarks>
--
Gitblit v1.9.1