chuanyin-group-project.git

			@@ -714,6 +714,8 @@
			new SqlParameter("@buyerId",DBNull.Value){SqlDbType=SqlDbType.UniqueIdentifier},
			new SqlParameter("@DocumentName",DBNull.Value){SqlDbType=SqlDbType.VarChar,Size=50},
			new SqlParameter("@Orderids",DBNull.Value){SqlDbType=SqlDbType.VarChar,Size=500},
			new SqlParameter("@WorkStates",DBNull.Value){SqlDbType=SqlDbType.VarChar,Size=500},
			new SqlParameter("@DeleverStates",DBNull.Value){SqlDbType=SqlDbType.VarChar,Size=500},

			};

			@@ -798,9 +800,9 @@
			}
			}
			/获取页数与返回数据条数/
			int? resultValue = CY.Infrastructure.Common.MyConvert.ConvertToInt32(sqlParms[32].Value);
			int? resultValue = CY.Infrastructure.Common.MyConvert.ConvertToInt32(sqlParms[34].Value);
			pagination.PageCount = resultValue.HasValue ? resultValue.Value : 0;
			resultValue = CY.Infrastructure.Common.MyConvert.ConvertToInt32(sqlParms[33].Value);
			resultValue = CY.Infrastructure.Common.MyConvert.ConvertToInt32(sqlParms[35].Value);
			pagination.RecordCount = resultValue.HasValue ? resultValue.Value : 0;

			return result;
			@@ -2901,8 +2903,9 @@
			/// <param name="WorkStates"></param>
			/// <param name="OutOrderId"></param>
			/// <param name="RelationType"></param>
			/// <param name="PayState"></param>
			/// <returns></returns>
			public IEnumerable<EC_OrderBasic> SelectAferOfOutOrder(Infrastructure.Query.Pagination pagination, Guid MemberId, DateTime? StartCreatTime, DateTime? EndCreatTime, DateTime? StartReturnTime, DateTime? EndReturnTime, string Creater, string OutFirm, string WorkStates, string OutOrderId, int? RelationType)
			public IEnumerable<EC_OrderBasic> SelectAferOfOutOrder(Infrastructure.Query.Pagination pagination, Guid MemberId, DateTime? StartCreatTime, DateTime? EndCreatTime, DateTime? StartReturnTime, DateTime? EndReturnTime, string Creater, string OutFirm, string WorkStates, string OutOrderId, int? RelationType, string PayState = null)
			{
			try
			{
			@@ -2913,6 +2916,9 @@

			if (RelationType > 0)
			condition += " and b.RelationTypeId = '" + RelationType + "' ";
			if (!string.IsNullOrEmpty(PayState))
			condition += " and a.PayState = " + PayState + " ";


			if (StartCreatTime != null)
			condition += " and a.CreateTime >= '" + StartCreatTime.Value + "' ";