From 1935fd1b234adbe582ee54172dd3d8b01e5b4b4c Mon Sep 17 00:00:00 2001 From: dengjunjie <dengjunjie@hnkhzn.com> Date: 星期三, 05 六月 2024 09:22:39 +0800 Subject: [PATCH] 优化AGV和桁架防呆逻辑,优化空托出库逻辑 --- 代码管理/WMS/WMS_Server/WIDESEA_WMS/Common/AGVTask/HandleTask.cs | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Common/AGVTask/HandleTask.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Common/AGVTask/HandleTask.cs" index 671fc19..41423b5 100644 --- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Common/AGVTask/HandleTask.cs" +++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Common/AGVTask/HandleTask.cs" @@ -164,11 +164,11 @@ { VOLContext context = new VOLContext(); Idt_stationinfoRepository stationinfoRepository = new dt_stationinfoRepository(context); - var station1 = stationinfoRepository.FindFirst(t => t.stationCode == task.agv_fromaddress); - var station2 = stationinfoRepository.FindFirst(t => t.stationCode == task.agv_toaddress); if (task.agv_taskstate == AGVTaskStateEnum.Complete1.ToString()) { + var station2 = stationinfoRepository.FindFirst(t => t.stationCode == task.agv_toaddress); + if (station2 == null) throw new Exception("鏈壘鍒扮粓鐐瑰湴鍧�锛�"); ////绌烘墭浠诲姟闇�淇敼閫昏緫 if (station2.stationCode.Contains("X")) station2.quantity = 0;// task.agv_tasktype.Contains("TaskType_EmptyPallet") ? 0 : task.agv_qty; //task.agv_qty; @@ -188,6 +188,8 @@ } else if (task.agv_taskstate == AGVTaskStateEnum.Complete.ToString()) { + var station1 = stationinfoRepository.FindFirst(t => t.stationCode == task.agv_fromaddress); + if (station1 == null) throw new Exception("鏈壘鍒拌捣鐐瑰湴鍧�锛�"); #region MyRegion //if (station1.stationCode.Contains("S")) // station1.quantity = 0; @@ -204,7 +206,9 @@ station1.quantity = station1.quantity - task.agv_qty; station1.location_state = LocationStateEnum.Stroge.ToString(); } - else if (station1.area == "10" || station1.area == "11" || (station1.stationCode.Contains("C") && task.agv_tasktype == "TaskType_EmptyPallet")) //鍑哄簱绌烘墭浠诲姟 + else if (station1.area == "10" || station1.area == "11" + || ((station1.stationCode.Contains("C") || station1.stationCode.Contains("B")) + && task.agv_tasktype == AGVTaskTypeEnum.TaskType_EmptyPallet.ToString())) //鍑哄簱绌烘墭浠诲姟 { station1.location_state = LocationStateEnum.Stroge.ToString(); station1.quantity = station1.quantity - 1; @@ -225,7 +229,8 @@ //if (!station1.stationCode.Contains("X") && !station1.stationCode.Contains("S") && !station1.stationCode.Contains("W01001004") && !station1.stationCode.Contains("W01001005")) // station1.tray_type = string.Empty; } - station1.lastUpdateTime = DateTime.Now; + if (!station1.stationCode.Contains("DD")) + station1.lastUpdateTime = DateTime.Now; stationinfoRepository.Update(station1, true); } } -- Gitblit v1.9.3