From 92ac88f7e00bbe9c78a1f3b9988262c3b6b83427 Mon Sep 17 00:00:00 2001 From: zhangxiaofeng Date: Mon, 27 Nov 2023 14:37:48 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=A1=A5=E5=85=85=EF=BC=9A=E8=BF=90?= =?UTF-8?q?=E8=B8=AA=E6=95=B0=E6=8D=AE=E6=8E=A5=E6=94=B6=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=9A=E6=9B=B4=E6=96=B0=E6=9F=90=E5=8D=95?= =?UTF-8?q?=E7=9A=84=E7=9B=AE=E7=9A=84=E6=B8=AFeta=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E4=B8=8D=E5=86=8D=E6=9B=B4=E6=96=B0=E5=90=8C=E8=88=B9=E5=90=8D?= =?UTF-8?q?=E3=80=81=E5=90=8C=E8=88=AA=E6=AC=A1=E3=80=81=E5=90=8C=E8=88=B9?= =?UTF-8?q?=E5=85=AC=E5=8F=B8=E7=9A=84eta,ata?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/DataSync/DataSyncService.cs | 33 +++++++++---------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/Myshipping.Application/Service/DataSync/DataSyncService.cs b/Myshipping.Application/Service/DataSync/DataSyncService.cs index 17ce6cf7..a03b64d9 100644 --- a/Myshipping.Application/Service/DataSync/DataSyncService.cs +++ b/Myshipping.Application/Service/DataSync/DataSyncService.cs @@ -2423,23 +2423,22 @@ namespace Myshipping.Application } - if (!string.IsNullOrEmpty(o.VESSEL) && !string.IsNullOrEmpty(o.VOYNO) && !string.IsNullOrEmpty(o.CARRIERID)) - { - var order = await _rep.AsQueryable().Filter(null, true).Where(x => x.VOYNO == o.VOYNO && x.VESSEL == o.VESSEL && x.CARRIERID == o.CARRIERID && x.TenantId == o.TenantId && x.IsDeleted == false && x.Id != item.BookingId).ToListAsync(); - - foreach (var it in order) - { - var _oldorder = it; - var _oldatd = it.ETA; - if (_oldatd != item.OpTime) - { - it.ETA = item.OpTime; - await _rep.UpdateAsync(it); - await _bookingorderservice.SendBookingOrder(new long[] { it.Id }); - await _bookingorderservice.SaveLog(it, _oldorder); - } - } - } + //if (!string.IsNullOrEmpty(o.VESSEL) && !string.IsNullOrEmpty(o.VOYNO) && !string.IsNullOrEmpty(o.CARRIERID)) + //{ + // var order = await _rep.AsQueryable().Filter(null, true).Where(x => x.VOYNO == o.VOYNO && x.VESSEL == o.VESSEL && x.CARRIERID == o.CARRIERID && x.TenantId == o.TenantId && x.IsDeleted == false && x.Id != item.BookingId).ToListAsync(); + // foreach (var it in order) + // { + // var _oldorder = it; + // var _oldatd = it.ETA; + // if (_oldatd != item.OpTime) + // { + // it.ETA = item.OpTime; + // await _rep.UpdateAsync(it); + // await _bookingorderservice.SendBookingOrder(new long[] { it.Id }); + // await _bookingorderservice.SaveLog(it, _oldorder); + // } + // } + //} } if (item.Status == "MDGATA") { From 05eb602fc1566705e716b62d544a33292072b803 Mon Sep 17 00:00:00 2001 From: zhangxiaofeng Date: Mon, 27 Nov 2023 18:16:48 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=BF=AB=E9=80=92=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=EF=BC=9A=E4=BC=98=E5=8C=96=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ExpressDelivery/Dto/ExpressDeliveryDto.cs | 31 +++++++++---------- .../ExpressDelivery/ExpressDeliveryService.cs | 20 ++++++------ 2 files changed, 24 insertions(+), 27 deletions(-) diff --git a/Myshipping.Application/Service/ExpressDelivery/Dto/ExpressDeliveryDto.cs b/Myshipping.Application/Service/ExpressDelivery/Dto/ExpressDeliveryDto.cs index 56349d44..f7f61637 100644 --- a/Myshipping.Application/Service/ExpressDelivery/Dto/ExpressDeliveryDto.cs +++ b/Myshipping.Application/Service/ExpressDelivery/Dto/ExpressDeliveryDto.cs @@ -31,6 +31,7 @@ namespace Myshipping.Application.Service.ExpressDelivery.Dto /// /// 快递公司 /// + [Required(ErrorMessage = "快递公司不能为空")] public string KDCompany { get; set; } /// @@ -49,10 +50,12 @@ namespace Myshipping.Application.Service.ExpressDelivery.Dto /// /// 收件省份Id /// + [Required(ErrorMessage = "收件省份不能为空")] public string SJProvinceId { get; set; } /// /// 收件城市 /// + [Required(ErrorMessage = "收件城市不能为空")] public string SJCity { get; set; } /// /// 收件地址 @@ -60,45 +63,39 @@ namespace Myshipping.Application.Service.ExpressDelivery.Dto [Required(ErrorMessage = "收件人地址不能为空")] public string SJAddress { get; set; } /// - /// 收件邮编 - /// - public string SJPostCode { get; set; } - /// /// 收件电话 /// [Required(ErrorMessage = "收件人电话不能为空")] public string SJTel { get; set; } /// - /// 发件公司 + /// 寄件公司 /// public string FJCompany { get; set; } /// - /// 发件人 + /// 寄件人 /// - [Required(ErrorMessage = "发件人不能为空")] + [Required(ErrorMessage = "寄件人不能为空")] public string FJPeople { get; set; } /// - /// 发件省份 + /// 寄件省份 /// + [Required(ErrorMessage = "寄件省份不能为空")] public string FJProvince { get; set; } /// - /// 发件省份ID + /// 寄件省份ID /// public string FJProvinceId { get; set; } /// - /// 发件城市 + /// 寄件城市 /// + [Required(ErrorMessage = "寄件城市不能为空")] public string FJCity { get; set; } /// - /// 发件地址 + /// 寄件地址 /// - [Required(ErrorMessage = "发件人地址不能为空")] + [Required(ErrorMessage = "寄件详细地址不能为空")] public string FJAddress { get; set; } /// - /// 发件邮编 - /// - public string FJPostCode { get; set; } - /// /// 发件电话 /// [Required(ErrorMessage = "发件人电话不能为空")] @@ -150,7 +147,7 @@ namespace Myshipping.Application.Service.ExpressDelivery.Dto /// /// 结费类型代码；1：现结；2：月结；3：到付 /// - [Required(ErrorMessage = "结费类型代码不能为空")] + [Required(ErrorMessage = "结费类型不能为空")] public string SettleAccountsTypeCode { get; set; } /// /// 月结卡号 diff --git a/Myshipping.Application/Service/ExpressDelivery/ExpressDeliveryService.cs b/Myshipping.Application/Service/ExpressDelivery/ExpressDeliveryService.cs index 75350951..e98be945 100644 --- a/Myshipping.Application/Service/ExpressDelivery/ExpressDeliveryService.cs +++ b/Myshipping.Application/Service/ExpressDelivery/ExpressDeliveryService.cs @@ -33,8 +33,8 @@ namespace Myshipping.Application private const string STATUS_ASSOCIATION = "关联快递订单"; private const string STATUS_DISASSOCIATION = "取消关联快递订单"; private const string STATUS_DELETE = "关联快递订单已删除"; - private const string STATUS_SEND = "快递下单"; - private const string STATUS_CANCEL = "快递消单"; + private const string STATUS_SEND = "快递已下单"; + private const string STATUS_CANCEL = "快递已消单"; private readonly ILogger _logger; private readonly ISysCacheService _cache; @@ -75,14 +75,14 @@ namespace Myshipping.Application var entities = await _orderRep.AsQueryable().Filter(null, true) .Where(x => x.TenantId == UserManager.TENANT_ID && x.IsDeleted == false) .WhereIF(!string.IsNullOrWhiteSpace(input.KDNO), u => u.KDNO.Contains(input.KDNO)) - .WhereIF(!string.IsNullOrWhiteSpace(input.SJCompany), u => u.KDNO.Contains(input.SJCompany)) - .WhereIF(!string.IsNullOrWhiteSpace(input.SJPeople), u => u.KDNO.Contains(input.SJPeople)) - .WhereIF(!string.IsNullOrWhiteSpace(input.SJTel), u => u.KDNO.Contains(input.SJTel)) - .WhereIF(!string.IsNullOrWhiteSpace(input.FJCompany), u => u.KDNO.Contains(input.FJCompany)) - .WhereIF(!string.IsNullOrWhiteSpace(input.FJPeople), u => u.KDNO.Contains(input.FJPeople)) - .WhereIF(!string.IsNullOrWhiteSpace(input.FJTel), u => u.KDNO.Contains(input.FJTel)) - .WhereIF(!string.IsNullOrWhiteSpace(input.VESSEL), u => u.KDNO.Contains(input.VESSEL)) - .WhereIF(!string.IsNullOrWhiteSpace(input.VOYNO), u => u.KDNO.Contains(input.VOYNO)) + .WhereIF(!string.IsNullOrWhiteSpace(input.SJCompany), u => u.SJCompany.Contains(input.SJCompany)) + .WhereIF(!string.IsNullOrWhiteSpace(input.SJPeople), u => u.SJPeople.Contains(input.SJPeople)) + .WhereIF(!string.IsNullOrWhiteSpace(input.SJTel), u => u.SJTel.Contains(input.SJTel)) + .WhereIF(!string.IsNullOrWhiteSpace(input.FJCompany), u => u.FJCompany.Contains(input.FJCompany)) + .WhereIF(!string.IsNullOrWhiteSpace(input.FJPeople), u => u.FJPeople.Contains(input.FJPeople)) + .WhereIF(!string.IsNullOrWhiteSpace(input.FJTel), u => u.FJTel.Contains(input.FJTel)) + .WhereIF(!string.IsNullOrWhiteSpace(input.VESSEL), u => u.VESSEL.Contains(input.VESSEL)) + .WhereIF(!string.IsNullOrWhiteSpace(input.VOYNO), u => u.VOYNO.Contains(input.VOYNO)) .WhereIF(input.BDate != null, u => u.Date >= input.BDate) .WhereIF(input.EDate != null, u => u.Date <= input.EDate) .OrderBy(PageInputOrder.OrderBuilder(input.SortField, input.DescSort)) From 5051c9c07547d830e3f089193dd1726210a7b4fb Mon Sep 17 00:00:00 2001 From: jianghaiqing Date: Thu, 30 Nov 2023 10:14:35 +0800 Subject: [PATCH 3/3] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9=E6=B4=BE?= =?UTF-8?q?=E8=BD=A6=E5=8E=BB=E6=8E=89=E8=AE=A2=E5=8D=95booking=5Forder?= =?UTF-8?q?=E7=9A=84VERSION=E7=9A=84=E6=9B=B4=E6=96=B0=E5=8A=A8=E4=BD=9C?= =?UTF-8?q?=202=E3=80=81=E4=BF=AE=E6=94=B9=E6=9C=8D=E5=8A=A1=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=92=8C=E7=8A=B6=E6=80=81=E5=8E=BB=E6=8E=89VERSION?= =?UTF-8?q?=E7=9A=84=E8=B5=8B=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/BookingOrder/BookingOrderService.cs | 4 ++-- .../Service/BookingTruck/BookingTruckService.cs | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs index fcf30ec8..eca497b8 100644 --- a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs +++ b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs @@ -9645,7 +9645,7 @@ namespace Myshipping.Application .First(a => a.Id == bookingId); model.BSSTATUSNAME = maxStatus.ShowName; - model.VERSION = IDGen.NextID().ToString().Replace("-", ""); + //model.VERSION = IDGen.NextID().ToString().Replace("-", ""); //更新订舱 _rep.AsUpdateable(model) @@ -9744,7 +9744,7 @@ namespace Myshipping.Application model.BSSTATUSNAME = string.Empty; } - model.VERSION = IDGen.NextID().ToString().Replace("-", ""); + //model.VERSION = IDGen.NextID().ToString().Replace("-", ""); //更新订舱 _rep.AsUpdateable(model) diff --git a/Myshipping.Application/Service/BookingTruck/BookingTruckService.cs b/Myshipping.Application/Service/BookingTruck/BookingTruckService.cs index d576c51e..0e7cd3ac 100644 --- a/Myshipping.Application/Service/BookingTruck/BookingTruckService.cs +++ b/Myshipping.Application/Service/BookingTruck/BookingTruckService.cs @@ -1946,13 +1946,13 @@ namespace Myshipping.Application bookingOrder.TRUCKERID = null; bookingOrder.TRUCKER = null; - bookingOrder.VERSION = IDGen.NextID().ToString().Replace("-", ""); + //bookingOrder.VERSION = IDGen.NextID().ToString().Replace("-", ""); _bookingOrderRepository.AsUpdateable(bookingOrder).UpdateColumns(it => new { it.TRUCKERID, it.TRUCKER, - it.VERSION + //it.VERSION }).ExecuteCommand(); var syncDongshengRlt = await _bookingOrderService.SendBookingOrder(new long[] { bookingTruckInfo.BookingId.Value }); @@ -1978,13 +1978,13 @@ namespace Myshipping.Application bookingOrder.TRUCKERID = info.TruckCode; bookingOrder.TRUCKER = info.TruckName; - bookingOrder.VERSION = IDGen.NextID().ToString().Replace("-", ""); + //bookingOrder.VERSION = IDGen.NextID().ToString().Replace("-", ""); _bookingOrderRepository.AsUpdateable(bookingOrder).UpdateColumns(it => new { it.TRUCKERID, it.TRUCKER, - it.VERSION + //it.VERSION }).ExecuteCommand(); //这里直接调用订舱服务的功能，担心有异常所以这里单独做了异常捕获