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 6cc08fe0..cee6a422 100644 --- a/ds-wms-service/DS.WMS.Core/TaskPlat/Method/TaskManageBCService.cs +++ b/ds-wms-service/DS.WMS.Core/TaskPlat/Method/TaskManageBCService.cs @@ -1146,11 +1146,14 @@ namespace DS.WMS.Core.TaskPlat.Method Id = x.Id, MBLNO = x.MBLNO, ContractNo = x.ContractNo, + + ETD = x.ETD, Vessel = x.Vessel, Voyno = x.Voyno, + DischargePort = x.DischargePort, - Destination = x.Destination, - ETD = x.ETD, + LoadPort = x.LoadPort, + ReeferQuantity = x.ReeferQuantity, TemperatureMin = x.TemperatureMin, TemperatureMax = x.TemperatureMax, @@ -1159,7 +1162,7 @@ namespace DS.WMS.Core.TaskPlat.Method }).FirstAsync(); if (seaExport == null) { - throw new Exception($"根据提单号:{taskBcInfo.MBL_NO}未查询到海运出口订单信息"); + return DataResult.Failed($"根据订单Id:【{taskBcInfo.BOOKING_ORDER_ID}】未查询到海运出口订单信息"); } var seaExportCtnList = await tenantDb.Queryable().Where(x => x.BSNO == seaExport.Id.ToString()).Select(x => new OpCtn() { @@ -1200,12 +1203,14 @@ namespace DS.WMS.Core.TaskPlat.Method ParserBCInfoDto bcSrcDto = new ParserBCInfoDto() { ContractNo = taskBcInfo.CONTRACTNO, + Vessel = taskBcInfo.VESSEL, VoyNo = taskBcInfo.VOYNO, - - DischargePort = taskBcInfo.PORTDISCHARGE, - Destination = taskBcInfo.PLACEDELIVERY, ETD = taskBcInfo.ETD?.ToString("yyyy-MM-dd"), + + Portload = taskBcInfo.PORTLOAD?.Split(',').FirstOrDefault()?.Trim(), + DischargePort = taskBcInfo.PORTDISCHARGE?.Split(',').FirstOrDefault()?.Trim(), + CtnList = taskBcCtnList.GroupBy(x => x.CTNALL).Select(x => new ParserBCCTNInfoDto { CtnALL = x.Key, @@ -1217,12 +1222,14 @@ namespace DS.WMS.Core.TaskPlat.Method ParserBCInfoDto bcTargetDto = new ParserBCInfoDto() { ContractNo = seaExport.ContractNo, + Vessel = seaExport.Vessel, VoyNo = seaExport.Voyno, - - DischargePort = seaExport.DischargePort, - Destination = seaExport.Destination, ETD = seaExport.ETD?.ToString("yyyy-MM-dd"), + + Portload = seaExport.LoadPort?.Split(',').FirstOrDefault()?.Trim(), + DischargePort = seaExport.DischargePort?.Split(',').FirstOrDefault()?.Trim(), + CtnList = seaExportCtnList.GroupBy(x => x.CtnAll).Select(x => new ParserBCCTNInfoDto { CtnALL = x.Key, @@ -1335,6 +1342,12 @@ namespace DS.WMS.Core.TaskPlat.Method { dataContext.Set(TaskFlowDataNameConst.BusinessId, seaExportId); taskBcInfo.BOOKING_ORDER_ID = seaExportId; + + await tenantDb.Updateable(taskBcInfo).UpdateColumns(x=>new + { + x.BOOKING_ORDER_ID, + }).ExecuteCommandAsync(); + return DataResult.Successed("匹配成功", MultiLanguageConst.OperationSuccess); } else