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

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>
@@ -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;
     }
 

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,14 @@ namespace DS.WMS.PrintApi.Service
                         report.Dictionary.Connections.Add(new JsonDataSourceConnection()
                         {
                             ConnectionString = str.ConnectionString,
-                            Name = "Connection", 
+                            Name = "Connection",
                         });
                     }
-                    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);