From b2f89f56e9c6e1fa536aa3134b7a4072bb850652 Mon Sep 17 00:00:00 2001 From: wet <1034391973@qq.com> Date: Mon, 14 Aug 2023 11:16:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=9C=E8=83=9C=E5=B0=81=E8=B4=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entity/BookingExtendState.cs | 4 ++ .../Enum/BookingErrorCode.cs | 6 +++ .../BookingOrder/BookingOrderService.cs | 4 +- .../Service/DataSync/DataSyncService.cs | 43 ++++++++++++++++++- .../Service/DataSync/Dto/BookingOrderLock.cs | 23 ++++++++++ 5 files changed, 78 insertions(+), 2 deletions(-) create mode 100644 Myshipping.Application/Service/DataSync/Dto/BookingOrderLock.cs diff --git a/Myshipping.Application/Entity/BookingExtendState.cs b/Myshipping.Application/Entity/BookingExtendState.cs index e3eec2da..38a5d6e5 100644 --- a/Myshipping.Application/Entity/BookingExtendState.cs +++ b/Myshipping.Application/Entity/BookingExtendState.cs @@ -42,5 +42,9 @@ namespace Myshipping.Application.Entity public int print { get; set; } + /// + /// 是否封账 + /// + public bool IsLockBooking { get; set; } } } diff --git a/Myshipping.Application/Enum/BookingErrorCode.cs b/Myshipping.Application/Enum/BookingErrorCode.cs index f308728e..2db39cb4 100644 --- a/Myshipping.Application/Enum/BookingErrorCode.cs +++ b/Myshipping.Application/Enum/BookingErrorCode.cs @@ -144,6 +144,12 @@ namespace Myshipping.Application.Enum /// [ErrorCodeItemMetadata("附件不存在")] BOOK200, + + /// + /// 请上传正确数据 + /// + [ErrorCodeItemMetadata("请上传正确数据")] + BOOK201, #endregion } } diff --git a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs index 72b7cb17..e9b37587 100644 --- a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs +++ b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs @@ -926,7 +926,7 @@ namespace Myshipping.Application entity.VOYNO = entity.VOYNOINNER; } entity.VERSION = Guid.NewGuid().ToString(); - + //判断如果船名航次船公司变动 同步更新船期字段 if (entity.CARRIERID != mlist.CARRIERID || entity.VOYNO != mlist.VOYNO || entity.VESSEL != mlist.VESSEL) { var vess = await _vesselInfo.AsQueryable().Filter(null, true).Where(x => x.IsDeleted == false && x.TenantId == UserManager.TENANT_ID && x.CARRIERID == entity.CARRIERID && @@ -978,6 +978,7 @@ namespace Myshipping.Application it.ATA }).ExecuteCommandAsync(); var ctnlist = await _repCtn.AsQueryable().Filter(null, true).Where(x => x.BILLID == input.Id && x.IsDeleted == false).Select(x => x.Id).ToListAsync(); + //删除箱信息 重新插入 await _repCtn.DeleteAsync(x => x.BILLID == input.Id); await _ctndetailrep.DeleteAsync(x => ctnlist.Contains((long)x.CTNID)); if (input.ctnInputs != null) @@ -9235,6 +9236,7 @@ HLCUTA12307DPXJ3 以这票为例 6个柜 extends.noApply = noApply; extends.applyNoPrint = applyNoPrint; extends.print = print; + extends.IsLockBooking = false; await _repextendstate.InsertAsync(extends); } else diff --git a/Myshipping.Application/Service/DataSync/DataSyncService.cs b/Myshipping.Application/Service/DataSync/DataSyncService.cs index bf707322..61ff6bf4 100644 --- a/Myshipping.Application/Service/DataSync/DataSyncService.cs +++ b/Myshipping.Application/Service/DataSync/DataSyncService.cs @@ -75,6 +75,7 @@ namespace Myshipping.Application private readonly SqlSugarRepository _statuslogdetail; private readonly SqlSugarRepository _repBookingStatus; private readonly IBookingOrderService _bookingorderservice; + private readonly SqlSugarRepository _bookingextstate; public DataSyncService(ILogger logger, ISysCacheService cache, SqlSugarRepository rep, SqlSugarRepository repCtn, @@ -83,7 +84,7 @@ namespace Myshipping.Application SqlSugarRepository djycustomercontact, SqlSugarRepository vesselinfo, SqlSugarRepository ctndetailrep , SqlSugarRepository bookingEDIExt, SqlSugarRepository bookinglog, SqlSugarRepository bookinglogdetail, SqlSugarRepository goodsStatus, SqlSugarRepository goodsStatusConfig, SqlSugarRepository repline, - SqlSugarRepository bookingremark, SqlSugarRepository mapcarrier, SqlSugarRepository codeForwarder, + SqlSugarRepository bookingremark, SqlSugarRepository mapcarrier, SqlSugarRepository codeForwarder, SqlSugarRepository bookingextstate, SqlSugarRepository codePortRep, SqlSugarRepository codeLaneRep, ICommonDBService commonDBService, SqlSugarRepository relaPortLane, SqlSugarRepository accountconfig, SqlSugarRepository bookingfile, IBookingOrderService bookingorderservice) { @@ -116,6 +117,7 @@ namespace Myshipping.Application this._repStatuslog = statuslog; this._statuslogdetail = statuslogdetail; this._repBookingStatus = repBookingStatus; + this._bookingextstate = bookingextstate; } @@ -2585,6 +2587,45 @@ namespace Myshipping.Application } } + + + /// + /// 东胜封账 + /// + /// + /// + [SqlSugarUnitOfWork] + [HttpPost("/DataSync/SaveBookingOrderLock"), ApiUser(ApiCode = "SaveBookingOrderLock")] + public async Task SaveBookingOrderLock(List dto) { + if (dto==null) { + throw Oops.Bah(BookingErrorCode.BOOK201); + + } + foreach (var item in dto) + { + + var extends = _bookingextstate.FirstOrDefault(x => x.bookingId == item.BookingId); + + if (extends == null) + { + extends.bookingId = item.BookingId; + extends.IsLockBooking = item.LockStatus; + await _bookingextstate.InsertAsync(extends); + } + else + { + extends.IsLockBooking = item.LockStatus; + await _bookingextstate.AsUpdateable(extends).IgnoreColumns().ExecuteCommandAsync(); + } + } + } + + + + + + + #endregion } } diff --git a/Myshipping.Application/Service/DataSync/Dto/BookingOrderLock.cs b/Myshipping.Application/Service/DataSync/Dto/BookingOrderLock.cs new file mode 100644 index 00000000..f7fe0865 --- /dev/null +++ b/Myshipping.Application/Service/DataSync/Dto/BookingOrderLock.cs @@ -0,0 +1,23 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Myshipping.Application.Service.DataSync.Dto +{ + public class BookingOrderLock + { + ///// + ///// 主键 + ///// + public long BookingId { get; set; } + + + + /// + /// 锁定状态 false 解锁 true 锁定 + /// + public bool LockStatus { get; set; } + } +}