From 5830c2d6b00af7f966f2abfde558c49e2dddbd5d Mon Sep 17 00:00:00 2001 From: jianghaiqing Date: Fri, 11 Oct 2024 15:20:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E8=AE=A2=E8=88=B1?= =?UTF-8?q?=E5=AE=8C=E8=A7=A6=E5=8F=91=E7=8A=B6=E6=80=81=E6=A0=87=E8=AE=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SeaExportBookingOrClosingEDIService.cs | 5 ++++ .../TaskPlat/Method/TaskManageBCService.cs | 29 ++++++++++--------- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportBookingOrClosingEDIService.cs b/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportBookingOrClosingEDIService.cs index 96010ed6..99ec4925 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportBookingOrClosingEDIService.cs +++ b/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportBookingOrClosingEDIService.cs @@ -1890,6 +1890,11 @@ namespace DS.WMS.Core.Op.Method await seaComService.SetGoodsStatus("JD", req.Id, tenantDb); //await SendBookingOrder(new long[] { req.Id }); } + else + { + //已订舱 + await seaComService.SetGoodsStatus("YDC", req.Id, tenantDb); + } } diff --git a/ds-wms-service/DS.WMS.Core/TaskPlat/Method/TaskManageBCService.cs b/ds-wms-service/DS.WMS.Core/TaskPlat/Method/TaskManageBCService.cs index 947873de..e77366f9 100644 --- a/ds-wms-service/DS.WMS.Core/TaskPlat/Method/TaskManageBCService.cs +++ b/ds-wms-service/DS.WMS.Core/TaskPlat/Method/TaskManageBCService.cs @@ -1746,25 +1746,26 @@ namespace DS.WMS.Core.TaskPlat.Method } else if (bcTaskInfo.TASK_TYPE == TaskBaseTypeEnum.BC_MODIFY.ToString()) { - //CMA没有变更附件，所以转发邮件时默认用原文件转发 - if (bcTaskInfo.CARRIER_CODE.Equals("CMA", StringComparison.OrdinalIgnoreCase)) + ////CMA没有变更附件，所以转发邮件时默认用原文件转发 + //if (bcTaskInfo.CARRIER_CODE.Equals("CMA", StringComparison.OrdinalIgnoreCase)) + //{ + // fileInfo = tenantDb.Queryable().Where(a => a.TASK_PKID == taskBCInfo.TASK_ID && a.FILE_CATEGORY.Contains("BC_MODIFY")) + //.OrderByDescending(a => a.CreateTime).First(); + //} + //else + //{ + + //} + + if (orderInfo.splitOrMergeFlag == 1) { - fileInfo = tenantDb.Queryable().Where(a => a.TASK_PKID == taskBCInfo.TASK_ID && a.FILE_CATEGORY.Contains("BC_MODIFY")) - .OrderByDescending(a => a.CreateTime).First(); + //这里需要按照箱量重新修改变更附件 } else { - if (orderInfo.splitOrMergeFlag == 1) - { - //这里需要按照箱量重新修改变更附件 - } - else - { - fileInfo = tenantDb.Queryable().Where(a => a.TASK_PKID == taskBCInfo.TASK_ID && a.FILE_CATEGORY.Contains("BC_MODIFY_NOTICE")) - .OrderByDescending(a => a.CreateTime).First(); - } + fileInfo = tenantDb.Queryable().Where(a => a.TASK_PKID == taskBCInfo.TASK_ID && a.FILE_CATEGORY.Contains("BC_MODIFY_NOTICE")) + .OrderByDescending(a => a.CreateTime).First(); } - } if (fileInfo == null)