From e110200c2e32a0f82f474fa38b315ae6360f2dc4 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 04 三月 2025 08:39:38 +0800
Subject: [PATCH] 在订单列表 送货安排 点击打印送货单 选择送货日期 默认最晚的送货日期，默认当天，可以修改 完成 司机查询 拥有司机小程序权限的人员 完成 新增送货 可以选择客户，也可以 填写临时客户 完成
---
CY_ECommercePlatform/CY.SQLDAL/OA/OA_DeliverPlanDAL.cs | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_DeliverPlanDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_DeliverPlanDAL.cs
index fa3f3d5..4c0a027 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,7 @@
new SqlParameter("@Biddingcompany",trueModel.Biddingcompany),
new SqlParameter("@shifouDelivery",trueModel.shifouDelivery),
new SqlParameter("@Lianxiren",trueModel.Lianxiren),
+ new SqlParameter("@CompanyName",trueModel.CompanyName),
};
try
{
@@ -181,6 +182,7 @@
new SqlParameter("@Biddingcompany",trueModel.Biddingcompany),
new SqlParameter("@shifouDelivery",trueModel.shifouDelivery),
new SqlParameter("@Lianxiren",trueModel.Lianxiren),
+ new SqlParameter("@CompanyName",trueModel.CompanyName),
};
try
{
--
Gitblit v1.9.1