From a95c4e748b01da8bea6ba0f8e6af9c281bc582d7 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期二, 29 七月 2025 09:22:13 +0800
Subject: [PATCH] 优化日志格式并增强库存查询逻辑在 CommonConveyorLineJob.cs和CommonConveyorLine_GWJob.cs文件中，修改了日志输出格式，添加了时间戳以提高可读性和可追溯性。部分代码中的ToJsonString()方法被替换为 Serialize()方法，以统一序列化方式。与此同时，在 Dt_TaskService.cs文件中增加了库存信息查询逻辑，以确保出库时能够正确处理库存条件，增强系统的健壮性。
---
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