From 8da82c37a072d4f0d148bef3b41c0fc91276b73c Mon Sep 17 00:00:00 2001 From: whm <86whm@163.com> Date: Tue, 18 Jul 2023 09:35:03 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=A2=9E=E5=8A=A0=E6=8F=90=E5=8D=95=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Myshipping.Core/Myshipping.Core.xml | 5 +++++ .../Service/DjyCustomer/Dto/DjyCustomerOutput.cs | 4 ++++ Myshipping.Report/Controllers/ReportController.cs | 8 ++++---- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/Myshipping.Core/Myshipping.Core.xml b/Myshipping.Core/Myshipping.Core.xml index 29e2a6b4..237160c5 100644 --- a/Myshipping.Core/Myshipping.Core.xml +++ b/Myshipping.Core/Myshipping.Core.xml @@ -11111,6 +11111,11 @@ 客服 + + + 提单信息 + + 服务项目 diff --git a/Myshipping.Core/Service/DjyCustomer/Dto/DjyCustomerOutput.cs b/Myshipping.Core/Service/DjyCustomer/Dto/DjyCustomerOutput.cs index 459cfa14..8eb9de90 100644 --- a/Myshipping.Core/Service/DjyCustomer/Dto/DjyCustomerOutput.cs +++ b/Myshipping.Core/Service/DjyCustomer/Dto/DjyCustomerOutput.cs @@ -156,6 +156,10 @@ namespace Myshipping.Core.Service /// public string CUSTSERVICE { get; set; } /// + /// 提单信息 + /// + public string TIDANINFO { get; set; } + /// /// 服务项目 /// public string ServiceItem { get; set; } diff --git a/Myshipping.Report/Controllers/ReportController.cs b/Myshipping.Report/Controllers/ReportController.cs index 73682e78..a09ac03d 100644 --- a/Myshipping.Report/Controllers/ReportController.cs +++ b/Myshipping.Report/Controllers/ReportController.cs @@ -297,10 +297,10 @@ namespace Myshipping.Report.Controllers private string GetBookingJson(long bookingId) { log.Debug($"准备获取订舱数据：{bookingId}"); - var order = sqlSugarClient.Queryable().First(x => x.Id == bookingId); - var ctns = sqlSugarClient.Queryable().Where(x => x.BILLID == bookingId).ToList(); - var bookingEdi = sqlSugarClient.Queryable().First(x => x.BookingId == bookingId); - var letterYard = sqlSugarClient.Queryable().First(x => x.BookingId == bookingId); + var order = sqlSugarClient.Queryable().First(x => x.Id == bookingId && x.IsDeleted == false); + var ctns = sqlSugarClient.Queryable().Where(x => x.BILLID == bookingId && x.IsDeleted == false).ToList(); + var bookingEdi = sqlSugarClient.Queryable().First(x => x.BookingId == bookingId && x.IsDeleted == false); + var letterYard = sqlSugarClient.Queryable().First(x => x.BookingId == bookingId && x.IsDeleted == false); long uid = 0; if (!string.IsNullOrEmpty(order.OPID)) From 0724d1f35e39ee535902521b0e1cbbc9866032bd Mon Sep 17 00:00:00 2001 From: whm <86whm@163.com> Date: Tue, 18 Jul 2023 13:43:12 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=AF=94=E5=AF=B9=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=89=88=E6=9C=AC=E5=8F=B7=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Myshipping.Application/Job/HCDataCompareWorker.cs | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/Myshipping.Application/Job/HCDataCompareWorker.cs b/Myshipping.Application/Job/HCDataCompareWorker.cs index c8b3c8a2..458376a5 100644 --- a/Myshipping.Application/Job/HCDataCompareWorker.cs +++ b/Myshipping.Application/Job/HCDataCompareWorker.cs @@ -71,7 +71,8 @@ namespace Myshipping.Application.Job { x.Id, x.MBLNO, - x.ParentId + x.ParentId, + x.VERSION }) .ToList(); @@ -82,7 +83,8 @@ namespace Myshipping.Application.Job .Select(x => new HCDataCompareSendSubModel { Id = x.Id, - MBLNO = x.MBLNO + MBLNO = x.MBLNO, + VERSION = x.VERSION }) .ToList(); } @@ -98,7 +100,8 @@ namespace Myshipping.Application.Job .Select(x => new HCDataCompareSendModel { Id = x.Id, - MBLNO = x.MBLNO + MBLNO = x.MBLNO, + VERSION = x.VERSION }) .ToList(); @@ -171,6 +174,8 @@ namespace Myshipping.Application.Job public string MBLNO { get; set; } + public string VERSION { get; set; } + public List Sub { get; set; } } @@ -179,5 +184,7 @@ namespace Myshipping.Application.Job public long Id { get; set; } public string MBLNO { get; set; } + + public string VERSION { get; set; } } } From 310ee36f3cab05913f0f6221fb4b5c28235de532 Mon Sep 17 00:00:00 2001 From: jianghaiqing Date: Tue, 18 Jul 2023 17:05:43 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=B4=BE=E8=BD=A6?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=8F=B0=E8=B4=A6=E4=BF=9D=E5=AD=98=E6=96=B9?= =?UTF-8?q?=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TaskManagePlat/Dtos/Truck/TruckPageDto.cs | 32 ++++++++++++ .../TaskManagePlat/TaskManageTruckService.cs | 52 +++++++++++++++++++ 2 files changed, 84 insertions(+) create mode 100644 Myshipping.Application/Service/TaskManagePlat/Dtos/Truck/TruckPageDto.cs diff --git a/Myshipping.Application/Service/TaskManagePlat/Dtos/Truck/TruckPageDto.cs b/Myshipping.Application/Service/TaskManagePlat/Dtos/Truck/TruckPageDto.cs new file mode 100644 index 00000000..100e3d50 --- /dev/null +++ b/Myshipping.Application/Service/TaskManagePlat/Dtos/Truck/TruckPageDto.cs @@ -0,0 +1,32 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Myshipping.Application +{ + /// + /// 派车任务台账保存 + /// + public class TruckPageDto + { + /// + /// 任务主键 + /// + public string TaskPKId { get; set; } + + /// + /// 车队ID + /// + public Nullable TruckId { get; set; } + /// + /// 车队代码 + /// + public string TruckCode { get; set; } + /// + /// 车队代码 + /// + public string TruckName { get; set; } + } +} diff --git a/Myshipping.Application/Service/TaskManagePlat/TaskManageTruckService.cs b/Myshipping.Application/Service/TaskManagePlat/TaskManageTruckService.cs index d3f844fc..45c2c882 100644 --- a/Myshipping.Application/Service/TaskManagePlat/TaskManageTruckService.cs +++ b/Myshipping.Application/Service/TaskManagePlat/TaskManageTruckService.cs @@ -1369,5 +1369,57 @@ namespace Myshipping.Application return rtn; } + /// + /// 派车任务台账保存 + /// + /// 请求详情 + /// 返回回执 + [HttpPost("/TaskManageTruck/SaveTruckByPage")] + public async Task SaveTruckByPage([FromBody] TruckPageDto model) + { + TaskManageOrderResultDto result = new TaskManageOrderResultDto(); + + try + { + var entity = _taskTruckRepository.AsQueryable().First(a => a.TASK_ID == model.TaskPKId); + + if (model == null) + throw Oops.Oh($"派车信息获取失败，派车信息不存在或已作废"); + + //校验 + ValidateTruck(OperateTypeEnum.Save, new TaskTruckInfo[] { entity }); + + entity.TruckId = model.TruckId; + entity.TruckCode = model.TruckCode; + entity.TruckName = model.TruckName; + + entity.UpdatedTime = DateTime.Now; + entity.UpdatedUserId = UserManager.UserId; + entity.UpdatedUserName = UserManager.Name; + + //更新 + await _taskTruckRepository.AsUpdateable(entity).UpdateColumns(it => new + { + it.TruckId, + it.TruckCode, + it.TruckName, + it.UpdatedTime, + it.UpdatedUserId, + it.UpdatedUserName + }).ExecuteCommandAsync(); + + result.succ = true; + result.msg = "保存成功"; + + } + catch (Exception ex) + { + result.succ = false; + result.msg = $"{ex.Message}"; + } + + return result; + } + } }