From a7e05ebe00fdcb649c012e5afc4a42a8d631e824 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 02 四月 2025 08:38:24 +0800
Subject: [PATCH] 删除客户管理查询条件中的“客户编号” 完成 新增订单---黑白印件 的后道工序最右边增加一个“口 竖式”，同前面套号、压痕一样，默认不勾选，是竖式的业务经理自己下单时勾选 完成提交外协付款申请时，增加上传审批证明的上传图片功能，可以添加多张图片；查询列表中增加“付款状态：全部、已付款、未付款”查询条件，默认全部；“完工状态”改为默认未完工 完成请示批复----付款申请 中也要向上面的需求一样，增加上传审批证明的上传图片功能，可以添加多张图片 完成在“请示批复”中进行“批复”操作的时候要能查看上传的审批图片 完成包装要求”要显示在打印的订单中 完成包装要求”要显示在打印的订单中 完成收据联单的新增订单中，纸张选无碳纸时，不显示“品牌”、“克重”，在联数的后面增加颜色选择：“颜色：上白下红”（匹配联数）订单管理中的“订单状态”删除，删除后新增两个状态：“完工状态：全部、未完工、已完工”和“送货状态：全部、已送货、未送货” 完成请示批复中默认“未批复” 完成请示批复中默认“未批复” 完成
---
CY_ECommercePlatform/CY.SQLDAL/OA/OA_DeliverPlanDAL.cs | 54 ++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 42 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..2d6b62d 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
{
@@ -151,6 +155,16 @@
TransfersTime = new SqlParameter("@TransfersTime", DBNull.Value);
}
+ SqlParameter LastUpdateTime = null;
+ if (trueModel.LastUpdateTime.HasValue)
+ {
+ LastUpdateTime = new SqlParameter("@LastUpdateTime", trueModel.LastUpdateTime.Value);
+ }
+ else
+ {
+ LastUpdateTime = new SqlParameter("@LastUpdateTime", DBNull.Value);
+ }
+
IList<SqlParameter> sqlParms = new List<SqlParameter>()
{
@@ -158,29 +172,35 @@
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),
+ LastUpdateTime,
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),
+ new SqlParameter("@DeliverPlanPaicheid", trueModel.DeliverPlanPaicheid.HasValue?trueModel.DeliverPlanPaicheid:Guid.Empty),
+
};
try
{
@@ -243,6 +263,16 @@
/// <summary>
+ /// 鍏ㄩ儴鏌ヨ
+ /// </summary>
+ /// <param name="query"></param>
+ /// <returns></returns>
+ public IEnumerable<Model.OA_DeliverPlan> GetModelByDeliverPlanPaicheid(Guid deliverPlanPaicheid)
+ {
+ return _dataBase.SelectModel<Model.OA_DeliverPlan>(" * ", " OA_DeliverPlan ", " DeliverPlanPaicheid = '" + deliverPlanPaicheid + "'") as IList<Model.OA_DeliverPlan>;//鎵ц鏌ヨ
+ }
+
+ /// <summary>
/// 鍒嗛〉鏌ヨ
/// </summary>
/// <param name="query"></param>
--
Gitblit v1.9.1