chuanyin-group-project.git

			@@ -1761,6 +1761,44 @@
			}
			}




			/// <summary>
			/// 修改订单送货金额
			/// </summary>
			/// <param name="orderOperate">订单操作</param>
			/// <returns></returns>
			internal bool UpdateOrderSonghuoJine(int OrderId,decimal? SonghuoJine)
			{


			_eC_OrderOperateDAL = null == _eC_OrderOperateDAL ? new EC_OrderOperateDAL(_dataBase) : _eC_OrderOperateDAL;
			try
			{

			bool isWin = false;


			IList<SqlParameter> sqlParms = new List<SqlParameter>()
			{
			new SqlParameter("@orderId",OrderId),
			new SqlParameter("@SonghuoJine",SonghuoJine.HasValue?SonghuoJine.Value:0),

			};
			string sql = "Update [EC_OrderExtend] Set [SonghuoJine]=@SonghuoJine where [Keyid] =@orderId ";


			_dataBase.ExecuteSql(sql, sqlParms.ToArray<SqlParameter>());

			return true;
			}
			catch (Exception ex)
			{
			throw ex;
			}
			}

			/// <summary>
			/// 根据新增订单操作，并修改订单状态
			/// </summary>
			@@ -2626,7 +2664,8 @@
			new SqlParameter(){ParameterName="@AppointCourierCompany",Value=awbInfo.AppointCourierCompany,SqlDbType=SqlDbType.VarChar,Size=50},
			new SqlParameter(){ParameterName="@FetchAddress",Value=awbInfo.FetchAddress,SqlDbType=SqlDbType.VarChar,Size=200},
			new SqlParameter(){ParameterName="@FetchContacts",Value=awbInfo.FetchContacts,SqlDbType=SqlDbType.VarChar,Size=50},
			new SqlParameter(){ParameterName="@FetchPhoneNum",Value=awbInfo.FetchPhoneNum,SqlDbType=SqlDbType.VarChar,Size=20}
			new SqlParameter(){ParameterName="@FetchPhoneNum",Value=awbInfo.FetchPhoneNum,SqlDbType=SqlDbType.VarChar,Size=20},
			new SqlParameter(){ParameterName="@SonghuoJine",Value=awbInfo.SonghuoJine.HasValue?awbInfo.SonghuoJine.Value:0,SqlDbType=SqlDbType.Money}
			};
			_dataBase.Query("sp_EC_AwbInfo_DeliverPresswork", CommandType.StoredProcedure, sqlParms.ToArray<SqlParameter>());
			isWin = 1.Equals(sqlParms[0].Value);
			@@ -2643,6 +2682,17 @@
			else
			;
			isWin = this.UpdateOrderStateUnit(awbInfo.Operate);//修改订单状态
			if (!isWin)
			return false;
			else
			;

			if(awbInfo.Operate.OperateType == 5)
			isWin = this.UpdateOrderSonghuoJine(awbInfo.Keyid.Value, awbInfo.SonghuoJine);//修改订单状态
			else
			{
			isWin = this.UpdateOrderSonghuoJine(awbInfo.Keyid.Value, 0);//修改订单状态
			}
			if (!isWin)
			return false;
			else
			@@ -3197,5 +3247,91 @@
			}
			}




			/// <summary>
			/// 分页查询
			/// </summary>
			/// <param name="pagination"></param>
			/// <param name="MemberId"></param>
			/// <returns></returns>
			public IEnumerable<Model.EC_OrderBasic> SelectModelPageSheji(Infrastructure.Query.Pagination pagination, Guid MemberId, string BeginCreateTime, string EndCreateTime, string SellerOrderId, string PrintTypeId, string BusinessManagerId, string Shejirenyuan, string BuyerName, string DocumentName, string ShejiStatus)
			{
			try
			{
			string condition = " 1=1 ";
			if (MemberId != Guid.Empty)
			{
			var originalGuid = MemberId;
			Guid reversedGuid = new Guid(originalGuid.ToByteArray().Reverse().ToArray());
			condition += " and ob.SellerId = '" + reversedGuid + "'";
			}



			if (!string.IsNullOrEmpty(BeginCreateTime))
			condition += string.Format(" and CAST(ob.CreateTime AS DATE) >='{0}'", BeginCreateTime);

			if (!string.IsNullOrEmpty(EndCreateTime))
			condition += string.Format(" and CAST(ob.CreateTime AS DATE) <='{0}'", EndCreateTime);

			if (!string.IsNullOrEmpty(SellerOrderId))
			condition += " and ob.SellerOrderId like '%" + SellerOrderId + "%'";

			if (!string.IsNullOrEmpty(PrintTypeId))
			{
			condition += " and ob.PrintTypeId = " + PrintTypeId + "";
			}
			if (!string.IsNullOrEmpty(BusinessManagerId))
			{
			condition += " and oe.BusinessManagerId = " + BusinessManagerId + "";
			}
			if (!string.IsNullOrEmpty(Shejirenyuan))
			{
			condition += " and ( oe.Shejirenyuan = " + Shejirenyuan + " or oe.Shejirenyuanneiye = " + Shejirenyuan + " )";
			}
			if (!string.IsNullOrEmpty(BuyerName))
			condition += " and ob.BuyerName like '%" + BuyerName + "%'";

			if (!string.IsNullOrEmpty(DocumentName))
			condition += " and ob.DocumentName like '%" + DocumentName + "%'";

			if (!string.IsNullOrEmpty(ShejiStatus))
			{
			if(ShejiStatus == "1")
			{
			condition += " and oe.ShejiStatus = " + ShejiStatus + "";
			}
			else
			{
			condition += " and oe.ShejiStatus != 1 ";
			}
			}

			/// <summary>
			/// 查询来源
			/// </summary>
			string fromss = " EC_OrderBasic as ob Inner Join [EC_OrderExtend] as oe On ob.Keyid=oe.Keyid Left Join SysInquiry_PrintingType as pt On(ob.PrintTypeId=pt.Keyid) " +


			" where " + condition;
			var ssss = _dataBase.SelectModel<Model.EC_OrderBasic>(" sum(oe.[ShejiSumPrice]) as ShejiSumPrice,sum(oe.ShejiSumPriceneiye) as ShejiSumPriceneiye ", fromss);
			if (ssss.Count > 0)
			{
			var aaaaa = ssss.First();
			pagination.heji1 = (aaaaa.ShejiSumPrice + aaaaa.ShejiSumPriceneiye)??0;

			}


			return _dataBase.SelectModelPage<Model.EC_OrderBasic>(pagination, " ob.*,oe.BusinessManagerId,oe.shifouDelivery,oe.IsPrintfengqian,oe.DeliveryOrderId,oe.KaipiaoshenqingCreater,oe.KaipiaoshenqingTime,oe.KaipiaoquerenCreater,oe.KaipiaoquerenTime,oe.Kehuqianshou,oe.KehuqianshouCreater,oe.KehuqianshouTime ,oe.Quchudingdan,oe.QuchudingdanCreater,oe.QuchudingdanTime,oe.PrintPackDeliveryRequir,oe.PrintNum,oe.ExigencyCaseId,oe.Duiyinghetongbianhao,oe.[Shejirenyuan],oe.[Shejileixing] ,oe.[Danshuangmian],oe.[Shejirenyuanneiye],oe.[Shejileixingneiye],oe.[Danshuangmianneiye],oe.[Shejiyaoqiu],oe.[Shejiyaoqiuneiye],oe.[ShejirenyuanName],oe.[ShejirenyuanNameneiye],oe.[ShejiStatus],oe.[ShejileixingName],oe.[ShejileixingNameneiye],oe.[ShejiUnitPrice] ,oe.[ShejiSumPrice],oe.[ShejiUnitPriceneiye],oe.[ShejiSumPriceneiye] ,oe.[Shejicount],oe.[Shejicountneiye] ,pt.PrintName as PrintTypeName ", " EC_OrderBasic as ob Inner Join [EC_OrderExtend] as oe On ob.Keyid=oe.Keyid Left Join SysInquiry_PrintingType as pt On(ob.PrintTypeId=pt.Keyid) ", " ob.CreateTime desc", " CreateTime desc ", condition);
			}
			catch (Exception ex)
			{
			throw ex;
			}
			}

			}
			}