From ad92b901b491d5921dbca2e91b0aafe8e2a0a017 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 27 九月 2024 13:30:53 +0800
Subject: [PATCH] 客户来源选择“政府采购”的才必选“机构代理”，除“政府采购”以外的客户来源，机构代码不用必填 “自联系”改为“上门送样”；“在线”改为“线上校对” 1）所有订单类型中的“印件名称”再增加几个字的长度，现在的格子有段短 （2）所有新增订单均把“客户单位”和“客户级别”这两行改到最前面，原来的“订单类型”这一行自动成为第3行 （3）“交货时间”现在默认的是第2天，全部改为默认第3天 在订单管理的列表中增加“封签”，列表中没打印显示“打印”，打印了就打“√” “订单管理”中，现在的“开票申请”栏目删除 生产安排中，生产“合版施工单”的前提必须是“订单类型”要相同，修改为不必相同。
---
CY_ECommercePlatform/CY.WebForm/Pages/financial/OrderMoneyBatchReceive.aspx.cs | 142 +++++++++++++++++++++++++++++++---------------
1 files changed, 95 insertions(+), 47 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/OrderMoneyBatchReceive.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/financial/OrderMoneyBatchReceive.aspx.cs
index 811bc01..8037d7c 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/financial/OrderMoneyBatchReceive.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/OrderMoneyBatchReceive.aspx.cs
@@ -47,9 +47,12 @@
protected void Page_Load(object sender, EventArgs e)
{
_eC_OrderBasicBLL = new EC_OrderBasicBLL();
- btnSubmit.ServerClick += new EventHandler(btnSubmit_ServerClick);
-
- LoadOrder();
+ //btnSubmit.ServerClick += new EventHandler(btnSubmit_ServerClick);
+ if (!IsPostBack)
+ {
+ LoadOrder();
+ }
+
if (IsPostBack || IsCallback)
return;
InitPage();
@@ -61,62 +64,106 @@
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
- void btnSubmit_ServerClick(object sender, EventArgs e)
+ protected void btn_Submit_form(object sender, EventArgs e)
{
- string[] orderIds = Request["ids"].Split(',');
+ var ids = Request["ids"];
+ //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)
+
+ try
{
- EC_OrderBasic _orderBasic = _eC_OrderBasicBLL.SelectModelById(orderId.ToInt32().Value);
- OA_CorporateClients m_OA_CorporateClients = bll_OA_CorporateClientsBLL.SelectModelByFirmIdandMemberId(CurrentUser.MemberId, _orderBasic.BuyerId);
- if (receiveWay == "0" && m_OA_CorporateClients != null)
- {
- if (this.txtReceiveMoney.Value.ToInt32() > (m_OA_CorporateClients.Prepayments + m_OA_CorporateClients.Credit))
- {
- JavaScript.MessageBox("棰勪粯娆句笉瓒筹紒", this, "window.location='/Pages/financial/OrderMoneyBatchReceive.aspx?id=" + Request["ids"] + "'");
- //Response.Redirect("/Pages/financial/OrderMoneyReceive.aspx?id=" + orderId);
- return;
- }
- }
- if (string.IsNullOrEmpty(orderId) || string.IsNullOrEmpty(receiveWay))
+ var _orderBasicmodes = _eC_OrderBasicBLL.GetOrderByIds(ids);
+ if (string.IsNullOrEmpty(ids) || string.IsNullOrEmpty(receiveWay))
{
JavaScript.MessageBox("浼犲叆鍙傛暟閿欒锛�", this);
return;
}
- if (null == _orderBasic)
+ if (null == _orderBasicmodes)
{
JavaScript.MessageBox("璁㈠崟涓嶅瓨鍦ㄦ垨宸插垹闄わ紒", this);
return;
}
- isWin = "0".Equals(receiveWay) ? UsePrepare(_orderBasic) : ToAccount(_orderBasic.Keyid.Value, _orderBasic.BuyerName, _orderBasic.UnPayedMoney);
- if (!isWin)
- {
- break;
- }
+ int i = 0;
+ foreach (var _orderBasic in _orderBasicmodes)
+ {
+
+ //EC_OrderBasic _orderBasic = _eC_OrderBasicBLL.SelectModelById(orderId.ToInt32().Value);
+
+ if (receiveWay == "0" && i == 0)
+ {
+ OA_CorporateClients m_OA_CorporateClients = bll_OA_CorporateClientsBLL.SelectModelByFirmIdandMemberId(CurrentUser.MemberId, _orderBasic.BuyerId);
+ if (m_OA_CorporateClients != null)
+ {
+ if (this.txtReceiveMoney.Value.ToInt32() > (m_OA_CorporateClients.Prepayments + m_OA_CorporateClients.Credit))
+ {
+ JavaScript.MessageBox("棰勪粯娆句笉瓒筹紒", this, "window.location='/Pages/financial/OrderMoneyBatchReceive.aspx?id=" + Request["ids"] + "'");
+ //Response.Redirect("/Pages/financial/OrderMoneyReceive.aspx?id=" + orderId);
+ return;
+ }
+ }
+ else
+ {
+ JavaScript.MessageBox("棰勪粯娆句笉瓒筹紒", this, "window.location='/Pages/financial/OrderMoneyBatchReceive.aspx?id=" + Request["ids"] + "'");
+ }
+
+
+ }
+ i = i + 1;
+
+ isWin = "0".Equals(receiveWay) ? UsePrepare(_orderBasic) : ToAccount(_orderBasic.Keyid.Value, _orderBasic.BuyerName, _orderBasic.UnPayedMoney);
+ if (!isWin)
+ {
+ break;
+ }
+
+ }
+ scope.Complete();
}
- scope.Complete();
+ catch (Exception ex)
+ {
+ // 鍥炴粴浜嬪姟
+ }
+ finally
+ {
+ // 閲婃斁璧勬簮
+ scope.Dispose();
+ }
}
if (isWin)
{
- JavaScript.MessageBox("鎿嶄綔鎴愬姛", this, true, true);
+ JavaScript.MessageBox("鎿嶄綔鎴愬姛", this);
+
+ JavaScript.RefreshDIVOpener(this);
}
else
{
JavaScript.MessageBox("鎿嶄綔澶辫触", this);
}
+
+
+
//JavaScript.MessageBox(isWin ? "鏀舵鎴愬姛锛�" : "鏀舵澶辫触锛�", this, "top.frmright.ReLoad();top.Dialog.close();");
- Request.RequestContext.RouteData.DataTokens.Add("IsWin", isWin ? "1" : "");
- if (!isWin)
- InitPage();
- else
- ;
+ //Request.RequestContext.RouteData.DataTokens.Add("IsWin", isWin ? "1" : "");
+ //if (!isWin)
+ // InitPage();
+ //else
+ // ;
}
@@ -178,7 +225,7 @@
{
string[] orderIds = Request["id"].Split(',');
this.ids.Value = Request["id"];
- List<EC_OrderBasic> eC_OrderBasics = new List<EC_OrderBasic>();
+ //List<EC_OrderBasic> eC_OrderBasics = new List<EC_OrderBasic>();
decimal shoukuanmoney = 0;
if (orderIds==null || orderIds.Length==0)
{
@@ -187,25 +234,26 @@
try
{
- foreach (string orderId in orderIds)
+ var _orderBasicmodes = _eC_OrderBasicBLL.GetOrderByIds(this.ids.Value);
+ foreach (var _orderBasicmode in _orderBasicmodes)
{
- EC_OrderBasic _orderBasicmode = _eC_OrderBasicBLL.SelectModelById(orderId.ToInt32().Value);
- OA_CorporateClients m_OA_CorporateClients = bll_OA_CorporateClientsBLL.SelectModelByFirmIdandMemberId(CurrentUser.MemberId, _orderBasicmode.BuyerId);
- if (m_OA_CorporateClients != null)
- {
- _orderBasicmode.nowCustomMoney = "锟�" + (m_OA_CorporateClients.Prepayments ?? 0).ToString("0.00");
- _orderBasicmode.nowCredit = "锟�" + (m_OA_CorporateClients.Credit ?? 0).ToString("0.00");
- }
- else
- {
- _orderBasicmode.nowCustomMoney = "锟�0";
- _orderBasicmode.nowCredit = "锟�0";
- }
+ // EC_OrderBasic _orderBasicmode = _eC_OrderBasicBLL.SelectModelById(orderId.ToInt32().Value);
+ //OA_CorporateClients m_OA_CorporateClients = bll_OA_CorporateClientsBLL.SelectModelByFirmIdandMemberId(CurrentUser.MemberId, _orderBasicmode.BuyerId);
+ //if (m_OA_CorporateClients != null)
+ //{
+ // _orderBasicmode.nowCustomMoney = "锟�" + (m_OA_CorporateClients.Prepayments ?? 0).ToString("0.00");
+ // _orderBasicmode.nowCredit = "锟�" + (m_OA_CorporateClients.Credit ?? 0).ToString("0.00");
+ //}
+ //else
+ //{
+ // _orderBasicmode.nowCustomMoney = "锟�0";
+ // _orderBasicmode.nowCredit = "锟�0";
+ //}
shoukuanmoney += _orderBasicmode.UnPayedMoney;
- eC_OrderBasics.Add(_orderBasicmode);
+ // eC_OrderBasics.Add(_orderBasicmode);
}
this.txtReceiveMoney.Value = String.Format("{0:F}", shoukuanmoney);
//rptOrderInfo.DataSource = eC_OrderBasics;
--
Gitblit v1.9.1