CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs
@@ -546,6 +546,18 @@ return _eC_OrderBasicDAL.DeleteOutOrder(OrderId); } /// <summary> /// 删除外协订单 /// </summary> /// <param name="OrderId"></param> /// <returns></returns> public bool UpdateOldOrderSurplusPrintNum(int outOrderId) { return _eC_OrderBasicDAL.UpdateOldOrderSurplusPrintNum(outOrderId); } /// <summary> /// 根据新增订单操作，并修改订单状态 /// </summary> CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderBasicDAL.cs
@@ -376,6 +376,13 @@ bool DeleteOutOrder(int OrderId); /// <summary> /// 修改原订单数量 /// </summary> /// <param name="OrderId"></param> /// <returns></returns> bool UpdateOldOrderSurplusPrintNum(int outOrderId); /// <summary> /// 统计订单金额 /// </summary> /// <param name="pagination">分页对象</param> CY_ECommercePlatform/CY.Model/OA/OA_WorkPlan.cs
@@ -57,7 +57,7 @@ } else if (HoubufapiaoStatus == 2) { return "候补发票"; return "后补发票"; } else if (HoubufapiaoStatus == 3) { @@ -81,15 +81,15 @@ { if (EvaluationStatus == 1) { return "已付款"; return "已报销"; } else if (EvaluationStatus == 2) { return "未付款"; return "未报销"; } else return "未付款"; return "未报销"; } else { CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
@@ -293,6 +293,31 @@ } /// <summary> /// 删除外协订单 /// </summary> /// <param name="OrderId"></param> /// <returns></returns> public bool UpdateOldOrderSurplusPrintNum(int OrderId) { IList<SqlParameter> sqlParms = new List<SqlParameter>() { 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 ) "; try { _dataBase.ExecuteSql(sql, sqlParms.ToArray<SqlParameter>()); } catch (Exception ex) { throw ex; } return true; } /// <summary> /// 分页查询 /// </summary> /// <param name="query">查询对象</param> CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx
@@ -24,6 +24,15 @@ }); } //删除 function onChexiao(keyid) { top.Dialog.confirm("确定要撤销该外协订单吗？", function () { window.location = "/Pages/business/AgOutsourcSingleAllList.aspx?chexiao=" + keyid; }); } $(function () { $(".UnRecive").each(function (ii, vv) { $(vv).remove(); @@ -211,7 +220,7 @@ <th class='w40px' style="text-align: center;"> 送货 </th> <th class='w80px'> <th class='w120px'> 操作 </th> </tr> @@ -271,6 +280,7 @@ </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_chexiaoOrder" menu_member_case_name="撤销" class="a_under <%#Eval("OrderState").ToString() == "1"?"":"UnRecive" %>" onclick='onChexiao(<%#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> </td> </tr> CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx.cs
@@ -9,6 +9,7 @@ using CY.Model; using CY.BLL.EC; using CY.Infrastructure.Query; using System.Transactions; namespace CY.WebForm.Pages.business { @@ -35,12 +36,66 @@ if (_eC_OrderBasic.BuyerId == CurrentUser.MemberId) { if (bll_EC_OrderBasicBLL.DeleteOutOrder(Request["delete"].ToInt32().Value)) Response.Redirect("/Pages/business/AgOutsourcSingleAllList.aspx"); JavaScript.MessageBox("删除成功", this, "window.location='/Pages/business/AgOutsourcSingleAllList.aspx'"); else Response.Redirect("/Pages/business/AgOutsourcSingleAllList.aspx"); JavaScript.MessageBox("删除失败", this); } else Response.Redirect("/Pages/business/AgOutsourcSingleAllList.aspx"); JavaScript.MessageBox("删除失败", this); } 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.BuyerId == CurrentUser.MemberId) { var res = false; using (TransactionScope scope = new TransactionScope(TransactionScopeOption.Required, new TransactionOptions { IsolationLevel = System.Transactions.IsolationLevel.ReadCommitted, Timeout = TransactionManager.MaximumTimeout } ) ) { try { res = bll_EC_OrderBasicBLL.UpdateOldOrderSurplusPrintNum(Request["chexiao"].ToInt32().Value); res = bll_EC_OrderBasicBLL.DeleteOutOrder(Request["chexiao"].ToInt32().Value); scope.Complete(); } catch (Exception ex) { PAGEHandleException(ex); JavaScript.MessageBox("撤单成功", this); } finally { // 释放资源 scope.Dispose(); } } if (res) { JavaScript.MessageBox("撤单成功", this, "window.location='/Pages/business/AgOutsourcSingleAllList.aspx'"); } else { JavaScript.MessageBox("撤单失败", this); } } else JavaScript.MessageBox("撤单失败", this); } UCPager1.AspNetPager.PageChanged += AspNetPager1_PageChanged; CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx
@@ -350,10 +350,10 @@ </tr> <tr class=" price_tabbg" style="font-weight: bold; background-color: #E6E6E6;"> <td> 版材类型 <span style="<%#Eval("shifouxianshi")%>" >版材类型</span> </td> <td colspan="2"> 规格 <span style="<%#Eval("shifouxianshi")%>" > 规格</span> </td> <td id="lbCTPCount" <%#show("CTPCount",Eval("PSF_PlateSource").ToString())%>> <span style="<%#Eval("shifouxianshi")%>" > CTP数量（张） </span> @@ -369,10 +369,10 @@ <tr> <tr style="background-color: #FFFFFF;"> <td> <%#Eval("PSF_PlateSource")%> <span style="<%#Eval("shifouxianshi")%>" > <%#Eval("PSF_PlateSource")%> </span> </td> <td colspan="2"> <%#Eval("PSF_CTPSpecType")%> <span style="<%#Eval("shifouxianshi")%>" > <%#Eval("PSF_CTPSpecType")%> </span> </td> <td id="tdCTPCount" <%#show("CTPCount",Eval("PSF_PlateSource").ToString())%>> <span style="<%#Eval("shifouxianshi")%>" > <%#0.Equals(Eval("PSF_CTPCount")) ? "" : Eval("PSF_CTPCount")%> </span> CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx
@@ -369,7 +369,7 @@ <td style="display:none;"> 版材类型 </td> <td colspan="2"> <td colspan="2" class="lb lbCTPCount" value_ppwaerid='<%#Container.ItemIndex + 1%>' > 规格 </td> <td id="lbCTPCount" value_ppwaerid='<%#Container.ItemIndex + 1%>' class="lb lbCTPCount" colspan="3"> @@ -395,7 +395,7 @@ <label class="Btnb CangKubtn_o" style="margin-left: 10px;"> <input type="button" value_waerid="<%#Container.ItemIndex + 1%>" class="Btn FromWarehouseByBanCai" value="连接仓库" id="BtnStorePlate" /></label><input type="hidden" value_ppwaerid="<%#Container.ItemIndex + 1%>" name="PSF_PaperId2" /> </td> <td colspan="2" > <td colspan="2" class="lb lbCTPCount" value_ppwaerid='<%#Container.ItemIndex + 1%>' > <div class="xialapp" style="margin-left:32%;"> <input type="text" value_ppwaerid="<%#Container.ItemIndex + 1%>" class="txt CTPSpecName " name="CTPSpecName" id="PlateSpec" value="<%#Eval("PSF_CTPSpecType")%>" /> <div class="xialapbp" > CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx.cs
@@ -236,6 +236,7 @@ { m_EC_SpecialForumsList = new List<EC_SpecialForums>(); EC_SpecialForums m_EC_SpecialForums = new EC_SpecialForums(); m_EC_SpecialForums.PSF_Note = _inquiryCommonModel.AfterWorksDemand; m_EC_SpecialForums.PSF_Forumsid = 1; m_EC_SpecialForumsList.Add(m_EC_SpecialForums); } CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx
@@ -10,7 +10,7 @@ <link href="../../Styles/changes.css" rel="stylesheet" type="text/css" /> <link href="../../Styles/ParticularWQJ.css" rel="stylesheet" type="text/css" /> <script src="../../js/Inquiry/Inquiry.js?v=130" type="text/javascript"></script> <script src="../../js/business/Order.js?v=38" type="text/javascript"></script> <script src="../../js/business/Order.js?v=40" type="text/javascript"></script> <!--前台页面end--> <script type="text/javascript" language="javascript"> @@ -343,7 +343,7 @@ <div id="divInquiry" style=' display: block;width:1010px;' > </div> <br /> <table class="table2 table2Left" align="left" style=" width:1000px;"> <table class="table2 table2Left" id="Duiyinghetongbianhao" align="left" style=" width:1000px;"> <tr style=" height:11px;"> <td style="width:100px;text-align:right;"> 对应合同序号： CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoFukuanList.aspx
@@ -95,8 +95,8 @@ <td> <select keepdefaultstyle="true" runat="server" id="selEvaluationStatus"> <option value="-1">全部</option> <option value="1">已付款</option> <option value="2">未付款</option> <option value="1">已报销</option> <option value="2">未报销</option> </select> </td> <td> CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoReplyAdd.aspx
@@ -99,7 +99,7 @@ <tr> <td class="ali03 " colspan="3"> 候补发票： 后补发票： </td> <td> <span id="spanHoubufapiaoStatus" runat="server"></span> CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoAdd.aspx
@@ -254,12 +254,12 @@ <tr> <td class="ali03 w100px"> 候补发票： 后补发票： </td> <td> <select id="selHoubufapiaoStatus" runat="server" keepdefaultstyle="true" style=" width:100px;"> <option value="1">有发票</option> <option value="2">候补发票</option> <option value="2">后补发票</option> <option value="3">无发票</option> </select> CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoDetail.aspx
@@ -97,7 +97,7 @@ <tr> <td class="ali03 " colspan="3"> 候补发票： 后补发票： </td> <td> <span id="spanHoubufapiaoStatus" runat="server"></span> CY_ECommercePlatform/CY.WebForm/js/business/Order.js
@@ -546,6 +546,7 @@ document.getElementById('txtDocumentName').value = document.getElementById('txtDocumentNameHide').value; } $("#Duiyinghetongbianhao").hide(); } else { document.getElementById('tbFacing').style.display = ''; @@ -555,6 +556,7 @@ document.getElementById('selVerifyWay321').style.display = ''; document.getElementById('selVerifyWay1234').style.display = ''; document.getElementById('selVerifyWay4321').style.display = ''; $("#Duiyinghetongbianhao").show(); } }
