From 418a0be6daaa91752497dae40e546ee78ea1bea7 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 10 九月 2021 16:44:54 +0800
Subject: [PATCH] 三、批量操作 1、增加“批量送货”，可以批量打印送货单 1、“批量收款”，增加事务的时长
---
CY_ECommercePlatform/CY.WebForm/Pages/financial/OrderMoneyBatchReceive.aspx.cs | 8 +++++++-
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchOperation.aspx | 6 ++++--
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchOperation.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchOperation.aspx
index d91c3a1..0b508f7 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchOperation.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchOperation.aspx
@@ -5,7 +5,7 @@
<head id="Head1" runat="server">
<title>璁㈠崟鍒楄〃</title>
<uc:cmshead id="CMSHead1" runat="server" />
- <script src="../../js/business/Order.js" type="text/javascript"></script>
+ <script src="../../js/business/Order.js?v=5" type="text/javascript"></script>
<script type="text/javascript">
//璁㈠崟璇勪环
function evaluationModel(orderid) {
@@ -314,7 +314,9 @@
<a href="javascript:;" menu_member_case_id="case_ToBatchPayList" menu_member_case_name="鎵归噺鏀舵" onclick="ToBatchPayList();"><span class="icon_edit">鎵归噺鏀舵</span></a>
<div class="box_tool_line">
</div>
-
+ <a href="javascript:;" menu_member_case_id="case_ToBatchPrintAwbOrder" menu_member_case_name="鎵撳嵃閫佽揣鍗�" onclick="ToPrintAwbOrder()"><span class="icon_edit">鎵撳嵃閫佽揣鍗�</span></a>
+ <div class="clear">
+ </div>
</div>
</div>
</div>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/OrderMoneyBatchReceive.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/financial/OrderMoneyBatchReceive.aspx.cs
index 811bc01..580d5ec 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/financial/OrderMoneyBatchReceive.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/OrderMoneyBatchReceive.aspx.cs
@@ -66,7 +66,13 @@
string[] orderIds = Request["ids"].Split(',');
string receiveWay = Request["rdoReceiveWay"];
bool isWin = false;
- using (var scope = new TransactionScope())
+ using (var scope = new TransactionScope(TransactionScopeOption.Required,
+ new TransactionOptions
+ {
+ IsolationLevel = IsolationLevel.ReadCommitted,
+ Timeout = TransactionManager.MaximumTimeout
+ }
+ ))
{
foreach (string orderId in orderIds)
{
--
Gitblit v1.9.1