Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev

ds-wms-service/DS.WMS.Core/Code/Dtos/CodeServiceSelectRes.cs

@@ -1,4 +1,5 @@
 using DS.Module.Core;
+using SqlSugar;
 
 namespace DS.WMS.Core.Code.Dtos;
 
@@ -19,8 +20,11 @@ public class CodeServiceSelectRes
     /// 中文名称
     /// </summary>
     public string CnName { get; set; }
-    
-   
+
+    /// <summary>
+    /// EDI代码
+    /// </summary>
+    public string EdiCode { get; set; }
     /// <summary>
     /// 备注
     /// </summary>

ds-wms-service/DS.WMS.MainApi/DS.WMS.MainApi.csproj.user

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <NameOfLastUsedPublishProfile>D:\Source\Repos\DS8\ds-wms-service\DS.WMS.MainApi\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
+    <NameOfLastUsedPublishProfile>D:\Code\DS\ds8-solution-pro\ds-wms-service\DS.WMS.MainApi\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
   </PropertyGroup>
 </Project>

ds-wms-service/DS.WMS.PrintApi/Service/OpenPrintService.cs

@@ -14,6 +14,7 @@ using System.Collections.Generic;
 using Newtonsoft.Json;
 using Microsoft.Extensions.DependencyInjection;
 using DS.WMS.PrintApi.Middleware;
+using Newtonsoft.Json.Schema;
 
 namespace DS.WMS.PrintApi.Service
 {
@@ -322,18 +323,42 @@ namespace DS.WMS.PrintApi.Service
                     FastReport.Report report = new FastReport.Report();
                     report.Load(printFile);
 
-                    report.Dictionary.Connections.Clear();
-
-                    //var dataSource = report.Dictionary.Connections[0] as JsonDataSourceConnection;
                     var str = new FastReport.Data.JsonConnection.JsonDataSourceConnectionStringBuilder();
                     str.Json = JsonConvert.SerializeObject(data);
-                    //dataSource.ConnectionString = str.ConnectionString;
-                    //重置数据源
-                    report.Dictionary.Connections.Add(new JsonDataSourceConnection()
+                    if (report.Dictionary.Connections.Count == 0)
                     {
-                        ConnectionString = str.ConnectionString,
-                        Alias = "JSON" 
-                    });
+                        //重置数据源
+                        report.Dictionary.Connections.Add(new JsonDataSourceConnection()
+                        {
+                            ConnectionString = str.ConnectionString,
+                            Name = "Connection", 
+                        });
+                    }
+                    else {
+                        var dataSource = report.Dictionary.Connections[0] as JsonDataSourceConnection;
+                        dataSource.ConnectionString = str.ConnectionString;
+                    }
+                    //var dataSource = report.Dictionary.Connections[0] as JsonDataSourceConnection;
+                    //var str = new FastReport.Data.JsonConnection.JsonDataSourceConnectionStringBuilder();
+                    //str.Json = JsonConvert.SerializeObject(data);
+                    //dataSource.ConnectionString = str.ConnectionString;
+                    //JsonSchemaGenerator generator = new JsonSchemaGenerator();
+                    //JsonSchema jsonSchema = generator.Generate()
+
+                    //report.Dictionary.Connections.Clear();
+
+                    //var dataSource = report.Dictionary.Connections[0] as JsonDataSourceConnection;
+                    //var str = new FastReport.Data.JsonConnection.JsonDataSourceConnectionStringBuilder();
+                    //str.Json = JsonConvert.SerializeObject(data);
+                    ////dataSource.ConnectionString = str.ConnectionString;
+                    ////重置数据源
+                    //report.Dictionary.Connections.Add(new JsonDataSourceConnection()
+                    //{
+                    //    ConnectionString = str.ConnectionString,
+                    //    Alias = "JSON" 
+                    //});
+
+
                     //report.Dictionary.Connections[0].ConnectionString = str.ConnectionString;
 
                     report.Prepare();