From 6868d66b4867d9523906a6d285ab68b17c663db3 Mon Sep 17 00:00:00 2001 From: wet <1034391973@qq.com> Date: Tue, 18 Apr 2023 16:29:00 +0800 Subject: [PATCH 1/3] 1 --- .../Service/BookingOrder/BookingOrderService.cs | 2 -- Myshipping.Core/Myshipping.Core.xml | 10 +++++++++- .../Service/DjyVesselInfo/DjyVesselInfoService.cs | 7 ++++++- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs index 0680f946..09c26de4 100644 --- a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs +++ b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs @@ -5212,8 +5212,6 @@ namespace Myshipping.Application } } - - Dictionary dic1 = new Dictionary(); foreach (PropertyDescriptor descriptor in TypeDescriptor.GetProperties(ctn)) { diff --git a/Myshipping.Core/Myshipping.Core.xml b/Myshipping.Core/Myshipping.Core.xml index 7bd1eef8..d15e6c19 100644 --- a/Myshipping.Core/Myshipping.Core.xml +++ b/Myshipping.Core/Myshipping.Core.xml @@ -11821,7 +11821,7 @@ - + 下拉列表 @@ -11893,6 +11893,14 @@ + + + 获取接口Key 个人或公司 + + + + + 网站账号维护输入参数 diff --git a/Myshipping.Core/Service/DjyVesselInfo/DjyVesselInfoService.cs b/Myshipping.Core/Service/DjyVesselInfo/DjyVesselInfoService.cs index 06118c2d..1f277f4c 100644 --- a/Myshipping.Core/Service/DjyVesselInfo/DjyVesselInfoService.cs +++ b/Myshipping.Core/Service/DjyVesselInfo/DjyVesselInfoService.cs @@ -109,12 +109,13 @@ namespace Myshipping.Core.Service /// /// [HttpGet("/DjyVesselInfoService/GetList")] - public async Task GetList([FromQuery] string CarrierID, DateTime? ETD = null, string KeyWord = "") + public async Task GetList([FromQuery] string CarrierID, DateTime? ETD = null, string PortDischargeId = null,string KeyWord = "") { //获取船名 List list = await _sysCacheService.GetAllCodeVessel(); var tlist = await _rep.AsQueryable().Filter(null, true).WhereIF(!string.IsNullOrWhiteSpace(KeyWord), x => x.Vessel.StartsWith(KeyWord.ToUpper())). + WhereIF(!string.IsNullOrEmpty(PortDischargeId),x=>x.PortDischargeId==PortDischargeId). WhereIF(ETD != null, x => Convert.ToDateTime(x.ETD).ToString("yyyy-MM-dd") == Convert.ToDateTime(ETD).ToString("yyyy-MM-dd")).//船期关联船名 WhereIF(ETD == null, x => x.ETD > DateTime.Now.AddDays(-7)).//领导需求当前日期7天之前 WhereIF(!string.IsNullOrEmpty(CarrierID),x=>x.CARRIERID==CarrierID|| x.CARRIERID==null|| x.CARRIERID == ""). @@ -126,6 +127,8 @@ namespace Myshipping.Core.Service Vessel = x.Vessel, ETD = x.ETD == null ? "" : Convert.ToDateTime(x.ETD).ToString("yyyy-MM-dd"), ATD = x.ATD == null ? "" : Convert.ToDateTime(x.ATD).ToString("yyyy-MM-dd"), + PortDischargeId=x.PortDischargeId, + PortDischarge=x.PortDischarge }).Take(20). ToListAsync(); @@ -147,6 +150,8 @@ namespace Myshipping.Core.Service Vessel = x.Name, ETD = "", ATD = "", + PortDischargeId = "", + PortDischarge = "" }).Take(20).ToList(); foreach (var item in ves) { From 77cd71399020c262f834338560517ef89c5edc8a Mon Sep 17 00:00:00 2001 From: jianghaiqing Date: Tue, 18 Apr 2023 16:58:59 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B4=BE=E8=BD=A6?= =?UTF-8?q?=E4=BF=9D=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Myshipping.Application/Entity/BookingTruck.cs | 6 +++--- .../Service/BookingTruck/BookingTruckService.cs | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Myshipping.Application/Entity/BookingTruck.cs b/Myshipping.Application/Entity/BookingTruck.cs index 85ea64bc..98d2adcd 100644 --- a/Myshipping.Application/Entity/BookingTruck.cs +++ b/Myshipping.Application/Entity/BookingTruck.cs @@ -14,7 +14,7 @@ namespace Myshipping.Application.Entity /// /// 订舱ID /// - [Description("车队ID")] + [Description("订舱ID")] public Nullable BookingId { get; set; } /// /// 车队ID @@ -27,9 +27,9 @@ namespace Myshipping.Application.Entity [Description("车队代码")] public string TruckCode { get; set; } /// - /// 车队代码 + /// 车队名称 /// - [Description("车队代码")] + [Description("车队名称")] public string TruckName { get; set; } /// /// TO diff --git a/Myshipping.Application/Service/BookingTruck/BookingTruckService.cs b/Myshipping.Application/Service/BookingTruck/BookingTruckService.cs index c688c07a..c02f7ee5 100644 --- a/Myshipping.Application/Service/BookingTruck/BookingTruckService.cs +++ b/Myshipping.Application/Service/BookingTruck/BookingTruckService.cs @@ -99,7 +99,7 @@ namespace Myshipping.Application { _bookingTruckRepository.Insert(entity); - if (entityCtnList.Count > 0) + if (entityCtnList != null && entityCtnList.Count > 0) { entityCtnList.ForEach(async ctn => { @@ -124,7 +124,7 @@ namespace Myshipping.Application it.TruckCode, }).ExecuteCommandAsync(); - if (entityCtnList.Count > 0) + if (entityCtnList != null && entityCtnList.Count > 0) { entityCtnList.ForEach(async ctn => { From 9ef165348751b4ba82f4787fdb00223bed726ce1 Mon Sep 17 00:00:00 2001 From: wet <1034391973@qq.com> Date: Tue, 18 Apr 2023 17:03:10 +0800 Subject: [PATCH 3/3] 11 --- Myshipping.Core/Service/CommonDB/CommonDBService.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/Myshipping.Core/Service/CommonDB/CommonDBService.cs b/Myshipping.Core/Service/CommonDB/CommonDBService.cs index c20bd316..f8660a39 100644 --- a/Myshipping.Core/Service/CommonDB/CommonDBService.cs +++ b/Myshipping.Core/Service/CommonDB/CommonDBService.cs @@ -1515,6 +1515,7 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie /// /// 查询条件 /// + [HttpGet("/commondb/CodeCountryList")] public async Task CodeCountryList([FromQuery] NameQueryDto input) { List list = await _sysCacheService.GetAllCodeCountry();