Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev

WarehouseMgr/Tnb.WarehouseMgr/ExcelDataImportManager.cs

@@ -1,92 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using JNPF.FriendlyException;
-using Microsoft.AspNetCore.Http;
-using NPOI.HSSF.UserModel;
-using NPOI.SS.UserModel;
-using NPOI.XSSF.UserModel;
-
-namespace Tnb.WarehouseMgr
-{
-    public class ExcelDataImportManager : BaseWareHouseService
-    {
-        /// <summary>
-        /// 解析Excel到内存
-        /// </summary>
-        /// <param name="file"></param>
-        /// <returns></returns>
-        protected Task<List<Dictionary<string, object>>> ImportExcelToMemory(IFormFile file)
-        {
-            int rowIndex = 1;
-            List<Dictionary<string, object>>? dics = new();
-            IWorkbook? workbook = null;
-            try
-            {
-                using (Stream stream = file.OpenReadStream())
-                {
-                    // 2007版本
-                    if (file.Name.IndexOf(".xlsx") > 0)
-                    {
-                        workbook = new XSSFWorkbook(stream);
-                    }
-                    else if (file.Name.IndexOf(".xls") > 0)
-                    {
-                        workbook = new HSSFWorkbook(stream);
-                    }
-
-                    ISheet? sheet = workbook?.GetSheetAt(0);
-                    if (workbook == null || sheet == null) throw Oops.Bah("无导入数据");
-                    if (sheet?.LastRowNum <= 1) throw Oops.Bah("无导入数据");
-
-                    ICellStyle style = workbook.CreateCellStyle();
-                    IFont font = workbook.CreateFont();
-                    font.Color = IndexedColors.Black.Index; // 将字体颜色设置为黑色
-                    style.SetFont(font);
-                    var nameRow = sheet?.GetRow(0);
-                    if (nameRow != null)
-                    {
-                        Dictionary<string, object> dic = new Dictionary<string, object>();
-                        List<string> columns = new List<string>();
-                        columns = nameRow.Cells.Select(x => x.StringCellValue).ToList();
-                        columns.ForEach(x =>
-                        {
-                            var strings = x.Split(new char[2] { '(', ')' }, StringSplitOptions.RemoveEmptyEntries);
-                            x = strings[1];
-                        });
-                        if (columns?.Count > 0)
-                        {
-                            for (rowIndex = 1; rowIndex <= sheet?.LastRowNum; rowIndex++)
-                            {
-                                var row = sheet?.GetRow(rowIndex);
-                                if (row != null)
-                                {
-                                    foreach (var col in columns)
-                                    {
-                                        ICell cell = row.GetCell(columns.IndexOf(col));
-                                        dic.Add(col, cell.StringCellValue);
-                                    }
-                                    dics.Add(dic);
-                                }
-                            }
-                            if (dics == null) throw new AppFriendlyException("输入的数据为空", 500);
-                        }
-                    }
-                }
-            }
-            catch (Exception)
-            {
-                //return Task.FromResult(dics);
-                throw;
-            }
-            return Task.FromResult(dics);
-        }
-
-        public async Task<dynamic?> GenImportTemplate(params string[] fields)
-        {
-            return null;
-        }
-    }
-}

WarehouseMgr/Tnb.WarehouseMgr/WmskittingOutService.cs

@@ -37,6 +37,7 @@ using Tnb.WarehouseMgr.Entities.Dto;
 using Tnb.WarehouseMgr.Entities.Dto.Inputs;
 using Tnb.WarehouseMgr.Entities.Dto.Outputs;
 using Tnb.WarehouseMgr.Entities.Enums;
+using Tnb.WarehouseMgr.Entities.Exceptions;
 using Tnb.WarehouseMgr.Interfaces;
 
 namespace Tnb.WarehouseMgr
@@ -164,8 +165,15 @@ namespace Tnb.WarehouseMgr
             {
                 JNPF.Logging.Log.Error("齐套出库，新增时出现错误", ex);
                 await curDb.Ado.RollbackTranAsync();
+                TimedTaskErrorInfo ei = new()
+                {
+                    RequestURL = App.HttpContext?.Request?.Path,
+                    RequestMethod = App.HttpContext?.Request?.Method,
+                    userIdentity = curUser,
+                };
+                var timedTaskEx = ex.ToTimedTaskException(ei);
                 cts?.Cancel();
-                throw;
+                throw timedTaskEx;
             }
         }
         /// <summary>
@@ -265,8 +273,15 @@ namespace Tnb.WarehouseMgr
             catch (Exception ex)
             {
                 JNPF.Logging.Log.Error("齐套出库，待配送时出现错误", ex);
+                TimedTaskErrorInfo ei = new()
+                {
+                    RequestURL = App.HttpContext?.Request?.Path,
+                    RequestMethod = App.HttpContext?.Request?.Method,
+                    userIdentity = curUser,
+                };
+                var timedTaskEx = ex.ToTimedTaskException(ei);
                 cts?.Cancel();
-                throw;
+                throw timedTaskEx;
             }
         }