From 554ebff8616f1ed2fc578cde80642791cfaff476 Mon Sep 17 00:00:00 2001 From: wangxinhui <wangxinhui@hnkhzn.com> Date: 星期四, 02 一月 2025 09:29:04 +0800 Subject: [PATCH] 出库完成等代码更新 --- 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/MesTaskService.cs | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/MesTaskService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/MesTaskService.cs" index 562fae5..55e6f47 100644 --- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/MesTaskService.cs" +++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/MesTaskService.cs" @@ -87,7 +87,7 @@ _recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(locationInfo, locationStatus, LocationChangeType.OutboundAssignLocation, stockInfo.Details.FirstOrDefault()?.OrderNo ?? "", taskOut.TaskNum); _unitOfWorkManage.CommitTran(); //灏嗕换鍔℃帹閫佸埌WCS - WebResponseContent content = PushTasksToWCS(new List<Dt_Task>() { taskOut }, "AGV"); + PushTasksToWCS(new List<Dt_Task>() { taskOut }, "AGV"); responseContent.OK(); } catch (Exception ex) @@ -138,11 +138,7 @@ BaseDal.AddData(taskIn); _stockRepository.StockInfoRepository.UpdateData(stockInfo); //灏嗕换鍔℃帹閫佸埌WCS - WebResponseContent content = PushTasksToWCS(new List<Dt_Task>() { taskIn }, "AGV"); ; - if (!content.Status) - { - return responseContent.Error(); - } + PushTasksToWCS(new List<Dt_Task>() { taskIn }, "AGV"); ; responseContent.OK(); } catch (Exception ex) @@ -171,16 +167,18 @@ List<Dt_StockInfoDetail> stockInfoDetails = new List<Dt_StockInfoDetail>(); foreach (var item in toolScraps.ToolCodes) { - Dt_StockInfo stockInfo = stockInfos.Find(x => x.Details.Any(x => x.BatchNo == item)); + Dt_StockInfo? stockInfo = stockInfos.FirstOrDefault(x => x.Details.Any(x => x.BatchNo == item)); if (stockInfo == null) { return responseContent.Error($"{item}搴撳瓨淇℃伅涓嶅瓨鍦�"); } stockInfoUpdates.Add(stockInfo); + stockInfoDetails.Add(stockInfo.Details.FirstOrDefault()); } //娓呴櫎搴撳瓨淇℃伅 _unitOfWorkManage.BeginTran(); _stockRepository.StockInfoRepository.DeleteAndMoveIntoHty(stockInfoUpdates, OperateTypeEnum.鑷姩鍒犻櫎); + _stockService.StockInfoDetailService.Repository.DeleteAndMoveIntoHty(stockInfoDetails,OperateTypeEnum.鑷姩鍒犻櫎); _unitOfWorkManage.CommitTran(); responseContent.OK($"鎶ュ簾鎴愬姛"); } -- Gitblit v1.9.3