From 578e007985865ce97f39233c56d7c9c0a10a1f3f Mon Sep 17 00:00:00 2001 From: wanghaomei <86whm@163.com> Date: Tue, 26 Mar 2024 09:43:33 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E7=AE=B1=E9=87=8F0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/BookingOrder/BookingOrderService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs index bd9f1bca..e1dabb3d 100644 --- a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs +++ b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs @@ -1486,7 +1486,7 @@ namespace Myshipping.Application if (input.ctnInputs != null) { - var groupList = input.ctnInputs.Where(x => x.CTNNUM > 0).GroupBy(c => c.CTNALL).Select(g => $"{g.Key}*{g.Sum(gg => gg.CTNNUM)}"); + var groupList = input.ctnInputs.GroupBy(c => c.CTNALL).Select(g => $"{g.Key}*{g.Sum(gg => gg.CTNNUM)}"); input.CNTRTOTAL = string.Join(" / ", groupList); } //条件限制 重复限制 From d3d5250329b359549224019beceae14cda39613c Mon Sep 17 00:00:00 2001 From: jianghaiqing Date: Tue, 26 Mar 2024 11:55:55 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A9=AC=E5=A3=AB?= =?UTF-8?q?=E5=9F=BAAPI=E5=8F=B0=E8=B4=A6=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/BookingOrder/BookingMSKAPIService.cs | 2 ++ .../Service/BookingOrder/Dto/BookingDeliveryRecordPageDto.cs | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Myshipping.Application/Service/BookingOrder/BookingMSKAPIService.cs b/Myshipping.Application/Service/BookingOrder/BookingMSKAPIService.cs index 89b123df..ce4c5f9b 100644 --- a/Myshipping.Application/Service/BookingOrder/BookingMSKAPIService.cs +++ b/Myshipping.Application/Service/BookingOrder/BookingMSKAPIService.cs @@ -33,6 +33,7 @@ namespace Myshipping.Application.Service.BookingOrder private readonly ISysCacheService _cache; private readonly IDjyWebsiteAccountConfigService _webAccountConfig; private readonly ILogger _logger; + private readonly ISysDataUserMenu _sysDataUserMenuService; const string CONST_MSK_API_COMMODITY_URL = "MSKApiCommodity"; const string CONST_MSK_API_BOOKING_URL = "MSKApiBooking"; @@ -41,6 +42,7 @@ namespace Myshipping.Application.Service.BookingOrder public BookingMSKAPIService(ILogger logger, ISysCacheService cache, IDjyWebsiteAccountConfigService webAccountConfig, SqlSugarRepository bookingDeliveryRecordRep, + ISysDataUserMenu sysDataUserMenuService, SqlSugarRepository bookingDeliveryRecordCtnRep) { _logger = logger; diff --git a/Myshipping.Application/Service/BookingOrder/Dto/BookingDeliveryRecordPageDto.cs b/Myshipping.Application/Service/BookingOrder/Dto/BookingDeliveryRecordPageDto.cs index a47f389e..74417e0f 100644 --- a/Myshipping.Application/Service/BookingOrder/Dto/BookingDeliveryRecordPageDto.cs +++ b/Myshipping.Application/Service/BookingOrder/Dto/BookingDeliveryRecordPageDto.cs @@ -433,7 +433,7 @@ namespace Myshipping.Application /// /// 最后BC接收时间 /// - public bool LstRecvBCDate { get; set; } + public Nullable LstRecvBCDate { get; set; } /// /// 是否已有BookingCancellation @@ -443,7 +443,7 @@ namespace Myshipping.Application /// /// 最后BookingCancellation接收时间 /// - public bool LstRecvBKCancelDate { get; set; } + public Nullable LstRecvBKCancelDate { get; set; } /// /// 预计航行天数 From 9542b850ba75115b12e991029a1c388e1493d31e Mon Sep 17 00:00:00 2001 From: jianghaiqing Date: Tue, 26 Mar 2024 12:04:16 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A9=AC=E5=A3=AB?= =?UTF-8?q?=E5=9F=BAAPI=E5=8F=B0=E8=B4=A6=E5=A2=9E=E5=8A=A0=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/BookingOrder/BookingMSKAPIService.cs | 7 ++++--- Myshipping.Core/Const/MenuConst.cs | 5 +++++ Myshipping.Core/Myshipping.Core.xml | 5 +++++ 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/Myshipping.Application/Service/BookingOrder/BookingMSKAPIService.cs b/Myshipping.Application/Service/BookingOrder/BookingMSKAPIService.cs index ce4c5f9b..ebdcbbfe 100644 --- a/Myshipping.Application/Service/BookingOrder/BookingMSKAPIService.cs +++ b/Myshipping.Application/Service/BookingOrder/BookingMSKAPIService.cs @@ -986,9 +986,9 @@ namespace Myshipping.Application.Service.BookingOrder //这里因为返回给前端的台账数据是DTO，所以这里排序时候需要转换成Entity对应的字段 if (!string.IsNullOrWhiteSpace(QuerySearch.SortField)) entityOrderCol = MapsterExtHelper.GetAdaptProperty(QuerySearch.SortField); - /* + //菜单375504048771141=我的任务台账 - List userlist = await _sysDataUserMenuService.GetDataScopeList(MenuConst.MenuTaskManage); + List userlist = await _sysDataUserMenuService.GetDataScopeList(MenuConst.MenuMSKApi); if (userlist == null) userlist = new List { UserManager.UserId }; @@ -997,9 +997,10 @@ namespace Myshipping.Application.Service.BookingOrder userlist = userlist.Distinct().ToList(); _logger.LogInformation("任务台账权限范围 {list}", userlist); - */ + var entities = await _bookingDeliveryRecordRep.AsQueryable() + .Where(t => userlist.Contains(t.CreatedUserId.Value)) .WhereIF(createBegin != DateTime.MinValue, t => t.CreatedTime.HasValue && t.CreatedTime.Value >= createBegin) .WhereIF(createEnd != DateTime.MinValue, t => t.CreatedTime.HasValue && t.CreatedTime.Value < createEnd) .WhereIF(updateBegin != DateTime.MinValue, t => t.UpdatedTime.HasValue && t.UpdatedTime.Value >= updateBegin) diff --git a/Myshipping.Core/Const/MenuConst.cs b/Myshipping.Core/Const/MenuConst.cs index 145a136c..5d3b5735 100644 --- a/Myshipping.Core/Const/MenuConst.cs +++ b/Myshipping.Core/Const/MenuConst.cs @@ -16,5 +16,10 @@ namespace Myshipping.Core.Const /// 我的任务台账 /// public const long MenuTaskManage = 375504048771141; + + /// + /// 马士基API订舱 + /// + public const long MenuMSKApi = 526643045195845; } } diff --git a/Myshipping.Core/Myshipping.Core.xml b/Myshipping.Core/Myshipping.Core.xml index c7412b4f..e7eb3e4d 100644 --- a/Myshipping.Core/Myshipping.Core.xml +++ b/Myshipping.Core/Myshipping.Core.xml @@ -842,6 +842,11 @@ 我的任务台账 + + + 马士基API订舱 + + 租户参数Code常量 From bea8eb0c76c68f868956d4ba78a459493d4c85fd Mon Sep 17 00:00:00 2001 From: jianghaiqing Date: Tue, 26 Mar 2024 12:09:36 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=B0=E8=B4=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/BookingOrder/BookingMSKAPIService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Myshipping.Application/Service/BookingOrder/BookingMSKAPIService.cs b/Myshipping.Application/Service/BookingOrder/BookingMSKAPIService.cs index ebdcbbfe..964ea006 100644 --- a/Myshipping.Application/Service/BookingOrder/BookingMSKAPIService.cs +++ b/Myshipping.Application/Service/BookingOrder/BookingMSKAPIService.cs @@ -50,7 +50,7 @@ namespace Myshipping.Application.Service.BookingOrder _webAccountConfig = webAccountConfig; _bookingDeliveryRecordRep = bookingDeliveryRecordRep; _bookingDeliveryRecordCtnRep = bookingDeliveryRecordCtnRep; - + _sysDataUserMenuService = sysDataUserMenuService; } #region 检索海运船期详情 From bc12a3edea85727ea7713b2bf977a7b4fe432b0f Mon Sep 17 00:00:00 2001 From: wanghaomei <86whm@163.com> Date: Tue, 26 Mar 2024 13:56:59 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E8=AE=A2=E8=88=B1?= =?UTF-8?q?=E8=B4=A6=E5=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entity/BookingCustomerOrder.cs | 5 ++++ .../BookingCustomerOrderService.cs | 1 + .../Service/BookingCustomerOrder/Dto/Dtos.cs | 23 ++++++++++++------- 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/Myshipping.Application/Entity/BookingCustomerOrder.cs b/Myshipping.Application/Entity/BookingCustomerOrder.cs index fe99187a..a4d1312b 100644 --- a/Myshipping.Application/Entity/BookingCustomerOrder.cs +++ b/Myshipping.Application/Entity/BookingCustomerOrder.cs @@ -283,6 +283,11 @@ namespace Myshipping.Application.Entity /// 目的地 /// public string DESTINATION { get; set; } + + /// + /// 附加数据 + /// + public string ExtendData { get; set; } } /// diff --git a/Myshipping.Application/Service/BookingCustomerOrder/BookingCustomerOrderService.cs b/Myshipping.Application/Service/BookingCustomerOrder/BookingCustomerOrderService.cs index d239e473..49027fb9 100644 --- a/Myshipping.Application/Service/BookingCustomerOrder/BookingCustomerOrderService.cs +++ b/Myshipping.Application/Service/BookingCustomerOrder/BookingCustomerOrderService.cs @@ -385,6 +385,7 @@ namespace Myshipping.Application outModel.Files = dicFile; outModel.LogList = _repStatuslog.AsQueryable().Where(x => x.BookingId == entity.Id && x.Category == StaLogCateAudit).OrderByDescending(x => x.OpTime).ToList().Adapt>(); outModel.ServiceItemList = _repServiceItem.AsQueryable().Where(x => x.BookingId == entity.Id).ToList().Adapt>(); + return outModel; } diff --git a/Myshipping.Application/Service/BookingCustomerOrder/Dto/Dtos.cs b/Myshipping.Application/Service/BookingCustomerOrder/Dto/Dtos.cs index c90bf365..b85c9f37 100644 --- a/Myshipping.Application/Service/BookingCustomerOrder/Dto/Dtos.cs +++ b/Myshipping.Application/Service/BookingCustomerOrder/Dto/Dtos.cs @@ -397,6 +397,11 @@ namespace Myshipping.Application /// public string UpdatedTime { get; set; } + /// + /// 附加数据 + /// + public string ExtendData { get; set; } + /// /// 文件列表 /// @@ -553,6 +558,11 @@ namespace Myshipping.Application /// 回推接口秘钥 /// public string FeedbackSecret { get; set; } + + /// + /// 附加数据 + /// + public string ExtendData { get; set; } } @@ -889,13 +899,10 @@ namespace Myshipping.Application /// 服务项目 /// public List ServiceItemList { get; set; } - ///// - ///// 订舱账号 - ///// - //public string BOOKINGACCOUNT { get; set; } - ///// - ///// 订舱密码 - ///// - //public string BOOKINGPASSWORD { get; set; } + + /// + /// 附加数据 + /// + public string ExtendData { get; set; } } } From e2ea429cb4e9ba6266ed43690c016ba9ed5b4708 Mon Sep 17 00:00:00 2001 From: wanghaomei <86whm@163.com> Date: Tue, 26 Mar 2024 14:31:01 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E8=AE=A2=E8=88=B1?= =?UTF-8?q?=E8=B4=A6=E5=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BookingCustomerOrderService.cs | 15 ++++++++++++++- .../Service/BookingCustomerOrder/Dto/Dtos.cs | 9 +++++++-- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/Myshipping.Application/Service/BookingCustomerOrder/BookingCustomerOrderService.cs b/Myshipping.Application/Service/BookingCustomerOrder/BookingCustomerOrderService.cs index 49027fb9..447886d6 100644 --- a/Myshipping.Application/Service/BookingCustomerOrder/BookingCustomerOrderService.cs +++ b/Myshipping.Application/Service/BookingCustomerOrder/BookingCustomerOrderService.cs @@ -385,7 +385,7 @@ namespace Myshipping.Application outModel.Files = dicFile; outModel.LogList = _repStatuslog.AsQueryable().Where(x => x.BookingId == entity.Id && x.Category == StaLogCateAudit).OrderByDescending(x => x.OpTime).ToList().Adapt>(); outModel.ServiceItemList = _repServiceItem.AsQueryable().Where(x => x.BookingId == entity.Id).ToList().Adapt>(); - + return outModel; } @@ -1909,6 +1909,19 @@ namespace Myshipping.Application ins = true; } + //订舱账号、密码 + var jobj = new JObject(); + if (!string.IsNullOrEmpty(custOrder.ExtendData)) + { + jobj = JObject.Parse(custOrder.ExtendData); + } + + var jobjBookAcc=new JObject(); + jobjBookAcc["Account"] = input.BOOKINGACCOUNT; + jobjBookAcc["Password"] = input.BOOKINGPASSWORD; + jobj["BookingAccount"] = jobjBookAcc; + custOrder.ExtendData = jobjBookAcc.ToJsonString(); + var ctns = input.CtnList.Adapt>(); var servList = input.ServiceItemList.Adapt>(); diff --git a/Myshipping.Application/Service/BookingCustomerOrder/Dto/Dtos.cs b/Myshipping.Application/Service/BookingCustomerOrder/Dto/Dtos.cs index b85c9f37..0bf18f31 100644 --- a/Myshipping.Application/Service/BookingCustomerOrder/Dto/Dtos.cs +++ b/Myshipping.Application/Service/BookingCustomerOrder/Dto/Dtos.cs @@ -901,8 +901,13 @@ namespace Myshipping.Application public List ServiceItemList { get; set; } /// - /// 附加数据 + /// 订舱账号 /// - public string ExtendData { get; set; } + public string BOOKINGACCOUNT { get; set; } + + /// + /// 订舱密码 + /// + public string BOOKINGPASSWORD { get; set; } } } From fa9cbd561d5a2d4198953766838b41cb13e7f771 Mon Sep 17 00:00:00 2001 From: jianghaiqing Date: Tue, 26 Mar 2024 15:36:46 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A9=AC=E5=A3=AB?= =?UTF-8?q?=E5=9F=BAAPI=E8=AE=A2=E8=88=B1=E7=9A=84=E5=8F=B0=E8=B4=A6?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/BookingOrder/BookingMSKAPIService.cs | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Myshipping.Application/Service/BookingOrder/BookingMSKAPIService.cs b/Myshipping.Application/Service/BookingOrder/BookingMSKAPIService.cs index 964ea006..8f45c343 100644 --- a/Myshipping.Application/Service/BookingOrder/BookingMSKAPIService.cs +++ b/Myshipping.Application/Service/BookingOrder/BookingMSKAPIService.cs @@ -990,17 +990,16 @@ namespace Myshipping.Application.Service.BookingOrder //菜单375504048771141=我的任务台账 List userlist = await _sysDataUserMenuService.GetDataScopeList(MenuConst.MenuMSKApi); - if (userlist == null) - userlist = new List { UserManager.UserId }; - if (userlist.Count > 0) + { + userlist.Add(UserManager.UserId); userlist = userlist.Distinct().ToList(); + } _logger.LogInformation("任务台账权限范围 {list}", userlist); - var entities = await _bookingDeliveryRecordRep.AsQueryable() - .Where(t => userlist.Contains(t.CreatedUserId.Value)) + .Where(t => userlist == null || (userlist.Count > 0 && userlist.Contains(t.CreatedUserId.Value))) .WhereIF(createBegin != DateTime.MinValue, t => t.CreatedTime.HasValue && t.CreatedTime.Value >= createBegin) .WhereIF(createEnd != DateTime.MinValue, t => t.CreatedTime.HasValue && t.CreatedTime.Value < createEnd) .WhereIF(updateBegin != DateTime.MinValue, t => t.UpdatedTime.HasValue && t.UpdatedTime.Value >= updateBegin) @@ -1296,6 +1295,7 @@ namespace Myshipping.Application.Service.BookingOrder /// /// 马士基API订舱ID组 /// 返回执行结果消息 + [HttpPost("/BookingMSKAPI/BatchSend")] public async Task BatchSend(long[] ids) { var list = await _bookingDeliveryRecordRep.AsQueryable() @@ -1316,6 +1316,7 @@ namespace Myshipping.Application.Service.BookingOrder /// 马士基API订舱ID /// 需要复制生成记录 /// 返回执行结果消息 + [HttpGet("/BookingMSKAPI/BatchSend")] public async Task BatchCopy(long id, int copyNum) { From bf90e142f253bb991844ac4b7bd44bd4bcadd56c Mon Sep 17 00:00:00 2001 From: jianghaiqing Date: Tue, 26 Mar 2024 16:17:07 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=8F=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/TaskManagePlat/TaskManageService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Myshipping.Application/Service/TaskManagePlat/TaskManageService.cs b/Myshipping.Application/Service/TaskManagePlat/TaskManageService.cs index a42cd1b4..7b7c243a 100644 --- a/Myshipping.Application/Service/TaskManagePlat/TaskManageService.cs +++ b/Myshipping.Application/Service/TaskManagePlat/TaskManageService.cs @@ -1290,7 +1290,7 @@ namespace Myshipping.Application #endregion #region 任务目的港未提货/任务目的港提货未返空 - if (info.Main.TaskType == TaskBaseTypeEnum.POD_DISCHARGE_FULL) + if (info.Main.TaskType == TaskBaseTypeEnum.POD_DISCHARGE_FULL || info.Main.TaskType == TaskBaseTypeEnum.POD_GATEOUT_FULL) { TaskPODDischargeGateoutFullInfo dischargeGateout = info.Main.PODDischargeGateoutFull.Adapt(); From bf41b71ee82488dc616a6cc1b624fd81e7343005 Mon Sep 17 00:00:00 2001 From: jianghaiqing Date: Tue, 26 Mar 2024 22:44:20 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9DRAFT=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entity/TaskManagePlat/TaskDraftInfo.cs | 6 +++--- Myshipping.Application/Enum/TaskFileCategoryEnum.cs | 10 ++++++++++ .../Service/TaskManagePlat/TaskManageService.cs | 12 ++++++++++++ 3 files changed, 25 insertions(+), 3 deletions(-) diff --git a/Myshipping.Application/Entity/TaskManagePlat/TaskDraftInfo.cs b/Myshipping.Application/Entity/TaskManagePlat/TaskDraftInfo.cs index e569df8f..78c21469 100644 --- a/Myshipping.Application/Entity/TaskManagePlat/TaskDraftInfo.cs +++ b/Myshipping.Application/Entity/TaskManagePlat/TaskDraftInfo.cs @@ -10,10 +10,10 @@ using System.Threading.Tasks; namespace Myshipping.Application { /// - /// 任务目的港未提货未返箱 + /// 任务格式单 /// - [SugarTable("task_pod_discharge_gateout_full")] - [Description("任务目的港未提货未返箱")] + [SugarTable("task_draft_info")] + [Description("任务格式单")] public class TaskDraftInfo : TaskManageDbEntity { /// diff --git a/Myshipping.Application/Enum/TaskFileCategoryEnum.cs b/Myshipping.Application/Enum/TaskFileCategoryEnum.cs index 9c725be8..c246102e 100644 --- a/Myshipping.Application/Enum/TaskFileCategoryEnum.cs +++ b/Myshipping.Application/Enum/TaskFileCategoryEnum.cs @@ -43,6 +43,16 @@ namespace Myshipping.Application [Description("Booking Cancellation Notice")] BC_CANCEL_NOTICE, /// + /// Booking Cancellation + /// + [Description("Draft")] + DRAFT, + /// + /// Booking Cancellation Notice + /// + [Description("Draft Notice")] + DRAFT_NOTICE, + /// /// 空 /// [Description("NONE")] diff --git a/Myshipping.Application/Service/TaskManagePlat/TaskManageService.cs b/Myshipping.Application/Service/TaskManagePlat/TaskManageService.cs index 7b7c243a..d18abe85 100644 --- a/Myshipping.Application/Service/TaskManagePlat/TaskManageService.cs +++ b/Myshipping.Application/Service/TaskManagePlat/TaskManageService.cs @@ -417,6 +417,12 @@ namespace Myshipping.Application fileCategory = TaskFileCategoryEnum.BC_CANCEL.ToString(); } + else if (TaskBaseTypeEnum.DRAFT.ToString() == taskInfo.TASK_BASE_TYPE) + { + attachFileType = "draftfiles"; + + fileCategory = TaskFileCategoryEnum.DRAFT.ToString(); + } var noExtensionFileName = Path.GetFileNameWithoutExtension(file.FileName); var fileFullName = await FileAttachHelper.SaveFile(taskInfo.PK_ID, bytes, batchNo, noExtensionFileName, @@ -466,6 +472,12 @@ namespace Myshipping.Application fileCategory = TaskFileCategoryEnum.BC_CANCEL_NOTICE.ToString(); } + else if (TaskBaseTypeEnum.DRAFT.ToString() == taskInfo.TASK_BASE_TYPE) + { + attachFileType = "draftnoticefiles"; + + fileCategory = TaskFileCategoryEnum.DRAFT.ToString(); + } var noExtensionFileName = Path.GetFileNameWithoutExtension(modifyFile.FileName); var fileFullName = await FileAttachHelper.SaveFile(taskInfo.PK_ID, bytes, batchNo, noExtensionFileName, From 334809922a5e887a5d496ccbeca2511cdff8014e Mon Sep 17 00:00:00 2001 From: jianghaiqing Date: Tue, 26 Mar 2024 23:07:14 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A9=AC=E5=A3=AB?= =?UTF-8?q?=E5=9F=BA=E8=AE=A2=E8=88=B1=E5=8F=B0=E8=B4=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/BookingOrder/BookingMSKAPIService.cs | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Myshipping.Application/Service/BookingOrder/BookingMSKAPIService.cs b/Myshipping.Application/Service/BookingOrder/BookingMSKAPIService.cs index 8f45c343..b4b10f48 100644 --- a/Myshipping.Application/Service/BookingOrder/BookingMSKAPIService.cs +++ b/Myshipping.Application/Service/BookingOrder/BookingMSKAPIService.cs @@ -990,7 +990,14 @@ namespace Myshipping.Application.Service.BookingOrder //菜单375504048771141=我的任务台账 List userlist = await _sysDataUserMenuService.GetDataScopeList(MenuConst.MenuMSKApi); - if (userlist.Count > 0) + bool isAdmin = false; + + if(userlist == null) + { + isAdmin = true; + userlist = new List(); + } + else if (userlist != null && userlist.Count > 0) { userlist.Add(UserManager.UserId); userlist = userlist.Distinct().ToList(); @@ -999,7 +1006,7 @@ namespace Myshipping.Application.Service.BookingOrder _logger.LogInformation("任务台账权限范围 {list}", userlist); var entities = await _bookingDeliveryRecordRep.AsQueryable() - .Where(t => userlist == null || (userlist.Count > 0 && userlist.Contains(t.CreatedUserId.Value))) + .Where(t => isAdmin || userlist.Contains(t.CreatedUserId.Value)) .WhereIF(createBegin != DateTime.MinValue, t => t.CreatedTime.HasValue && t.CreatedTime.Value >= createBegin) .WhereIF(createEnd != DateTime.MinValue, t => t.CreatedTime.HasValue && t.CreatedTime.Value < createEnd) .WhereIF(updateBegin != DateTime.MinValue, t => t.UpdatedTime.HasValue && t.UpdatedTime.Value >= updateBegin) From df662c45c8c4a0dbb197582fea8934dc5d82c0d3 Mon Sep 17 00:00:00 2001 From: jianghaiqing Date: Wed, 27 Mar 2024 13:07:13 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=88=AA=E5=8D=95?= =?UTF-8?q?=E5=9B=9E=E6=89=A7=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Dtos/TaskManageOrderSIFeedBackInfo.cs | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/Myshipping.Application/Service/TaskManagePlat/Dtos/TaskManageOrderSIFeedBackInfo.cs b/Myshipping.Application/Service/TaskManagePlat/Dtos/TaskManageOrderSIFeedBackInfo.cs index 76583f00..fe34ddb3 100644 --- a/Myshipping.Application/Service/TaskManagePlat/Dtos/TaskManageOrderSIFeedBackInfo.cs +++ b/Myshipping.Application/Service/TaskManagePlat/Dtos/TaskManageOrderSIFeedBackInfo.cs @@ -134,6 +134,26 @@ namespace Myshipping.Application /// public string ThirdPayAddr { get; set; } + /// + /// 截单上传时间 + /// + public string SubmittedDate { get; set; } + + /// + /// 签单方式(seaway、original、telex) + /// + public string DocumentType { get; set; } + + /// + /// 提单份数 + /// + public string BillOfNum { get; set; } + + /// + /// 放单方式 + /// + public string ReleaseInstruction { get; set; } + /// /// 箱信息 ///