From ba381be6a5aac58df11e2e7b6b19f012bd9ff5a1 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 04 十二月 2024 10:34:30 +0800
Subject: [PATCH] 开票申请
---
CY_ECommercePlatform/CY.SQLDAL/OA/OA_KipiaoshenqingDAL.cs | 33 +++++++++++++++++++++++++++------
1 files changed, 27 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..7f3ad88 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,15 @@
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)),
};
- 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)"
+ + " Values ( @Keyid,@FirmId,@BuyerId,@Kaipiaoshenqing, @Kehuqianshou, @KehuqianshouTime, @KehuqianshouCreater, @KaipiaoquerenTime, @KaipiaoquerenCreater, @BusinessManagerId, @Creater,@CreateTime,@Updater,@LastUpdateTime,@SellerOrderId,@remark,@ApprovalStatus,@Zengjianmoney,@Dingdanshu,@kpmoney,@Huikuanmoney )";
try
{
_dataBase.ExecuteSql(sql, sqlParms.ToArray<SqlParameter>());
@@ -140,6 +145,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 +173,15 @@
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,
};
- 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 where [Keyid] =@Keyid ";
try
{
--
Gitblit v1.9.1