chuanyin-group-project.git

			@@ -17,20 +17,20 @@
			private EC_OrderBasicBLL _eC_OrderBasicBLL = new EC_OrderBasicBLL();
			private Sys_DictionaryBLL _bll_Sys_DictionaryBLL = new Sys_DictionaryBLL();
			private EC_AcceptWayByOrderBLL _AcceptWayByOrderBLL = new EC_AcceptWayByOrderBLL();
			public int orderId
			{
			get
			{
			if (Request["id"] != null)
			{
			return Request["id"].ToString().ToInt32().Value;
			}
			else
			{
			return 0;
			}
			}
			}
			//public int orderId
			//{
			// get
			// {
			// if (Request["id"] != null)
			// {
			// return Request["id"].ToString().ToInt32().Value;
			// }
			// else
			// {
			// return 0;
			// }
			// }
			//}

			/// <summary>
			/// 绑定收货方式
			@@ -50,9 +50,13 @@
			if (!IsPostBack)
			{
			BindAcceptType();
			if (orderId != 0)
			{
			EC_AwbInfo model = _eC_OrderBasicBLL.SelectAwbInfoById(orderId);

			List<EC_OrderBasic> m_EC_OrderBasicList = _eC_OrderBasicBLL.GetEC_OrderBasicListByKeyid(Request["ids"].ToString2().Trim(','), CurrentUser.MemberId) as List<EC_OrderBasic>;
			this.RepClientList.DataSource = m_EC_OrderBasicList;
			this.RepClientList.DataBind();


			EC_AwbInfo model = _eC_OrderBasicBLL.SelectAwbInfoById(m_EC_OrderBasicList[0].Keyid.Value);
			if (model != null)
			{
			this.txtTheAwb.Text = model.TheAwb;
			@@ -86,7 +90,7 @@
			else
			{
			this.txtDeliverTime.Text = DateTime.Now.ToShortDateString();
			EC_AcceptWayByOrder acceptWayByOrder = _AcceptWayByOrderBLL.GetModelByTargetId(orderId);
			EC_AcceptWayByOrder acceptWayByOrder = _AcceptWayByOrderBLL.GetModelByTargetId(m_EC_OrderBasicList[0].Keyid.Value);
			if (acceptWayByOrder != null)
			{
			this.ddlAcceptType.SelectedValue = acceptWayByOrder.AcceptTypeId.ToString();
			@@ -118,7 +122,7 @@
			}
			}
			}
			}

			}
			}

			@@ -127,8 +131,12 @@
			protected void btnSubmit_Click(object sender, EventArgs e)
			{
			bool isSuccess = false;
			string[] ids = Request["ids"].ToString2().Trim(',').Split(',');

			foreach (var item in ids)
			{
			EC_AwbInfo eC_AwbInfo = new EC_AwbInfo();
			eC_AwbInfo.Keyid = orderId;
			eC_AwbInfo.Keyid = item.ToInt32();
			eC_AwbInfo.TheAwb = this.txtTheAwb.Text;
			eC_AwbInfo.DeliverPerson = this.txtDeliverPerson.Text;
			if (this.txtDeliverTime.Text != string.Empty)
			@@ -166,7 +174,9 @@
			eC_AwbInfo.Operate.OrderId = eC_AwbInfo.Keyid;
			eC_AwbInfo.Operate.Remark = eC_AwbInfo.Remark;
			eC_AwbInfo.Operate.Operator = CurrentUser.ShortName;
			int orderState = Request["OrderState"].ToString().ToInt32().Value;
			//int orderState = Request["OrderState"].ToString().ToInt32().Value;
			var order = _eC_OrderBasicBLL.SelectModelById(item.ToInt32().Value);
			int orderState = order.OrderState.Value;
			if (orderState == -1)
			{
			eC_AwbInfo.Operate.OperateType = -1;
			@@ -191,7 +201,25 @@
			m_EC_AwbInfoOut.Keyid = m_EC_OrderBasic_Out.Keyid;
			m_EC_AwbInfoOut.Operate.OrderId = eC_AwbInfo.Keyid;
			isSuccess = _eC_OrderBasicBLL.DeliverPresswork(m_EC_AwbInfoOut);
			if (!isSuccess)
			{
			JavaScript.MessageBox("操作失败", this);
			}
			}

			}
			else
			{
			JavaScript.MessageBox("操作失败", this);
			}
			}





			if (isSuccess)
			{
			JavaScript.MessageBox("操作成功", this,true,true);
			}
			else