From 8ae1a147aefadbb255edde088e7c12535c5f02d4 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期三, 08 十月 2025 20:35:51 +0800
Subject: [PATCH] 完善输送线和堆垛机任务处理逻辑在CommonConveyorLine_NewCW.cs`中添加版本注释和设备属性定义，增强设备连接状态检查与命令发送逻辑。 修改 CommonConveyorLine_GWJob.cs`的任务查询逻辑，确保在特定条件下不下发新任务。在CommonConveyorLine_NewCWJob.cs中实现请求入库和出库的处理逻辑，确保任务状态更新。在 RequestInbound.cs中添加出库任务和新任务的处理逻辑，增强异常处理。 在CommonStackerCrane_NewCWJob.cs中实现堆垛机任务完成事件的处理，确保状态更新和前端通知。新增设备型号修改相关常量和 DTO 类，更新服务接口和实现逻辑，确保设备型号修改请求的正确处理。修改 Dt_TaskService.cs中的任务处理逻辑，确保出库任务的库存判断和状态更新。
---
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