diff --git a/Reportapi/FrameWork/Fleck/Fleck.csproj b/Reportapi/FrameWork/Fleck/Fleck.csproj
index 7be24ea..7c7e3bc 100644
--- a/Reportapi/FrameWork/Fleck/Fleck.csproj
+++ b/Reportapi/FrameWork/Fleck/Fleck.csproj
@@ -31,6 +31,9 @@
4
+
+ ..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll
+
@@ -70,5 +73,8 @@
+
+
+
\ No newline at end of file
diff --git a/Reportapi/FrameWork/Fleck/packages.config b/Reportapi/FrameWork/Fleck/packages.config
new file mode 100644
index 0000000..bc2a97e
--- /dev/null
+++ b/Reportapi/FrameWork/Fleck/packages.config
@@ -0,0 +1,4 @@
+
+
+
+
\ No newline at end of file
diff --git a/Reportapi/FrameWork/SqlSugar/SqlSugar.csproj b/Reportapi/FrameWork/SqlSugar/SqlSugar.csproj
index 7efafd9..dc1021b 100644
--- a/Reportapi/FrameWork/SqlSugar/SqlSugar.csproj
+++ b/Reportapi/FrameWork/SqlSugar/SqlSugar.csproj
@@ -37,9 +37,8 @@
..\..\Lib\MySql.Data.dll
False
-
- False
- Lib\Newtonsoft.Json.dll
+
+ ..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll
False
@@ -308,7 +307,9 @@
-
+
+
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
+
+
+
@@ -61,106 +61,106 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
diff --git a/Reportapi/MyCode.Project.GenerateCode/MyCode.Project.GenerateCode.csproj b/Reportapi/MyCode.Project.GenerateCode/MyCode.Project.GenerateCode.csproj
index 6f8f56d..ccd5ac4 100644
--- a/Reportapi/MyCode.Project.GenerateCode/MyCode.Project.GenerateCode.csproj
+++ b/Reportapi/MyCode.Project.GenerateCode/MyCode.Project.GenerateCode.csproj
@@ -33,6 +33,9 @@
4
+
+ ..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll
+
@@ -51,6 +54,7 @@
+
diff --git a/Reportapi/MyCode.Project.GenerateCode/packages.config b/Reportapi/MyCode.Project.GenerateCode/packages.config
new file mode 100644
index 0000000..bc2a97e
--- /dev/null
+++ b/Reportapi/MyCode.Project.GenerateCode/packages.config
@@ -0,0 +1,4 @@
+
+
+
+
\ No newline at end of file
diff --git a/Reportapi/MyCode.Project.Infrastructure/Common/DingDingHelper.cs b/Reportapi/MyCode.Project.Infrastructure/Common/DingDingHelper.cs
index dcd7a61..d89aecb 100644
--- a/Reportapi/MyCode.Project.Infrastructure/Common/DingDingHelper.cs
+++ b/Reportapi/MyCode.Project.Infrastructure/Common/DingDingHelper.cs
@@ -52,7 +52,7 @@ namespace MyCode.Project.Infrastructure.Common
var jsonStr = jsonObject.ToJson();
- var result = webUtils.DoPostJson(url, jsonStr);
+ //var result = webUtils.DoPostJson(url, jsonStr);
return Task.CompletedTask;
}
diff --git a/Reportapi/MyCode.Project.Infrastructure/MyCode.Project.Infrastructure.csproj b/Reportapi/MyCode.Project.Infrastructure/MyCode.Project.Infrastructure.csproj
index 8a89419..b13ddf2 100644
--- a/Reportapi/MyCode.Project.Infrastructure/MyCode.Project.Infrastructure.csproj
+++ b/Reportapi/MyCode.Project.Infrastructure/MyCode.Project.Infrastructure.csproj
@@ -94,9 +94,8 @@
..\packages\Unity.4.0.1\lib\net45\Microsoft.Practices.Unity.RegistrationByConvention.dll
True
-
- False
- ..\Lib\Newtonsoft.Json.dll
+
+ ..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll
..\packages\NPOI.2.2.1\lib\net40\NPOI.dll
diff --git a/Reportapi/MyCode.Project.Infrastructure/app.config b/Reportapi/MyCode.Project.Infrastructure/app.config
index 4769706..25358f0 100644
--- a/Reportapi/MyCode.Project.Infrastructure/app.config
+++ b/Reportapi/MyCode.Project.Infrastructure/app.config
@@ -1,32 +1,32 @@
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
diff --git a/Reportapi/MyCode.Project.Infrastructure/packages.config b/Reportapi/MyCode.Project.Infrastructure/packages.config
index 651819d..bf11cdf 100644
--- a/Reportapi/MyCode.Project.Infrastructure/packages.config
+++ b/Reportapi/MyCode.Project.Infrastructure/packages.config
@@ -9,6 +9,7 @@
+
diff --git a/Reportapi/MyCode.Project.OutSideService/MyCode.Project.OutSideService.csproj b/Reportapi/MyCode.Project.OutSideService/MyCode.Project.OutSideService.csproj
index dfb5e77..ec05a8f 100644
--- a/Reportapi/MyCode.Project.OutSideService/MyCode.Project.OutSideService.csproj
+++ b/Reportapi/MyCode.Project.OutSideService/MyCode.Project.OutSideService.csproj
@@ -46,8 +46,8 @@
..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll
True
-
- ..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll
+
+ ..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll
..\Lib\Qiniu.dll
diff --git a/Reportapi/MyCode.Project.OutSideService/app.config b/Reportapi/MyCode.Project.OutSideService/app.config
index 9e1cbb7..9c8fb32 100644
--- a/Reportapi/MyCode.Project.OutSideService/app.config
+++ b/Reportapi/MyCode.Project.OutSideService/app.config
@@ -1,28 +1,28 @@
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
diff --git a/Reportapi/MyCode.Project.OutSideService/packages.config b/Reportapi/MyCode.Project.OutSideService/packages.config
index 5ef9265..0e80d03 100644
--- a/Reportapi/MyCode.Project.OutSideService/packages.config
+++ b/Reportapi/MyCode.Project.OutSideService/packages.config
@@ -4,7 +4,7 @@
-
+
diff --git a/Reportapi/MyCode.Project.Repositories/App.config b/Reportapi/MyCode.Project.Repositories/App.config
index 3c691af..517377d 100644
--- a/Reportapi/MyCode.Project.Repositories/App.config
+++ b/Reportapi/MyCode.Project.Repositories/App.config
@@ -1,32 +1,32 @@
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
diff --git a/Reportapi/MyCode.Project.Repositories/MyCode.Project.Repositories.csproj b/Reportapi/MyCode.Project.Repositories/MyCode.Project.Repositories.csproj
index b05c01a..d76f62e 100644
--- a/Reportapi/MyCode.Project.Repositories/MyCode.Project.Repositories.csproj
+++ b/Reportapi/MyCode.Project.Repositories/MyCode.Project.Repositories.csproj
@@ -45,9 +45,8 @@
False
..\Lib\Microsoft.Practices.Unity.Interception.dll
-
- False
- ..\Lib\Newtonsoft.Json.dll
+
+ ..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll
@@ -101,6 +100,7 @@
Designer
+
diff --git a/Reportapi/MyCode.Project.Repositories/packages.config b/Reportapi/MyCode.Project.Repositories/packages.config
new file mode 100644
index 0000000..bc2a97e
--- /dev/null
+++ b/Reportapi/MyCode.Project.Repositories/packages.config
@@ -0,0 +1,4 @@
+
+
+
+
\ No newline at end of file
diff --git a/Reportapi/MyCode.Project.ScheduleTask/App.config b/Reportapi/MyCode.Project.ScheduleTask/App.config
index 79e372a..998488e 100644
--- a/Reportapi/MyCode.Project.ScheduleTask/App.config
+++ b/Reportapi/MyCode.Project.ScheduleTask/App.config
@@ -27,7 +27,7 @@
-
+
@@ -39,15 +39,15 @@
-
+
-
+
-
+
@@ -57,7 +57,7 @@
-
+
@@ -194,7 +194,7 @@
-
+
diff --git a/Reportapi/MyCode.Project.ScheduleTask/MyCode.Project.ScheduleTask.csproj b/Reportapi/MyCode.Project.ScheduleTask/MyCode.Project.ScheduleTask.csproj
index b092af4..49a78c6 100644
--- a/Reportapi/MyCode.Project.ScheduleTask/MyCode.Project.ScheduleTask.csproj
+++ b/Reportapi/MyCode.Project.ScheduleTask/MyCode.Project.ScheduleTask.csproj
@@ -65,9 +65,8 @@
..\Lib\Microsoft.Practices.Unity.Interception.Configuration.dll
-
- False
- ..\Lib\Newtonsoft.Json.dll
+
+ ..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll
False
diff --git a/Reportapi/MyCode.Project.ScheduleTask/packages.config b/Reportapi/MyCode.Project.ScheduleTask/packages.config
index 3d3ceea..4dee09b 100644
--- a/Reportapi/MyCode.Project.ScheduleTask/packages.config
+++ b/Reportapi/MyCode.Project.ScheduleTask/packages.config
@@ -1,7 +1,7 @@
-
+
diff --git a/Reportapi/MyCode.Project.Services/App.config b/Reportapi/MyCode.Project.Services/App.config
index 04d83ff..25358f0 100644
--- a/Reportapi/MyCode.Project.Services/App.config
+++ b/Reportapi/MyCode.Project.Services/App.config
@@ -8,7 +8,7 @@
-
+
diff --git a/Reportapi/MyCode.Project.Services/Implementation/OrderPushService.cs b/Reportapi/MyCode.Project.Services/Implementation/OrderPushService.cs
index 186b7f1..c892ae1 100644
--- a/Reportapi/MyCode.Project.Services/Implementation/OrderPushService.cs
+++ b/Reportapi/MyCode.Project.Services/Implementation/OrderPushService.cs
@@ -246,11 +246,11 @@ namespace MyCode.Project.Services.Implementation
Fcode = n.Barcode, // 条码带出物料 、物料带出税额
FQty = n.SellCount, // 销售数量
FTaxPrice = Math.Round(n.DivideSellTotal / n.SellCount, 10), // 含税单价等于 金额/总数
- // 仓库必填
- FSOStockId = new FSOStockId()
+ FSOStockId = new FSOStockId() // 仓库必填
{
FNUMBER = pushKingdeeOrder.WarehouseCode
},
+
}).ToList();
// 构建单据数据包
var model = new SaleOrderModel()
diff --git a/Reportapi/MyCode.Project.Services/MyCode.Project.Services.csproj b/Reportapi/MyCode.Project.Services/MyCode.Project.Services.csproj
index 0082c00..dd2cdeb 100644
--- a/Reportapi/MyCode.Project.Services/MyCode.Project.Services.csproj
+++ b/Reportapi/MyCode.Project.Services/MyCode.Project.Services.csproj
@@ -70,9 +70,8 @@
..\packages\MiniExcel.1.30.0\lib\net45\MiniExcel.dll
-
- False
- ..\Lib\Newtonsoft.Json.dll
+
+ ..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll
..\packages\RestSharp.106.11.4\lib\net452\RestSharp.dll
diff --git a/Reportapi/MyCode.Project.Services/packages.config b/Reportapi/MyCode.Project.Services/packages.config
index 72bda0b..aed16c7 100644
--- a/Reportapi/MyCode.Project.Services/packages.config
+++ b/Reportapi/MyCode.Project.Services/packages.config
@@ -3,6 +3,7 @@
+
diff --git a/Reportapi/MyCode.Project.WebApi/MyCode.Project.WebApi.csproj b/Reportapi/MyCode.Project.WebApi/MyCode.Project.WebApi.csproj
index 62db77f..688ec78 100644
--- a/Reportapi/MyCode.Project.WebApi/MyCode.Project.WebApi.csproj
+++ b/Reportapi/MyCode.Project.WebApi/MyCode.Project.WebApi.csproj
@@ -106,9 +106,8 @@
False
..\Lib\netstandard.dll
-
- False
- ..\Lib\Newtonsoft.Json.dll
+
+ ..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll
diff --git a/Reportapi/MyCode.Project.WebApi/Web.config b/Reportapi/MyCode.Project.WebApi/Web.config
index 0f6ebb3..20aeafc 100644
--- a/Reportapi/MyCode.Project.WebApi/Web.config
+++ b/Reportapi/MyCode.Project.WebApi/Web.config
@@ -32,21 +32,21 @@
-
+
-
+
-
+
-
+
-
+
@@ -182,7 +182,7 @@
-
+
diff --git a/Reportapi/MyCode.Project.WebApi/packages.config b/Reportapi/MyCode.Project.WebApi/packages.config
index 0954894..73a9be8 100644
--- a/Reportapi/MyCode.Project.WebApi/packages.config
+++ b/Reportapi/MyCode.Project.WebApi/packages.config
@@ -29,6 +29,7 @@
+
diff --git a/Reportapi/MyCode.Project.ZHMDGenerateCode/App.config b/Reportapi/MyCode.Project.ZHMDGenerateCode/App.config
index 2f36935..ddc18bc 100644
--- a/Reportapi/MyCode.Project.ZHMDGenerateCode/App.config
+++ b/Reportapi/MyCode.Project.ZHMDGenerateCode/App.config
@@ -1,45 +1,45 @@
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
+
+
+
@@ -61,106 +61,106 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
diff --git a/Reportapi/MyCode.Project.ZHMDGenerateCode/MyCode.Project.ZHMDGenerateCode.csproj b/Reportapi/MyCode.Project.ZHMDGenerateCode/MyCode.Project.ZHMDGenerateCode.csproj
index 0b8deef..8a8eaf5 100644
--- a/Reportapi/MyCode.Project.ZHMDGenerateCode/MyCode.Project.ZHMDGenerateCode.csproj
+++ b/Reportapi/MyCode.Project.ZHMDGenerateCode/MyCode.Project.ZHMDGenerateCode.csproj
@@ -33,6 +33,9 @@
4
+
+ ..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll
+
@@ -51,6 +54,7 @@
+
diff --git a/Reportapi/MyCode.Project.ZHMDGenerateCode/packages.config b/Reportapi/MyCode.Project.ZHMDGenerateCode/packages.config
new file mode 100644
index 0000000..bc2a97e
--- /dev/null
+++ b/Reportapi/MyCode.Project.ZHMDGenerateCode/packages.config
@@ -0,0 +1,4 @@
+
+
+
+
\ No newline at end of file