退舱改配问题修复

ds-wms-service/DS.Module.ExcelModule/ExcelService.cs

@@ -24,7 +24,15 @@ namespace DS.Module.ExcelModule
     {
         private readonly IServiceProvider _serviceProvider;
         private readonly ISqlSugarClient db;
-
+        static readonly ApiFox api;
+        /// <summary>
+        /// 构造函数
+        /// </summary>
+        /// <param name="serviceProvider"></param>
+        static ExcelService()
+        {
+            api = new ApiFox();
+        }
         /// <summary>
         /// 构造函数
         /// </summary>
@@ -33,7 +41,6 @@ namespace DS.Module.ExcelModule
         {
             _serviceProvider = serviceProvider;
             db = _serviceProvider.GetRequiredService<ISqlSugarClient>();
-
         }
         public DataResult<string> ExportExcelByColumn(ExportByColumnReq req)
         {
@@ -60,6 +67,29 @@ namespace DS.Module.ExcelModule
             return DataResult<string>.Success(path);
         }
 
+        public async Task<MemoryStream> ExportExcelStreamByColumnAsync(ExportByColumnReq req)
+        { 
+            var data = JArray.Parse(req.JsonDataStr);
+
+            var values = new List<Dictionary<string, object>>();
+
+            for (int i = 0; i < data.Count; i++)
+            {
+                var temp = data[i];
+                var info = new Dictionary<string, object>();
+                for (int n = 0; n < req.ColumnSets.Count; n++)
+                {
+                    var columnSet = req.ColumnSets[n];
+                    var key = columnSet.DataIndex;
+                    info.Add(columnSet.Title, temp[key]);
+                }
+                values.Add(info);
+            }
+            var stream = new MemoryStream();
+            await MiniExcel.SaveAsAsync(stream, values);
+            stream.Seek(0, SeekOrigin.Begin);
+            return stream;
+        }
 
         public MemoryStream ExportExcelStreamByColumn(ExportByColumnReq req)
         {

ds-wms-service/DS.Module.ExcelModule/IExcelService.cs

@@ -26,5 +26,11 @@ namespace DS.Module.ExcelModule
         /// <returns></returns>
         public MemoryStream ExportExcelStreamByColumn(ExportByColumnReq req);
 
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="req"></param>
+        /// <returns></returns>
+        public  Task<MemoryStream> ExportExcelStreamByColumnAsync(ExportByColumnReq req);
     }
 }

ds-wms-service/DS.Module.ExcelModule/Model/ExportExcelReq.cs

@@ -0,0 +1,30 @@
+using DS.Module.Core;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DS.Module.ExcelModule.Model
+{
+    /// <summary>
+    /// 导出Excel通用请求
+    /// </summary>
+    public class ExportExcelReq
+    {
+        /// <summary>
+        /// 请求路由Url
+        /// </summary>
+        public string Url  { get; set; }  
+        /// <summary>
+        /// 查询条件
+        /// </summary>
+        public PageRequest QueryRequest { get; set; }
+
+        /// <summary>
+        /// 用户自定义列设置
+        /// </summary>
+        public List<UserColumnSet> ColumnSets { get; set; }
+
+    }
+}

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

@@ -324,7 +324,7 @@ public class SeaExportBillManage : BaseOrgModel<long>
     /// <summary>
     /// 签单方式    t_code_issutype 
     /// </summary>
-    [SugarColumn(ColumnDescription = "签单方式", IsNullable = true, Length = 12)]
+    [SugarColumn(ColumnDescription = "签单方式", IsNullable = true, Length = 30)]
     public string IssueType { get; set; }
 
     /// <summary>

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

@@ -299,14 +299,14 @@ namespace DS.WMS.Core.Op.Method
                         await tenantDb.Insertable(list).ExecuteCommandAsync();
                 }
                 //更新主表货运跟踪
-                var statusLogs = await tenantDb.Queryable<BookingStatusLog>().Where(x => x.BusinessId == req.Id).ToListAsync();
+                var bookingGoods = await tenantDb.Queryable<BookingGoodsStatus>().Where(x => x.BusinessId == req.Id).ToListAsync();
-                if (statusLogs.IsNotNull() && statusLogs.Count > 0)
+                if (bookingGoods.IsNotNull() && bookingGoods.Count > 0)
                 { 
-                    foreach (var item in statusLogs)
+                    foreach (var item in bookingGoods)
                     {
                         item.BusinessId = newKey; 
                     } 
-                    await tenantDb.Updateable(statusLogs).ExecuteCommandAsync();
+                    await tenantDb.Updateable(bookingGoods).ExecuteCommandAsync();
                 }
                 //任务交互表
                 var taskList = await tenantDb.Queryable<BusinessTask>().Where(x => x.BusinessId == req.Id).ToListAsync();

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

@@ -22,6 +22,11 @@ using Microsoft.AspNetCore.Authorization;
 using SixLabors.ImageSharp.Drawing;
 using System.IO;
 using System.Web;
+using DS.WMS.Core.Flow.Dtos;
+using DS.WMS.Core.Flow.Entity;
+using DS.WMS.Core;
+using MathNet.Numerics;
+using NPOI.SS.Formula.Functions;
 
 namespace DS.WMS.MainApi.Controllers
 {
@@ -53,6 +58,50 @@ namespace DS.WMS.MainApi.Controllers
             return _invokeService.ExportExcelByColumn(req);
         }
 
+        //[HttpPost]
+        //[Route("CommonExcelExportAsync")]
+        //public async Task<IActionResult>  CommonExcelExportAsync([FromBody] ExportExcelReq req)
+        //{
+
+        //    if (instance.CallbackURL.IsNullOrEmpty())
+        //        return;
+
+        //    //请求参数设置
+        //    var callback = new FlowCallback
+        //    {
+        //        InstanceId = instance.Id,
+        //        BusinessId = instance.BusinessId,
+        //        BusinessType = instance.BusinessType,
+        //        AuditType = instance.AuditType,
+        //        FlowStatus = instance.FlowStatus,
+        //        RejectReason = instance.Note
+        //    };
+
+        //    if (api.DefaultHeaders.Contains("Authorization"))
+        //        api.DefaultHeaders.Remove("Authorization");
+
+        //    api.DefaultHeaders.Add("Authorization", "Bearer " + User.GetToken());
+        //    try
+        //    {
+        //        var result = await api.PostAsync<DataResult>(instance.CallbackURL, callback);
+        //        if (result.Succeeded)
+        //        {
+        //            //更新回调执行标识
+        //            await Db.Updateable<FlowInstance>().SetColumns(it => it.IsCallbackExecuted == true)
+        //                .Where(it => it.Id == instance.Id).ExecuteCommandAsync();
+        //        }
+        //        else
+        //        {
+        //            await new ApplicationException($"访问回调URL：{instance.CallbackURL} 时返回了错误：" + result.Message).LogAsync(Db);
+        //        }
+        //    }
+        //    catch (Exception ex)
+        //    {
+        //        await ex.LogAsync(Db);
+        //    }
+
+
+        //}
         /// <summary>
         /// 根据用户列导出Excel文件流
         /// </summary>