From f6cb981322bc4c2a27921ad0480dce7fb483a4d8 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 10 四月 2026 13:23:54 +0800
Subject: [PATCH] 先提交一部分
---
CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderList.aspx.cs | 122 ++++++++++++++++++++++++++++++++++++++++
1 files changed, 122 insertions(+), 0 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderList.aspx.cs
index 7c9e641..9004e55 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderList.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderList.aspx.cs
@@ -11,6 +11,7 @@
using CY.BLL.Sys;
using System.Data;
using CY.BLL.OA;
+using CY.BLL.EC;
namespace CY.WebForm.Pages.business
{
@@ -20,12 +21,19 @@
{
EC_MergerSingleBLL bll_EC_MergerSingleBLL = null;
OA_CorporateClientsBLL bll_OA_CorporateClientsBLL = null;
+ EC_OrderBasicBLL _eC_OrderBasicBLL = null;
+ OA_OutOfStorageBLL _OA_OutOfStorageBLL = null;
+ OA_InventoryBLL _OA_InventoryBLL = null;
+
//鍒濆鍖�
public AgMergerOrderList()
{
bll_EC_MergerSingleBLL = new EC_MergerSingleBLL();
bll_OA_CorporateClientsBLL = new OA_CorporateClientsBLL();
+ _eC_OrderBasicBLL = new EC_OrderBasicBLL();
+ _OA_OutOfStorageBLL = new OA_OutOfStorageBLL();
+ _OA_InventoryBLL = new OA_InventoryBLL();
}
//椤甸潰鍔犺浇
@@ -43,6 +51,40 @@
EC_MergerSingle model = bll_EC_MergerSingleBLL.GetModelByKeyid(Request["delete"].ToInt32());
if (model != null && model.Keyid != null)
{
+ //閫�鍥炲簱瀛�
+ var oA_OutOfStorages = _OA_OutOfStorageBLL.getModelListByRemark(model.Member_id, "<span class=''a_under'' title=''鐐瑰嚮鏌ョ湅鏂藉伐鍗曡鎯�'' onclick=\"ViewModel_Merger(''" + model.Keyid + "'')\">鍚堢増锛�" + model.PMS_OrderNum + "</span>").ToList();
+ if (oA_OutOfStorages != null && oA_OutOfStorages.Count > 0)
+ {
+ foreach (var outOfStorage in oA_OutOfStorages)
+ {
+ if (outOfStorage.InfoType == "纭鍑哄簱")
+ {
+ _OA_OutOfStorageBLL.DeleteModel(outOfStorage);
+ }
+ else if (outOfStorage.InfoType == "鍑哄簱")
+ {
+
+
+ OA_Inventory Inventory = new OA_Inventory();
+ Inventory.BrandId = outOfStorage.BrandId;
+ Inventory.FirmId = outOfStorage.FirmId;
+ Inventory.GoodsId = outOfStorage.GoodsId;
+ Inventory.LastUpdateTime = DateTime.Now;
+ Inventory.WarehouseId = outOfStorage.WarehouseId;
+ Inventory.SpecificationId = outOfStorage.SpecificationId;
+ Inventory.PaperWeightId = outOfStorage.PaperWeightId;
+
+ var m_OA_Inventory = _OA_InventoryBLL.IfHasModel(Inventory);
+ if (m_OA_Inventory != null)//濡傛灉鎵�閫夎揣浣嶅瓨鍦ㄦ浜у搧
+ {
+
+ m_OA_Inventory.InventoryCount = m_OA_Inventory.InventoryCount + outOfStorage.Quantity;
+ bool isSuccess = _OA_InventoryBLL.UpdateModel(m_OA_Inventory);
+ }
+ _OA_OutOfStorageBLL.DeleteModel(outOfStorage);
+ }
+ }
+ }
bll_EC_MergerSingleBLL.DeleteModel(model);
JavaScript.MessageBox("鍒犻櫎鎴愬姛", this);
Response.Redirect("/Pages/business/AgMergerOrderList.aspx");
@@ -52,6 +94,86 @@
JavaScript.MessageBox("鍒犻櫎澶辫触", this);
}
}
+ if (Request["chedan"] != null)
+ {
+ EC_MergerSingle model = bll_EC_MergerSingleBLL.GetModelByKeyid(Request["chedan"].ToInt32());
+ if (model != null && model.Keyid != null)
+ {
+ var strOrderIdTemp = model.PMS_OldId.ToString2();
+ var strOrderId = strOrderIdTemp.Replace("<br/>", ",");
+ var orderId = strOrderId.Trim(',').Split(',');
+ foreach (var item in orderId)
+ {
+ EC_OrderBasic _eC_OrderBasic = _eC_OrderBasicBLL.SelectModelById(item.ToInt32().Value);
+ if (null == _eC_OrderBasic)
+ {
+
+ }
+ else
+ {
+ //淇敼璁㈠崟鐘舵��
+ List<EC_OrderOperate> oprates = new List<EC_OrderOperate>();
+ oprates.Add(new EC_OrderOperate()
+ {
+ OperateType = 1,
+ OrderId = _eC_OrderBasic.Keyid,
+ Operator = CurrentUser.ShortName,
+ Remark = ""
+ });
+ _eC_OrderBasicBLL.UpdateOrderState(oprates[0]);
+ //淇敼璁㈠崟鏁伴噺
+ _eC_OrderBasicBLL.UpSurplusPrintNum(_eC_OrderBasic.Keyid, _eC_OrderBasic.OrderExtend.PrintNum, CurrentUser.ShortName);
+
+
+
+ }
+ }
+
+ //閫�鍥炲簱瀛�
+ var oA_OutOfStorages = _OA_OutOfStorageBLL.getModelListByRemark(model.Member_id, "<span class=''a_under'' title=''鐐瑰嚮鏌ョ湅鏂藉伐鍗曡鎯�'' onclick=\"ViewModel_Merger(''" + model.Keyid + "'')\">鍚堢増锛�" + model.PMS_OrderNum + "</span>").ToList();
+ if (oA_OutOfStorages != null && oA_OutOfStorages.Count > 0)
+ {
+ foreach (var outOfStorage in oA_OutOfStorages)
+ {
+ if (outOfStorage.InfoType == "纭鍑哄簱")
+ {
+ _OA_OutOfStorageBLL.DeleteModel(outOfStorage);
+ }
+ else if (outOfStorage.InfoType == "鍑哄簱")
+ {
+
+
+ OA_Inventory Inventory = new OA_Inventory();
+ Inventory.BrandId = outOfStorage.BrandId;
+ Inventory.FirmId = outOfStorage.FirmId;
+ Inventory.GoodsId = outOfStorage.GoodsId;
+ Inventory.LastUpdateTime = DateTime.Now;
+ Inventory.WarehouseId = outOfStorage.WarehouseId;
+ Inventory.SpecificationId = outOfStorage.SpecificationId;
+ Inventory.PaperWeightId = outOfStorage.PaperWeightId;
+
+ var m_OA_Inventory = _OA_InventoryBLL.IfHasModel(Inventory);
+ if (m_OA_Inventory != null)//濡傛灉鎵�閫夎揣浣嶅瓨鍦ㄦ浜у搧
+ {
+
+ m_OA_Inventory.InventoryCount = m_OA_Inventory.InventoryCount + outOfStorage.Quantity;
+ bool isSuccess = _OA_InventoryBLL.UpdateModel(m_OA_Inventory);
+ }
+ _OA_OutOfStorageBLL.DeleteModel(outOfStorage);
+ }
+ }
+ }
+
+ bll_EC_MergerSingleBLL.DeleteModel(model);
+ JavaScript.MessageBox("鎾ゅ崟鎴愬姛", this);
+ Response.Redirect("/Pages/business/AgMergerOrderList.aspx");
+ }
+ else
+ {
+ JavaScript.MessageBox("鎾ゅ崟澶辫触", this);
+ }
+ }
+
}
//缁戝畾澶栧崗鍘傚晢
--
Gitblit v1.9.1