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

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

@@ -1,4 +1,5 @@
-using System;
+using DS.WMS.Core.Fee.Dtos;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -11,5 +12,9 @@ namespace DS.WMS.Core.Op.Dtos
     /// </summary>
     public class SeaExportCopyRes: SeaExportRes
     {
+        /// <summary>
+        /// 费用记录
+        /// </summary>
+        public List<FeeRecordRes> FeeList { get; set; }
     }
 }

ds-wms-service/DS.WMS.Core/Op/Method/SeaExportService.cs

@@ -11,6 +11,7 @@ using DS.Module.SqlSugar;
 using DS.Module.UserModule;
 using DS.WMS.Core.Code.Dtos;
 using DS.WMS.Core.Code.Entity;
+using DS.WMS.Core.Fee.Dtos;
 using DS.WMS.Core.Fee.Entity;
 using DS.WMS.Core.HangfireJob.Interface;
 using DS.WMS.Core.Info.Entity;
@@ -1052,10 +1053,23 @@ public partial class SeaExportService : ISeaExportService
                 item.BusinessId = 0;
             }
         }
-        if (template.IsNotNull())
+        if (req.IsCopyFee)
         {
-
+            var fees = await tenantDb.Queryable<FeeRecord>().Where(x => x.BusinessId == id).ToListAsync();
+            if (fees.IsNotNull() && fees.Count > 0)
+            {
+                foreach (var item in fees)
+                {
+                    item.Id = 0;
+                    item.BusinessId = 0;
                 }
+                data.FeeList = fees.Adapt<List<FeeRecordRes>>();
+            }
+        }
+        //if (template.IsNotNull())
+        //{
+
+        //}
         return await Task.FromResult(DataResult<SeaExportCopyRes>.Success("复制成功!", data, MultiLanguageConst.DataCopySuccess));
     }
     #endregion

ds-wms-service/DS.WMS.OpApi/Controllers/SeaExportController.cs

@@ -88,7 +88,18 @@ public class SeaExportController : ApiController
         var res = await _invokeService.EditSeaExport(req);
         return res;
     }
-
+    /// <summary>
+    /// 业务单据复制-返回前端
+    /// </summary>
+    /// <param name="req"></param>
+    /// <returns></returns>
+    [HttpPost]
+    [Route("GetSeaExportCopyInfo")]
+    public async Task<DataResult<SeaExportCopyRes>> GetSeaExportCopyInfo([FromBody] SeaExportCopyReq req)
+    {
+        var res = await _invokeService.GetSeaExportCopyInfo(req);
+        return res;
+    }
     /// <summary>
     /// 详情
     /// </summary>