From 2fee7b9b90c1acf7a17aef84ee22c2a31b801fe2 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 07 三月 2025 08:34:42 +0800
Subject: [PATCH] 送货管理 增加查询 业务经理 客户名称 完成 查询送货安排的历史 完成
---
CY_ECommercePlatform/CY.SQLDAL/OA/OA_DeliverPlanDAL.cs | 32 ++++++++++++++++++++------------
1 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_DeliverPlanDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_DeliverPlanDAL.cs
index fa3f3d5..8e8a66c 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_DeliverPlanDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_DeliverPlanDAL.cs
@@ -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
{
--
Gitblit v1.9.1