打印模块调整

ds-wms-service/DS.Module.PrintModule/IPrintService.cs

@@ -21,12 +21,12 @@ namespace DS.Module.PrintModule
         /// <returns></returns>
         public DataResult GetOpenPrintTemplateList(string id);
 
-        ///// <summary>
-        ///// 获取Json打印信息
-        ///// </summary>
-        ///// <param name="req"></param>
-        ///// <returns></returns>
-        //public DataResult GetOpenJsonPrintInfo(OpenJsonPrintReq req);
+        /// <summary>
+        /// 获取Json打印信息
+        /// </summary>
+        /// <param name="req"></param>
+        /// <returns></returns>
+        public DataResult GetOpenJsonPrintInfo(OpenJsonPrintReq req);
 
         /// <summary>
         /// 获取Json打印信息文件流

ds-wms-service/DS.Module.PrintModule/OpenJsonPrintReq.cs

@@ -20,5 +20,10 @@ namespace DS.Module.PrintModule
         /// Json数据
         /// </summary>
         public string JsonDataStr { get; set; }
+
+        /// <summary>
+        /// 打印类型 1. PDF 2.EXCEL 2.WORD
+        /// </summary>
+        public string PrintType { get; set; }
     }
 }

ds-wms-service/DS.Module.PrintModule/PrintService.cs

@@ -26,6 +26,7 @@ namespace DS.Module.PrintModule
         private readonly string moduleUrl;
         private readonly string templateUrl;
         private readonly string jsonPrintInfoUrl;
+        private readonly string jsonPrintStreamUrl;
         private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
 
         /// <summary>
@@ -45,6 +46,7 @@ namespace DS.Module.PrintModule
             moduleUrl = AppSetting.app(new string[] { "PrintService", "GetModuleListUrl" }).ObjToString();
             templateUrl = AppSetting.app(new string[] { "PrintService", "GetTemplateListUrl" }).ObjToString();
             jsonPrintInfoUrl = AppSetting.app(new string[] { "PrintService", "GetJsonPrintInfoUrl" }).ObjToString();
+            jsonPrintStreamUrl = AppSetting.app(new string[] { "PrintService", "GetJsonPrintStreamUrl" }).ObjToString();
         }
 
 
@@ -141,7 +143,7 @@ namespace DS.Module.PrintModule
             //DataResult res = new DataResult();
 
             // 发起POST请求，超时时间15秒，返回响应字节数组
-            string result = HttpUtillib.HttpPost(jsonPrintInfoUrl, JsonConvert.SerializeObject(req), 30);
+            string result = HttpUtillib.HttpPost(jsonPrintStreamUrl, JsonConvert.SerializeObject(req), 30);
             if (null == result)
             {
                 throw new Exception("请求失败,请联系管理员");

ds-wms-service/DS.WMS.Core/Op/Dtos/SeaExportReq.cs

@@ -814,7 +814,7 @@ public class SeaExportReq
     /// <summary>
     /// 船代
     /// </summary>
-    public long ShipAgency { get; set; }
+    public string ShipAgency { get; set; }
 
     /// <summary>
     /// Desc:湿度

ds-wms-service/DS.WMS.Core/Op/Dtos/SeaExportRes.cs

@@ -909,7 +909,7 @@ public class SeaExportRes
     /// <summary>
     /// 船代
     /// </summary>
-    public long ShipAgency { get; set; }
+    public string ShipAgency { get; set; }
     /// <summary>
     /// Desc:湿度
     /// </summary>

ds-wms-service/DS.WMS.Core/Op/Entity/SeaExport.cs

@@ -1087,7 +1087,7 @@ public class SeaExport : BaseOrgModel<long>
     /// 船代
     /// </summary>
     [SqlSugar.SugarColumn(ColumnDescription = "船代", IsNullable = true,Length = 100)]
-    public long ShipAgency { get; set; }
+    public string ShipAgency { get; set; }
     /// <summary>
     /// 船代Id
     /// </summary>

ds-wms-service/DS.WMS.MainApi/Controllers/PrintController.cs

@@ -55,9 +55,9 @@ namespace DS.WMS.MainApi.Controllers
         /// <returns></returns>
         [HttpPost]
         [Route("GetOpenJsonPrintInfo")]
-        public DataResult<PrintStreamRes> GetOpenJsonPrintInfo([FromBody] OpenJsonPrintReq req)
+        public DataResult GetOpenJsonPrintInfo([FromBody] OpenJsonPrintReq req)
         {
-            var res =_invokeService.GetOpenJsonPrintStream(req);
+            var res =_invokeService.GetOpenJsonPrintInfo(req);
             return res;
             //if (res.Succeeded)
             //{
@@ -92,6 +92,7 @@ namespace DS.WMS.MainApi.Controllers
         /// <param name="req"></param>
         /// <returns></returns>
         [HttpPost]
+        [Obsolete]
         [Route("GetOpenJsonPrintStream")]
         public IActionResult GetOpenJsonPrintStream([FromBody] OpenJsonPrintReq req)
         {

ds-wms-service/DS.WMS.MainApi/appsettings.json

@@ -56,6 +56,7 @@
         "AccessSecret": "d816e6fe938f24e2f205db129d31286a",
         "GetModuleListUrl": "/printApi/OpenPrint/GetPrintModuleList",
         "GetTemplateListUrl": "/printApi/OpenPrint/GetPrintTemplateList",
-        "GetJsonPrintInfoUrl": "/printApi/OpenPrint/GetOpenJsonPrintStream"
+        "GetJsonPrintInfoUrl": "/printApi/OpenPrint/GetOpenJsonPrintInfo",
+        "GetJsonPrintStreamUrl": "/printApi/OpenPrint/GetOpenJsonPrintStream"
     }
 }