From ea71208bf0d457f948edb7d16b29f94ae5dd3def Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 24 十二月 2025 12:10:53 +0800
Subject: [PATCH] 就是受理，生产之后就不能修改，撤销工单之后就可以修改
---
CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs | 2 +-
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.cs | 5 +++++
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx | 2 +-
CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx.cs | 18 ++++++++++++++----
CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx | 6 +++---
CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderList.aspx.cs | 2 +-
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderList.aspx.cs | 2 +-
7 files changed, 26 insertions(+), 11 deletions(-)
diff --git a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
index ac0b495..1b278b7 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
@@ -410,7 +410,7 @@
{
new SqlParameter("@Keyid",OrderId)
};
- string sql = " Update [EC_OrderExtend] Set [SurplusPrintNum]=[PrintNum] where [Keyid] = (select [OrderId] from [OA_OrderWorkListRelation] where [RelationTargetId] = @Keyid and [RelationTypeId]=4 ) ;Update [EC_OrderBasic] Set [OrderState]=2 where [Keyid] = (select [OrderId] from [OA_OrderWorkListRelation] where [RelationTargetId] = @Keyid and [RelationTypeId]=4 ) ";
+ string sql = " Update [EC_OrderExtend] Set [SurplusPrintNum]=[PrintNum] where [Keyid] = (select [OrderId] from [OA_OrderWorkListRelation] where [RelationTargetId] = @Keyid and [RelationTypeId]=4 ) ;Update [EC_OrderBasic] Set [OrderState]=1 where [Keyid] = (select [OrderId] from [OA_OrderWorkListRelation] where [RelationTargetId] = @Keyid and [RelationTypeId]=4 ) ";
try
{
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderList.aspx.cs
index 115a290..98c5bcf 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderList.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderList.aspx.cs
@@ -77,7 +77,7 @@
List<EC_OrderOperate> oprates = new List<EC_OrderOperate>();
oprates.Add(new EC_OrderOperate()
{
- OperateType = 2,
+ OperateType = 1,
OrderId = _eC_OrderBasic.Keyid,
Operator = CurrentUser.ShortName,
Remark = ""
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx
index d626664..3bda09a 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx
@@ -25,9 +25,9 @@
}
//鍒犻櫎
- function onChexiao(keyid) {
+ function onChexiao(keyid, OldOrderId) {
top.Dialog.confirm("纭畾瑕佹挙閿�璇ュ鍗忚鍗曞悧锛�", function () {
- window.location = "/Pages/business/AgOutsourcSingleAllList.aspx?chexiao=" + keyid;
+ window.location = "/Pages/business/AgOutsourcSingleAllList.aspx?chexiao=" + keyid + "&OldOrderId=" + OldOrderId;
});
}
@@ -467,7 +467,7 @@
</td>
<td>
<span menu_member_case_id="case_outAfterOrder" menu_member_case_name="淇敼" class="a_under <%#Eval("OrderState").ToString() == "1"||Eval("OrderState").ToString() == "2"||Eval("OrderState").ToString() == "3"?"":"UnRecive" %>" onclick='outAfterOrder(<%#Eval("Keyid") %>,<%#Eval("OldOrderId") %>)'>淇敼</span>
- <span menu_member_case_id="case_chexiaoOrder" menu_member_case_name="鎾ら攢" class="a_under <%#Eval("OrderState").ToString() == "1"?"":"UnRecive" %>" onclick='onChexiao(<%#Eval("Keyid") %>)'>鎾ら攢</span>
+ <span menu_member_case_id="case_chexiaoOrder" menu_member_case_name="鎾ら攢" class="a_under <%#Eval("OrderState").ToString() == "1"?"":"UnRecive" %>" onclick='onChexiao(<%#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>
</td>
</tr>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx.cs
index 34adbde..c31ad21 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx.cs
@@ -48,10 +48,10 @@
if (!string.IsNullOrEmpty(Request["chexiao"]))
{
EC_OrderBasic _eC_OrderBasic = bll_EC_OrderBasicBLL.SelectModelById(Request["chexiao"].ToInt32().Value);
- if(_eC_OrderBasic.SellerName != "鍏朵粬")
- {
- JavaScript.MessageBox("宸茬粡纭渚涘簲鍟嗕笉鑳芥挙鍗曪紒", this);
- }
+ //if(_eC_OrderBasic.SellerName != "鍏朵粬")
+ //{
+ // JavaScript.MessageBox("宸茬粡纭渚涘簲鍟嗕笉鑳芥挙鍗曪紒", this);
+ //}
if (_eC_OrderBasic.BuyerId == CurrentUser.MemberId)
{
var res = false;
@@ -66,6 +66,16 @@
{
try
{
+ //淇敼璁㈠崟鐘舵��
+ List<EC_OrderOperate> oprates = new List<EC_OrderOperate>();
+ oprates.Add(new EC_OrderOperate()
+ {
+ OperateType = 1,
+ OrderId = Request["OldOrderId"].ToInt32().Value,
+ Operator = CurrentUser.ShortName,
+ Remark = ""
+ });
+ res = bll_EC_OrderBasicBLL.UpdateOrderState(oprates[0]);
res = bll_EC_OrderBasicBLL.UpdateOldOrderSurplusPrintNum(Request["chexiao"].ToInt32().Value);
res = bll_EC_OrderBasicBLL.DeleteOutOrder(Request["chexiao"].ToInt32().Value);
scope.Complete();
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderList.aspx.cs
index 5862dd9..3f9ddfc 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderList.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderList.aspx.cs
@@ -68,7 +68,7 @@
List<EC_OrderOperate> oprates = new List<EC_OrderOperate>();
oprates.Add(new EC_OrderOperate()
{
- OperateType = 2,
+ OperateType = 1,
OrderId = _eC_OrderBasic.Keyid,
Operator = CurrentUser.ShortName,
Remark = ""
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.cs
index 4d7f30d..e0a766b 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.cs
@@ -104,6 +104,11 @@
}
EC_OrderBasic _eC_OrderBasic = _eC_OrderBasicBLL.SelectModelById(orderId.Value);
+ if(_eC_OrderBasic.OrderState != 1)
+ {
+ JavaScript.MessageBox("鍙湁鐘舵�佷负宸蹭笅鍗曠殑璁㈠崟鎵嶈兘淇敼锛�", this, "window.location = 'OrderList.aspx';");
+ return;
+ }
this.txtKeyid.Value = MyConvert.ConvertToString(_eC_OrderBasic.Keyid);
this.txtOrderId.Value = MyConvert.ConvertToString(_eC_OrderBasic.SellerOrderId);
this.txtCustormerName.Value = MyConvert.ConvertToString(_eC_OrderBasic.BuyerName);
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx
index ec0aa74..d95891f 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx
@@ -544,7 +544,7 @@
<%#Container.ItemIndex + (UCPager1.PageSize *( UCPager1.PageIndex-1)+1)%>
</td>
<td style="text-align: center;">
- <span class="edit a_under" <%#(int.Parse(Eval("OrderState").ToString())>=4||int.Parse(Eval("OrderState").ToString())<=0||int.Parse(Eval("OrderTypeId").ToString())>1)?"title=''":"title='鐐瑰嚮淇敼璁㈠崟'" %> onclick="window.location='OrderEdit.aspx?Target=ToUpSetData&orderId=<%#Eval("Keyid") %>';">
+ <span class="edit a_under" <%#(int.Parse(Eval("OrderState").ToString())>=2||int.Parse(Eval("OrderState").ToString())<=0||int.Parse(Eval("OrderTypeId").ToString())>1)?"title=''":"title='鐐瑰嚮淇敼璁㈠崟' onclick=\"window.location='OrderEdit.aspx?Target=ToUpSetData&orderId="+Eval("Keyid")+"';\" " %> >
<%#Eval("SellerOrderId")%></span><input type="hidden" id="hideOrderState" runat="server" value='<%#Eval("OrderState")%>' /><input type="hidden" id="hidOrderType" runat="server" value='<%#Eval("OrderTypeId")%>' />
<%--<a href='javascript:void(0)' class='a_under' title='鐐瑰嚮鏌ョ湅璁㈠崟璇︽儏' style="display: <%#1.Equals(Eval("OrderState"))?"none;":""%>" onclick='ShowOrder(<%#Eval("Keyid") %>)'>
<%#Eval("SellerOrderId")%></a>--%>
--
Gitblit v1.9.1