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_KipiaoshenqingDAL.cs | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 52 insertions(+), 6 deletions(-)
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_KipiaoshenqingDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_KipiaoshenqingDAL.cs
index 8877a76..ffb57ce 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_KipiaoshenqingDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_KipiaoshenqingDAL.cs
@@ -24,10 +24,10 @@
/// 鏌ヨ鏉ユ簮
/// </summary>
const string FROMSOUCEBEFORE = " ( select distinct ok.*,d_kaipiaoshenqing.Name as KaipiaoshenqingName,d_fapiaoqianshou.Name as KehuqianshouName, " +
- " oe.CompanyName as BuyerName,eo.shuliang,eo.jine, os.Name as BusinessManager " +
+ " oe.CompanyName as BuyerName, os.Name as BusinessManager " +//,eo.shuliang,eo.jine
" from [OA_Kaipiaoshenqing] ok inner join [OA_CorporateClients] oe on oe.Keyid = ok.[BuyerId] " +
- " left join (select count(*) as shuliang,sum(eo.[SumPrice]) as jine,eoe.KaipiaoshenqingId from [EC_OrderBasic] eo ,[EC_OrderExtend] eoe where eoe.Keyid=eo.Keyid group by eoe.KaipiaoshenqingId ) eo on ok.Keyid =eo.KaipiaoshenqingId " +
+ // " left join (select count(*) as shuliang,sum(eo.[SumPrice]) as jine,eoe.KaipiaoshenqingId from [EC_OrderBasic] eo ,[EC_OrderExtend] eoe where eoe.Keyid=eo.Keyid group by eoe.KaipiaoshenqingId ) eo on ok.Keyid =eo.KaipiaoshenqingId " +
" left join [OA_Staff] os on ok.BusinessManagerId = os.Keyid " +
" Left Join Sys_Dictionary as d_kaipiaoshenqing On(d_kaipiaoshenqing.DicType= 'EC_寮�绁ㄧ敵璇�' and ok.[Kaipiaoshenqing]= d_kaipiaoshenqing.MeanValue) " +
@@ -36,7 +36,7 @@
/// <summary>
/// 鍒嗛〉榛樿鎺掑簭瀛楁
/// </summary>
- const string ORDERBY = " SellerOrderId desc ";
+ const string ORDERBY = " CreateTime desc ";
#endregion
public OA_KipiaoshenqingDAL()
{
@@ -94,10 +94,18 @@
new SqlParameter("@Creater",trueModel.Creater),
new SqlParameter("@SellerOrderId",trueModel.SellerOrderId),
new SqlParameter("@remark",trueModel.remark),
+ new SqlParameter("@ApprovalStatus",trueModel.ApprovalStatus),
+ new SqlParameter("@Zengjianmoney",trueModel.Zengjianmoney),
+ new SqlParameter("@Dingdanshu",trueModel.Dingdanshu.HasValue?trueModel.Dingdanshu.Value:0),
+ new SqlParameter("@kpmoney",trueModel.kpmoney),
+ new SqlParameter("@Huikuanmoney",trueModel.Huikuanmoney.HasValue?trueModel.Huikuanmoney.Value:new decimal(0)),
+
+ new SqlParameter("@Shenqingleixing",string.IsNullOrEmpty(trueModel.Shenqingleixing)?"":trueModel.Shenqingleixing),
+ new SqlParameter("@Kehumoney",trueModel.Kehumoney.HasValue?trueModel.Kehumoney.Value:new decimal(0)),
};
- string sql = "Insert Into OA_Kaipiaoshenqing ([Keyid],[FirmId],[BuyerId],[Kaipiaoshenqing],[Kehuqianshou], [KehuqianshouTime], [KehuqianshouCreater],[KaipiaoquerenTime], [KaipiaoquerenCreater],[BusinessManagerId], [Creater],[CreateTime],[Updater],[LastUpdateTime],[SellerOrderId],remark)"
- + " Values ( @Keyid,@FirmId,@BuyerId,@Kaipiaoshenqing, @Kehuqianshou, @KehuqianshouTime, @KehuqianshouCreater, @KaipiaoquerenTime, @KaipiaoquerenCreater, @BusinessManagerId, @Creater,@CreateTime,@Updater,@LastUpdateTime,@SellerOrderId,@remark )";
+ string sql = "Insert Into OA_Kaipiaoshenqing ([Keyid],[FirmId],[BuyerId],[Kaipiaoshenqing],[Kehuqianshou], [KehuqianshouTime], [KehuqianshouCreater],[KaipiaoquerenTime], [KaipiaoquerenCreater],[BusinessManagerId], [Creater],[CreateTime],[Updater],[LastUpdateTime],[SellerOrderId],remark,ApprovalStatus,Zengjianmoney,Dingdanshu,kpmoney,Huikuanmoney,Shenqingleixing,Kehumoney)"
+ + " Values ( @Keyid,@FirmId,@BuyerId,@Kaipiaoshenqing, @Kehuqianshou, @KehuqianshouTime, @KehuqianshouCreater, @KaipiaoquerenTime, @KaipiaoquerenCreater, @BusinessManagerId, @Creater,@CreateTime,@Updater,@LastUpdateTime,@SellerOrderId,@remark,@ApprovalStatus,@Zengjianmoney,@Dingdanshu,@kpmoney,@Huikuanmoney,@Shenqingleixing,@Kehumoney )";
try
{
_dataBase.ExecuteSql(sql, sqlParms.ToArray<SqlParameter>());
@@ -140,6 +148,16 @@
{
KaipiaoquerenTime = new SqlParameter("@KaipiaoquerenTime", DBNull.Value);
}
+ SqlParameter ShoukuanTime = null;
+ if (trueModel.ShoukuanTime.HasValue)
+ {
+ ShoukuanTime = new SqlParameter("@ShoukuanTime", trueModel.ShoukuanTime.Value);
+ }
+ else
+ {
+ ShoukuanTime = new SqlParameter("@ShoukuanTime", DBNull.Value);
+ }
+
IList<SqlParameter> sqlParms = new List<SqlParameter>()
{
@@ -158,9 +176,16 @@
new SqlParameter("@Updater",trueModel.Updater),
new SqlParameter("@LastUpdateTime",trueModel.LastUpdateTime),
new SqlParameter("@Creater",trueModel.Creater),
+ new SqlParameter("@ApprovalStatus",trueModel.ApprovalStatus),
+ new SqlParameter("@Zengjianmoney",trueModel.Zengjianmoney),
+ new SqlParameter("@Kehuqianshoutupian",string.IsNullOrEmpty(trueModel.Kehuqianshoutupian)?"":trueModel.Kehuqianshoutupian),
+ new SqlParameter("@Fapiaohao",string.IsNullOrEmpty(trueModel.Fapiaohao)?"":trueModel.Fapiaohao),
+ new SqlParameter("@Huikuanmoney",trueModel.Huikuanmoney.HasValue?trueModel.Huikuanmoney.Value:new decimal(0)),
+ ShoukuanTime,
+ new SqlParameter("@Kehumoney",trueModel.Kehumoney.HasValue?trueModel.Kehumoney.Value:new decimal(0)),
};
- string sql = "Update OA_Kaipiaoshenqing Set [FirmId]=@FirmId,[BuyerId]=@BuyerId,[Kaipiaoshenqing]=@Kaipiaoshenqing,[Kehuqianshou]=@Kehuqianshou, [KehuqianshouTime]=@KehuqianshouTime, [KehuqianshouCreater]=@KehuqianshouCreater,[KaipiaoquerenTime]=@KaipiaoquerenTime, [KaipiaoquerenCreater]=@KaipiaoquerenCreater,[BusinessManagerId]=@BusinessManagerId, [Creater]=@Creater,[CreateTime]=@CreateTime,[Updater]=@Updater,[LastUpdateTime]=@LastUpdateTime where [Keyid] =@Keyid ";
+ string sql = "Update OA_Kaipiaoshenqing Set [FirmId]=@FirmId,[BuyerId]=@BuyerId,[Kaipiaoshenqing]=@Kaipiaoshenqing,[Kehuqianshou]=@Kehuqianshou, [KehuqianshouTime]=@KehuqianshouTime, [KehuqianshouCreater]=@KehuqianshouCreater,[KaipiaoquerenTime]=@KaipiaoquerenTime, [KaipiaoquerenCreater]=@KaipiaoquerenCreater,[BusinessManagerId]=@BusinessManagerId, [Creater]=@Creater,[CreateTime]=@CreateTime,[Updater]=@Updater,[LastUpdateTime]=@LastUpdateTime,ApprovalStatus=@ApprovalStatus,Zengjianmoney=@Zengjianmoney,Kehuqianshoutupian=@Kehuqianshoutupian,Fapiaohao=@Fapiaohao,Huikuanmoney=@Huikuanmoney,ShoukuanTime=@ShoukuanTime,Kehumoney=@Kehumoney where [Keyid] =@Keyid ";
try
{
@@ -249,6 +274,27 @@
resultOrderBy = query.Criteria[maxParamIndex].Value.ToString();//= 1 == orderbys.Length ? resultOrderBy : orderbys[1];
}
string fromSouce = string.Format("{0}{1}{2}", FROMSOUCEBEFORE, query.Criteria[0].Value, FROMSOUCEEND);//鎷艰鏉′欢
+
+
+ /// <summary>
+ /// 鏌ヨ鏉ユ簮
+ /// </summary>
+ string fromss = " [OA_Kaipiaoshenqing] ok inner join [OA_CorporateClients] oe on oe.Keyid = ok.[BuyerId] " +
+
+
+
+
+
+ " where 0=0 "+ query.Criteria[0].Value;
+ var ssss = _dataBase.SelectModel<Model.OA_Kaipiaoshenqing>(" sum(ok.kpmoney) as kpmoney,sum(ok.Huikuanmoney) as Huikuanmoney,sum(ok.Zengjianmoney) as Zengjianmoney ", fromss);
+ if (ssss.Count>0)
+ {
+ var aaaaa = ssss.First();
+ pagination.heji1 = aaaaa.kpmoney;
+ pagination.heji2 = aaaaa.Zengjianmoney;
+ pagination.heji3 = aaaaa.Huikuanmoney;
+ }
+
return _dataBase.SelectModelPage<Model.OA_Kaipiaoshenqing>(pagination, SELECTTARGET, fromSouce, orderbys[0], resultOrderBy);
}
--
Gitblit v1.9.1