From 1f9a89458a66c12c1f7dfbceb2588ada8fbf16f4 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期四, 13 十一月 2025 17:35:36 +0800
Subject: [PATCH] 新增移库页面与WebSocket支持,优化任务逻辑新增移库页面支持移库任务输入与提交。新增 WebSocket 支持(`websocket.js`、`WebSocketSetup.cs`),实现实时通信功能。 在任务状态枚举中新增 AGV 移库任务状`TaskStatusEnum.cs`)- 重构库存数据展示页面(`Home.vue`),新增数据总览与图表展示功能。 - 新增库存数据接口(`StockInfoService.cs`、`StockInfoController.cs`),支持库存统计与展示。 - 优化任务状态管理逻辑,支持 AGV 移库任务(`Dt_TaskService.cs`)。
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_OrderServices/Dt_AllocateOutboundOrderService.cs | 11 +++--------
1 files changed, 3 insertions(+), 8 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_OrderServices/Dt_AllocateOutboundOrderService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_OrderServices/Dt_AllocateOutboundOrderService.cs"
index 3e14a4a..b4d418e 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_OrderServices/Dt_AllocateOutboundOrderService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_OrderServices/Dt_AllocateOutboundOrderService.cs"
@@ -162,8 +162,7 @@
else
return content.Error("璇烽�夋嫨璋冩嫧浠撳簱");
-
- List<RequestTaskDto> taskDtos = new List<RequestTaskDto>();
+ List<RequestTaskDto> taskDtos = new List<RequestTaskDto>();
Dt_AllocateOutboundOrderDetail allocateoutboundOrderdetail = _allocateoutboundOrderDetailRepository.QueryFirst(x => x.Id == orderId);
Dt_AllocateOutboundOrder outboundOrder = BaseDal.QueryFirst(x => x.Id == allocateoutboundOrderdetail.OrderId);
@@ -188,7 +187,6 @@
MaterielCode = allocateoutboundOrderdetail.MaterielCode,
Position = item.LocationCode,
PalletCode = item.PalletCode,
- //AreaId = Convert.ToInt32(requestOut.AreaId),
AreaId = Convert.ToInt32(2),
};
taskDtos.Add(task);
@@ -221,19 +219,16 @@
}
List<DtLocationStatusChangeRecord> locationStatusChangeRecords = new List<DtLocationStatusChangeRecord>();
List<DtLocationInfo> locations = new List<DtLocationInfo>();
- if(taskNews.Count <= 0)
+ if (taskNews.Count <= 0)
{
throw new Exception($"{allocateoutboundOrderdetail.MaterielCode}鏈壘鍒板彲鍑哄簱鎵樼洏");
}
foreach (var item in taskNews)
{
taskDTOs.Add(CreateTaskDTO(item));
- var result1 = _taskService.UpdateLocationStatus(item.SourceAddress, LocationEnum.InStockDisable, item.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticOutbound);
- var result2 = _taskService.UpdateLocationStatus(item.TargetAddress, LocationEnum.Lock, item.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticOutbound);
+ var result1 = _taskService.UpdateLocationStatus(item.SourceAddress, LocationEnum.InStockDisable, item.TaskNum.Value,(int)StatusChangeTypeEnum.AutomaticOutbound);
locationStatusChangeRecords.AddRange(result1.Item1);
- locationStatusChangeRecords.AddRange(result2.Item1);
locations.AddRange(result1.Item2);
- locations.AddRange(result2.Item2);
}
outboundOrder.OrderStatus = (int)OrderStateEmun.寮�濮�;
await _unitOfWorkManage.UseTranAsync(async () =>
--
Gitblit v1.9.3