From 36836f1eebfe43bc46afd411f1d387fac29b0302 Mon Sep 17 00:00:00 2001
From: cjy <tiankui_xing@163.com>
Date: Thu, 8 Aug 2024 12:09:07 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/ClientCommonController.cs          |  8 ++++----
 .../DS.WMS.PrintApi/Service/OpenPrintService.cs    | 14 +++++++++-----
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/ds-wms-service/DS.WMS.MainApi/Controllers/ClientCommonController.cs b/ds-wms-service/DS.WMS.MainApi/Controllers/ClientCommonController.cs
index 3151273f..0c897b56 100644
--- a/ds-wms-service/DS.WMS.MainApi/Controllers/ClientCommonController.cs
+++ b/ds-wms-service/DS.WMS.MainApi/Controllers/ClientCommonController.cs
@@ -574,9 +574,9 @@ public class ClientCommonController : ApiController
     /// <returns></returns>
     [HttpGet]
     [Route("GetVesselSelectList")]
-    public DataResult<List<CodeVesselSelectRes>> GetVesselSelectList()
+    public DataResult<List<CodeVesselSelectRes>> GetVesselSelectList([FromQuery] string queryKey = "")
     {
-        var res = _invokeService.GetVesselSelectList();
+        var res = _invokeService.GetVesselSelectList(queryKey);
         return res;
     }
 
@@ -586,9 +586,9 @@ public class ClientCommonController : ApiController
     /// <returns></returns>
     [HttpGet]
     [Route("GetVoynoSelectList")]
-    public DataResult<List<CodeVoynoSelectRes>> GetVoynoSelectList()
+    public DataResult<List<CodeVoynoSelectRes>> GetVoynoSelectList([FromQuery] string queryKey = "")
     {
-        var res = _invokeService.GetVoynoSelectList();
+        var res = _invokeService.GetVoynoSelectList(queryKey);
         return res;
     }
 
diff --git a/ds-wms-service/DS.WMS.PrintApi/Service/OpenPrintService.cs b/ds-wms-service/DS.WMS.PrintApi/Service/OpenPrintService.cs
index 0e0b930e..48fd4007 100644
--- a/ds-wms-service/DS.WMS.PrintApi/Service/OpenPrintService.cs
+++ b/ds-wms-service/DS.WMS.PrintApi/Service/OpenPrintService.cs
@@ -312,6 +312,8 @@ namespace DS.WMS.PrintApi.Service
                     var printFileName = $"{fileName}.frx";
                     var printFile = Path.Combine(savePath, printFileName);
 
+
+
                     //写入CRX文件
                     using (FileStream fs = new FileStream(printFile, FileMode.Create))
                     {
@@ -331,13 +333,15 @@ namespace DS.WMS.PrintApi.Service
                         report.Dictionary.Connections.Add(new JsonDataSourceConnection()
                         {
                             ConnectionString = str.ConnectionString,
-                            Name = "Connection", 
+                            Name = "Connection",
+                            Tables.
                         });
                     }
-                    else {
-                        var dataSource = report.Dictionary.Connections[0] as JsonDataSourceConnection;
-                        dataSource.ConnectionString = str.ConnectionString;
-                    }
+                    //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);

From 359f97c6522745711e9dc54687c3b07593e70f07 Mon Sep 17 00:00:00 2001
From: cjy <tiankui_xing@163.com>
Date: Thu, 8 Aug 2024 13:34:57 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DS.WMS.MainApi/Controllers/ClientCommonController.cs    | 6 +++---
 ds-wms-service/DS.WMS.PrintApi/Service/OpenPrintService.cs  | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/ds-wms-service/DS.WMS.MainApi/Controllers/ClientCommonController.cs b/ds-wms-service/DS.WMS.MainApi/Controllers/ClientCommonController.cs
index 0c897b56..a27e38de 100644
--- a/ds-wms-service/DS.WMS.MainApi/Controllers/ClientCommonController.cs
+++ b/ds-wms-service/DS.WMS.MainApi/Controllers/ClientCommonController.cs
@@ -45,13 +45,13 @@ public class ClientCommonController : ApiController
     /// <summary>
     /// 获取商品下拉列表-客户端
     /// </summary>
-    /// <param name="code">商品代码</param>
+    /// <param name="queryKey">商品代码</param>
     /// <returns></returns>
     [HttpGet]
     [Route("GetClientGoodsList")]
-    public async Task<DataResult<List<CodeGoodsSelectRes>>> GetClientGoodsList([FromQuery] string code)
+    public async Task<DataResult<List<CodeGoodsSelectRes>>> GetClientGoodsList([FromQuery] string queryKey)
     {
-        var res = await _invokeService.GetClientGoodsList(code);
+        var res = await _invokeService.GetClientGoodsList(queryKey);
         return res;
     }
     /// <summary>
diff --git a/ds-wms-service/DS.WMS.PrintApi/Service/OpenPrintService.cs b/ds-wms-service/DS.WMS.PrintApi/Service/OpenPrintService.cs
index 48fd4007..34235e72 100644
--- a/ds-wms-service/DS.WMS.PrintApi/Service/OpenPrintService.cs
+++ b/ds-wms-service/DS.WMS.PrintApi/Service/OpenPrintService.cs
@@ -334,7 +334,6 @@ namespace DS.WMS.PrintApi.Service
                         {
                             ConnectionString = str.ConnectionString,
                             Name = "Connection",
-                            Tables.
                         });
                     }
                     //else {