From 8b658a8b6c3a0f822a2fc43d28c9446dde6ffabd Mon Sep 17 00:00:00 2001 From: jianghaiqing Date: Mon, 28 Oct 2024 18:12:03 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9Excel=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TaskPlat/Dtos/TaskMessageInfoDto.cs | 10 + .../TaskShippingOrderCompareService.cs | 51 ++ .../DS.WMS.Core/Utils/ExportFileHelper.cs | 560 ++++++++++-------- .../Controllers/SeaExportController.cs | 27 + 4 files changed, 389 insertions(+), 259 deletions(-) diff --git a/ds-wms-service/DS.WMS.Core/TaskPlat/Dtos/TaskMessageInfoDto.cs b/ds-wms-service/DS.WMS.Core/TaskPlat/Dtos/TaskMessageInfoDto.cs index 8dd533df..9191913a 100644 --- a/ds-wms-service/DS.WMS.Core/TaskPlat/Dtos/TaskMessageInfoDto.cs +++ b/ds-wms-service/DS.WMS.Core/TaskPlat/Dtos/TaskMessageInfoDto.cs @@ -220,6 +220,16 @@ namespace DS.WMS.Core.TaskPlat.Dtos /// 箱信息列表 /// public List ContaList { get; set; } + + /// + /// 网站的账户(网站需要登录的需要提供) + /// + public string WebUser { get; set; } + + /// + /// 网站的密码(网站需要登录的需要提供) + /// + public string WebPassword { get; set; } } /// diff --git a/ds-wms-service/DS.WMS.Core/TaskPlat/Method/ShippingOrderCompare/TaskShippingOrderCompareService.cs b/ds-wms-service/DS.WMS.Core/TaskPlat/Method/ShippingOrderCompare/TaskShippingOrderCompareService.cs index cc1ed30b..bdf884a7 100644 --- a/ds-wms-service/DS.WMS.Core/TaskPlat/Method/ShippingOrderCompare/TaskShippingOrderCompareService.cs +++ b/ds-wms-service/DS.WMS.Core/TaskPlat/Method/ShippingOrderCompare/TaskShippingOrderCompareService.cs @@ -5,6 +5,7 @@ using DS.Module.Core.Helpers; using DS.Module.DjyServiceStatus; using DS.Module.SqlSugar; using DS.Module.UserModule; +using DS.WMS.Core.Code.Dtos; using DS.WMS.Core.Code.Interface; using DS.WMS.Core.Code.Method; using DS.WMS.Core.Invoice.Dtos; @@ -12,6 +13,8 @@ using DS.WMS.Core.Map.Interface; using DS.WMS.Core.Map.Method; using DS.WMS.Core.Op.Dtos; using DS.WMS.Core.Op.Entity; +using DS.WMS.Core.Sys.Interface; +using DS.WMS.Core.Sys.Method; using DS.WMS.Core.TaskPlat.Dtos; using DS.WMS.Core.TaskPlat.Entity; using DS.WMS.Core.TaskPlat.Interface; @@ -47,6 +50,8 @@ namespace DS.WMS.Core.TaskPlat.Method private readonly IMappingYardService _mappingYardService; private readonly IMappingCarrierService _mappingCarrierService; private readonly ICodePortService _codePortService; + private readonly ICodeThirdPartyService _codeThirdPartyService; + private readonly IConfigService _configService; private readonly string shippingOrderCompareUrl; private readonly string shippingOrderCompareResultUrl; @@ -66,6 +71,8 @@ namespace DS.WMS.Core.TaskPlat.Method _mappingYardService = _serviceProvider.GetRequiredService(); _mappingCarrierService = _serviceProvider.GetRequiredService(); _codePortService = _serviceProvider.GetRequiredService(); + _codeThirdPartyService = _serviceProvider.GetRequiredService(); + _configService = _serviceProvider.GetRequiredService(); shippingOrderCompareUrl = AppSetting.app(new string[] { "ShippingOrderCompare", "Url" }); shippingOrderCompareResultUrl = AppSetting.app(new string[] { "ShippingOrderCompare", "ResultUrl" }); @@ -196,6 +203,50 @@ namespace DS.WMS.Core.TaskPlat.Method mainInfo.ContaList = contaList.Adapt>(); } + CodeThirdPartyRes webAccountConfig = null; + + + bool isYGT = false; + bool isLuHai = false; + + var cfgYGT = _configService.GetConfig("ShipCompareAccountYGT", long.Parse(user.TenantId), false).GetAwaiter().GetResult()?.Data?.Value; + + if (!string.IsNullOrWhiteSpace(cfgYGT)) + { + var currArg = cfgYGT.Split(new char[] { ',' }).ToArray(); + + if (currArg.Contains(mainInfo.YardCode)) + { + isYGT = true; + + webAccountConfig = _codeThirdPartyService.GetCodeThirdPartyInfoWithCompany("yungangtong").GetAwaiter().GetResult()?.Data; + } + } + + //如果不是云港通，就试试陆海通 + if (!isYGT) + { + var cfgLuht = _configService.GetConfig("ShipCompareAccountLUHAI", long.Parse(user.TenantId), false).GetAwaiter().GetResult()?.Data?.Value; + + if (!string.IsNullOrWhiteSpace(cfgLuht)) + { + var currArg = cfgLuht.Split(new char[] { ',' }).ToArray(); + + if (currArg.Contains(mainInfo.YardCode)) + { + isYGT = true; + + webAccountConfig = _codeThirdPartyService.GetCodeThirdPartyInfoWithCompany("LuHaiTong").GetAwaiter().GetResult()?.Data; + } + } + } + + if (webAccountConfig != null) + { + mainInfo.WebUser = webAccountConfig.AppKey; + mainInfo.WebPassword = webAccountConfig.AppSecret; + } + var msgModel = GetMessageInfo(batchNo, mainInfo); Logger.Log(NLog.LogLevel.Info, "批次={no} 对应请求报文完成 msg={msg}", batchNo, JsonConvert.SerializeObject(msgModel)); diff --git a/ds-wms-service/DS.WMS.Core/Utils/ExportFileHelper.cs b/ds-wms-service/DS.WMS.Core/Utils/ExportFileHelper.cs index b3132120..f598c4a0 100644 --- a/ds-wms-service/DS.WMS.Core/Utils/ExportFileHelper.cs +++ b/ds-wms-service/DS.WMS.Core/Utils/ExportFileHelper.cs @@ -1,283 +1,325 @@ -using LanguageExt; +using iText.Kernel.Utils.Objectpathitems; +using iText.Kernel.XMP.Impl.XPath; +using LanguageExt; +using LanguageExt.TypeClasses; using Masuit.Tools.Strings; using Microsoft.AspNetCore.Identity; using NPOI.HPSF; using NPOI.HSSF.UserModel; +using NPOI.SS.Formula.Functions; using NPOI.SS.UserModel; using NPOI.XSSF.UserModel; using System; using System.Collections.Generic; using System.ComponentModel; +using System.Data; using System.Linq; +using System.Reflection; using System.Text; using System.Threading.Tasks; +using System.Xml; using static iText.StyledXmlParser.Jsoup.Select.Evaluator; namespace DS.WMS.Core.Utils { + public class ExportFileHelper { + /// + /// Excel行高，Height的单位是1/20个点。例：设置高度为25个点 + /// + private static short rowHeight = 25 * 20; + + #region 导出Excel + + #region 导出 + /// + /// 导出 + /// + /// 数据源 + /// 列名 + /// 绝对路径 + /// sheet页名 + public static void Export(List dataList, Dictionary colDicts, string fileName, string sheetName = "Sheet1") + { + // 使用 NPOI 组件导出 Excel 文件 + + //XSSFWorkbook:是操作Excel2007的版本，扩展名是.xlsx + XSSFWorkbook workbook = new XSSFWorkbook(); + + //HSSFWorkbook:是操作Excel2003以前（包括2003）的版本，扩展名是.xls + //HSSFWorkbook workbook = new HSSFWorkbook(); + + //创建Sheet + ISheet sheet = workbook.CreateSheet(sheetName); + + + + //设置单元格样式 + ICellStyle style = SetCellStyle(workbook); + + //创建表格 + NPOICreateTable(dataList, colDicts, sheet, style, 0); + + // 将 Excel 文件保存到磁盘 + NPOISaveFile(workbook, fileName); + + // 释放资源 + //workbook.Dispose(); + } + #endregion + + #region 自定义框架，导出 + /// + /// 自定义顶部，导出 + /// + /// 数据源 + /// 拆分后列名 + /// 绝对路径，路径+文件名+后缀 + /// 新一行索引，开始 + /// + /// + public static void Export(List dataList, Dictionary colDicts, string fileName, int num, XSSFWorkbook workbook, ISheet sheet) + { + //设置单元格样式 + ICellStyle style = SetCellStyle(workbook); + + //创建表格 + NPOICreateTable(dataList, colDicts, sheet, style, num); + + // 将 Excel 文件保存到磁盘 + NPOISaveFile(workbook, fileName); - // /// - // /// 导出 - // /// - // /// - // /// - // /// - // /// - // public async Task Export(List dataLiist, Dictionary colDicts) + // 释放资源 + //workbook.Dispose(); + } + #endregion + + #endregion + + #region 获取用户选择保存路径 + + /// + /// 获取让用户选择保存文件的绝对路径 + /// + /// + //public static string GetSaveFileRoute(string filter, string fileName) + //{ + // SaveFileDialog dialog = new SaveFileDialog(); + // dialog.Filter = filter; + // dialog.FileName = fileName; + // if (dialog.ShowDialog() == true) // { - // string filePath = string.Empty; - - // /* - // 1、生成空Excel文件。 - // 2、根据colDicts提供的key来匹配字段列表的 - // 3、暂存文件，并返回完整文件名 - // */ - // try - // { - // string sheetName = ""; - // XSSFWorkbook workbook = new XSSFWorkbook(); - // ISheet sheet = workbook.CreateSheet(sheetName); - - // #region Excel模板打印 - // //var opt = App.GetOptions(); - // //var dirAbs = opt.basePath; - // //if (string.IsNullOrEmpty(dirAbs)) - // //{ - // // dirAbs = App.WebHostEnvironment.WebRootPath; - // //} - // var fileAbsPath = Path.Combine(dirAbs, printTemplate.FilePath); - // //_logger.LogInformation($"准备调用EXCEL生成：id：{id}，文件：{printTemplate.FileName}"); - - - // var result = new FileStream(fileAbsPath, FileMode.Open); - // var excelwork = new HSSFWorkbook(result); - // var sheet = excelwork.GetSheetAt(0); - - - // var entity = await _bookingExcelTemplateRepository.AsQueryable() - // .Where(x => x.PId == templateId).OrderBy(x => x.Row).ToListAsync(); - // if (entity == null) - // { - - // throw Oops.Bah("当前模板未设置"); - - // } - - - // for (int _row = 1; _row <= entity.Max(x => x.Row); _row++) - // { - - // if (entity.Where(x => x.Row == _row).Count() > 0) - // { - // ////获取行 - // var row = sheet.GetRow(_row - 1); - // if (row != null) - // { - // for (int _cellNum = 1; _cellNum <= entity.Max(x => x.Column); _cellNum++) - // { - // if (entity.Where(x => x.Row == _row && x.Column == _cellNum).Count() > 0) - // { - // var name = entity.Where(x => x.Row == _row && x.Column == _cellNum).Select(x => x.Field).FirstOrDefault(); - - // if (name.Split('.')[0].ToLower() == "order") - // { - - // foreach (PropertyDescriptor descriptor in TypeDescriptor.GetProperties(order)) - // { - // var _name = descriptor.Name.ToLower(); - // if (name.Split('.')[0].ToLower() == "order" && name.Split('.')[1].ToLower() == _name) - // { - // var value = descriptor.GetValue(order) != null ? descriptor.GetValue(order).ToString() : ""; - // ICell cell = row.GetCell(_cellNum - 1); - // if (descriptor.PropertyType.FullName.Contains("DateTime")) - // { - // value = value != "" ? Convert.ToDateTime(value).ToString("yyyy-MM-dd") : ""; - // } - // if (cell != null) - // { - // row.Cells[_cellNum - 1].SetCellValue(value); - // } - // else - // { - // row.CreateCell(_cellNum - 1).SetCellValue(value); - // } - // } - // } - // } - - // if (name.Split('.')[0].ToLower() == "edi") - // { - - // foreach (PropertyDescriptor descriptor in TypeDescriptor.GetProperties(edi)) - // { - // var _name = descriptor.Name.ToLower(); - // if (name.Split('.')[0].ToLower() == "edi" && name.Split('.')[1].ToLower() == _name) - // { - // var value = descriptor.GetValue(edi) != null ? descriptor.GetValue(edi).ToString() : ""; - // ICell cell = row.GetCell(_cellNum - 1); - // if (descriptor.PropertyType.FullName.Contains("DateTime")) - // { - // value = value != "" ? Convert.ToDateTime(value).ToString("yyyy-MM-dd") : ""; - // } - // if (cell != null) - // { - // row.Cells[_cellNum - 1].SetCellValue(value); - // } - // else - // { - // row.CreateCell(_cellNum - 1).SetCellValue(value); - // } - // } - // } - - - // } - - // if (name.Split('.')[0].ToLower() == "userinfo") - // { - // ICell cell = row.GetCell(_cellNum - 1); - // var value = string.Empty; - // if (name.Split('.')[1].ToLower() == "username") - // { - // value = UserManager.Name; - // } - // if (name.Split('.')[1].ToLower() == "usertel") - // { - // value = UserManager.TEl; - // } - // if (name.Split('.')[1].ToLower() == "usermobile") - // { - // value = UserManager.Phone; - // } - // if (name.Split('.')[1].ToLower() == "useremail") - // { - // value = UserManager.Email; - // } - // if (name.Split('.')[1].ToLower() == "usertenant") - // { - // value = UserManager.TENANT_NAME; - // } - // if (cell != null) - // { - // row.Cells[_cellNum - 1].SetCellValue(value); - // } - // else - // { - // row.CreateCell(_cellNum - 1).SetCellValue(value); - // } - // } - // } - // } - // } - // else - // { - // ////创建行 - // var srow = NpoiExcelExportHelper._.CreateRow(sheet, _row - 1); - - // for (int _cellNum = 1; _cellNum <= entity.Max(x => x.Column); _cellNum++) - // { - // if (entity.Where(x => x.Row == _row && x.Column == _cellNum).Count() > 0) - // { - // var name = entity.Where(x => x.Row == _row && x.Column == _cellNum).Select(x => x.Field).FirstOrDefault(); - - // if (name.Split('.')[0].ToLower() == "order") - // { - // foreach (PropertyDescriptor descriptor in TypeDescriptor.GetProperties(order)) - // { - // var _name = descriptor.Name.ToLower(); - // if (name.Split('.')[1].ToLower() == _name && name.Split('.')[0].ToLower() == "order") - // { - // var value = descriptor.GetValue(order) != null ? descriptor.GetValue(order).ToString() : ""; - // if (descriptor.PropertyType.FullName.Contains("DateTime")) - // { - // value = value != "" ? Convert.ToDateTime(value).ToString("yyyy-MM-dd") : ""; - // } - // srow.CreateCell(_cellNum - 1).SetCellValue(value); - // } - // } - // } - // if (name.Split('.')[0].ToLower() == "edi") - // { - // foreach (PropertyDescriptor descriptor in TypeDescriptor.GetProperties(edi)) - // { - // var _name = descriptor.Name.ToLower(); - // if (name.Split('.')[1].ToLower() == _name && name.Split('.')[0].ToLower() == "edi") - // { - // var value = descriptor.GetValue(edi) != null ? descriptor.GetValue(edi).ToString() : ""; - // if (descriptor.PropertyType.FullName.Contains("DateTime")) - // { - // value = value != "" ? Convert.ToDateTime(value).ToString("yyyy-MM-dd") : ""; - // } - // srow.CreateCell(_cellNum - 1).SetCellValue(value); - // } - // } - // } - - // if (name.Split('.')[0].ToLower() == "userinfo") - // { - - // var value = string.Empty; - // if (name.Split('.')[1].ToLower() == "username") - // { - // value = UserManager.Name; - // } - // if (name.Split('.')[1].ToLower() == "usertel") - // { - // value = UserManager.TEl; - // } - // if (name.Split('.')[1].ToLower() == "usermobile") - // { - // value = UserManager.Phone; - // } - // if (name.Split('.')[1].ToLower() == "useremail") - // { - // value = UserManager.Email; - // } - // if (name.Split('.')[1].ToLower() == "usertenant") - // { - // value = UserManager.TENANT_NAME; - // } - - // srow.CreateCell(_cellNum - 1).SetCellValue(value); - - // } - // } - // } - // } - - // } - // } - // var fileFullPath = Path.Combine(App.WebHostEnvironment.WebRootPath, App.GetOptions().Path);//服务器路径 - // if (!Directory.Exists(fileFullPath)) - // { - // Directory.CreateDirectory(fileFullPath); - // } - - // fileName = $"{DateTime.Now.Ticks}.xls";//名称 - // ////2023-4-3，根据河川操作要求，文件名只带提单号 - // //if (!string.IsNullOrEmpty(order.MBLNO)) - // //{ - // // fileName = $"{order.MBLNO}.xls";//名称 - // //} - // //else - // //{ - // // fileName = $"{order.Id}_{DateTime.Now.Ticks}.xls";//名称 - // //} - // _logger.LogInformation("导出excel:" + Path.Combine(fileFullPath, fileName)); - // var filestream = new FileStream(Path.Combine(fileFullPath, fileName), FileMode.OpenOrCreate, FileAccess.ReadWrite); - // excelwork.Write(filestream); - - // #endregion - // } - // catch (Exception ex) - // { - - // } - - // return filePath; + // return dialog.FileName; // } + // return ""; //} + + #endregion + + #region 保存文件 + + private static string NPOISaveFile(XSSFWorkbook workbook, string fileName) + { + try + { + // 将 Excel 文件保存到磁盘 + using (FileStream fs = new FileStream(fileName, FileMode.Create, FileAccess.Write)) + { + workbook.Write(fs); + } + + return ""; + } + catch (Exception err) + { + return err.Message; + } + } + + #endregion + + #region 创建表格 + + /// + /// 创建表格 + /// + /// 数据源 + /// 拆分后的列名 + /// Sheet页 + /// 样式 + /// 行索引 + private static void NPOICreateTable(List dataList, Dictionary colDicts, ISheet sheet, ICellStyle style, int num) + { + string[] strArry = colDicts.Select(b => b.Value).ToArray(); + + IRow row = null;//声明行 + + #region 创建列名 + + //在索引 num 的位置 创建一行 + row = sheet.CreateRow(num); + row.Height = rowHeight;//设置行高 + + //循环列名数组，创建单元格并赋值、样式 + for (int i = 0; i < strArry.Length; i++) + { + row.CreateCell(i).SetCellValue(strArry[i]); + row.GetCell(i).CellStyle = style; + } + + #endregion + + #region 创建行 + + //循环数据源 创建行 + for (int i = 0; i < dataList.Count; i++) + { + //创建行 + row = sheet.CreateRow(num + 1); + row.Height = rowHeight;//设置行高 + num++;//行索引自增 + + Dictionary> dataDict = new Dictionary>(); + + foreach (System.Reflection.PropertyInfo p in dataList[i].GetType().GetProperties()) + { + var value = p.GetValue(dataList[i]); + + + dataDict.Add(p.Name,new Tuple(value.ToString(), p.PropertyType.Name)); + } + + //循环数据源列集合，创建单元格 + foreach (var col in colDicts) + { + + //var pList = TypeDescriptor.GetProperties(T) + + string ValueType = "";//值类型 + string Value = "";//值 + //类型 和 值，赋值 + //if (dt.Rows[i][j].ToString() != null) + //{ + // ValueType = dt.Rows[i][j].GetType().ToString(); + // Value = dt.Rows[i][j].ToString(); + //} + var j = 0; + //根据不同数据类型，对数据处理。处理后创建单元格并赋值 和 样式 + switch (ValueType) + { + case "System.String"://字符串类型 + row.CreateCell(j).SetCellValue(Value); + break; + case "System.DateTime"://日期类型 + System.DateTime dateV; + System.DateTime.TryParse(Value, out dateV); + row.CreateCell(j).SetCellValue(dateV.ToString("yyyy-MM-dd")); + break; + case "System.Boolean"://布尔型 + bool boolV = false; + bool.TryParse(Value, out boolV); + row.CreateCell(j).SetCellValue(boolV); + break; + case "System.Int16"://整型 + case "System.Int32": + case "System.Int64": + case "System.Byte": + int intV = 0; + int.TryParse(Value, out intV); + row.CreateCell(j).SetCellValue(intV); + break; + case "System.Decimal"://浮点型 + case "System.Double": + double doubV = 0; + double.TryParse(Value, out doubV); + row.CreateCell(j).SetCellValue(doubV); + break; + case "System.DBNull"://空值处理 + row.CreateCell(j).SetCellValue(""); + break; + default: + row.CreateCell(j).SetCellValue(""); + break; + } + row.GetCell(j).CellStyle = style; + //设置宽度 + //sheet.SetColumnWidth(j, (Value.Length + 10) * 256); + } + } + + #endregion + + //循环列名数组，多所有列 设置 自动列宽 + for (int i = 0; i < strArry.Length; i++) + { + sheet.AutoSizeColumn(i); + } + } + + #endregion + + public string GetPropertyValue(T t, string field) + { + string value = "9"; + if (t == null) + { + return value; + } + PropertyInfo[] properties = t.GetType().GetProperties(BindingFlags.Instance | BindingFlags.Public); + + if (properties.Length <= 0) + { + return value; + } + var property = properties.Where(x => x.Name == field).FirstOrDefault(); + value = property.GetValue(t, null).ToString(); + + return value; + } + + + #region 设置单元格样式 + + public static ICellStyle SetCellStyle(XSSFWorkbook workbook) + { + #region 单元格样式 + + //创建一个样式 + ICellStyle style = workbook.CreateCellStyle(); + style.Alignment = HorizontalAlignment.Center;//水平对齐 + style.VerticalAlignment = VerticalAlignment.Center;//垂直对齐 + + style.BorderBottom = BorderStyle.Thin;//下边框为细线边框 + style.BorderLeft = BorderStyle.Thin;//左边框 + style.BorderRight = BorderStyle.Thin;//上边框 + style.BorderTop = BorderStyle.Thin;//右边框 + + #endregion + + return style; + } + #endregion } + + /// + /// 导出excel-中英文规则类 + /// + public class ExportRegular + { + /// + /// 属性名称（英文） + /// + public string PropertyName { get; set; } + /// + /// 数据类型 + /// + public string DataType { get; set; } + + /// + /// 导出名称（中文） + /// + public string ExportFieldName { get; set; } + } + } diff --git a/ds-wms-service/DS.WMS.OpApi/Controllers/SeaExportController.cs b/ds-wms-service/DS.WMS.OpApi/Controllers/SeaExportController.cs index e4bfddce..8055831e 100644 --- a/ds-wms-service/DS.WMS.OpApi/Controllers/SeaExportController.cs +++ b/ds-wms-service/DS.WMS.OpApi/Controllers/SeaExportController.cs @@ -12,6 +12,7 @@ using DS.WMS.Core.Op.EDI; using DS.WMS.Core.Op.Interface; using DS.WMS.Core.Sys.Dtos; using DS.WMS.Core.Sys.Interface; +using DS.WMS.Core.Utils; using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json; using NPOI.XWPF.UserModel; @@ -566,4 +567,30 @@ public class SeaExportController : ApiController return res; } + + /// + /// 导出 + /// + /// 业务Id + /// + [HttpGet] + [Route("ExportOrder")] + public async Task> ExportOrder([FromQuery] long id) + { + List list = new List { + new SeaExportRes{ + Id = 1, + MBLNO = "TEST", + } + }; + + Dictionary colDicts = new Dictionary { + { "Id","主键"}, { "MBLNO","提单号"} + }; + + ExportFileHelper.Export(list, colDicts, "text"); + + return DataResult.Success(""); + + } } \ No newline at end of file From 3ff5398ac23482561465edf7274c92b301295aa8 Mon Sep 17 00:00:00 2001 From: jianghaiqing Date: Mon, 28 Oct 2024 18:30:52 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=A3=E8=B4=B9?= =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Op/Method/DJYChargeFee/DJYChargeFeeService.cs | 6 ++++-- .../Op/Method/SeaExportBookingOrClosingEDIService.cs | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ds-wms-service/DS.WMS.Core/Op/Method/DJYChargeFee/DJYChargeFeeService.cs b/ds-wms-service/DS.WMS.Core/Op/Method/DJYChargeFee/DJYChargeFeeService.cs index 78eb3b18..9d9f55ee 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Method/DJYChargeFee/DJYChargeFeeService.cs +++ b/ds-wms-service/DS.WMS.Core/Op/Method/DJYChargeFee/DJYChargeFeeService.cs @@ -103,8 +103,6 @@ namespace DS.WMS.Core.Op.Method var orderInfo = orderList.FirstOrDefault(a => a.Id == id); - - var userInfo = db.Queryable().Filter(null, true).First(x => x.Id == orderInfo.OperatorId && x.TenantId == long.Parse(user.TenantId)); string djyUserId = userInfo?.DjyUserId; @@ -122,6 +120,8 @@ namespace DS.WMS.Core.Op.Method { detail.Status = "FAILURE"; detail.Message = $"当前操作OP={userInfo?.UserName}没有绑定大简云用户ID,请联系管理员"; + + Logger.Log(NLog.LogLevel.Info, $"当前操作OP={userInfo?.UserName}没有绑定大简云用户ID,请联系管理员"); continue; } @@ -132,6 +132,8 @@ namespace DS.WMS.Core.Op.Method { detail.Status = "FAILURE"; detail.Message = $"未配置大简云扣费授权，请在接口账户维护"; + + Logger.Log(NLog.LogLevel.Info, $"未配置大简云扣费授权，请在接口账户维护"); continue; } diff --git a/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportBookingOrClosingEDIService.cs b/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportBookingOrClosingEDIService.cs index 3c99878a..466d2e35 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportBookingOrClosingEDIService.cs +++ b/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportBookingOrClosingEDIService.cs @@ -1868,7 +1868,7 @@ namespace DS.WMS.Core.Op.Method } }); - _logger.Info($"批次={batchNo} 扣费完成，结果{JsonConvert.SerializeObject(feeRlt)}"); + _logger.Info($"批次={batchNo} mblno={ }扣费完成，结果{JsonConvert.SerializeObject(feeRlt)}"); } } From 76d7dc599b77fa1175b2452df76caf5fc8dedb9f Mon Sep 17 00:00:00 2001 From: jianghaiqing Date: Mon, 28 Oct 2024 18:37:50 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=88=B1=E4=BD=8D?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../舱位信息导出模板.xlsx | Bin 9966 -> 9943 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/ds-wms-service/DS.WMS.OpApi/wwwroot/ExportTemplate/舱位信息导出模板.xlsx b/ds-wms-service/DS.WMS.OpApi/wwwroot/ExportTemplate/舱位信息导出模板.xlsx index 15fb70b04269460725eff928e69d6f9d25093b02..6ebf9283c8a7bc13632e45f70497812b5530f7cd 100644 GIT binary patch delta 4912 zcmY+IbyO43|Nciw!+;@dC|%N}G>RaSN=u7`(l8_kY#<0I0*)b_k`ki?N0*eu=#&QO zh7HLt{yyjTIp6R7<8_|%oaa9G{(0|vS7$<}Jc)o<5_<=LN+S?P$bqwW9@)R3Ar}1T z%ON}SP6ra#=jQG{?(O~64}A6TWz$=I5nP>)Qmg-1GR4rREaFe=xe}=qjZ(c{G4yO0 zWWx@X;W~g-cyp^*--K6=^f|g};T>V7YTSYLB!#O=IhCzwO;#<|rv0bKtZcuELLGID zMc_X5LfU8Z5)O|Z1X0&hYbQQV2vT2Lz5eYE;4`5LB}98a=`{%9OC+;%-5|!zq*L0~ z+L^32t5pLk@Nn8|O!*iz|0YP>K^5_F-Z&Q9UieL-%aZ)j3G|^b{uSekT4VM-nrh>G z%D^?v3wgmj=Itbp7NTzMrmkl`Yb(_lghN8%fQD7BUBYm~z3liQFxN`s&$V&C=8Rw% z=rq$0r62d_D4gE7&qS%2J%iw6;qnN(C0eyl_=A9anRTpSi5LLrMwJtDAm-oZJOIM? zw696SH?~6F?_(>1R8aZ8u4o-pZ{7||t7qRGlRNy-;pQg6)^~I%G3!y)EkBA^XWWq` zC+8CiZ>>yB^DZ#Z57N-PKH8@uib}4(&#^D|Zleu8oMNIR;dU(eXrtZp9sGRh^M(tv zyUYwUsxrnbcy`r_!%G2KM7aW5!K$1~Vd_XCmc%0AIov2-XzpHt!cl0C-Jdlm%xjCR zc$oLr{N6~I<>89#o2PoD_e^h7b~nrAK6yW6Slx9D?J z+>1cbhOjkw`t-hV;#DO+!(W2Tj$JUew+!1MPiE25tC(*pFgLnogLtg%1$|b4@)Zye zm3?5EMyL8miGd0GW#O;Akd1G>F(c;Qk4aV|E%NyN{e9=)7xSC` zWr*P9#W(aK`A5mxEeLl>nIGb*f_X)$!&4PO7ik|TGZb^>p_3RbroGw25z+*uyTrMg zjo+wJ_Nh2q%1{ORJ7`o_nUliUoZS-AT7dC7A!L$hLIVWV@farlHoN%EGok{T=`ZQ* zKJC{&=_jh_yjBhkukfzXVet@fWoCKlw^dt;FF6RWII3B5LCj&=BXy9?j#&t6OV4*Ol-hDrIbN+6d7UTy?j7ou=Nn6z_&c&Azeh7p z0rq^<+-|Ci2qMFDDKYyR6Yc}@SxG~#mrtTV{^ zIwV_NaR=ri`x@>d0UNi=_Kq@ek#zKutA440yefB=MEq^75eSM@b|k98S#L zt2SLNgX$w!Gbt+H^;!4ww(3QN3tN)-zN|r2UlX3U=PF;wsD4&@ysNhbo?%vIgUYH7 zDlHXoAUL7xse&VLyAhw*=y`-eYN-Wk-h;7tXVX~|Ll2gh$F54PK{3MrBdH7D9_Df4AZ&OmRH+G7kUKPBbyWP0gk6<7ui-NA5T97ee5kbHjxFV z`LrX%v#k){^%C5(aQ4<6cEUX zn0KDm1$E7np0hoko5ARHGK)Vc*|BqdVLYQq+Fz9Q;i$8su~f{lj)OwWNVjfdyJTtm z*UzGz{mg^3pVu}MaySq7bt}TZ@B#bpGB(HYAT-Hb=sCgJz>trLkA)+KE zjzjYB?Z;KvN^5I*=IP&5s%_XGrs24jogY~^6v+s5gatG230l~H=lux2PMtQ#lLr5a zouZST?bTfer;;^WDPIwn(p))M`-=&_W!Q0dnSHdJ0Vh2dZ3>4fdtfjY0ZL`&#D~5J+ zm$C;SYvivr%g>c_pE%OCO0_10cPUd#{pjv*$?qsjc2tlO+C_2*Iz zRSdA!U;BT7r!0WOyp8+5(L(f9y@~6L1s4RmT13PsHeN`T2R)8}{OdGjCkX`r5P)(A z@gQPe9@Zr0dQ~}Zm8(FYJ8lrE^T1ZC9PYwP`l7P=lV95?On@ z>l5$^jnEJI=|fs!S~&PLWQKZCidi71y=4>kG_uGw|HGr@=6)WXy+%44L~5u=0TF*AlV-a!-PpqRH`IgDav=Qi(ZLSh5P5wG8vh2s`*|h6++F=61;Y*ohN?% z$eS2Cpw-%*lAdQhU)%!{_^qUq7M0r{-j; z`_|ETF)%(UT$6{hzYq3_lxSM=wv76oly-HvdK7^fQTB?oHp2#Hw8itmQ36>>Xp7wIYJm{Wmulm5=LloRyG#vo zOMS{uu-sbx6pR7TeJ9>CJNjgCzcl|Z-l<(0?P&7?Nm<9E#=wqj^I*-{(S9>VSzjYd z_WtjMEbJj?XC7^*61%?APW7u_d=7bTr<}Tf5wQe5d}}*ySqQM-UZSK5RZgv&E*A!l zuRr23aTGP-FEKN1w%5ZLQy>D7dd2TaSkpdP-?5W_CUG(5EhX_zaEF(wLq%|3TL$@c z*}N-4OyqC@P2es2{=4}wjM*#Jh@vx}-M#G^1KW)AVOK6&$81IWaHqqeDUV=IjX;BkEE9GM1tv+!lM2@wZVyCl$$2 z?}A|UtMI;(?!V#5$V{yy@ZZ`nFfD9+KDAgj;=fL9&7Tw|o@ldySFcyr=wGYBMP7BH z9&PRQiy>ZQI=lYYoEroJ67G9aOL9F-6q7u>#)>VcYGX=g@u5m3AsRzp0)nNL62AphUzcWl{3!G zCQF_%=XJcZ+LL1X%s2N%Yg9mw@o)$uJ>_Ym29R}wb54C~` z?yD3tEk#4@#rE2Yma0z#vk?M@r>m_3;RXk8v4V?+MDFah^hFZsjQ50hOSrG*@7A9i zTQ6CveJ@K&-L?4C$ zL<{TsH|mDzL}}zI(-wj3iZ0@9e#sXYqBCp+WMm>>6cTpu48mA4c>(TL63t{5Z67DI z{!k$k5MweYX@u1GC{)kD+1|k9aqH-P8KJ^BZO72|cLF`5G%`Z@aS#Jx-Bk>s+2ecn z@)OD_xq9LRd_@fkX%GWWJ=DODxjYeCXc;DBEwmYvh89g?hp>W>2&K8djK%GmV-K_2 zHMnw&Dun4_ar?3f$yi)8#&~kN-O=<0inIDjgo^dDXLLOQE3L`I&4Mfm<=qb%Wu_ zMX5`J#g+sf2Lhq=QaqM)SWa=m_j*y003ABISUMx-nn;@a#bJhzV z&+ED4Wl;t*R;Cm&UE;&H-wUlImB+(^U}v$YjoIs;OZ&n+)Z+eEUbpvAU04(@aC|WA zb5bBY<@?%D7Wt3|96y_g&EVx$xGlwToA)Igio*v4AM}hoUCRvg!bM^EU0TTos2^K6 zth%f7IC8MC3W{kns16}a2Ew~yMSec_mStfz5F4a(;1c88NQBS|`30M{u#X9nvnZJ5 z1#`G>CXr|tz2Ik2V%uo5NZ4fjbt{JX=a!AkfGv-P!osbX5Mbsvt85p)zRkyd`LOqu zi^yV1Wa>>W{3)746%7#7cs=Id*XEoq^6tj#5^`x{DAzclK-jl)G1a6~OyP6H6?8HX<%R%J;m?5I)G)DSTFUOd0GUmm2UpRq8ZwdPU90;+==TB!MBqjE0BlM z8`TMYX}}XCj-pWK%9e{PUhi}2O5&!@M_|GB$u-^y*AWD~qm*u}t&F26B v_5TT&qmVpu1Qn=0o(F`J~L)=6ZmY}0GjCcl&D-oNngc43~ zMcO+$j2Gr(*6pqygRUo4>!o%%ud#MOE^11mp%g+z>7%adXC{KPFV%w9lu>2k+C}Vs z4PV?p5Lm+xF(Mea8J1S5NzLp&9Z z>LR-V5K_kckc#Iqj<3~(+5W7E%f2QcB6bw&vH7fXw@kd&@OY|_ZzkSIpu*rl?^U~~ zo6}eS>BO1O$2`*;X2E`=_uWFa!FLEorS8i?H4tgu(8rV3_aj+MkA^;slD1`wYr~pnkr`lCTmOc`?JldRr9wCY?l^( zAcyt33soVcZ1CFw2^nDZ{jK1_@ph--*k+w3_~V+(W5UA2?ZoA3bz;$t!STyXCMBsk z7l@!;D^Z{HGUSx40#gTt8MGKv`IZA{pk-}t098z70ConwI-5@x1Ic63$0Z)qWN<2T~BDc)vAJH2xf6p?>qT zM1paP&FpN@xFqZ~&9~T+n+vnfux^+uWt zs8?Y{cm2Mo)SZ`7mc0z6u_~;c+zUx)pT8V6#O-sa+FkUTUQMCZKDysvGe{G+TTHo) zubJ@fLCR1~L7BiEl5*5o5xvzdmo*E+7*}Drb6KeNtcd7w+>n;!gEeqap`4y8L?EZ zL_@V;{7vtC;Ew>sK$OqUVUc$f&2qVrqreBSI~AC?LMSEI@Q#69_`*#*^Mapl?Hv7 z^B=|E*QBey{k6=nrTmb&f=BRM!jVY6zv_}LgGtfSC9oJ11(eqxs>C5pQdDxK% zVJj|=VG^Dq+JWb8J1Kn<$>H)Tf=>(Il7XitTgs0Ji4^x2W7-C?9#UTU7!=!t57w!r zL)T++7VsjyD~Y_gjy94!9@74~mVr2P^|FC*q?5?B!V$IcKOjWcHK{^sb4Q)h}r!YR8oBDOuHr zi6(;x7=0b3D1V$>*ohiP2zqpDnD&z@V(qcd^)&6($I0JDe`O6lCzm53*MTs9lvUEW zjn0pZHfBazN4M;hOp!PJch8}{RD<^ zbVvPbB6~>lYa-_l{A6KEGKBpsmvK+FK)G=3u;p5s=$@mnr{itZUzGnv<`Wo9W0UF6 z1~WuTaJp`o%OJ+lI6d{HR24lQuH4G@+Ki^7DRhiO8KJf~BlV>m@E))$x0?O*lbi|% zni9aC!1EVsf8qQWv7#dWP5KVDC|B;O;mt+e{C{G0$SxAyF`=Ij?mh&g86Ns>lA*Zg z!GAIn5LGI&`_p_8XYdthjrRtaHLK;I>+~mPiO#2 zZ(prqa+h*?=|s~TFQ3Kn@)jk}Q`RC(PVx(eISPl%)-UL5ypPP%3p`lW%h=RC?*$Rc z$p;G7yV$Y*7JsaoCo8oZa*)1)mj|Op^gSS`CIRHl4?pg1wYU|e4ejSo8Q7RhJ=5Fv zEEK_Q6Cw?`?p@f8`FvT4*(=@m8O3N(4z4(xQ7hehxqV2ko1Et!vmHbcd3DNH=NKpz zNAD9A%&{_X|nZEhMK7h!+~TvxH?fZua0usxV(#N z+7+@v?ptRC`VEfXqOAI4eY$I=Ej!ppL+I1DB25$9K*R9o9S_rf6|$#($*k&)>4aio zDCj6_&)6J6LBc2Tq0`MJyphBWT9Z2vH~1p&a)v3eVdFw2@so7!+{gUKw9mL#2WjWw z83|G8k9YYU(&A?p*KA1wpGo@sFX)Xn=HMLnOovPi?YC0j5tIRgqbL5%R}5&V(mjB0 z0$=>%mik$&-UAu}L_vjtujkS?z)XOKwgUrG0U$A!sHV&kvBgHO8R$Fblw>r}V*iMV zl+UD3r8$}IaX?3e;u{5Qf^wMDk^U%dTQ{_2zvbcq&N&ghZn*}hTM~uEQy!<%IvD=z z%_w)=wc~FOv{|UhCvx3O+`G;=n6tC1Wl=Ai{n(x{TRXPeZnw$vZ4=k6e5uKNsA{ad z3?gXxA?V&kTu!QSB73Ne?rnE3@&NUbjOg;zzsu8=TQBPE$+e9Uc=pHv;~! zGw91AE6E+Ca%^Plr1K8iJFG~Jww5iX_90oG^gN~C9aid-eJjDm+wnMqEGMOjGT_j* zs-bcY)C7aMRK+lbaNCxTe8SR9bBRl>dAmUie@9{>B+Ewb)9IfShVOaok0;cto%|!$ zZ>h!%bGOu^A8zMuz}>O%+t_sJOTfz%HGDUN80~!v>%mt6p&P;XH}BccjUPNm-$Rby z{MzXx{-bdh3>CQ+YD+Mg@^(xHQ5VHeia9@MmB_d;%qYo|@3%A^sG=7dNXS9M2q68@u%|v_+L~H^zbt5N~RB| z^=ypu)+_gm*K+ZaEMw?9N7|>U54V0*gL2IFioM2YJpUbzv`h1q9L0@D z=e(vMB)&taWeP;+*9#vA%NRK^e=7SI|s6hoq zoEz)9`&gKj%`)7EFx@m2ZG@y|zw{Ky3CRwHkm~vc9eClf3*l~az1Tu+wgC(;J1#1U z*7H&myM5ih#x?9VpR@>8@+a?C)1(Gc1zW!~KkW~Xd5xcRj*9PfN>@*tcLsfBNG+v5 zX{R%mjNSDW{bo|CSnS*%o4Iyp#vX%nb`uX(gtFXuL+8zJGA2&v9L3bEq*UdR9qAl)9seb~HeT zpFF=@T=1JBl|q20tQ#I(tQV^-o^E7vp;1J_*`S9B!;>N*g2nA-`$E9QX5o2{f>-=d z>(VM4Z|2PSQfr!$)t>I>h9&`3)q2Lh5O2w#d?tw6A_%3M#ckFp*bHwEN};!IjaXk6 zcDv=|L98ARP@Aa$?n;LE=K5#|8lvMaFbWh~bm*8;!J4ncoZXi8WiV%!<3$?CK(YZ{yt9>#0)vi&yyb?3JSeECP8y_QcP zX_z|I{o%qB;+;p77@4$}u=x>7fktNb&6jm1f6+4Ter(5 z#iyl;O+?5SnpOf)ki#ONagl@JPHlsfVD4GXceNyUQ25tJqHTLtT70sJ?hvA>v0=7O zaQeBgGCrqKrrtWi*h9S0HqOabzeSG^5jvhULOyIYk6cknA*toZ782nw%XQo{#@Z{S zuEIVRnUKh_TUTnAxYpB=ImH|gd3YFz>WUfG4%QVxefMa9$Z@2J-Y>wA2wyggG@djx zxqcDeoq1-9kmQlo_pFZ7N=_$~bO z3q`avD1uxQwtZm3caZ4CK~c$2qSjs!7&@!e)7YstxY0>m+XelL1k zB9uIw-u7>V0i(nis`lcdHg1Kbr`-YuiG}`9zKDXno$QP*J&6u^nH9Zxr&T-2Jir0u zv{K+;fd>WnqK1YxaJ!zbc1d1ejb&vFMeq<&LGKv(^9E-8DtdGB?lxS(mvSjmz*5_{ z;aT)@!AzD@hQuJe805|l@*GI7&q^&;dw~JFtrt+riwnv*e_zvuI@?9ig5G8kocS9 zx7jdPnF2Y#-kSNoqk zE`~|m2P}Ws1>8Nq1L7&kec$IlNMx|0@rE;X#pE?ZKN48|0^+Zn{YE~!5=;Po6?ip~1R1Xkc>e^yq^y6L#2tV=E;45c(0Ul|ur9ngxdB;QQ}y!U~|lcp!zn1aLC^ zZ{w+jhDMC`-$F-YdD Date: Mon, 28 Oct 2024 18:42:05 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=A3=E8=B4=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SeaExportBookingOrClosingEDIService.cs | 2 +- .../Controllers/SeaExportController.cs | 25 ------------------- 2 files changed, 1 insertion(+), 26 deletions(-) diff --git a/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportBookingOrClosingEDIService.cs b/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportBookingOrClosingEDIService.cs index 466d2e35..812d39ee 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportBookingOrClosingEDIService.cs +++ b/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportBookingOrClosingEDIService.cs @@ -1868,7 +1868,7 @@ namespace DS.WMS.Core.Op.Method } }); - _logger.Info($"批次={batchNo} mblno={ }扣费完成，结果{JsonConvert.SerializeObject(feeRlt)}"); + _logger.Info($"批次={batchNo} mblno={ order.MBLNO }扣费完成，结果{JsonConvert.SerializeObject(feeRlt)}"); } } diff --git a/ds-wms-service/DS.WMS.OpApi/Controllers/SeaExportController.cs b/ds-wms-service/DS.WMS.OpApi/Controllers/SeaExportController.cs index 8055831e..9256ce60 100644 --- a/ds-wms-service/DS.WMS.OpApi/Controllers/SeaExportController.cs +++ b/ds-wms-service/DS.WMS.OpApi/Controllers/SeaExportController.cs @@ -568,29 +568,4 @@ public class SeaExportController : ApiController return res; } - /// - /// 导出 - /// - /// 业务Id - /// - [HttpGet] - [Route("ExportOrder")] - public async Task> ExportOrder([FromQuery] long id) - { - List list = new List { - new SeaExportRes{ - Id = 1, - MBLNO = "TEST", - } - }; - - Dictionary colDicts = new Dictionary { - { "Id","主键"}, { "MBLNO","提单号"} - }; - - ExportFileHelper.Export(list, colDicts, "text"); - - return DataResult.Success(""); - - } } \ No newline at end of file