chuanyin-group-project.git

			@@ -23,14 +23,14 @@
			/// 查询来源
			/// </summary>
			const string FROMSOUCEBEFORE = " ( select distinct od.*,d_Shifouwanjie.Name as TransferstatusName, " +
			" oe.CompanyName as BuyerName,eo.shuliang, os.Name as BusinessManager,od.Dizhi+' 联系人：'+od.Lianxiren+' 电话：'+od.Dianhua as DizhiLianxirenDianhua, " +
			" od.CompanyName as BuyerName,eo.shuliang, os.Name as BusinessManager,od.Dizhi+' 联系人：'+od.Lianxiren+' 电话：'+od.Dianhua as DizhiLianxirenDianhua, " +
			" ocar.[CarNumber] as CarName,oss.Name as DriverName " +
			" from [OA_DeliverPlan] od inner join [OA_CorporateClients] oe on oe.Keyid = od.[BuyerId] " +
			" from [OA_DeliverPlan] od left join [OA_CorporateClients] oe on oe.Keyid = od.[BuyerId] " +
			// " inner join (select count(*) as shuliang,eo.BuyerId,ISNULL(eoe.DelayTime,eo.DeliveryTime) DeliveryTime from [EC_OrderBasic] eo inner join [EC_OrderExtend] eoe on eo.Keyid=eoe.Keyid where eo.OrderState =4 group by eo.BuyerId,ISNULL(eoe.DelayTime,eo.DeliveryTime) ) eo on oe.Keyid =eo.BuyerId " +
			" left join (select count(*) as shuliang,eoe.DeliveryOrderId from [EC_OrderBasic] eo ,[EC_OrderExtend] eoe where eoe.Keyid=eo.Keyid group by eoe.DeliveryOrderId ) eo on od.Keyid =eo.DeliveryOrderId " + // eo.OrderState =4
			" inner join [OA_CustomerCommunications] oc on oe.Keyid = oc.Keyid " +
			// " inner join [OA_CustomerCommunications] oc on oe.Keyid = oc.Keyid " +
			//" left join [OA_DeliverPlan] od on oe.Keyid = od.[BuyerId] and DATEDIFF(day,eo.[DeliveryTime], od.[DeliverTime])=0 " +
			" left join [OA_Staff] os on oe.BusinessManagerId = os.Keyid " +
			" left join [OA_Staff] os on od.BusinessManagerId = os.Keyid " +
			" left join [OA_CarManage] ocar on od.[CarId] = ocar.Keyid " +
			" left join [OA_Staff] oss on od.[DriverId] = oss.Keyid " +
			" Left Join Sys_Dictionary as d_Shifouwanjie On(d_Shifouwanjie.DicType= '送货单移交状态' and od.[Transferstatus]= d_Shifouwanjie.MeanValue) where 0=0 ";
			@@ -107,6 +107,10 @@
			new SqlParameter("@Biddingcompany",trueModel.Biddingcompany),
			new SqlParameter("@shifouDelivery",trueModel.shifouDelivery),
			new SqlParameter("@Lianxiren",trueModel.Lianxiren),
			new SqlParameter("@CompanyName",string.IsNullOrEmpty(trueModel.CompanyName)?"":trueModel.CompanyName),
			new SqlParameter("@Deliveredstatus",trueModel.Deliveredstatus.HasValue?trueModel.Deliveredstatus.Value:0),
			new SqlParameter("@TransferType",trueModel.TransferType.HasValue?trueModel.TransferType.Value:0),
			new SqlParameter("@TransferName",string.IsNullOrEmpty(trueModel.TransferName)?"":trueModel.TransferName),
			};
			try
			{
			@@ -158,29 +162,33 @@
			new SqlParameter("@FirmId",trueModel.FirmId),
			new SqlParameter("@BuyerId",trueModel.BuyerId),
			DeliveredTime,
			new SqlParameter("@Zhuyishixiang",trueModel.Zhuyishixiang),
			new SqlParameter("@Gongzuokaoping",trueModel.Gongzuokaoping),
			new SqlParameter("@Zhuyishixiang",string.IsNullOrEmpty(trueModel.Zhuyishixiang)?"":trueModel.Zhuyishixiang ),
			new SqlParameter("@Gongzuokaoping",string.IsNullOrEmpty(trueModel.Gongzuokaoping)?"":trueModel.Gongzuokaoping ),
			new SqlParameter("@CarId",trueModel.CarId),
			new SqlParameter("@DriverId",trueModel.DriverId),
			new SqlParameter("@Transferstatus",trueModel.Transferstatus),
			TransfersTime,
			new SqlParameter("@Creater",trueModel.Creater),
			new SqlParameter("@CreateTime",trueModel.CreateTime),
			new SqlParameter("@Updater",trueModel.Updater),
			new SqlParameter("@LastUpdateTime",trueModel.LastUpdateTime),
			new SqlParameter("@Updater",trueModel.Updater.HasValue?trueModel.Updater.Value:Guid.Empty),
			new SqlParameter("@LastUpdateTime",trueModel.LastUpdateTime.HasValue?trueModel.LastUpdateTime.Value:DateTime.MinValue),
			new SqlParameter("@Sort",trueModel.Sort),
			new SqlParameter("@DeliverTime",trueModel.DeliverTime),
			new SqlParameter("@wentifankui",trueModel.wentifankui),
			new SqlParameter("@Yichangchuli",trueModel.Yichangchuli),
			new SqlParameter("@Xingzhengzhuize",trueModel.Xingzhengzhuize),
			new SqlParameter("@wentifankui",string.IsNullOrEmpty(trueModel.wentifankui)?"":trueModel.wentifankui),
			new SqlParameter("@Yichangchuli",string.IsNullOrEmpty(trueModel.Yichangchuli)?"":trueModel.Yichangchuli),
			new SqlParameter("@Xingzhengzhuize",string.IsNullOrEmpty(trueModel.Xingzhengzhuize)?"":trueModel.Xingzhengzhuize),
			new SqlParameter("@SellerOrderId",trueModel.SellerOrderId),
			new SqlParameter("@Dianhua",trueModel.Dianhua),
			new SqlParameter("@Dizhi",trueModel.Dizhi),
			new SqlParameter("@Remark",trueModel.Remark),
			new SqlParameter("@BusinessManagerId",trueModel.BusinessManagerId),
			new SqlParameter("@Biddingcompany",trueModel.Biddingcompany),
			new SqlParameter("@Biddingcompany",trueModel.Biddingcompany.HasValue?trueModel.Biddingcompany.Value:0),
			new SqlParameter("@shifouDelivery",trueModel.shifouDelivery),
			new SqlParameter("@Lianxiren",trueModel.Lianxiren),
			new SqlParameter("@CompanyName",string.IsNullOrEmpty(trueModel.CompanyName)?"":trueModel.CompanyName),
			new SqlParameter("@Deliveredstatus",trueModel.Deliveredstatus.HasValue?trueModel.Deliveredstatus.Value:0),
			new SqlParameter("@TransferType",trueModel.TransferType.HasValue?trueModel.TransferType.Value:0),
			new SqlParameter("@TransferName",string.IsNullOrEmpty(trueModel.TransferName)?"":trueModel.TransferName),
			};
			try
			{