chuanyin-group-project.git

			@@ -22,7 +22,9 @@
			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()
			@@ -30,6 +32,8 @@
			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();
			}

			//页面加载
			@@ -47,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");
			@@ -91,7 +129,42 @@
			}
			}

			bll_EC_MergerSingleBLL.DeleteModel(model);
			//退回库存
			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");
			}