diff --git a/ApiNew/bin/Debug/ApiNew.dll b/ApiNew/bin/Debug/ApiNew.dll index f7f7a48..a7e5227 100644 Binary files a/ApiNew/bin/Debug/ApiNew.dll and b/ApiNew/bin/Debug/ApiNew.dll differ diff --git a/ApiNew/bin/Debug/ApiNew.pdb b/ApiNew/bin/Debug/ApiNew.pdb index 4812633..62512ed 100644 Binary files a/ApiNew/bin/Debug/ApiNew.pdb and b/ApiNew/bin/Debug/ApiNew.pdb differ diff --git a/ApiNew/obj/Debug/ApiNew.csproj.FileListAbsolute.txt b/ApiNew/obj/Debug/ApiNew.csproj.FileListAbsolute.txt index 8b883ea..62496c0 100644 --- a/ApiNew/obj/Debug/ApiNew.csproj.FileListAbsolute.txt +++ b/ApiNew/obj/Debug/ApiNew.csproj.FileListAbsolute.txt @@ -227,3 +227,4 @@ C:\wms新\erpnew\ERP\ApiNew\obj\Debug\ApiNew.csproj.CoreCompileInputs.cache C:\wms新\erpnew\ERP\ApiNew\obj\Debug\ApiNew.csproj.CopyComplete C:\wms新\erpnew\ERP\ApiNew\obj\Debug\ApiNew.dll C:\wms新\erpnew\ERP\ApiNew\obj\Debug\ApiNew.pdb +C:\wms新\erpnew\ERP\ApiNew\obj\Debug\ApiNew.csproj.AssemblyReference.cache diff --git a/ApiNew/obj/Debug/ApiNew.dll b/ApiNew/obj/Debug/ApiNew.dll index f7f7a48..a7e5227 100644 Binary files a/ApiNew/obj/Debug/ApiNew.dll and b/ApiNew/obj/Debug/ApiNew.dll differ diff --git a/ApiNew/obj/Debug/ApiNew.pdb b/ApiNew/obj/Debug/ApiNew.pdb index 4812633..62512ed 100644 Binary files a/ApiNew/obj/Debug/ApiNew.pdb and b/ApiNew/obj/Debug/ApiNew.pdb differ diff --git a/TradeManage/Web.config b/TradeManage/Web.config index 6a46a2f..9563b42 100644 --- a/TradeManage/Web.config +++ b/TradeManage/Web.config @@ -67,8 +67,8 @@ - - + + diff --git a/TradeManage/bin/ApiNew.dll b/TradeManage/bin/ApiNew.dll index f7f7a48..a7e5227 100644 Binary files a/TradeManage/bin/ApiNew.dll and b/TradeManage/bin/ApiNew.dll differ diff --git a/TradeManage/bin/TradeManage.dll b/TradeManage/bin/TradeManage.dll index 7d842e4..831782c 100644 Binary files a/TradeManage/bin/TradeManage.dll and b/TradeManage/bin/TradeManage.dll differ diff --git a/TradeManage/bin/TradeManage.dll.config b/TradeManage/bin/TradeManage.dll.config index 6a46a2f..9563b42 100644 --- a/TradeManage/bin/TradeManage.dll.config +++ b/TradeManage/bin/TradeManage.dll.config @@ -67,8 +67,8 @@ - - + + diff --git a/TradeManage/bin/TradeManage.pdb b/TradeManage/bin/TradeManage.pdb index dfd1536..8813ef3 100644 Binary files a/TradeManage/bin/TradeManage.pdb and b/TradeManage/bin/TradeManage.pdb differ diff --git a/TradeManage/bin/TradeManageNew.dll b/TradeManage/bin/TradeManageNew.dll index d0821f2..f8f8a6b 100644 Binary files a/TradeManage/bin/TradeManageNew.dll and b/TradeManage/bin/TradeManageNew.dll differ diff --git a/TradeManage/bin/TradeManageNew.dll.config b/TradeManage/bin/TradeManageNew.dll.config index 66850e4..4b0b07e 100644 --- a/TradeManage/bin/TradeManageNew.dll.config +++ b/TradeManage/bin/TradeManageNew.dll.config @@ -63,11 +63,11 @@ - + - + diff --git a/TradeManage/bin/TradeManageNew.pdb b/TradeManage/bin/TradeManageNew.pdb index bc75fe6..a22f513 100644 Binary files a/TradeManage/bin/TradeManageNew.pdb and b/TradeManage/bin/TradeManageNew.pdb differ diff --git a/TradeManage/obj/Debug/TradeManage.dll b/TradeManage/obj/Debug/TradeManage.dll index 7d842e4..831782c 100644 Binary files a/TradeManage/obj/Debug/TradeManage.dll and b/TradeManage/obj/Debug/TradeManage.dll differ diff --git a/TradeManage/obj/Debug/TradeManage.pdb b/TradeManage/obj/Debug/TradeManage.pdb index dfd1536..8813ef3 100644 Binary files a/TradeManage/obj/Debug/TradeManage.pdb and b/TradeManage/obj/Debug/TradeManage.pdb differ diff --git a/TradeManageNew/DD_OrderServiceNew.asmx.cs b/TradeManageNew/DD_OrderServiceNew.asmx.cs index 3e84111..1ba1c65 100644 --- a/TradeManageNew/DD_OrderServiceNew.asmx.cs +++ b/TradeManageNew/DD_OrderServiceNew.asmx.cs @@ -30466,6 +30466,9 @@ namespace TradeManageNew public int Save_TemuShopGoodActive(TemuShopGoodActive Model) { Pages.Login(this.Session); + Model.State = 1; + Model.CreateTime = DateTime.Now; + Model.CreateUserId= Convert.ToInt32(Session["UserId"]); return DataNew.Save_TemuShopGoodActive(Model); } #endregion @@ -30562,6 +30565,7 @@ namespace TradeManageNew ActiveInfo +="折扣："+ddmd.OffNum.Value.ToString() + " 售价："+ ddmd.SalePrice.Value.ToString() + " 活动库存："+ ddmd.ActiveNum.Value.ToString() + " 已出订单："+ ddmd.OutNum.Value.ToString() + "
"; } } + omd.ActiveInfo = ActiveInfo; } } } diff --git a/TradeManageNew/Huowu/TemuShopGoodPriceNew.aspx b/TradeManageNew/Huowu/TemuShopGoodPriceNew.aspx index 44b0b15..56c6f30 100644 --- a/TradeManageNew/Huowu/TemuShopGoodPriceNew.aspx +++ b/TradeManageNew/Huowu/TemuShopGoodPriceNew.aspx @@ -182,6 +182,10 @@ col.HeaderText = "基础价格"; col.CellTemplate = "{Bind BasePrice}"; Array.add(datagrid1.Columns, col); + col = new nblf.ui.DataGridColumn(); + col.HeaderText = "活动信息"; + col.CellTemplate = "{Bind ActiveInfo}"; + Array.add(datagrid1.Columns, col); col = new nblf.ui.DataGridColumn(); col.HeaderText = "创建人"; @@ -198,6 +202,13 @@ col = new nblf.ui.DataGridColumn(); col.HeaderText = "状态"; col.CellTemplate = "{Bind State}"; + col.CellFormatter = function (value) { + switch (value) { + case 1: return "正常"; + case 0: return "已结束"; + default: return ""; + } + }; Array.add(datagrid1.Columns, col); @@ -290,7 +301,7 @@ Model = data.d; Model.ID = 0; CreateGetModel("MainTable", Model); - $("#select_shops").val(Model.ShopId ); + $("#select_shops").val(Model.Shopid); datagrid2.DataBind(Model.ListModel); } @@ -299,12 +310,12 @@ //#endregion //#region 删除 function Delete(ID) { - if (window.confirm("确定要删除吗?") == false) return; + if (window.confirm("确定要结束该活动吗?") == false) return; var param = new Object(); param.ID = ID; WindowLoadModel.Show(); $.ajax({ - url: "../DD_OrderServiceNew.asmx/Delete_TemuShopGoodActive", + url: "../DD_OrderServiceNew.asmx/Update_TemuShopGoodActive", data: Sys.Serialization.JavaScriptSerializer.serialize(param), success: function (data) { WindowLoadModel.Hide(); diff --git a/TradeManageNew/SysManageServiceNew.asmx.cs b/TradeManageNew/SysManageServiceNew.asmx.cs index 57b26d7..b2fd65e 100644 --- a/TradeManageNew/SysManageServiceNew.asmx.cs +++ b/TradeManageNew/SysManageServiceNew.asmx.cs @@ -3055,9 +3055,9 @@ where a.CompanyId=1 " + tj1 + " order by " + Sort; #endregion - #region 报表18 + #region 报表18(备份文凯的) [WebMethod(EnableSession = true)] - public string GetReportTable18(DateTime? InDate, int DeptId, int ShopId, int PlatId, string MoneyCode, string Sort, bool isyc) + public string GetReportTable18_250210(DateTime? InDate, int DeptId, int ShopId, int PlatId, string MoneyCode, string Sort, bool isyc) { string dd = ""; try @@ -3161,6 +3161,185 @@ left join ( select sid, CONVERT(decimal(12,2), SUM(t.cost)) as Rate3,CONVERT(dec + return GetReport3(dt, 18); + } + catch (Exception ex) + { + string a = dd; + return ""; + + } + } + #endregion + + + #region 报表18 + [WebMethod(EnableSession = true)] + public string GetReportTable18(DateTime? InDate, int DeptId, int ShopId, int PlatId, string MoneyCode, string Sort, bool isyc) + { + string dd = ""; + try + { + var obj = new BaseService(); + + string tj = ""; + string tj1 = ""; + //if (DeptId > 0) + //{ + // tj += " and b.DeptId=" + DeptId + " "; + // tj1 += " and a.DeptId=" + DeptId + " "; + //} + if (PlatId > 0) + { + tj += " and a.PlatId=" + PlatId + " "; + tj1 += " and a.PlatId=" + PlatId + " "; + } + + if (ShopId > 0) + { + tj += " and a.ShopId=" + ShopId + " "; + tj1 += " and a.ShopId=" + ShopId + " "; + } + + string tj2 = ""; + + if (PlatId > 0) + { + tj2 += " where c.PlatType=" + PlatId + " "; + + } + + if (ShopId > 0) + { + tj2 += " where c.ShopId=" + ShopId + " "; + + } + + string tj3 = ""; + + if (PlatId > 0) + { + tj3 += " where d.PlatType=" + PlatId + " "; + + } + + if (ShopId > 0) + { + tj3 += " where d.ShopId=" + ShopId + " "; + + } + //if (MoneyCode != "0") + // tj += " and a.MoneyCode='" + MoneyCode + "' "; + // string sql = @" + //declare @moneyrate decimal(18,4) + //select @moneyrate=MRate from JC_Money where MCode='USD' and PlatId=2 + //select a.ShopId,a.TotalPrice,escrowFee=isnull(a.escrowFee,0),a.RMBPrice,c.yj,yf=c.yf,cb=c.cb,hwsf=c.hwsf,c.tc,c.ck,c.md,a.Ad_Fee,a.DR_BackFee,a.DR_PostFee,a.DR_SSFee,a.Other_Fee,moneyrate=isnull(c.moneyrate,@moneyrate) into #ls from DT_OrderInfo a with(nolock) + //inner join DT_OrderXXInfo b with(nolock) on a.OrderId=b.OrderId + //left join DT_Fees c with(nolock) on a.OrderId=c.orderid + //where DATEDIFF(day,a.OrderDate,'" + InDate.Value.ToString("yyyy-MM-dd") + @"')=0 " + tj + @" and a.State>0 and a.State<3 + //select a.*,Num2=isnull(b.Num2,0) into #ls2 from ( + //select b.ShopId,Num=COUNT(0) from HW_GoodsInfo a with(nolock) + //inner join HW_Shop b with(nolock) on a.GoodsId=b.GoodsId + //group by b.ShopId)a + //left join ( + //select a.ShopId,Num2=COUNT(distinct c.GoodsId) from DT_OrderInfo a with(nolock) + //inner join DT_OrderGoods b with(nolock) on a.OrderId=b.OrderId + //inner join HW_GoodsDetail c with(nolock) on b.DetailId=c.DetailId + //where a.State>0 and a.State<3 and DATEDIFF(day,a.OrderDate,'" + InDate.Value.ToString("yyyy-MM-dd") + @"')=0 group by a.ShopId)b on a.ShopId=b.ShopId + + //select d.ShopName,Master=case when d.Master=d.buyer then d.Master when d.buyer is not null and d.buyer<>'' then d.Master+'-'+d.buyer else d.Master end,a.OrderNum,a.RMBMoney,a.USDMoney,AvgPrice=case when a.OrderNum>0 then cast(a.USDMoney/a.OrderNum as decimal(18,2)) else 0 end,a.InPrice,LR=cast(b.ml as decimal(18,2)),MLL=case when b.TotalPrice>0 then cast(b.ml*100/b.TotalPrice as decimal(18,2)) else 0 end,ShopTJGoods=e.Num,ShopCDGoods=e.Num2,ckfee,a.mdfee,a.adfee,bz=case when a.InPrice>0 then CAST(a.RMBMoney/a.InPrice as decimal(18,2)) else 0 end,c.GoodRate,c.ODR,c.DSRService,c.DSRGoods,h.DSRPost,c.USDUseMoney,c.USDNoMoney,c.RMBUseMoney,c.RMBNoMoney,c.Rate1,c.Rate2,f.Rate3,c.Rate4,c.PropertyViolate,c.Rate5,g.Rate6,Rate7=isnull(c.Rate7,d.dayfee),JL=cast(b.ml as decimal(18,2))+isnull(ckfee,0)+isnull(mdfee,0)-isnull(c.Rate3,0)-isnull(c.Rate7,d.dayfee),FeeDate=isnull(c.FeeDate,d.FeeDate),TXFee=isnull(c.TXFee,d.TXFee) from + //JC_Shop d left join ( + //select ShopId,OrderNum=COUNT(0),RMBMoney=SUM(RMBPrice),escrowFee=sum(escrowFee),USDMoney=SUM(TotalPrice),InPrice=SUM(cb),ckfee=SUM(ck),mdfee=SUM(md),adfee=SUM(Ad_Fee) from #ls + //group by ShopId)a on d.ShopId=a.ShopId + //left join (select ShopId,TotalPrice=sum(TotalPrice),ml=sum(isnull(TotalPrice,0)-isnull(escrowFee,0)-isnull(yj,0)-isnull(yf,0)-((isnull(cb,0)+isnull(hwsf,0))/moneyrate)-isnull(tc,0)-isnull(ck,0)-isnull(md,0)-isnull(Ad_Fee,0)) from #ls where yf>0 + //group by ShopId)b on a.ShopId=b.ShopId + //left join ( + //select GoodRate,ODR,DSRService,DSRGoods,DSRPost,USDUseMoney,USDNoMoney,RMBUseMoney, RMBNoMoney,Rate1,Rate2,Rate3,Rate4,PropertyViolate,Rate5,Rate6,Rate7,FeeDate,TXFee + //TXFee,ShopId from JC_ShopData + //where DATEDIFF(day,indate,'" + InDate.Value.ToString("yyyy-MM-dd") + @"')=0 )c on a.ShopId=c.ShopId + //left Join #ls2 e on a.ShopId=e.ShopId + // left join (select shopid,SUM(ABS(adfee)) Rate3 from AD_FeeList where DATEDIFF(day,addate,'" + InDate.Value.AddDays(-2).ToString("yyyy-MM-dd") + "')=0 group by shopid) f on d.ShopId=f.shopid "+ + // " left join ( select shopid,SUM(ABS(adfee)) Rate6 from AD_FeeList where CONVERT(varchar(7), addate, 120)='"+ InDate.Value.ToString("yyyy-MM") + "' group by shopid) g on d.ShopId=g.shopid "+ + // " left join(select b.name shopName,case when a.Spend=0 or a.ad_sale_amount=0 then 0 else cast((Spend/ad_sale_amount)*100 as decimal(12,2)) end DSRPost from ( select sid,SUM(ISNULL(ABS(spend),0)) Spend, SUM(ISNULL(ad_sales_amount,0)) ad_sale_amount from [192.168.1.187].[UpGoods].dbo.LxERP_ProductPerformance where summary_field='Asin' and RequestDate='" + InDate.Value.AddDays(-2).ToString("yyyy-MM-dd") + "' group by sid) a left join [192.168.1.187].[UpGoods].dbo.LxERP_Amazon_Shop b on a.sid=b.sid) h on d.ShopName=h.shopName " + + // + " order by " + Sort; + + + string sql = @" + declare @moneyrate decimal(18,4) + select @moneyrate=MRate from JC_Money where MCode='USD' and PlatId=2 + select a.ShopId,a.TotalPrice,escrowFee=isnull(a.escrowFee,0),a.RMBPrice,c.yj,yf=c.yf,cb=c.cb,hwsf=c.hwsf,c.tc,c.ck,c.md,a.Ad_Fee,a.DR_BackFee,a.DR_PostFee,a.DR_SSFee,a.Other_Fee,moneyrate=isnull(c.moneyrate,@moneyrate),ISnull( c.SubsidyFee,0) SubsidyFee into #ls from DT_OrderInfo a with(nolock) + inner join DT_OrderXXInfo b with(nolock) on a.OrderId=b.OrderId + left join DT_Fees c with(nolock) on a.OrderId=c.orderid + where DATEDIFF(day,a.OrderDate,'" + InDate.Value.ToString("yyyy-MM-dd") + @"')=0 " + tj + @" and a.State>0 and a.State<3 + select a.*,Num2=isnull(b.Num2,0) into #ls2 from ( + select b.ShopId,Num=COUNT(0) from HW_GoodsInfo a with(nolock) + inner join HW_Shop b with(nolock) on a.GoodsId=b.GoodsId + left join jc_shop c on b.ShopId=c.ShopId " + tj2 + @" + group by b.ShopId)a + left join ( + select a.ShopId,Num2=COUNT(distinct c.GoodsId) from DT_OrderInfo a with(nolock) + inner join DT_OrderGoods b with(nolock) on a.OrderId=b.OrderId + inner join HW_GoodsDetail c with(nolock) on b.DetailId=c.DetailId + where a.State>0 and a.State<3 and DATEDIFF(day,a.OrderDate,'" + InDate.Value.ToString("yyyy-MM-dd") + @"')=0 group by a.ShopId)b on a.ShopId=b.ShopId + + select * from ( + select d.ShopName,Master=case when d.Master=d.buyer then d.Master when d.buyer is not null and d.buyer<>'' then d.Master+'-'+d.buyer else d.Master end,a.OrderNum,a.RMBMoney,a.USDMoney,AvgPrice=case when a.OrderNum>0 then cast(a.USDMoney/a.OrderNum as decimal(18,2)) else 0 end,a.InPrice,LR=cast(b.ml as decimal(18,2)),MLL=case when b.TotalPrice>0 then cast(b.ml*100/b.TotalPrice as decimal(18,2)) else 0 end,ShopTJGoods=e.Num,ShopCDGoods=e.Num2,ckfee,a.mdfee,a.adfee,bz=case when a.InPrice>0 then CAST(a.RMBMoney/a.InPrice as decimal(18,2)) else 0 end,a.yf,c.GoodRate,c.ODR,DSRService=0,DSRGoods=null,DSRPost=0,c.USDUseMoney, USDNoMoney=0,c.RMBUseMoney,c.RMBNoMoney,Rate1=null,Rate2=null,Rate4=null, PropertyViolate=0, Rate5=0,Rate6=0,Rate7=isnull(c.Rate7,d.dayfee),JL=cast(b.ml as decimal(18,2))+isnull(ckfee,0)-isnull(c.Rate3,0)-isnull(c.Rate7,d.dayfee),FeeDate=null,TXFee=0 from + JC_Shop d left join ( + select ShopId,OrderNum=COUNT(0),RMBMoney=SUM(RMBPrice),escrowFee=sum(escrowFee),USDMoney=SUM(TotalPrice),InPrice=SUM(cb),ckfee=SUM(ck),mdfee=SUM(md),adfee=SUM(Ad_Fee),yf=SUM(yf) from #ls + group by ShopId)a on d.ShopId=a.ShopId + left join (select ShopId,TotalPrice=sum(TotalPrice),ml=sum(isnull(TotalPrice,0)-isnull(escrowFee,0)-isnull(yj,0)-isnull(yf,0)-((isnull(cb,0)+isnull(hwsf,0))/moneyrate)-isnull(tc,0)-isnull(ck,0)-isnull(md,0)-isnull(Ad_Fee,0)+SubsidyFee) from #ls where yf>0 + group by ShopId)b on a.ShopId=b.ShopId + left join ( + select GoodRate,ODR,DSRService,DSRGoods,DSRPost,USDUseMoney,USDNoMoney,RMBUseMoney, RMBNoMoney,Rate1,Rate2,Rate3,Rate4,PropertyViolate,Rate5,Rate6,Rate7,FeeDate,TXFee + TXFee,ShopId from JC_ShopData + where DATEDIFF(day,indate,'" + InDate.Value.ToString("yyyy-MM-dd") + @"')=0 )c on a.ShopId=c.ShopId + left Join #ls2 e on a.ShopId=e.ShopId "+ tj3 + @" + ) a order by " + Sort; + +// string sql = @" +// declare @moneyrate decimal(18,4) +// select @moneyrate=MRate from JC_Money where MCode='USD' and PlatId=2 +// select a.ShopId,a.TotalPrice,escrowFee=isnull(a.escrowFee,0),a.RMBPrice,c.yj,yf=c.yf,cb=c.cb,hwsf=c.hwsf,c.tc,c.ck,c.md,a.Ad_Fee,a.DR_BackFee,a.DR_PostFee,a.DR_SSFee,a.Other_Fee,moneyrate=isnull(c.moneyrate,@moneyrate),ISnull( c.SubsidyFee,0) SubsidyFee into #ls from DT_OrderInfo a with(nolock) +// inner join DT_OrderXXInfo b with(nolock) on a.OrderId=b.OrderId +// left join DT_Fees c with(nolock) on a.OrderId=c.orderid +// where DATEDIFF(day,a.OrderDate,'" + InDate.Value.ToString("yyyy-MM-dd") + @"')=0 " + tj + @" and a.State>0 and a.State<3 +// select a.*,Num2=isnull(b.Num2,0) into #ls2 from ( +// select b.ShopId,Num=COUNT(0) from HW_GoodsInfo a with(nolock) +// inner join HW_Shop b with(nolock) on a.GoodsId=b.GoodsId +// inner join jc_shop c on b.ShopId=c.ShopId " + tj2 + @" +// group by b.ShopId)a +// left join ( +// select a.ShopId,Num2=COUNT(distinct c.GoodsId) from DT_OrderInfo a with(nolock) +// inner join DT_OrderGoods b with(nolock) on a.OrderId=b.OrderId +// inner join HW_GoodsDetail c with(nolock) on b.DetailId=c.DetailId +// where a.State>0 and a.State<3 and DATEDIFF(day,a.OrderDate,'" + InDate.Value.ToString("yyyy-MM-dd") + @"')=0 group by a.ShopId)b on a.ShopId=b.ShopId + +// select * from ( +// select d.ShopName,Master=case when d.Master=d.buyer then d.Master when d.buyer is not null and d.buyer<>'' then d.Master+'-'+d.buyer else d.Master end,a.OrderNum,a.RMBMoney,a.USDMoney,AvgPrice=case when a.OrderNum>0 then cast(a.USDMoney/a.OrderNum as decimal(18,2)) else 0 end,a.InPrice,LR=cast(b.ml as decimal(18,2)),MLL=case when b.TotalPrice>0 then cast(b.ml*100/b.TotalPrice as decimal(18,2)) else 0 end,ShopTJGoods=e.Num,ShopCDGoods=e.Num2,ckfee,a.mdfee,a.adfee,bz=case when a.InPrice>0 then CAST(a.RMBMoney/a.InPrice as decimal(18,2)) else 0 end,a.yf,c.GoodRate,c.ODR,t3.CVR DSRService,t3.user_sessions DSRGoods,f.DSRPost,c.USDUseMoney, n1.originalTotalCurrencyAmount as USDNoMoney,c.RMBUseMoney,c.RMBNoMoney,t2.orderDefectRate Rate1,t2.validTrackingRate Rate2,Case when d.PlatType=2 then f.Rate3 else c.Rate3 end Rate3,t4.RefundRate as Rate4, ABS( ISNULL( t4.RefundAmount,0) ) as PropertyViolate,t2.cancelRate Rate5,Case when d.PlatType=2 then g.Rate6 else (select SUM(ISNULL(Rate3,0)) from JC_ShopData where ShopId=d.ShopId and DATEDIFF(MONTH,InDate,'2023-10-18')=0) end Rate6,Rate7=isnull(c.Rate7,d.dayfee),JL=cast(b.ml as decimal(18,2))+isnull(ckfee,0)-isnull(c.Rate3,0)-isnull(c.Rate7,d.dayfee),t1.financialEventGroupEndLocale as FeeDate,t1.originalTotalCurrencyAmount as TXFee from +// JC_Shop d left join ( +// select ShopId,OrderNum=COUNT(0),RMBMoney=SUM(RMBPrice),escrowFee=sum(escrowFee),USDMoney=SUM(TotalPrice),InPrice=SUM(cb),ckfee=SUM(ck),mdfee=SUM(md),adfee=SUM(Ad_Fee),yf=SUM(yf) from #ls +// group by ShopId)a on d.ShopId=a.ShopId +// left join (select ShopId,TotalPrice=sum(TotalPrice),ml=sum(isnull(TotalPrice,0)-isnull(escrowFee,0)-isnull(yj,0)-isnull(yf,0)-((isnull(cb,0)+isnull(hwsf,0))/moneyrate)-isnull(tc,0)-isnull(ck,0)-isnull(md,0)-isnull(Ad_Fee,0)+SubsidyFee) from #ls where yf>0 +// group by ShopId)b on a.ShopId=b.ShopId +// left join ( +// select GoodRate,ODR,DSRService,DSRGoods,DSRPost,USDUseMoney,USDNoMoney,RMBUseMoney, RMBNoMoney,Rate1,Rate2,Rate3,Rate4,PropertyViolate,Rate5,Rate6,Rate7,FeeDate,TXFee +// TXFee,ShopId from JC_ShopData +// where DATEDIFF(day,indate,'" + InDate.Value.ToString("yyyy-MM-dd") + @"')=0 )c on a.ShopId=c.ShopId +// inner Join #ls2 e on a.ShopId=e.ShopId +// left join [192.168.1.187].[UpGoods].dbo.LxERP_Amazon_Shop o on d.ShopName=o.name +// left join ( select sid, CONVERT(decimal(12,2), SUM(t.cost)) as Rate3,CONVERT(decimal(12,2), SUM(t.sales)) as ad_sales , case when CONVERT(decimal(12,2), SUM(t.sales))<=0 then '∞' else CONVERT(nvarchar(20), convert(decimal(12,2), (CONVERT(decimal(12,2), SUM(t.cost))/CONVERT(decimal(12,2), SUM(t.sales)))*100)) end DSRPost from( select sid, SUM( ISNULL(cost,0)) as cost,SUM(ISNULL(sales,0))sales from [192.168.1.187].[UpGoods].dbo.LxERP_SPAdGroupReports where CONVERT(date,report_date)='" + InDate.Value.AddDays(-2).Date.ToString("yyyy-MM-dd") + "' group by sid union all select sid, SUM( ISNULL(cost,0)) as cost,SUM(ISNULL(sales,0))sales from [192.168.1.187].[UpGoods].dbo.LxERP_SBCampaignReports where CONVERT(date,report_date)='" + InDate.Value.AddDays(-2).Date.ToString("yyyy-MM-dd") + "' group by sid union all select sid, SUM( ISNULL(cost,0)) as cost,SUM(ISNULL(sales,0))sales from [192.168.1.187].[UpGoods].dbo.LxERP_SDAdGroupReports where CONVERT(date,report_date)='" + InDate.Value.AddDays(-2).Date.ToString("yyyy-MM-dd") + "' group by sid) t group by sid ) f on f.sid=o.sid" + +//" \r\n left join (select sid, CONVERT(decimal(12,2), SUM(t.cost)) as Rate6 from( select sid, SUM( ISNULL(cost,0)) as cost from [192.168.1.187].[UpGoods].dbo.LxERP_SPAdGroupReports where CONVERT(date,report_date)<='" + InDate.Value.AddDays(-2).ToString("yyyy-MM-dd") + "' and CONVERT(date,report_date)>='" + InDate.Value.AddDays(-31).ToString("yyyy-MM-dd") + "' group by sid union all select sid, SUM( ISNULL(cost,0)) as cost from [192.168.1.187].[UpGoods].dbo.LxERP_SBCampaignReports where CONVERT(date,report_date)<='" + InDate.Value.AddDays(-2).ToString("yyyy-MM-dd") + "' and CONVERT(date,report_date)>='" + InDate.Value.AddDays(-31).ToString("yyyy-MM-dd") + "' group by sid union all select sid, SUM( ISNULL(cost,0)) as cost from [192.168.1.187].[UpGoods].dbo.LxERP_SDAdGroupReports where CONVERT(date,report_date)<='" + InDate.Value.AddDays(-2).ToString("yyyy-MM-dd") + "' and CONVERT(date,report_date)>='" + InDate.Value.AddDays(-31).ToString("yyyy-MM-dd") + "' group by sid) t group by sid) g on o.sid=g.sid " + +// " \r\n left join(select t.row, t.storename,t.financialEventGroupEndLocale,t.originCurrencyIcon,CAST(ISNULL( t.originalTotalCurrencyAmount,0) as decimal(12,2)) as originalTotalCurrencyAmount from ( select ROW_NUMBER() over(PARTITION BY storename ORDER BY requestDate DESC) row,storename, financialEventGroupEndLocale,originCurrencyIcon,originalTotalCurrencyAmount from [192.168.1.187].[UpGoods].dbo.LxERP_SettlementSummaryData where accountType='Standard' and processingStatus='Closed ') t where t.row=1) t1 on d.ShopName=t1.storeName left join (select storename,CONVERT(decimal(12,2), SUM(ISNULL(originalTotalCurrencyAmount,0))) originalTotalCurrencyAmount from [192.168.1.187].[UpGoods].dbo.LxERP_SettlementSummaryData where processingStatus='Open' and accountType='Standard' group by storename) n1 on d.ShopName=n1.storeName " + +// "\r\n" + +// " left join (select sid, CAST( orderDefectRate *100 as decimal(12,2)) orderDefectRate,CAST( validTrackingRate *100 as decimal(12,2)) validTrackingRate,cast(CancelRate *100 as decimal(12,2)) cancelRate from (\r\nselect ROW_NUMBER() over(PARTITION BY sid ORDER BY requestDate DESC) row,sid, orderDefectRate,validTrackingRate,CancelRate from [192.168.1.187].[UpGoods].dbo.Amazon_V2_SELLER_PERFORMANCE_REPORT where CONVERT(date, RequestDate)='" + InDate.Value.AddDays(-1).Date.ToString("yyyy-MM-dd") + "') t where t.row=1)t2 on t2.sid=o.sid \r\nleft join (select sid, user_sessions,totalOrderItems, case when user_sessions=0 or totalOrderItems=0 then 0 else convert(decimal(12,2),(totalOrderItems*1.00/user_sessions)*100 ) end as CVR from [192.168.1.187].[UpGoods].dbo.Amazon_SALES_AND_TRAFFIC_REPORT where CONVERT(date, ReportDate)='" + InDate.Value.AddDays(-2).Date.ToString("yyyy-MM-dd") + "') t3 on t3.sid=o.sid\r\nleft join [192.168.1.187].[UpGoods].dbo.AmazonStoreRefundAmountAndRate t4 on t4.sid=o.sid and Convert(date, t4.ReportDate)='" + InDate.Value.AddDays(-2).Date.ToString("yyyy-MM-dd") + "'\r\n" +// + " where d.PlatType=2 union all\r\n select d.ShopName,Master=case when d.Master=d.buyer then d.Master when d.buyer is not null and d.buyer<>'' then d.Master+'-'+d.buyer else d.Master end,a.OrderNum,a.RMBMoney,a.USDMoney,AvgPrice=case when a.OrderNum>0 then cast(a.USDMoney/a.OrderNum as decimal(18,2)) else 0 end,a.InPrice,LR=cast(b.ml as decimal(18,2)),MLL=case when b.TotalPrice>0 then cast(b.ml*100/b.TotalPrice as decimal(18,2)) else 0 end,ShopTJGoods=e.Num,ShopCDGoods=e.Num2,ckfee,a.mdfee,a.adfee,bz=case when a.InPrice>0 then CAST(a.RMBMoney/a.InPrice as decimal(18,2)) else 0 end,a.yf,c.GoodRate,c.ODR,c.DSRService,c.DSRGoods,case when ISNULL(c.DSRPost,0)=0 then '' else CONVERT(nvarchar(20),c.DSRPost) end DSRPost,c.USDUseMoney,c.USDNoMoney,c.RMBUseMoney,c.RMBNoMoney,c.Rate1,c.Rate2,c.Rate3,c.Rate4,c.PropertyViolate,c.Rate5,c.Rate6,Rate7=isnull(c.Rate7,d.dayfee),JL=cast(b.ml as decimal(18,2))+isnull(ckfee,0)-isnull(c.Rate3,0)-isnull(c.Rate7,d.dayfee),FeeDate=isnull(c.FeeDate,d.FeeDate),TXFee=isnull(c.TXFee,d.TXFee) from \r\nJC_Shop d left join (\r\nselect ShopId,OrderNum=COUNT(0),RMBMoney=SUM(RMBPrice),escrowFee=sum(escrowFee),USDMoney=SUM(TotalPrice),InPrice=SUM(cb),ckfee=SUM(ck),mdfee=SUM(md),adfee=SUM(Ad_Fee),yf=SUM(yf) from #ls\r\ngroup by ShopId)a on d.ShopId=a.ShopId\r\nleft join (select ShopId,TotalPrice=sum(TotalPrice),ml=sum(isnull(TotalPrice,0)-isnull(escrowFee,0)-isnull(yj,0)-isnull(yf,0)-((isnull(cb,0)+isnull(hwsf,0))/moneyrate)-isnull(tc,0)-isnull(ck,0)-isnull(md,0)-isnull(Ad_Fee,0) + SubsidyFee) from #ls where yf>0\r\ngroup by ShopId)b on a.ShopId=b.ShopId\r\nleft join (\r\nselect GoodRate,ODR,DSRService,DSRGoods,DSRPost,USDUseMoney,USDNoMoney,RMBUseMoney, RMBNoMoney,Rate1,Rate2,Rate3,Rate4,PropertyViolate,Rate5,Rate6,Rate7,FeeDate,TXFee\r\nTXFee,ShopId from JC_ShopData\r\nwhere DATEDIFF(day,indate,'" + InDate.Value.ToString("yyyy-MM-dd") + "')=0 )c on a.ShopId=c.ShopId\r\nleft Join #ls2 e on a.ShopId=e.ShopId where d.PlatType!=2 " + (isyc ? " and d.Master!='东南亚专用'" : "") + "\r\n) a order by " + Sort; + + + DataTable dt = obj.GetReportData(sql); + + + return GetReport3(dt, 18); } catch (Exception ex) diff --git a/TradeManageNew/bin/ApiNew.dll b/TradeManageNew/bin/ApiNew.dll index f7f7a48..a7e5227 100644 Binary files a/TradeManageNew/bin/ApiNew.dll and b/TradeManageNew/bin/ApiNew.dll differ diff --git a/TradeManageNew/bin/ApiNew.pdb b/TradeManageNew/bin/ApiNew.pdb index 4812633..62512ed 100644 Binary files a/TradeManageNew/bin/ApiNew.pdb and b/TradeManageNew/bin/ApiNew.pdb differ diff --git a/TradeManageNew/bin/TradeManageNew.dll b/TradeManageNew/bin/TradeManageNew.dll index d0821f2..e2c1f30 100644 Binary files a/TradeManageNew/bin/TradeManageNew.dll and b/TradeManageNew/bin/TradeManageNew.dll differ diff --git a/TradeManageNew/bin/TradeManageNew.pdb b/TradeManageNew/bin/TradeManageNew.pdb index dfe5154..4dfa9be 100644 Binary files a/TradeManageNew/bin/TradeManageNew.pdb and b/TradeManageNew/bin/TradeManageNew.pdb differ diff --git a/TradeManageNew/obj/Debug/TradeManageNew.dll b/TradeManageNew/obj/Debug/TradeManageNew.dll index d0821f2..e2c1f30 100644 Binary files a/TradeManageNew/obj/Debug/TradeManageNew.dll and b/TradeManageNew/obj/Debug/TradeManageNew.dll differ diff --git a/TradeManageNew/obj/Debug/TradeManageNew.pdb b/TradeManageNew/obj/Debug/TradeManageNew.pdb index dfe5154..4dfa9be 100644 Binary files a/TradeManageNew/obj/Debug/TradeManageNew.pdb and b/TradeManageNew/obj/Debug/TradeManageNew.pdb differ