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_StorageBasicServices/Boxing/BoxingInfoService.cs | 34 ++++++++++++----------------------
1 files changed, 12 insertions(+), 22 deletions(-)
diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Boxing/BoxingInfoService.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Boxing/BoxingInfoService.cs
index 2ec48b9..79d8610 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Boxing/BoxingInfoService.cs
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Boxing/BoxingInfoService.cs
@@ -12,38 +12,28 @@
public async Task<WebResponseContent> AddBoxingInfoAsync(DtBoxingInfo boxingInfo)
{
WebResponseContent content = new WebResponseContent();
- // 楠岃瘉妯″瀷閲岄潰鏁版嵁鏄惁鍚堟硶锛屽鏋滀笉鍚堟硶鎶涘嚭寮傚父
- var errors = ValidateModel(boxingInfo);
- if (errors.Count > 0)
+ var info = await BaseDal.QueryFirstAsync(x => x.PalletCode == boxingInfo.PalletCode);
+ if (!info.IsNullOrEmpty())
{
- foreach (var error in errors)
- {
- Console.WriteLine(error.ErrorMessage);
-
- }
- string errorMessage = string.Join(",", errors.Select(e => e.ErrorMessage));
- content.Error(errorMessage);
+ content.Error("璇ユ墭鐩樺凡瀛樺湪缁勭洏");
}
else
{
- var info = await BaseDal.QueryFirstAsync(x=>x.PalletCode == boxingInfo.PalletCode);
- if (!info.IsNullOrEmpty())
+ // 娣诲姞缁勭洏淇℃伅
+ var result = await BaseDal.AddDataNavAsync(boxingInfo);
+ if (result)
{
- content.Error("璇ユ墭鐩樺凡瀛樺湪缁勭洏");
- }
- else
- {
- // 娣诲姞缁勭洏淇℃伅
- var result = await BaseDal.AddDataNavAsync(boxingInfo);
- if (result)
- {
- content.OK("娣诲姞鎴愬姛", boxingInfo);
- }
+ content.OK("娣诲姞鎴愬姛", boxingInfo);
}
}
return content;
}
+ public override PageGridData<DtBoxingInfo> GetPageData(PageDataOptions options)
+ {
+ return base.GetPageData(options);
+ }
+
// 楠岃瘉妯″瀷
public static List<ValidationResult> ValidateModel(object model)
{
--
Gitblit v1.9.3