From e8042fe43a178ca26fe4fe4f8cf5dedbfc9910fd Mon Sep 17 00:00:00 2001 From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com> Date: 星期四, 03 七月 2025 10:50:24 +0800 Subject: [PATCH] 更新任务查询逻辑以包含条形码在CommonConveyorLineJob.cs和 CommonConveyorLine_GWJob.cs文件中,修改了多个任务查询方法,现支持使用任务号、子设备代码和条形码进行查询。这一改动旨在提高任务查询的准确性。同时,移除了不再需要的注释代码行。 --- Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MCS/Partial/RequsetCellInfo.cs | 22 ++++++++++++++++++++-- 1 files changed, 20 insertions(+), 2 deletions(-) diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MCS/Partial/RequsetCellInfo.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MCS/Partial/RequsetCellInfo.cs index 9ec1468..fde68ec 100644 --- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MCS/Partial/RequsetCellInfo.cs +++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MCS/Partial/RequsetCellInfo.cs @@ -7,6 +7,8 @@ using System.Threading.Tasks; using WIDESEA_Core; using WIDESEA_DTO; +using WIDESEA_IBusinessesRepository; +using WIDESEA_Repository; namespace WIDESEA_StoragIntegrationServices { @@ -24,9 +26,25 @@ { if (string.IsNullOrEmpty(json.ToString())) throw new Exception("涓婁紶鍙傛暟涓虹┖"); + + //var result = JsonConvert.DeserializeObject<RequsetCellInfo>(json.ToString()); + + ////var area = _areaInfoRepository.QueryFirst(x => x.AreaID == result.LocationArea); + + //var location = _locationRepository.QueryFirst(x => x.LocationCode == result.LocationID && x.AreaId == result.LocationArea); + + //if (location != null) + //{ + // throw new Exception("璇锋眰寮傚父锛氭湭鐭ュ簱浣�"); + //} + + //var info = _stockInfoRepository.QueryFirst(x => x.LocationCode == result.LocationID && x.LocationId == location.Id); + var result = JsonConvert.DeserializeObject<RequsetCellInfo>(json.ToString()); - var info = _stockInfoRepository.QueryFirst(x => x.LocationCode == result.LocationID); + var area = _areaInfoRepository.QueryFirst(x => x.AreaID == result.LocationArea); + + var info = _stockInfoRepository.QueryFirst(x => x.LocationCode == result.LocationID && x.AreaCode == area.AreaCode); //todo if (info != null) { @@ -36,7 +54,7 @@ } else { - return new { code = 0, palletBarcode = "",message="搴撲綅鏃犲簱瀛樿褰�" }; + return new { code = 0, palletBarcode = "", message = "搴撲綅鏃犲簱瀛樿褰�" }; } } -- Gitblit v1.9.3