chuanyin-group-project.git

			@@ -29,6 +29,8 @@
			OA_OutOfStorageBLL bll_OA_OutOfStorageBLL = null;
			public Guid targetid = Guid.Empty;
			EC_OrderPrintParameterBLL _eC_OrderPrintParameterBLL = null;
			OA_ShebeiManageBLL bll_oA_ShebeiManageBLL = null;
			OA_StaffBLL bll_OA_StaffBLL = null;



			@@ -47,6 +49,8 @@
			public string xialapr = "";

			AfterParameterInfoBLL _afterParameterInfoBLL = null;
			public string shebeilist = "";
			public List<OA_ShebeiManage> oA_ShebeiManages = new List<OA_ShebeiManage>();
			//初始化
			public AgMergerOrderEdit()
			{
			@@ -60,6 +64,8 @@
			bll_EC_CuttingPaperSpecBLL = new EC_CuttingPaperSpecBLL();
			_afterParameterInfoBLL = new AfterParameterInfoBLL();
			_eC_OrderPrintParameterBLL = new EC_OrderPrintParameterBLL();
			bll_oA_ShebeiManageBLL = new OA_ShebeiManageBLL();
			bll_OA_StaffBLL = new OA_StaffBLL();
			}

			//页面加载
			@@ -88,6 +94,13 @@
			List<EC_MemberDictionary> m_EC_MemberDictionaryList_filmSpec = bll_EC_MemberDictionaryBLL.SelectListByMemberIdAndParType(CurrentUser.MemberId, "自带菲林规格") as List<EC_MemberDictionary>;
			List<EC_MemberDictionary> m_EC_MemberDictionaryList_ctpSpec = bll_EC_MemberDictionaryBLL.SelectListByMemberIdAndParType(CurrentUser.MemberId, "自带CTP规格") as List<EC_MemberDictionary>;

			//初始化设备列表
			var a_ShebeiCate = bll_oA_ShebeiManageBLL.GetDataByType(CurrentUser.MemberId).Where(x=>x.Name == "生产设备" \|\| x.Name == "印刷设备" \|\| x.Name == "装订设备").ToList();
			if (a_ShebeiCate != null && a_ShebeiCate.Count > 0)
			{
			oA_ShebeiManages = bll_oA_ShebeiManageBLL.GetDataByCate(CurrentUser.MemberId, a_ShebeiCate[0].Keyid + "," + a_ShebeiCate[1].Keyid + "," + a_ShebeiCate[2].Keyid, true, 2).ToList();
			shebeilist = JsonHelper.GetJsonStringByObject(oA_ShebeiManages);
			}
			Pagination pa = new Pagination();
			pa.PageSize = 15;
			pa.PageIndex = 1;
			@@ -188,7 +201,7 @@
			}
			keyidstr = m_EC_MergerSingle.Keyid.ToString2();
			EC_OrderBasicBLL _eC_OrderBasicBLL = new EC_OrderBasicBLL();

			var shuliang = 0;
			List<EC_OrderBasic> mEC_OrderBasicList = new List<EC_OrderBasic>();
			foreach (var item in orderId)
			{
			@@ -251,6 +264,7 @@
			_eC_OrderBasic.PrintSizeName = _inquiryCommonModel.PrintSizeName;
			}
			}
			shuliang += (_eC_OrderBasic.OrderExtend.SurplusPrintNum??0);
			mEC_OrderBasicList.Add(_eC_OrderBasic);
			}
			#endregion
			@@ -313,12 +327,22 @@
			{
			m_EC_MergerHoudaosList = new List<EC_MergerHoudaos>();
			EC_MergerHoudaos m_EC_MergerHoudaos = new EC_MergerHoudaos();
			m_EC_MergerHoudaos.PSF_Shuliang = shuliang.ToString() ;
			m_EC_MergerHoudaos.PSF_Beishu = "1";
			m_EC_MergerHoudaosList.Add(m_EC_MergerHoudaos);

			}

			List<int> houdaolist = new List<int>();
			List<string> houdaostringlist = new List<string>();
			List<string> houdaosssss = new List<string>();
			houdaosssss.Add("折页");
			houdaosssss.Add("骑马钉");
			houdaosssss.Add("胶装");
			houdaosssss.Add("压痕");
			houdaosssss.Add("烫金");
			houdaosssss.Add("粘信封");
			houdaosssss.Add("粘页");
			foreach (var eC_OrderBasic in mEC_OrderBasicList)
			{
			EC_OrderPrintParameter _eC_OrderPrintParameter = _eC_OrderPrintParameterBLL.GetModel(eC_OrderBasic.Keyid.ToInt32().Value);
			@@ -413,8 +437,50 @@

			}


			foreach (var houdao in houdaosssss)
			{
			if (sysInquiry_Afters.Count(x => x.ParameterName == houdao) <= 0)
			{

			if (houdao == c_MergerHoudaos.PSF_Houdaogongxu)
			{
			select += "<option value='" + houdao + "' selected=\"selected\" >" + houdao + "</option>";
			}
			else
			{
			select += "<option value='" + houdao + "' >" + houdao + "</option>";
			}
			}


			}

			string houdaoduibi = c_MergerHoudaos.PSF_Houdaogongxu;
			c_MergerHoudaos.PSF_Houdaogongxu = select;


			//机长选项
			string selectjizhang = "<option value='0'>请选择</option>";
			if (!string.IsNullOrEmpty(houdaoduibi))
			{
			var oA_ShebeiManageshoudao = oA_ShebeiManages.Where(x => x.Name.Contains(houdaoduibi));
			foreach (var a_ShebeiManage in oA_ShebeiManageshoudao)
			{
			if (a_ShebeiManage.Zerenren == c_MergerHoudaos.PSF_JichangId)
			{
			selectjizhang += "<option value='" + a_ShebeiManage.Zerenren.Value.ToString() + "' selected=\"selected\" >" + a_ShebeiManage.ZerenrenName + "</option>";
			}
			else
			{
			selectjizhang += "<option value='" + a_ShebeiManage.Zerenren.Value.ToString() + "' >" + a_ShebeiManage.ZerenrenName + "</option>";
			}
			}
			}



			c_MergerHoudaos.PSF_Jichang = selectjizhang;

			}

			this.RepeaterHoudaoList.DataSource = m_EC_MergerHoudaosList;
			@@ -576,7 +642,7 @@
			string[] selHoudaogongxu = Request["selHoudaogongxu"].ToString2().Split(',');
			string[] txtShuliang = Request["txtShuliang"].ToString2().Split(',');
			string[] txtBeishu = Request["txtBeishu"].ToString2().Split(',');
			string[] txtJichang = Request["txtJichang"].ToString2().Split(',');
			string[] selJichang = Request["selJichang"].ToString2().Split(',');
			string[] txtYaoqiu = Request["txtYaoqiu"].ToString2().Split(',');


			@@ -1002,7 +1068,7 @@
			m_OA_OutOfStorageOld.GoodsId = m_OA_InventoryOld.GoodsId;
			m_OA_OutOfStorageOld.CargoSpaceId = 0;
			m_OA_OutOfStorageOld.WarehouseId = m_OA_InventoryOld.WarehouseId;
			m_OA_OutOfStorageOld.InfoType = "确认出库";
			m_OA_OutOfStorageOld.InfoType = "出库";
			m_OA_OutOfStorageOld.SuppliersId = 0;
			m_OA_OutOfStorageOld.Price = 0;
			m_OA_OutOfStorageOld.Quantity = PMS_PaperCount1_NEW[Array.IndexOf(PSF_PaperId_NEW, item)].ToInt32() ?? 0;
			@@ -1014,7 +1080,10 @@
			m_OA_OutOfStorageOld.BrandId = m_OA_InventoryOld.BrandId;
			m_OA_OutOfStorageOld.PaperWeightId = m_OA_InventoryOld.PaperWeightId;
			m_OA_OutOfStorageOld.SpecificationId = m_OA_InventoryOld.SpecificationId;
			m_OA_OutOfStorageOld.InventoryId = m_OA_InventoryOld.Keyid;
			m_OA_OutOfStorageList.Add(m_OA_OutOfStorageOld);
			m_OA_InventoryOld.InventoryCount = m_OA_InventoryOld.InventoryCount - m_OA_OutOfStorageOld.Quantity;
			m_OA_InventoryList.Add(m_OA_InventoryOld);
			}
			}
			}
			@@ -1028,7 +1097,7 @@
			m_OA_OutOfStorage.GoodsId = m_OA_Inventory.GoodsId;
			m_OA_OutOfStorage.CargoSpaceId = 0;
			m_OA_OutOfStorage.WarehouseId = m_OA_Inventory.WarehouseId;
			m_OA_OutOfStorage.InfoType = "确认出库";
			m_OA_OutOfStorage.InfoType = "出库";
			m_OA_OutOfStorage.SuppliersId = 0;
			m_OA_OutOfStorage.Price = 0;
			if (j == 0)
			@@ -1051,8 +1120,47 @@
			m_OA_OutOfStorage.BrandId = m_OA_Inventory.BrandId;
			m_OA_OutOfStorage.PaperWeightId = m_OA_Inventory.PaperWeightId;
			m_OA_OutOfStorage.SpecificationId = m_OA_Inventory.SpecificationId;
			m_OA_OutOfStorage.InventoryId = m_OA_Inventory.Keyid;
			m_OA_OutOfStorageList.Add(m_OA_OutOfStorage);
			m_OA_Inventory.InventoryCount = m_OA_Inventory.InventoryCount - m_OA_OutOfStorage.Quantity;
			m_OA_InventoryList.Add(m_OA_Inventory);
			}
			}
			}

			var CTPSpecNamei = CTPSpecName[i];
			var CTPCounti = CTPCount[i];
			var PSF_Fabantaoshui = PSF_Fabantaoshu[i];
			if (!string.IsNullOrEmpty(CTPCounti))
			{
			OA_Inventory m_OA_InventoryOld = bll_OA_InventoryBLL.SelecetModelDetailInfoList(CurrentUser.MemberId, "", "", "板材", "", CTPSpecNamei).FirstOrDefault();
			if (m_OA_InventoryOld != null)
			{
			OA_OutOfStorage m_OA_OutOfStorageOld = new OA_OutOfStorage();
			m_OA_OutOfStorageOld.FirmId = CurrentUser.MemberId;
			m_OA_OutOfStorageOld.GoodsId = m_OA_InventoryOld.GoodsId;
			m_OA_OutOfStorageOld.CargoSpaceId = 0;
			m_OA_OutOfStorageOld.WarehouseId = m_OA_InventoryOld.WarehouseId;
			m_OA_OutOfStorageOld.InfoType = "出库";
			m_OA_OutOfStorageOld.SuppliersId = 0;
			m_OA_OutOfStorageOld.Price = 0;
			m_OA_OutOfStorageOld.Quantity = CTPCounti.ToInt32() ?? 0;
			if (!string.IsNullOrEmpty(PSF_Fabantaoshui))
			{
			m_OA_OutOfStorageOld.Quantity = m_OA_OutOfStorageOld.Quantity * (PSF_Fabantaoshui.ToInt32() ?? 0);
			}
			m_OA_OutOfStorageOld.AllMoney = 0;
			m_OA_OutOfStorageOld.LastUpdateTime = DateTime.Now;
			m_OA_OutOfStorageOld.Operator = CurrentUser.ShortName;
			m_OA_OutOfStorageOld.Remark = "";
			m_OA_OutOfStorageOld.TanPrice = 0;
			m_OA_OutOfStorageOld.BrandId = m_OA_InventoryOld.BrandId;
			m_OA_OutOfStorageOld.PaperWeightId = m_OA_InventoryOld.PaperWeightId;
			m_OA_OutOfStorageOld.SpecificationId = m_OA_InventoryOld.SpecificationId;
			m_OA_OutOfStorageOld.InventoryId = m_OA_InventoryOld.Keyid;
			m_OA_OutOfStorageList.Add(m_OA_OutOfStorageOld);
			m_OA_InventoryOld.InventoryCount = m_OA_InventoryOld.InventoryCount - m_OA_OutOfStorageOld.Quantity;
			m_OA_InventoryList.Add(m_OA_InventoryOld);
			}
			}
			}
			@@ -1065,13 +1173,22 @@
			m_EC_MergerHoudaos.PSF_Houdaogongxu = selHoudaogongxu[i].ToString2().Replace("，+-+，", ",");
			m_EC_MergerHoudaos.PSF_Shuliang = txtShuliang[i];
			m_EC_MergerHoudaos.PSF_Beishu = txtBeishu[i];
			m_EC_MergerHoudaos.PSF_Jichang = txtJichang[i];
			m_EC_MergerHoudaos.PSF_JichangId = selJichang[i].ToInt32();
			if(m_EC_MergerHoudaos.PSF_JichangId.HasValue && m_EC_MergerHoudaos.PSF_JichangId.Value > 0)
			{
			var oA_Staff = bll_OA_StaffBLL.GetModelByKeyid(m_EC_MergerHoudaos.PSF_JichangId);
			if (oA_Staff != null)
			{
			m_EC_MergerHoudaos.PSF_Jichang = oA_Staff.Name;
			}
			}
			else
			{
			m_EC_MergerHoudaos.PSF_Jichang = "";
			}

			m_EC_MergerHoudaos.PSF_Yaoqiu = txtYaoqiu[i].Trim();
			if (!string.IsNullOrEmpty(m_EC_MergerHoudaos.PSF_Houdaogongxu)
			\|\| !string.IsNullOrEmpty(m_EC_MergerHoudaos.PSF_Shuliang)
			\|\| !string.IsNullOrEmpty(m_EC_MergerHoudaos.PSF_Beishu)
			\|\| !string.IsNullOrEmpty(m_EC_MergerHoudaos.PSF_Jichang)
			\|\| !string.IsNullOrEmpty(m_EC_MergerHoudaos.PSF_Yaoqiu))
			if (!string.IsNullOrEmpty(m_EC_MergerHoudaos.PSF_Houdaogongxu))
			{
			m_EC_MergerHoudaosList.Add(m_EC_MergerHoudaos);
			}