From a8be8f9371b6fc03b66d212b2902d08f93b087dd Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期三, 02 七月 2025 13:55:55 +0800
Subject: [PATCH] 新增任务查询方法并优化逻辑在 `ITaskService.cs` 中添加了新的 `QueryExecutingConveyorLineTask` 方法，支持根据托盘号和下一地址查询任务，同时调整了原有方法的参数以保留旧功能。在 `TaskService.cs` 中新增重载方法，允许根据下一地址和条形码查询任务。在 `CommonConveyorLine_GWJob.cs` 中更新了 `ConveyorLineOutFinish` 方法，简化了任务查询逻辑并删除了多余的注释代码。同时，增加了对 `taskNext` 的处理逻辑，确保在任务未找到时的相应处理，并更新在途数据的逻辑，提升数据一致性和准确性。
---
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MCS/Partial/RequsetCellInfo.cs | 27 +++++++++++++++++++++++----
1 files changed, 23 insertions(+), 4 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 7e287d0..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
{
@@ -23,19 +26,35 @@
{
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)
{
LogFactory.GetLog("鍒嗗鑾峰彇搴撲綅鎵樼洏").Info(true, $"\r\r--------------------------------------");
- LogFactory.GetLog("鍒嗗鑾峰彇搴撲綅鎵樼洏锛�").Info(true, result);
+ LogFactory.GetLog("鍒嗗鑾峰彇搴撲綅鎵樼洏").Info(true, result.ToJsonString());
return new { code = 1, palletBarcode = info.PalletCode };
}
else
{
- return new { code = 0, palletBarcode = "",message="搴撲綅鏃犲簱瀛樿褰�" };
+ return new { code = 0, palletBarcode = "", message = "搴撲綅鏃犲簱瀛樿褰�" };
}
}
--
Gitblit v1.9.3