From 77ee85a249a26fcf47c28aebc9cd89b187f9d4dc Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期四, 27 六月 2024 17:57:16 +0800
Subject: [PATCH] 优化WMS库区前端界面
---
代码管理/PCS/WCS_Server/WIDESEA_WCS/JobsPart/Common/RestockHCJ.cs | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/JobsPart/Common/RestockHCJ.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/JobsPart/Common/RestockHCJ.cs"
index f88d6c8..042d8f5 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/JobsPart/Common/RestockHCJ.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/JobsPart/Common/RestockHCJ.cs"
@@ -44,6 +44,11 @@
{
var agvtask = agvtasks.Where(x => x.agv_tasktype == AGVTaskType).OrderByDescending(x => x.agv_grade).ThenBy(x => x.agv_createtime).FirstOrDefault();
if (agvtask != null) UpdateQueue(agvtaskService, agvtask);
+ //var tasks = agvtasks.Where(x => x.agv_tasktype == AGVTaskType).OrderByDescending(x => x.agv_grade).ThenBy(x => x.agv_createtime).ToList();
+ //foreach (var task in tasks)
+ //{
+ // UpdateQueue(agvtaskService, task);
+ //}
}
#endregion
@@ -84,7 +89,7 @@
if (string.IsNullOrEmpty(agvtask.agv_toaddress))
{
var stationinfo = stationinfoRepository.Find(x => x.stationCode == agvtask.agv_fromaddress).FirstOrDefault();
- var work = workinfoRepository.Find(x => x.workOrder == stationinfo.Number && x.drawingNo == stationinfo.stationType && x.heatID == stationinfo.heatNumber && x.processCode == "17").FirstOrDefault();
+ var work = workinfoRepository.Find(x => x.workOrder == stationinfo.Number && x.drawingNo == stationinfo.stationType && x.heatID == stationinfo.heatNumber && x.processCode == "17").OrderByDescending(x => x.CreateTime).FirstOrDefault();
var TargetLocation = agvtask.agv_tasktype == AGVTaskTypeEnum.TaskType_Inbound.ToString() ? GetLocation.GetEmptyLocation(stationinfoRepository, work, agvtask) : StationTask.GetEmptyLocation(stationinfoRepository);
if (TargetLocation != null)
{
@@ -97,11 +102,19 @@
TargetLocation.stationType = agvtask.agv_materielid;
TargetLocation.heatNumber = stationinfo.heatNumber;
TargetLocation.Number = agvtask.jobID;
- stationinfoRepository.Update(TargetLocation, true);
- agvtaskService.Update(agvtask, true);
+ stationinfoRepository.Update(TargetLocation, x => new { x.location_state, x.billetID, x.stationType, x.heatNumber, x.Number }, true);
+ agvtaskService.Update(agvtask, x => new { x.agv_taskstate, x.agv_toaddress }, true);
WriteDBLog.Success("鏇存柊鍏ュ簱闃熷垪浠诲姟", $"浠诲姟缂栧彿锛歿agvtask.agv_tasknum}", "PCS");
}
}
+ else
+ {
+ if (agvtask.agv_tasktype == AGVTaskTypeEnum.TaskType_Inbound.ToString())
+ {
+ agvtask.agv_tasktype = AGVTaskTypeEnum.TaskType_OutsourceInbound.ToString();
+ agvtaskService.Update(agvtask, x => new { x.agv_tasktype }, true);
+ }
+ }
}
}
else if (agvtask.agv_tasktype == AGVTaskTypeEnum.TaskType_OutsourceOutbound.ToString() || agvtask.agv_tasktype == AGVTaskTypeEnum.TaskType_Outbound.ToString())//澶栧崗搴撳嚭搴�/AB搴撳嚭搴�
--
Gitblit v1.9.3