From a55f5fa0707c43ba79a791bc4ee57514a07c7ea6 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 22 九月 2021 11:02:23 +0800
Subject: [PATCH] 提交
---
开票修改.sql | 16 ++++++++++++++++
CY_ECommercePlatform/CY.WebForm/Web.config | 8 ++++----
CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderDAL.cs | 4 ++--
3 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderDAL.cs
index abeb5d0..f2ddddf 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderDAL.cs
@@ -1409,7 +1409,7 @@
fromSouce += " Inner Join Pay_TradingSingle as ts On(ob.Keyid = ts.OrderId) ";
fromSouce += " Inner Join OA_CorporateClients as oc On(ob.BuyerId = oc.Keyid) ";
fromSouce += " left join EC_AwbInfo ea on ob.Keyid = ea.Keyid where DATEDIFF(DAY,ob.CreateTime,'" + chaxuntimestart + "') <=0 and DATEDIFF(DAY,ob.CreateTime,'" + chaxuntimeend + "') >=0 and ob.PayState = -1 ";
- fromSouce += " group by oc.BusinessManagerId ) obhuikuan on os.Keyid = ob.BusinessManagerId ";
+ fromSouce += " group by oc.BusinessManagerId ) obhuikuan on os.Keyid = obhuikuan.BusinessManagerId ";
fromSouce += " left join ( select oc.BusinessManagerId ,COUNT( distinct ob.BuyerId ) as weihuikuankehu ";
@@ -1418,7 +1418,7 @@
fromSouce += " Inner Join Pay_TradingSingle as ts On(ob.Keyid = ts.OrderId) ";
fromSouce += " Inner Join OA_CorporateClients as oc On(ob.BuyerId = oc.Keyid) ";
fromSouce += " left join EC_AwbInfo ea on ob.Keyid = ea.Keyid where DATEDIFF(DAY,ob.CreateTime,'" + chaxuntimestart + "') <=0 and DATEDIFF(DAY,ob.CreateTime,'" + chaxuntimeend + "') >=0 and ob.PayState != -1 ";
- fromSouce += " group by oc.BusinessManagerId ) obweihuikuan on os.Keyid = ob.BusinessManagerId ";
+ fromSouce += " group by oc.BusinessManagerId ) obweihuikuan on os.Keyid = obweihuikuan.BusinessManagerId ";
fromSouce += " left join ( select oc.BusinessManagerId,sum(ob.SumPrice) kaipiaojine ";
diff --git a/CY_ECommercePlatform/CY.WebForm/Web.config b/CY_ECommercePlatform/CY.WebForm/Web.config
index 07a3e20..f0003a3 100644
--- a/CY_ECommercePlatform/CY.WebForm/Web.config
+++ b/CY_ECommercePlatform/CY.WebForm/Web.config
@@ -267,10 +267,10 @@
</exceptionPolicies>
</exceptionHandling>
<connectionStrings>
- <add name="SqlConnection" connectionString="Server=CB2-20200827ONU;Database=ECTEST;Trusted_Connection=True;" providerName="System.Data.SqlClient" />
- <!-- <add name="SqlConnection"
- connectionString="Data Source=DESKTOP-8E2C3RS;Initial Catalog=ECTEST;User ID=sa;Password=123456"
- providerName="System.Data.SqlClient" />-->
+ <!--<add name="SqlConnection" connectionString="Server=CB2-20200827ONU;Database=ECTEST;Trusted_Connection=True;" providerName="System.Data.SqlClient" />-->
+ <add name="SqlConnection"
+ connectionString="Data Source=.;Initial Catalog=ECTEST;User ID=sa;Password=123456"
+ providerName="System.Data.SqlClient" />
<!--<add name="SqlConnection"
connectionString="Data Source=118.123.213.60\SQLSERVER2008;Initial Catalog=ECTEST;User ID=sa;Password=123qwe!@#;"
providerName="System.Data.SqlClient" />-->
diff --git "a/\345\274\200\347\245\250\344\277\256\346\224\271.sql" "b/\345\274\200\347\245\250\344\277\256\346\224\271.sql"
index eb54f96..4ce58ab 100644
--- "a/\345\274\200\347\245\250\344\277\256\346\224\271.sql"
+++ "b/\345\274\200\347\245\250\344\277\256\346\224\271.sql"
@@ -1,6 +1,16 @@
USE [ECTEST]
GO
+
+
+
+INSERT INTO [Sys_Dictionary]([Name] ,[DicType] ,[LastUpdateTime] ,[Operator] ,[MeanValue]) VALUES ('张','印刷单位',getdate(),'管理员',1)
+ INSERT INTO [Sys_Dictionary]([Name] ,[DicType] ,[LastUpdateTime] ,[Operator] ,[MeanValue]) VALUES ('本','印刷单位',getdate(),'管理员',2)
+ INSERT INTO [Sys_Dictionary]([Name] ,[DicType] ,[LastUpdateTime] ,[Operator] ,[MeanValue]) VALUES ('册','印刷单位',getdate(),'管理员',3)
+ INSERT INTO [Sys_Dictionary]([Name] ,[DicType] ,[LastUpdateTime] ,[Operator] ,[MeanValue]) VALUES ('只','印刷单位',getdate(),'管理员',4)
+
+ go
+
--2021.09.10 增加备注
alter table [OA_Kaipiaoshenqing]
add [remark] nvarchar(250) null
@@ -22,9 +32,15 @@
alter table [EC_OrderExtend]
add [printunit] [int] NULL
+ go
+
update [EC_OrderExtend] set [printunit]=1
+go
+
ALTER TABLE [dbo].[EC_OrderExtend] ADD CONSTRAINT [DF_EC_OrderExtend_printunit] DEFAULT ((1)) FOR [printunit]
+go
+
--更新存储过程[sp_EC_OrderBasic_Search_Seller] ，订单查询sql
--更新存储过程sp_EC_OrderExtend_Insert，sp_EC_OrderExtend_Update， 订单扩展sql
\ No newline at end of file
--
Gitblit v1.9.1