From 8e2d6de4540c86774df77340fde51102b43fb436 Mon Sep 17 00:00:00 2001 From: jianghaiqing Date: Wed, 5 Jul 2023 12:14:59 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B4=BE=E8=BD=A6?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BookingTruck/BookingTruckService.cs | 44 ++++++++++++++++--- 1 file changed, 39 insertions(+), 5 deletions(-) diff --git a/Myshipping.Application/Service/BookingTruck/BookingTruckService.cs b/Myshipping.Application/Service/BookingTruck/BookingTruckService.cs index 8523e280..31bb677e 100644 --- a/Myshipping.Application/Service/BookingTruck/BookingTruckService.cs +++ b/Myshipping.Application/Service/BookingTruck/BookingTruckService.cs @@ -846,9 +846,34 @@ namespace Myshipping.Application throw Oops.Oh($"请求派车调度失败，原因={taskRlt.msg}", typeof(InvalidOperationException)); } - //派车后填写货物状态 - await _bookingOrderService.SetGoodsStatus("YPC", model.Id); - await _bookingOrderService.SendBookingOrder(new long[] { model.Id }); + //这里直接调用订舱服务的功能，担心有异常所以这里单独做了异常捕获 + try + { + //派车后填写货物状态 + await _bookingOrderService.SetGoodsStatus("YPC", model.Id); + + _logger.LogInformation("批次={no} id={id} 更新订舱的货物状态完成", batchNo, model.Id); + } + catch(Exception bkException) + { + _logger.LogInformation("批次={no} id={id} 更新订舱的货物状态 YPC异常，原因：{erro}", batchNo, model.Id, bkException.Message); + } + + //这里直接调用订舱服务的功能，担心有异常所以这里单独做了异常捕获 + try + { + //触发发送东胜 + var currRlt = await _bookingOrderService.SendBookingOrder(new long[] { model.Id }); + + string curMsg = JSON.Serialize(currRlt); + + _logger.LogInformation("批次={no} id={id} 触发发送东胜完成 结果={rlt}", batchNo, model.Id, curMsg); + } + catch (Exception bkException) + { + _logger.LogInformation("批次={no} id={id} 触发发送东胜完成，原因：{erro}", batchNo, model.Id, bkException.Message); + } + //更新派车订单为已提交 model.Status = BookingTruckStatus.SUBMITED.ToString(); model.UpdatedTime = DateTime.Now; @@ -1863,9 +1888,18 @@ namespace Myshipping.Application it.TRUCKER }).ExecuteCommand(); - var syncDongshengRlt = await _bookingOrderService.SendBookingOrder(new long[] { bookingTruckInfo.BookingId.Value }); + //这里直接调用订舱服务的功能，担心有异常所以这里单独做了异常捕获 + try + { + //触发发送东胜 + var syncDongshengRlt = await _bookingOrderService.SendBookingOrder(new long[] { bookingTruckInfo.BookingId.Value }); - _logger.LogInformation($"推送订舱同步东胜完毕，id={bookingTruckInfo.BookingId.Value} rlt={JSON.Serialize(syncDongshengRlt)}"); + _logger.LogInformation($"推送订舱同步东胜完毕，id={bookingTruckInfo.BookingId.Value} rlt={JSON.Serialize(syncDongshengRlt)}"); + } + catch (Exception bkException) + { + _logger.LogInformation("批次={no} id={id} 触发发送东胜完成，原因：{erro}", batchNo, bookingTruckInfo.BookingId.Value, bkException.Message); + } _logger.LogInformation("判断回写需要更新订舱的车队,更新完成"); } From 0cb702a8c3fca1941c11363a4ded96c93288c4da Mon Sep 17 00:00:00 2001 From: jianghaiqing Date: Wed, 5 Jul 2023 13:14:47 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B4=BE=E8=BD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/BookingTruck/BookingTruckService.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Myshipping.Application/Service/BookingTruck/BookingTruckService.cs b/Myshipping.Application/Service/BookingTruck/BookingTruckService.cs index 31bb677e..03b76550 100644 --- a/Myshipping.Application/Service/BookingTruck/BookingTruckService.cs +++ b/Myshipping.Application/Service/BookingTruck/BookingTruckService.cs @@ -850,28 +850,28 @@ namespace Myshipping.Application try { //派车后填写货物状态 - await _bookingOrderService.SetGoodsStatus("YPC", model.Id); + await _bookingOrderService.SetGoodsStatus("YPC", bookingOrder.Id); - _logger.LogInformation("批次={no} id={id} 更新订舱的货物状态完成", batchNo, model.Id); + _logger.LogInformation("批次={no} id={id} 更新订舱的货物状态完成", batchNo, bookingOrder.Id); } catch(Exception bkException) { - _logger.LogInformation("批次={no} id={id} 更新订舱的货物状态 YPC异常，原因：{erro}", batchNo, model.Id, bkException.Message); + _logger.LogInformation("批次={no} id={id} 更新订舱的货物状态 YPC异常，原因：{erro}", batchNo, bookingOrder.Id, bkException.Message); } //这里直接调用订舱服务的功能，担心有异常所以这里单独做了异常捕获 try { //触发发送东胜 - var currRlt = await _bookingOrderService.SendBookingOrder(new long[] { model.Id }); + var currRlt = await _bookingOrderService.SendBookingOrder(new long[] { bookingOrder.Id }); string curMsg = JSON.Serialize(currRlt); - _logger.LogInformation("批次={no} id={id} 触发发送东胜完成 结果={rlt}", batchNo, model.Id, curMsg); + _logger.LogInformation("批次={no} id={id} 触发发送东胜完成 结果={rlt}", batchNo, bookingOrder.Id, curMsg); } catch (Exception bkException) { - _logger.LogInformation("批次={no} id={id} 触发发送东胜完成，原因：{erro}", batchNo, model.Id, bkException.Message); + _logger.LogInformation("批次={no} id={id} 触发发送东胜完成，原因：{erro}", batchNo, bookingOrder.Id, bkException.Message); } //更新派车订单为已提交 From 20273a0d214d69dacf6b5d09e98f703b7f699b93 Mon Sep 17 00:00:00 2001 From: jianghaiqing Date: Wed, 5 Jul 2023 14:12:11 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/TrackingSystem/ServiceProjectService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Myshipping.Application/Service/TrackingSystem/ServiceProjectService.cs b/Myshipping.Application/Service/TrackingSystem/ServiceProjectService.cs index 3d3da575..52ca64a2 100644 --- a/Myshipping.Application/Service/TrackingSystem/ServiceProjectService.cs +++ b/Myshipping.Application/Service/TrackingSystem/ServiceProjectService.cs @@ -257,7 +257,7 @@ namespace Myshipping.Application /// /// 服务项目主键数组 /// 返回回执 - [HttpGet("/ServiceProject/SetUnEnable")] + [HttpPost("/ServiceProject/SetUnEnable")] public async Task SetUnEnable([FromBody] string[] pkIds) { TaskManageOrderResultDto result = new TaskManageOrderResultDto();