From 31eba6a8c6261adf5bfef4dafad4dc8efc1f66a2 Mon Sep 17 00:00:00 2001 From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com> Date: 星期二, 18 二月 2025 18:57:54 +0800 Subject: [PATCH] 1 --- Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MCS/Partial/RequsetCellInfo.cs | 40 ++++++++++++++++++++++++++++++++++------ 1 files changed, 34 insertions(+), 6 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 340e770..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 @@ -1,4 +1,5 @@ -锘縰sing Newtonsoft.Json; +锘縰sing Masuit.Tools; +using Newtonsoft.Json; using System; using System.Collections.Generic; using System.Linq; @@ -6,6 +7,8 @@ using System.Threading.Tasks; using WIDESEA_Core; using WIDESEA_DTO; +using WIDESEA_IBusinessesRepository; +using WIDESEA_Repository; namespace WIDESEA_StoragIntegrationServices { @@ -16,23 +19,48 @@ /// </summary> /// <param name="json"></param> /// <returns></returns> - public WebResponseContent RequsetCellInfo(object json) + public object RequsetCellInfo(object json) { WebResponseContent content = new WebResponseContent(); try { 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()); - //_stockInfoRepository.QueryFirst(x=>x.LocationCode == result.LocationID && x) - //todo + var area = _areaInfoRepository.QueryFirst(x => x.AreaID == result.LocationArea); - return content.OK(); + var info = _stockInfoRepository.QueryFirst(x => x.LocationCode == result.LocationID && x.AreaCode == area.AreaCode); + //todo + if (info != null) + { + LogFactory.GetLog("鍒嗗鑾峰彇搴撲綅鎵樼洏").Info(true, $"\r\r--------------------------------------"); + LogFactory.GetLog("鍒嗗鑾峰彇搴撲綅鎵樼洏").Info(true, result.ToJsonString()); + return new { code = 1, palletBarcode = info.PalletCode }; + } + else + { + return new { code = 0, palletBarcode = "", message = "搴撲綅鏃犲簱瀛樿褰�" }; + } + } catch (Exception ex) { - return content.Error(ex.Message); + return new { code = 0, palletBarcode = "", message = ex.Message }; } } } -- Gitblit v1.9.3