From dfa28b7d5089acd327ed81e4d311310ec195185f Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 26 十一月 2024 08:35:36 +0800
Subject: [PATCH] 合版工单，专版工单，后到工单撤单
---
CY_ECommercePlatform/CY.Model/EC/EC_SpecialForums.cs | 10
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx.cs | 9
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx.designer.cs | 70 +++---
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderList.aspx | 8
CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs | 12 +
CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderExtendDAL.cs | 25 ++
CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderExtendDAL.cs | 9
CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderList.aspx.designer.cs | 42 ++--
CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAfterList.aspx.designer.cs | 42 ++--
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx | 6
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderList.aspx.designer.cs | 36 +-
CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAfterList.aspx | 5
CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAfterEdit.aspx.cs | 2
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx.cs | 11 +
CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderList.aspx.cs | 49 ++++
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx | 201 ++++++++++++++++++--
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderList.aspx.cs | 42 ++++
CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderList.aspx | 9
18 files changed, 464 insertions(+), 124 deletions(-)
diff --git a/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs b/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs
index e397294..254946e 100644
--- a/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs
+++ b/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs
@@ -42,10 +42,12 @@
{
IEC_OrderBasicDAL _eC_OrderBasicDAL = null;
IEC_OrderPrintParameterDAL _eC_OrderPrintParameterDAL = null;
+ IEC_OrderExtendDAL _eC_OrderExtendDAL = null;
public EC_OrderBasicBLL()
{
_eC_OrderBasicDAL = AbstractFactory.Factory.GetDALByInterfaceName(AbstractFactory.DALInterface.IEC_OrderBasicDAL) as IEC_OrderBasicDAL;
_eC_OrderPrintParameterDAL = AbstractFactory.Factory.GetDALByInterfaceName(AbstractFactory.DALInterface.IEC_OrderPrintParameterDAL) as IEC_OrderPrintParameterDAL;
+ _eC_OrderExtendDAL = AbstractFactory.Factory.GetDALByInterfaceName(AbstractFactory.DALInterface.IEC_OrderExtendDAL) as IEC_OrderExtendDAL;
}
/// <summary>
@@ -169,6 +171,16 @@
}
/// <summary>
+ /// 淇敼璁㈠崟鐘舵��(闈炴敮浠樼姸鎬佷笖涓嶅彲淇敼涓烘湭鍙楃悊鍜屽凡鍙楃悊)
+ /// </summary>
+ /// <param name="orderOperate">璁㈠崟鎿嶄綔</param>
+ /// <returns></returns>
+ public bool UpSurplusPrintNum(int? Keyid, int? SurplusPrintNum, string Operator)
+ {
+ return _eC_OrderExtendDAL.UpSurplusPrintNumsql(Keyid, SurplusPrintNum, Operator);
+ }
+
+ /// <summary>
/// 鏍规嵁缂栧彿鎵归噺鍒犻櫎鏁版嵁
/// </summary>
/// <param name="currentOperator">褰撳墠鎿嶄綔浜�</param>
diff --git a/CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderExtendDAL.cs b/CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderExtendDAL.cs
index 6d81329..4333eb7 100644
--- a/CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderExtendDAL.cs
+++ b/CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderExtendDAL.cs
@@ -38,6 +38,15 @@
bool UpSurplusPrintNum(int? Keyid, int? SurplusPrintNum, string Operator);
/// <summary>
+ /// 鏇存柊璁㈠崟鎵╁睍琛ㄥ墿浣欏嵃鍒锋暟閲�
+ /// </summary>
+ /// <param name="Keyid"></param>
+ /// <param name="SurplusPrintNum"></param>
+ /// <param name="Operator"></param>
+ /// <returns></returns>
+ bool UpSurplusPrintNumsql(int? Keyid, int? SurplusPrintNum, string Operator);
+
+ /// <summary>
/// 淇敼澶栧崗璁㈠崟
/// </summary>
/// <param name="orderBasic"></param>
diff --git a/CY_ECommercePlatform/CY.Model/EC/EC_SpecialForums.cs b/CY_ECommercePlatform/CY.Model/EC/EC_SpecialForums.cs
index 685d0de..e5bfc21 100644
--- a/CY_ECommercePlatform/CY.Model/EC/EC_SpecialForums.cs
+++ b/CY_ECommercePlatform/CY.Model/EC/EC_SpecialForums.cs
@@ -55,12 +55,12 @@
private int? _psf_CTPCount;
private string _psf_PSSpec;
private int? _psf_PSCount;
+ public string shifouxianshi { get; set; }
-
- /// <summary>
- /// 涓婚敭--鏍囪瘑ID
- /// </summary>
- public int? Keyid
+ /// <summary>
+ /// 涓婚敭--鏍囪瘑ID
+ /// </summary>
+ public int? Keyid
{
set{ _keyid=value;}
get{return _keyid;}
diff --git a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderExtendDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderExtendDAL.cs
index 6df952b..a4a0cc6 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderExtendDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderExtendDAL.cs
@@ -356,6 +356,31 @@
}
}
+
+ /// <summary>
+ /// 鏇存柊璁㈠崟鎵╁睍琛ㄥ墿浣欏嵃鍒锋暟閲�
+ /// </summary>
+ /// <param name="Keyid"></param>
+ /// <param name="SurplusPrintNum"></param>
+ /// <param name="Operator"></param>
+ /// <returns></returns>
+ public bool UpSurplusPrintNumsql(int? Keyid, int? SurplusPrintNum, string Operator)
+ {
+
+ try
+ {
+ var sqlStr = "UPDATE [EC_OrderExtend] SET [SurplusPrintNum]=[PrintNum] WHERE Keyid=@Keyid ";
+ SqlParameter par = new SqlParameter("@Keyid", Keyid);
+ _dataBase.ExecuteSql(sqlStr, par);
+
+ return true;
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ }
+
public bool UpdateModel(Infrastructure.Domain.IAggregateRoot model)
{
throw new NotImplementedException();
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderList.aspx
index c3e6a81..7828697 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderList.aspx
@@ -26,6 +26,14 @@
window.location = "/Pages/business/AgMergerOrderList.aspx?delete=" + keyid;
});
}
+
+ //鎾ゅ崟
+ function onchedan(keyid) {
+ top.Dialog.confirm("纭畾瑕佹挙鍗曡璁板綍鍚楋紵", function () {
+ window.location = "/Pages/business/AgMergerOrderList.aspx?chedan=" + keyid;
+ });
+ }
+
</script>
</head>
<body>
@@ -188,6 +196,7 @@
<span menu_member_case_id="case_onView" menu_member_case_name="鎵撳嵃" onclick="onView('<%#Eval("Keyid")%>')">鎵撳嵃</span>
<span menu_member_case_id="case_onEdit" menu_member_case_name="淇敼" onclick="onEdit('<%#Eval("Keyid")%>')">淇敼</span>
<span menu_member_case_id="case_onDelete" menu_member_case_name="鍒犻櫎" onclick="onDelete('<%#Eval("Keyid")%>')">鍒犻櫎</span>
+ <span onclick="onchedan('<%#Eval("Keyid")%>')">鎾ゅ崟</span>
</td>
</tr>
</ItemTemplate>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderList.aspx.cs
index 7c9e641..115a290 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderList.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderList.aspx.cs
@@ -11,6 +11,7 @@
using CY.BLL.Sys;
using System.Data;
using CY.BLL.OA;
+using CY.BLL.EC;
namespace CY.WebForm.Pages.business
{
@@ -20,12 +21,15 @@
{
EC_MergerSingleBLL bll_EC_MergerSingleBLL = null;
OA_CorporateClientsBLL bll_OA_CorporateClientsBLL = null;
+ EC_OrderBasicBLL _eC_OrderBasicBLL = null;
+
//鍒濆鍖�
public AgMergerOrderList()
{
bll_EC_MergerSingleBLL = new EC_MergerSingleBLL();
bll_OA_CorporateClientsBLL = new OA_CorporateClientsBLL();
+ _eC_OrderBasicBLL = new EC_OrderBasicBLL();
}
//椤甸潰鍔犺浇
@@ -52,6 +56,51 @@
JavaScript.MessageBox("鍒犻櫎澶辫触", this);
}
}
+ if (Request["chedan"] != null)
+ {
+ EC_MergerSingle model = bll_EC_MergerSingleBLL.GetModelByKeyid(Request["chedan"].ToInt32());
+ if (model != null && model.Keyid != null)
+ {
+ var strOrderIdTemp = model.PMS_OldId.ToString2();
+ var strOrderId = strOrderIdTemp.Replace("<br/>", ",");
+ var orderId = strOrderId.Trim(',').Split(',');
+ foreach (var item in orderId)
+ {
+ EC_OrderBasic _eC_OrderBasic = _eC_OrderBasicBLL.SelectModelById(item.ToInt32().Value);
+ if (null == _eC_OrderBasic)
+ {
+
+ }
+ else
+ {
+ //淇敼璁㈠崟鐘舵��
+ List<EC_OrderOperate> oprates = new List<EC_OrderOperate>();
+ oprates.Add(new EC_OrderOperate()
+ {
+ OperateType = 2,
+ OrderId = _eC_OrderBasic.Keyid,
+ Operator = CurrentUser.ShortName,
+ Remark = ""
+ });
+ _eC_OrderBasicBLL.UpdateOrderState(oprates[0]);
+ //淇敼璁㈠崟鏁伴噺
+ _eC_OrderBasicBLL.UpSurplusPrintNum(_eC_OrderBasic.Keyid, _eC_OrderBasic.OrderExtend.PrintNum, CurrentUser.ShortName);
+
+
+
+ }
+ }
+
+ bll_EC_MergerSingleBLL.DeleteModel(model);
+ JavaScript.MessageBox("鎾ゅ崟鎴愬姛", this);
+ Response.Redirect("/Pages/business/AgMergerOrderList.aspx");
+ }
+ else
+ {
+ JavaScript.MessageBox("鎾ゅ崟澶辫触", this);
+ }
+ }
+
}
//缁戝畾澶栧崗鍘傚晢
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderList.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderList.aspx.designer.cs
index ebaed5d..d0dc1b3 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderList.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderList.aspx.designer.cs
@@ -2,16 +2,18 @@
// <鑷姩鐢熸垚>
// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
//
-// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
// </鑷姩鐢熸垚>
//------------------------------------------------------------------------------
-namespace CY.WebForm.Pages.business {
-
-
- public partial class AgMergerOrderList {
-
+namespace CY.WebForm.Pages.business
+{
+
+
+ public partial class AgMergerOrderList
+ {
+
/// <summary>
/// CMSHead1 鎺т欢銆�
/// </summary>
@@ -20,7 +22,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
-
+
/// <summary>
/// form1 鎺т欢銆�
/// </summary>
@@ -29,7 +31,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-
+
/// <summary>
/// txtBeginDate 鎺т欢銆�
/// </summary>
@@ -38,7 +40,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtBeginDate;
-
+
/// <summary>
/// txtEndDate 鎺т欢銆�
/// </summary>
@@ -47,7 +49,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtEndDate;
-
+
/// <summary>
/// txtPrintName 鎺т欢銆�
/// </summary>
@@ -56,7 +58,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtPrintName;
-
+
/// <summary>
/// txtCustormerName 鎺т欢銆�
/// </summary>
@@ -65,7 +67,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtCustormerName;
-
+
/// <summary>
/// txtPO_OrderNum 鎺т欢銆�
/// </summary>
@@ -74,7 +76,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtPO_OrderNum;
-
+
/// <summary>
/// txtPMS_Printers 鎺т欢銆�
/// </summary>
@@ -83,7 +85,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect txtPMS_Printers;
-
+
/// <summary>
/// txtPSO_OrderNum 鎺т欢銆�
/// </summary>
@@ -92,7 +94,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtPSO_OrderNum;
-
+
/// <summary>
/// selPayStates 鎺т欢銆�
/// </summary>
@@ -101,7 +103,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect selPayStates;
-
+
/// <summary>
/// selPrintStates 鎺т欢銆�
/// </summary>
@@ -110,7 +112,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect selPrintStates;
-
+
/// <summary>
/// btn_Search 鎺т欢銆�
/// </summary>
@@ -119,7 +121,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.WebControls.Button btn_Search;
-
+
/// <summary>
/// RepClientList 鎺т欢銆�
/// </summary>
@@ -128,7 +130,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.WebControls.Repeater RepClientList;
-
+
/// <summary>
/// UCPager1 鎺т欢銆�
/// </summary>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAfterEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAfterEdit.aspx.cs
index 10a84c0..42899c2 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAfterEdit.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAfterEdit.aspx.cs
@@ -156,7 +156,7 @@
m_EC_OrderBasicNew.BuyerName = CurrentUser.Name;
m_EC_OrderBasicNew.Creater = CurrentUser.ShortName;
m_EC_OrderBasicNew.Operator = CurrentUser.ShortName;
- m_EC_OrderBasicNew.DeliveryTime = _eC_OrderBasic.DeliveryTime.Value.ToDateTime2();
+ m_EC_OrderBasicNew.DeliveryTime = _eC_OrderBasic.DeliveryTime.ToDateTime2();
m_EC_OrderBasicNew.DocumentName = _eC_OrderBasic.DocumentName;
m_EC_OrderBasicNew.OrderTypeId = 4;
m_EC_OrderBasicNew.PrintTypeId = _eC_OrderBasic.PrintTypeId;
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAfterList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAfterList.aspx
index eee9571..9f356ad 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAfterList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAfterList.aspx
@@ -135,7 +135,7 @@
<th class='w80px'>
杩斿洖鏃堕棿
</th>
- <th class='w80px'>
+ <th class='w120px'>
鎿嶄綔
</th>
</tr>
@@ -184,7 +184,8 @@
</td>
<td>
<span menu_member_case_id="case_outAfterOrder" menu_member_case_name="淇敼" class="a_under <%#Eval("OrderState").ToString() == "1"?"":"UnRecive" %>" onclick='outAfterOrder(<%#Eval("Keyid") %>,<%#Eval("OldOrderId") %>)'>淇敼</span>
- <span menu_member_case_id="case_deleteOrder" menu_member_case_name="鍒犻櫎" class="a_under <%#Eval("OrderState").ToString() == "1"?"":"UnRecive" %>" onclick='onDelete(<%#Eval("Keyid") %>)'>鍒犻櫎</span>
+ <span menu_member_case_id="case_deleteOrder" menu_member_case_name="鍒犻櫎" class="a_under <%#Eval("OrderState").ToString() == "1"?"":"UnRecive" %>" onclick='onDelete(<%#Eval("Keyid") %>)'>鍒犻櫎</span>
+ <span class="a_under <%#Eval("OrderState").ToString() == "1"?"":"UnRecive" %>" onclick='onDelete(<%#Eval("Keyid") %>)'>鎾ゅ崟</span>
</td>
</tr>
</ItemTemplate>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAfterList.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAfterList.aspx.designer.cs
index cbc2255..88136ac 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAfterList.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAfterList.aspx.designer.cs
@@ -2,16 +2,18 @@
// <鑷姩鐢熸垚>
// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
//
-// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
// </鑷姩鐢熸垚>
//------------------------------------------------------------------------------
-namespace CY.WebForm.Pages.business {
-
-
- public partial class AgOutsourcSingleAfterList {
-
+namespace CY.WebForm.Pages.business
+{
+
+
+ public partial class AgOutsourcSingleAfterList
+ {
+
/// <summary>
/// Head1 鎺т欢銆�
/// </summary>
@@ -20,7 +22,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
-
+
/// <summary>
/// CMSHead1 鎺т欢銆�
/// </summary>
@@ -29,7 +31,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
-
+
/// <summary>
/// form1 鎺т欢銆�
/// </summary>
@@ -38,7 +40,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-
+
/// <summary>
/// txtStartCreatTime 鎺т欢銆�
/// </summary>
@@ -47,7 +49,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtStartCreatTime;
-
+
/// <summary>
/// txtEndCreatTime 鎺т欢銆�
/// </summary>
@@ -56,7 +58,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtEndCreatTime;
-
+
/// <summary>
/// txtCreater 鎺т欢銆�
/// </summary>
@@ -65,7 +67,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtCreater;
-
+
/// <summary>
/// selOutFirm 鎺т欢銆�
/// </summary>
@@ -74,7 +76,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect selOutFirm;
-
+
/// <summary>
/// selWorkStates 鎺т欢銆�
/// </summary>
@@ -83,7 +85,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect selWorkStates;
-
+
/// <summary>
/// txtStartReturnTime 鎺т欢銆�
/// </summary>
@@ -92,7 +94,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtStartReturnTime;
-
+
/// <summary>
/// txtEndReturnTime 鎺т欢銆�
/// </summary>
@@ -101,7 +103,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtEndReturnTime;
-
+
/// <summary>
/// txtOutOrderId 鎺т欢銆�
/// </summary>
@@ -110,7 +112,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtOutOrderId;
-
+
/// <summary>
/// btn_Search 鎺т欢銆�
/// </summary>
@@ -119,7 +121,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.WebControls.Button btn_Search;
-
+
/// <summary>
/// RepClientList 鎺т欢銆�
/// </summary>
@@ -128,7 +130,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.WebControls.Repeater RepClientList;
-
+
/// <summary>
/// UCPager1 鎺т欢銆�
/// </summary>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx
index 3c2fdbf..a686273 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx
@@ -279,7 +279,7 @@
<%#Eval("PSF_EditionCount")%>
</td>--%>
</tr>
- <tr class=" price_tabbg" style="font-weight: bold; background-color: #E6E6E6;">
+ <tr class=" price_tabbg" style="font-weight: bold; background-color: #E6E6E6;<%#Eval("shifouxianshi")%>">
<td rowspan="2">
绾稿紶鏉ユ簮
</td>
@@ -296,7 +296,7 @@
寮�鏂欒鏍�
</td>
</tr>
- <tr class=" price_tabbg" style="font-weight: bold; background-color: #E6E6E6;">
+ <tr class=" price_tabbg" style="font-weight: bold; background-color: #E6E6E6;<%#Eval("shifouxianshi")%>">
<td>
绾稿紶鏁伴噺
</td>
@@ -316,7 +316,7 @@
闀垮害(mm)
</td>
</tr>
- <tr style="background-color: #FFFFFF;">
+ <tr style="background-color: #FFFFFF;<%#Eval("shifouxianshi")%>">
<td>
<%#Eval("PSF_PaperSource")%>
</td>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx.cs
index f03b91a..4dab4a0 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx.cs
@@ -170,6 +170,15 @@
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.shifouxianshi = "display:none;";
+ }
+
+ }
this.RepClientList.DataSource = m_EC_SpecialForumsList;
this.RepClientList.DataBind();
return true;
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 e721734..7afaa43 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx.designer.cs
@@ -2,16 +2,18 @@
// <鑷姩鐢熸垚>
// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
//
-// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
// </鑷姩鐢熸垚>
//------------------------------------------------------------------------------
-namespace CY.WebForm.Pages.business {
-
-
- public partial class AgSpecialOrderDetail {
-
+namespace CY.WebForm.Pages.business
+{
+
+
+ public partial class AgSpecialOrderDetail
+ {
+
/// <summary>
/// Head1 鎺т欢銆�
/// </summary>
@@ -20,7 +22,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
-
+
/// <summary>
/// FormCon 鎺т欢銆�
/// </summary>
@@ -29,7 +31,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm FormCon;
-
+
/// <summary>
/// hideOrderId 鎺т欢銆�
/// </summary>
@@ -38,7 +40,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputHidden hideOrderId;
-
+
/// <summary>
/// spanSpecialNum 鎺т欢銆�
/// </summary>
@@ -47,7 +49,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanSpecialNum;
-
+
/// <summary>
/// spanSpecialExigency 鎺т欢銆�
/// </summary>
@@ -56,7 +58,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanSpecialExigency;
-
+
/// <summary>
/// spanSpecialOprator 鎺т欢銆�
/// </summary>
@@ -65,7 +67,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanSpecialOprator;
-
+
/// <summary>
/// spanSpecialTime 鎺т欢銆�
/// </summary>
@@ -74,7 +76,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanSpecialTime;
-
+
/// <summary>
/// spanOrderNum 鎺т欢銆�
/// </summary>
@@ -83,7 +85,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanOrderNum;
-
+
/// <summary>
/// spanOrderTitle 鎺т欢銆�
/// </summary>
@@ -92,7 +94,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanOrderTitle;
-
+
/// <summary>
/// spanOrderDeliveryTime 鎺т欢銆�
/// </summary>
@@ -101,7 +103,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanOrderDeliveryTime;
-
+
/// <summary>
/// spanOrderCustormName 鎺т欢銆�
/// </summary>
@@ -110,7 +112,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanOrderCustormName;
-
+
/// <summary>
/// spanOrderCustormLevel 鎺т欢銆�
/// </summary>
@@ -119,7 +121,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanOrderCustormLevel;
-
+
/// <summary>
/// spanOrderCustormPeople 鎺т欢銆�
/// </summary>
@@ -128,7 +130,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanOrderCustormPeople;
-
+
/// <summary>
/// spanOrderCustormPhone 鎺т欢銆�
/// </summary>
@@ -137,7 +139,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanOrderCustormPhone;
-
+
/// <summary>
/// spanOrderBusinessManage 鎺т欢銆�
/// </summary>
@@ -146,7 +148,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanOrderBusinessManage;
-
+
/// <summary>
/// spanOrderCustormManage 鎺т欢銆�
/// </summary>
@@ -155,7 +157,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanOrderCustormManage;
-
+
/// <summary>
/// spanOrderName 鎺т欢銆�
/// </summary>
@@ -164,7 +166,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanOrderName;
-
+
/// <summary>
/// spanOrderPrintNum 鎺т欢銆�
/// </summary>
@@ -173,7 +175,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanOrderPrintNum;
-
+
/// <summary>
/// spanOrderPrintDemand 鎺т欢銆�
/// </summary>
@@ -182,7 +184,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanOrderPrintDemand;
-
+
/// <summary>
/// spanOrderAfterWorksDemand 鎺т欢銆�
/// </summary>
@@ -191,7 +193,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanOrderAfterWorksDemand;
-
+
/// <summary>
/// spanOrderDeliveryModeName 鎺т欢銆�
/// </summary>
@@ -200,7 +202,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanOrderDeliveryModeName;
-
+
/// <summary>
/// spanOrderBillModeName 鎺т欢銆�
/// </summary>
@@ -209,7 +211,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanOrderBillModeName;
-
+
/// <summary>
/// spanOrderRemarks 鎺т欢銆�
/// </summary>
@@ -218,7 +220,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanOrderRemarks;
-
+
/// <summary>
/// RepClientList 鎺т欢銆�
/// </summary>
@@ -227,7 +229,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.WebControls.Repeater RepClientList;
-
+
/// <summary>
/// txtPSO_Work_o_TR 鎺т欢銆�
/// </summary>
@@ -236,7 +238,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlTableRow txtPSO_Work_o_TR;
-
+
/// <summary>
/// txtPSO_Work_o 鎺т欢銆�
/// </summary>
@@ -245,7 +247,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl txtPSO_Work_o;
-
+
/// <summary>
/// txtPSO_Remarks_o_TR 鎺т欢銆�
/// </summary>
@@ -254,7 +256,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlTableRow txtPSO_Remarks_o_TR;
-
+
/// <summary>
/// txtPSO_Remarks_o 鎺т欢銆�
/// </summary>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx
index 46c9dfc..30d6ea5 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx
@@ -197,25 +197,26 @@
<td rowspan="2" style="width: 195px;">
鏋勪欢
</td>
- <td rowspan="2" colspan="2" colspan="2">
+ <td rowspan="2" colspan="2" >
P鏁�
</td>
<td rowspan="2" colspan="2">
鍗板埛鏈哄彴
</td>
- <td colspan="2">
- 鍗拌壊
+ <td colspan="2" >
+ <p name="PSF_yinse" value_openwidthspan="<%#Container.ItemIndex + 1%>">鍗拌壊</p>
</td>
<td rowspan="2" colspan="2">
鍗板埛鏂瑰紡
</td>
+
</tr>
- <tr class=" price_tabbg" style="font-weight: bold; background-color: #E6E6E6;">
+ <tr class=" price_tabbg" style="font-weight: bold; background-color: #E6E6E6;" >
<td>
- 姝�
+ <p name="PSF_yinsezheng" value_openwidthspan="<%#Container.ItemIndex + 1%>">姝�</p>
</td>
<td>
- 鑳�
+ <p name="PSF_yinsebei" value_openwidthspan="<%#Container.ItemIndex + 1%>">鑳�</p>
</td>
</tr>
<tr>
@@ -235,8 +236,9 @@
<%=PressesDeskHtml %>
</select>
</td>
- <td>
+ <td >
<select keepdefaultstyle="true" class="" name="PSF_PrintedColorPositive" value_selspec="<%#Container.ItemIndex + 1%>" >
+ <option value="" >璇烽�夋嫨</option>
<option value="鍗曡壊" selected="selected">鍗曡壊</option>
<option value="鍙岃壊">鍙岃壊</option>
<option value="涓夎壊">涓夎壊</option>
@@ -246,6 +248,7 @@
</td>
<td>
<select keepdefaultstyle="true" class="" name="PSF_PrintedColorRear" value_ppwaerid="<%#Container.ItemIndex + 1%>">
+ <option value="" >璇烽�夋嫨</option>
<option value="0鑹�">0鑹�</option>
<option value="鍗曡壊" selected="selected">鍗曡壊</option>
<option value="鍙岃壊">鍙岃壊</option>
@@ -261,9 +264,16 @@
<option value="鎵ｆ澘">鎵ｆ澘</option>
<option value="鍗曢潰">鍗曢潰</option>
</select>
+
+ <select keepdefaultstyle="true" class="" name="PSF_Typesettinghide" value_ppwaerid="<%#Container.ItemIndex + 1%>" style="display:none;">
+ <option value="鍗曢潰">鍗曢潰</option>
+ <option value="鍙岄潰">鍙岄潰</option>
+
+ </select>
</td>
+
</tr>
- <tr class=" price_tabbg" style="font-weight: bold; background-color: #E6E6E6; width: 100%">
+ <tr class=" price_tabbg" style="font-weight: bold; background-color: #E6E6E6; width: 100%" name="PSF_PrintedPaperTd" value_selspec="<%#Container.ItemIndex + 1%>">
<td rowspan="2">
绾稿紶鏉ユ簮
</td>
@@ -280,7 +290,7 @@
寮�鏂欒鏍�
</td>
</tr>
- <tr class=" price_tabbg" style="font-weight: bold; background-color: #E6E6E6;">
+ <tr class=" price_tabbg" style="font-weight: bold; background-color: #E6E6E6;" name="PSF_PrintedPaperTdtr" value_selspec="<%#Container.ItemIndex + 1%>">
<td>
绾稿紶鏁伴噺
</td>
@@ -300,7 +310,7 @@
<p name="PSF_OpenWidthspan" value_openwidthspan="<%#Container.ItemIndex + 1%>">闀垮害(mm)</p>
</td>
</tr>
- <tr>
+ <tr name="PSF_PrintedPaperTdtrtr" value_selspec="<%#Container.ItemIndex + 1%>">
<td>
<select keepdefaultstyle="true" class=" w80px" name="PSF_PaperSource" value_selwaerid="<%#Container.ItemIndex + 1%>" value_name="" value_type="" value_soure="">
<option value="鏉ヨ嚜浠撳簱">鏉ヨ嚜浠撳簱</option>
@@ -558,6 +568,9 @@
$("select[name='PSF_OpenSpecifications']").last().attr("value_selSpec", value_id + 1);
$("p[name='PSF_OpenSpecificationsspan']").last().attr("value_selspecspan", value_id + 1);
$("p[name='PSF_OpenWidthspan']").last().attr("value_openwidthspan", value_id + 1);
+ $("p[name='PSF_yinse']").last().attr("value_openwidthspan", value_id + 1);
+ $("p[name='PSF_yinsezheng']").last().attr("value_openwidthspan", value_id + 1);
+ $("p[name='PSF_yinsebei']").last().attr("value_openwidthspan", value_id + 1);
$("select[name='PSF_PrintedColorRear']").last().attr("value_ppwaerid", value_id + 1);
$("select[name='PSF_PressesDesk']").last().attr("value_selspec", value_id + 1);
$("select[name='PSF_PrintedColorPositive']").last().attr("value_selspec", value_id + 1);
@@ -580,6 +593,19 @@
$(".tdPsCount").last().attr("value_ppwaerid", value_id + 1);
$("input[name='PSF_PaperId2']").last().attr("value_PpWaerId", value_id + 1);
$("input[name='PSF_PaperId3']").last().attr("value_PpWaerId", value_id + 1);
+
+
+
+
+
+
+
+ $("tr[name='PSF_PrintedPaperTd']").last().attr("value_selspec", value_id + 1);
+ $("tr[name='PSF_PrintedPaperTdtr']").last().attr("value_selspec", value_id + 1);
+ $("tr[name='PSF_PrintedPaperTdtrtr']").last().attr("value_selspec", value_id + 1);
+
+ $("select[name='PSF_Typesettinghide']").last().attr("value_ppwaerid", value_id + 1);
+
// $("select[name='PSF_OpenSpecifications']").last().val("灏忓叏寮�");
//$("p[name='PSF_OpenSpecificationsspan']").last().text("寮�鏁�");
@@ -737,6 +763,22 @@
$("input[name='PSF_OpenWidth'][value_ppwaerid='" + value_SelWaerId + "']").show();
$(".xialap[value_ppwaerid='" + value_SelWaerId + "']").hide();
+
+ $("select[name='PSF_Typesetting'][value_ppwaerid='" + value_SelWaerId + "']").show();
+
+ $("p[name='PSF_yinse'][value_openwidthspan='" + value_SelWaerId + "']").show();
+ $("p[name='PSF_yinsezheng'][value_openwidthspan='" + value_SelWaerId + "']").show();
+ $("p[name='PSF_yinsebei'][value_openwidthspan='" + value_SelWaerId + "']").show();
+
+
+ $("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']").show();
+ $("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").show();
+
+ $("tr[name='PSF_PrintedPaperTd'][value_selspec='" + value_SelWaerId + "']").show();
+ $("tr[name='PSF_PrintedPaperTdtr'][value_selspec='" + value_SelWaerId + "']").show();
+ $("tr[name='PSF_PrintedPaperTdtrtr'][value_selspec='" + value_SelWaerId + "']").show();
+ $("select[name='PSF_Typesettinghide'][value_ppwaerid='" + value_SelWaerId + "']").hide();
+
}
else if ($(this).val().indexOf('鍥涜壊') >= 0) {
@@ -751,6 +793,22 @@
$("input[name='PSF_OpenLength'][value_ppwaerid='" + value_SelWaerId + "']").show();
$("input[name='PSF_OpenWidth'][value_ppwaerid='" + value_SelWaerId + "']").show();
$(".xialap[value_ppwaerid='" + value_SelWaerId + "']").hide();
+
+
+ $("select[name='PSF_Typesetting'][value_ppwaerid='" + value_SelWaerId + "']").show();
+
+ $("p[name='PSF_yinse'][value_openwidthspan='" + value_SelWaerId + "']").show();
+ $("p[name='PSF_yinsezheng'][value_openwidthspan='" + value_SelWaerId + "']").show();
+ $("p[name='PSF_yinsebei'][value_openwidthspan='" + value_SelWaerId + "']").show();
+
+
+ $("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']").show();
+ $("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").show();
+
+ $("tr[name='PSF_PrintedPaperTd'][value_selspec='" + value_SelWaerId + "']").show();
+ $("tr[name='PSF_PrintedPaperTdtr'][value_selspec='" + value_SelWaerId + "']").show();
+ $("tr[name='PSF_PrintedPaperTdtrtr'][value_selspec='" + value_SelWaerId + "']").show();
+ $("select[name='PSF_Typesettinghide'][value_ppwaerid='" + value_SelWaerId + "']").hide();
}
else if ($(this).val().indexOf('鍏壊') >= 0) {
$("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").val("鍥涜壊");
@@ -764,6 +822,23 @@
$("input[name='PSF_OpenLength'][value_ppwaerid='" + value_SelWaerId + "']").show();
$("input[name='PSF_OpenWidth'][value_ppwaerid='" + value_SelWaerId + "']").show();
$(".xialap[value_ppwaerid='" + value_SelWaerId + "']").hide();
+
+
+
+ $("select[name='PSF_Typesetting'][value_ppwaerid='" + value_SelWaerId + "']").show();
+
+ $("p[name='PSF_yinse'][value_openwidthspan='" + value_SelWaerId + "']").show();
+ $("p[name='PSF_yinsezheng'][value_openwidthspan='" + value_SelWaerId + "']").show();
+ $("p[name='PSF_yinsebei'][value_openwidthspan='" + value_SelWaerId + "']").show();
+
+
+ $("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']").show();
+ $("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").show();
+
+ $("tr[name='PSF_PrintedPaperTd'][value_selspec='" + value_SelWaerId + "']").show();
+ $("tr[name='PSF_PrintedPaperTdtr'][value_selspec='" + value_SelWaerId + "']").show();
+ $("tr[name='PSF_PrintedPaperTdtrtr'][value_selspec='" + value_SelWaerId + "']").show();
+ $("select[name='PSF_Typesettinghide'][value_ppwaerid='" + value_SelWaerId + "']").hide();
}
else if ($(this).val().indexOf('榛戠櫧') >= 0) {
$("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").val("鍗曡壊");
@@ -777,6 +852,23 @@
$("input[name='PSF_OpenLength'][value_ppwaerid='" + value_SelWaerId + "']").show();
$("input[name='PSF_OpenWidth'][value_ppwaerid='" + value_SelWaerId + "']").show();
$(".xialap[value_ppwaerid='" + value_SelWaerId + "']").hide();
+
+
+
+ $("select[name='PSF_Typesetting'][value_ppwaerid='" + value_SelWaerId + "']").show();
+
+ $("p[name='PSF_yinse'][value_openwidthspan='" + value_SelWaerId + "']").show();
+ $("p[name='PSF_yinsezheng'][value_openwidthspan='" + value_SelWaerId + "']").show();
+ $("p[name='PSF_yinsebei'][value_openwidthspan='" + value_SelWaerId + "']").show();
+
+
+ $("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']").show();
+ $("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").show();
+
+ $("tr[name='PSF_PrintedPaperTd'][value_selspec='" + value_SelWaerId + "']").show();
+ $("tr[name='PSF_PrintedPaperTdtr'][value_selspec='" + value_SelWaerId + "']").show();
+ $("tr[name='PSF_PrintedPaperTdtrtr'][value_selspec='" + value_SelWaerId + "']").show();
+ $("select[name='PSF_Typesettinghide'][value_ppwaerid='" + value_SelWaerId + "']").hide();
}
else if ($(this).val().indexOf('杞浆') >= 0) {
$("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").val("鍗曡壊");
@@ -793,7 +885,54 @@
$("input[name='PSF_OpenWidth'][value_ppwaerid='" + value_SelWaerId + "']").hide();
$(".xialap[value_ppwaerid='" + value_SelWaerId + "']").show();
+
+
+
+ $("select[name='PSF_Typesetting'][value_ppwaerid='" + value_SelWaerId + "']").show();
+
+ $("p[name='PSF_yinse'][value_openwidthspan='" + value_SelWaerId + "']").show();
+ $("p[name='PSF_yinsezheng'][value_openwidthspan='" + value_SelWaerId + "']").show();
+ $("p[name='PSF_yinsebei'][value_openwidthspan='" + value_SelWaerId + "']").show();
+
+
+ $("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']").show();
+ $("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").show();
+
+ $("tr[name='PSF_PrintedPaperTd'][value_selspec='" + value_SelWaerId + "']").show();
+ $("tr[name='PSF_PrintedPaperTdtr'][value_selspec='" + value_SelWaerId + "']").show();
+ $("tr[name='PSF_PrintedPaperTdtrtr'][value_selspec='" + value_SelWaerId + "']").show();
+ $("select[name='PSF_Typesettinghide'][value_ppwaerid='" + value_SelWaerId + "']").hide();
+
+ } else if ($(this).val().indexOf('鏁扮爜') >= 0) {
+ $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").show();
+ $("p[name='PSF_OpenSpecificationsspan'][value_selspecspan='" + value_SelWaerId + "']").show();
+ $("p[name='PSF_OpenWidthspan'][value_openwidthspan='" + value_SelWaerId + "']").show();
+ $("input[name='PSF_OpenLength'][value_ppwaerid='" + value_SelWaerId + "']").show();
+ $("input[name='PSF_OpenWidth'][value_ppwaerid='" + value_SelWaerId + "']").show();
+ $(".xialap[value_ppwaerid='" + value_SelWaerId + "']").hide();
+
+
+
+
+ $("select[name='PSF_Typesetting'][value_ppwaerid='" + value_SelWaerId + "']").hide();
+
+ $("p[name='PSF_yinse'][value_openwidthspan='" + value_SelWaerId + "']").hide();
+ $("p[name='PSF_yinsezheng'][value_openwidthspan='" + value_SelWaerId + "']").hide();
+ $("p[name='PSF_yinsebei'][value_openwidthspan='" + value_SelWaerId + "']").hide();
+
+
+ $("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']").hide();
+ $("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").hide();
+
+ $("tr[name='PSF_PrintedPaperTd'][value_selspec='" + value_SelWaerId + "']").hide();
+ $("tr[name='PSF_PrintedPaperTdtr'][value_selspec='" + value_SelWaerId + "']").hide();
+ $("tr[name='PSF_PrintedPaperTdtrtr'][value_selspec='" + value_SelWaerId + "']").hide();
+ $("select[name='PSF_Typesettinghide'][value_ppwaerid='" + value_SelWaerId + "']").show();
+ $("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").val("");
+ $("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']").val("");
+
+
}
@@ -815,6 +954,7 @@
$(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"));
$(vv).parent().parent().parent().parent().parent().find("select[name='PSF_Typesetting']").val($(vv).attr("value_hide_psf_typesetting"));
+ $(vv).parent().parent().parent().parent().parent().find("select[name='PSF_Typesettinghide']").val($(vv).attr("value_hide_psf_typesetting"));
$(vv).parent().parent().parent().parent().parent().find("select[name='PSF_PaperSource']").val($(vv).attr("value_hide_psf_papersource"));
$(vv).parent().parent().parent().parent().parent().find("select[name='PSF_OpenSpecifications']").val($(vv).attr("value_hide_psf_openspecifications"));
$(vv).parent().parent().parent().parent().parent().find("select[name='selPaperName']").val($(vv).attr("value_hide_psf_selPaperName"));
@@ -863,18 +1003,37 @@
var keyid = "<%=keyid %>";
if (keyid != "") {
var value_SelWaerId = $(this).attr("value_selspec");
- if ($(vv).val().indexOf('杞浆') >= 0) {
+ if ($(vv).val().indexOf('杞浆') >= 0) {
+
+ $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").hide();
+
+ $("p[name='PSF_OpenSpecificationsspan'][value_selspecspan='" + value_SelWaerId + "']").hide();
+ $("p[name='PSF_OpenWidthspan'][value_openwidthspan='" + value_SelWaerId + "']").hide();
+ $("input[name='PSF_OpenLength'][value_ppwaerid='" + value_SelWaerId + "']").hide();
+ $("input[name='PSF_OpenWidth'][value_ppwaerid='" + value_SelWaerId + "']").hide();
+ $(".xialap[value_ppwaerid='" + value_SelWaerId + "']").show();
+
+
+ } else if ($(vv).val().indexOf('鏁扮爜') >= 0)
+ {
+
+ $("select[name='PSF_Typesetting'][value_ppwaerid='" + value_SelWaerId + "']").hide();
+
+ $("p[name='PSF_yinse'][value_openwidthspan='" + value_SelWaerId + "']").hide();
+ $("p[name='PSF_yinsezheng'][value_openwidthspan='" + value_SelWaerId + "']").hide();
+ $("p[name='PSF_yinsebei'][value_openwidthspan='" + value_SelWaerId + "']").hide();
+
+
+ $("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']").hide();
+ $("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").hide();
+
+ $("tr[name='PSF_PrintedPaperTd'][value_selspec='" + value_SelWaerId + "']").hide();
+ $("tr[name='PSF_PrintedPaperTdtr'][value_selspec='" + value_SelWaerId + "']").hide();
+ $("tr[name='PSF_PrintedPaperTdtrtr'][value_selspec='" + value_SelWaerId + "']").hide();
+ $("select[name='PSF_Typesettinghide'][value_ppwaerid='" + value_SelWaerId + "']").show();
- $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").hide();
-
- $("p[name='PSF_OpenSpecificationsspan'][value_selspecspan='" + value_SelWaerId + "']").hide();
- $("p[name='PSF_OpenWidthspan'][value_openwidthspan='" + value_SelWaerId + "']").hide();
- $("input[name='PSF_OpenLength'][value_ppwaerid='" + value_SelWaerId + "']").hide();
- $("input[name='PSF_OpenWidth'][value_ppwaerid='" + value_SelWaerId + "']").hide();
- $(".xialap[value_ppwaerid='" + value_SelWaerId + "']").show();
-
-
- }
+
+ }
}
});
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx.cs
index 1c2f997..c807cdc 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx.cs
@@ -353,6 +353,7 @@
string[] PSF_PrintedColorPositive = Request["PSF_PrintedColorPositive"].ToString2().Split(',');
string[] PSF_PrintedColorRear = Request["PSF_PrintedColorRear"].ToString2().Split(',');
string[] PSF_Typesetting = Request["PSF_Typesetting"].ToString2().Split(',');
+ string[] PSF_Typesettinghide = Request["PSF_Typesettinghide"].ToString2().Split(',');
string[] PSF_PrintedCount = Request["PSF_PrintedCount"].ToString2().Split(',');
string[] PSF_PrintedPositive = Request["PSF_PrintedPositive"].ToString2().Split(',');
string[] PSF_LastNum = Request["PSF_LastNum"].ToString2().Split(',');
@@ -443,7 +444,15 @@
m_EC_SpecialForums.PSF_PressesDesk = PSF_PressesDesk[i].ToString2().Replace("锛�+-+锛�", ",");
m_EC_SpecialForums.PSF_PrintedColorPositive = PSF_PrintedColorPositive[i].ToString2().Replace("锛�+-+锛�", ",");
m_EC_SpecialForums.PSF_PrintedColorRear = PSF_PrintedColorRear[i].ToString2().Replace("锛�+-+锛�", ",");
- m_EC_SpecialForums.PSF_Typesetting = PSF_Typesetting[i].ToString2().Replace("锛�+-+锛�", ",");
+ if (PSF_PressesDesk[i].IndexOf("鏁扮爜") >= 0)
+ {
+ m_EC_SpecialForums.PSF_Typesetting = PSF_Typesettinghide[i].ToString2().Replace("锛�+-+锛�", ",");
+ }
+ else
+ {
+ m_EC_SpecialForums.PSF_Typesetting = PSF_Typesetting[i].ToString2().Replace("锛�+-+锛�", ",");
+ }
+
if (PSF_PrintedCount[i].ToInt32() == null)
{
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderList.aspx
index b87b5df..b7571ac 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderList.aspx
@@ -22,6 +22,13 @@
window.location = "/Pages/business/AgSpecialOrderList.aspx?delete=" + keyid;
});
}
+
+ //鍒犻櫎
+ function onchedan(keyid) {
+ top.Dialog.confirm("纭畾瑕佹挙鍗曡璁板綍鍚楋紵", function () {
+ window.location = "/Pages/business/AgSpecialOrderList.aspx?chedan=" + keyid;
+ });
+ }
</script>
</head>
<body>
@@ -131,6 +138,7 @@
<span menu_member_case_id="case_ViewModel" menu_member_case_name="鎵撳嵃" onclick="ViewModel('<%#Eval("PO_OrderId")%>')">鎵撳嵃</span>
<span menu_member_case_id="case_EditModel" menu_member_case_name="淇敼" onclick="EditModel('<%#Eval("PO_OrderId")%>')">淇敼</span>
<span menu_member_case_id="case_onDelete" menu_member_case_name="鍒犻櫎" onclick="onDelete('<%#Eval("Keyid")%>')">鍒犻櫎</span>
+ <span onclick="onchedan('<%#Eval("Keyid")%>')">鎾ゅ崟</span>
</td>
</tr>
</ItemTemplate>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderList.aspx.cs
index 8c60f41..305e81b 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderList.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderList.aspx.cs
@@ -11,6 +11,7 @@
using CY.BLL.Sys;
using System.Data;
using CY.BLL.OA;
+using CY.BLL.EC;
namespace CY.WebForm.Pages.business
{
@@ -19,11 +20,13 @@
public partial class AgSpecialOrderList : BasePage
{
EC_SpecialOrdersBLL bll_EC_SpecialOrdersBLL = null;
+ EC_OrderBasicBLL _eC_OrderBasicBLL = null;
//鍒濆鍖�
public AgSpecialOrderList()
{
bll_EC_SpecialOrdersBLL = new EC_SpecialOrdersBLL();
+ _eC_OrderBasicBLL = new EC_OrderBasicBLL();
}
//椤甸潰鍔犺浇
@@ -48,6 +51,45 @@
JavaScript.MessageBox("鍒犻櫎澶辫触", this);
}
}
+
+ if (Request["chedan"] != null)
+ {
+ EC_SpecialOrders model = bll_EC_SpecialOrdersBLL.GetModelByKeyid(Request["chedan"].ToInt32());
+ if (model != null && model.Keyid != null)
+ {
+ EC_OrderBasic _eC_OrderBasic = _eC_OrderBasicBLL.SelectModelById(model.PO_OrderId.ToInt32().Value);
+ if (null == _eC_OrderBasic)
+ {
+
+ }
+ else
+ {
+ //淇敼璁㈠崟鐘舵��
+ List<EC_OrderOperate> oprates = new List<EC_OrderOperate>();
+ oprates.Add(new EC_OrderOperate()
+ {
+ OperateType = 2,
+ OrderId = _eC_OrderBasic.Keyid,
+ Operator = CurrentUser.ShortName,
+ Remark = ""
+ });
+ _eC_OrderBasicBLL.UpdateOrderState(oprates[0]);
+ //淇敼璁㈠崟鏁伴噺
+ _eC_OrderBasicBLL.UpSurplusPrintNum(_eC_OrderBasic.Keyid, _eC_OrderBasic.OrderExtend.PrintNum, CurrentUser.ShortName);
+
+
+
+ }
+
+ bll_EC_SpecialOrdersBLL.DeleteModel(model);
+ JavaScript.MessageBox("鎾ゅ崟鎴愬姛", this);
+ Response.Redirect("/Pages/business/AgSpecialOrderList.aspx");
+ }
+ else
+ {
+ JavaScript.MessageBox("鎾ゅ崟澶辫触", this);
+ }
+ }
}
//缁戝畾鏁版嵁
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderList.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderList.aspx.designer.cs
index e53f5bc..c6be1c9 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderList.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderList.aspx.designer.cs
@@ -2,16 +2,18 @@
// <鑷姩鐢熸垚>
// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
//
-// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
// </鑷姩鐢熸垚>
//------------------------------------------------------------------------------
-namespace CY.WebForm.Pages.business {
-
-
- public partial class AgSpecialOrderList {
-
+namespace CY.WebForm.Pages.business
+{
+
+
+ public partial class AgSpecialOrderList
+ {
+
/// <summary>
/// Head1 鎺т欢銆�
/// </summary>
@@ -20,7 +22,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
-
+
/// <summary>
/// CMSHead1 鎺т欢銆�
/// </summary>
@@ -29,7 +31,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
-
+
/// <summary>
/// form1 鎺т欢銆�
/// </summary>
@@ -38,7 +40,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-
+
/// <summary>
/// txtBeginDate 鎺т欢銆�
/// </summary>
@@ -47,7 +49,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtBeginDate;
-
+
/// <summary>
/// txtEndDate 鎺т欢銆�
/// </summary>
@@ -56,7 +58,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtEndDate;
-
+
/// <summary>
/// txtPrintName 鎺т欢銆�
/// </summary>
@@ -65,7 +67,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtPrintName;
-
+
/// <summary>
/// txtCustormerName 鎺т欢銆�
/// </summary>
@@ -74,7 +76,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtCustormerName;
-
+
/// <summary>
/// txtPSO_OrderNum 鎺т欢銆�
/// </summary>
@@ -83,7 +85,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtPSO_OrderNum;
-
+
/// <summary>
/// btn_Search 鎺т欢銆�
/// </summary>
@@ -92,7 +94,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.WebControls.Button btn_Search;
-
+
/// <summary>
/// RepClientList 鎺т欢銆�
/// </summary>
@@ -101,7 +103,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.WebControls.Repeater RepClientList;
-
+
/// <summary>
/// UCPager1 鎺т欢銆�
/// </summary>
--
Gitblit v1.9.1