From 85c82e61104884a052893b2a642e732d1182707f Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 21 一月 2025 14:01:03 +0800
Subject: [PATCH] 专版施工单 订单的后道工序复制到专版工单的后道工序
---
CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoFukuanList.aspx | 4
CY_ECommercePlatform/CY.WebForm/js/business/Order.js | 2
CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs | 12 ++++
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx | 4
CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderBasicDAL.cs | 7 ++
CY_ECommercePlatform/CY.Model/OA/OA_WorkPlan.cs | 8 +-
CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx.cs | 61 +++++++++++++++++++-
CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx | 12 +++
CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoDetail.aspx | 2
CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoReplyAdd.aspx | 2
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx | 8 +-
CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs | 25 ++++++++
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx.cs | 1
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx | 4
CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoAdd.aspx | 4
15 files changed, 134 insertions(+), 22 deletions(-)
diff --git a/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs b/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs
index 3cbc719..c6d1a8a 100644
--- a/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs
+++ b/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>
diff --git a/CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderBasicDAL.cs b/CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderBasicDAL.cs
index a51933f..f9e9567 100644
--- a/CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderBasicDAL.cs
+++ b/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>
diff --git a/CY_ECommercePlatform/CY.Model/OA/OA_WorkPlan.cs b/CY_ECommercePlatform/CY.Model/OA/OA_WorkPlan.cs
index 2e8f212..16d9cdb 100644
--- a/CY_ECommercePlatform/CY.Model/OA/OA_WorkPlan.cs
+++ b/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
{
diff --git a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
index 8cc520c..2f41745 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
+++ b/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>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx
index 7f4183a..35ce08d 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx
+++ b/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>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx.cs
index 282b1e5..530672e 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx.cs
+++ b/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;
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx
index c9bb454..cbe99a5 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx
+++ b/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>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx
index e1d31cf..dc96d8f 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx
+++ b/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" >
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx.cs
index c807cdc..6491a40 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx.cs
+++ b/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);
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx
index d384711..eb73b72 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx
+++ b/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;">
瀵瑰簲鍚堝悓搴忓彿锛�
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoFukuanList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoFukuanList.aspx
index a2f0fd6..497476a 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoFukuanList.aspx
+++ b/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>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoReplyAdd.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoReplyAdd.aspx
index 996ef70..a56d568 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoReplyAdd.aspx
+++ b/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>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoAdd.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoAdd.aspx
index 2ef5988..9f02a8c 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoAdd.aspx
+++ b/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>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoDetail.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoDetail.aspx
index c13b6cf..814d761 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoDetail.aspx
+++ b/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>
diff --git a/CY_ECommercePlatform/CY.WebForm/js/business/Order.js b/CY_ECommercePlatform/CY.WebForm/js/business/Order.js
index 19aa827..a89652b 100644
--- a/CY_ECommercePlatform/CY.WebForm/js/business/Order.js
+++ b/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();
}
}
--
Gitblit v1.9.1