diff --git a/HHWMS.Web/Areas/Api/IWCSController.cs b/HHWMS.Web/Areas/Api/IWCSController.cs index 12d8563..4f5c096 100644 --- a/HHWMS.Web/Areas/Api/IWCSController.cs +++ b/HHWMS.Web/Areas/Api/IWCSController.cs @@ -236,7 +236,7 @@ namespace HHWMS.Web // 更新目的仓位 var to = _unitwork.FindSingle(x => x.ContiguousCode == task.ToLocation && x.Type.Equals(LocationTypeEnum.机械臂工位))?.Code; - plrTask.ToLocation = to; + plrTask.ToLocation += $" {to}"; // 更新明细为待下发 var details = plrTask.TaskDetails.Where(x => !string.IsNullOrEmpty(x.ContainerCode) && x.ContainerCode.Contains(task.ContainerCode)); @@ -270,8 +270,11 @@ namespace HHWMS.Web { var station = _unitwork.Find(x => x.Code == task.FromLocation).FirstOrDefault(); // 创建料盒入库任务 - // 查找回库的任务起点, - var fromLocation = _unitwork.FindSingle(x => x.Code.Equals(task.ToLocation)).ContiguousCode; + // 根据子任务容器编码,查找回库的任务起点,(主任务会有多个容器编码) + var fromLocation = _unitwork.FindSingle(x => + x.ContainerCode.Equals(containerCode) + && x.Type == LocationTypeEnum.堆垛机工位 + ).Code; newTask.ZoneCode = ZoneCodeEnum.盘料库; if (task.TaskNo.Contains("PLoop")) { @@ -317,7 +320,7 @@ namespace HHWMS.Web && n.TaskStatus == InventoryTaskStatus.任务中).FirstOrDefault(); if (inv != null) { - inv.ContainerCode = tolocation.ContainerCode; + inv.ContainerCode = tolocation?.ContainerCode; inv.LocationCode = task.ToLocation; inv.Lot = taskde.ToLocation; _unitwork.Update(inv); diff --git a/HHWMS.Web/Areas/Receipt/Controllers/ReceiptInController.cs b/HHWMS.Web/Areas/Receipt/Controllers/ReceiptInController.cs index e4e4bb3..9918d60 100644 --- a/HHWMS.Web/Areas/Receipt/Controllers/ReceiptInController.cs +++ b/HHWMS.Web/Areas/Receipt/Controllers/ReceiptInController.cs @@ -142,6 +142,13 @@ namespace HHWMS.Web.Controllers { try { + // 先捡货,后入库 + if (_unitWork.IsExit(x => !string.IsNullOrEmpty(x.SourceCode) + && x.LocationCode == data.First().BoxCode)) + { + return JsonMore(null, 500, "周转箱存在未捡货任务,请捡货完成后再执行入库操作!"); + } + //单据明细验证 var errDetails = _unitWork.Find(x => data.Select(x => x.UniqueCode).ToList() .Contains(x.UniqueCode) && x.Status != ReceiptStatusEnum.新建).ToList(); @@ -206,8 +213,11 @@ namespace HHWMS.Web.Controllers } var boxcode = data.First().BoxCode; - //创建入库任务 - var invList = _unitWork.Find(x => x.ContainerCode.Equals(boxcode)) + //根据提交的uniquecode,创建入库任务 + var invList = _unitWork.Find(x => + data.Select(y => y.UniqueCode).ToList().Contains(x.UniqueCode) + && x.TaskStatus == InventoryTaskStatus.任务中 + && x.ContainerCode.Equals(boxcode)) .ToList(); if (invList.Count == 0) { diff --git a/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentDetailHistoryVMs/ShipmentDetailHistoryListVM.cs b/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentDetailHistoryVMs/ShipmentDetailHistoryListVM.cs index 726f614..c45ad8d 100644 --- a/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentDetailHistoryVMs/ShipmentDetailHistoryListVM.cs +++ b/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentDetailHistoryVMs/ShipmentDetailHistoryListVM.cs @@ -89,6 +89,7 @@ namespace HHWMS.Web var query = DC.Set() .CheckEqual(Searcher.ShipmentHeaderHistoryId, x=>x.ShipmentHeaderHistoryId) .CheckContain(Searcher.ZoneCode, x=>x.ZoneCode) + .CheckContain(Searcher.UniqueCode, x=>x.UniqueCode) .CheckContain(Searcher.MaterialCode, x=>x.MaterialCode) .CheckContain(Searcher.MaterialType, x=>x.MaterialType) .CheckContain(Searcher.MaterialName, x=>x.MaterialName) diff --git a/HHWMS.Web/Areas/System/Controllers/jobs/SendWcsJob.cs b/HHWMS.Web/Areas/System/Controllers/jobs/SendWcsJob.cs index cd60e37..bb0a158 100644 --- a/HHWMS.Web/Areas/System/Controllers/jobs/SendWcsJob.cs +++ b/HHWMS.Web/Areas/System/Controllers/jobs/SendWcsJob.cs @@ -240,7 +240,7 @@ namespace HHWMS.Web newTask.Station = "2"; _unitwork.Add(newTask); - task.ContainerCode += container.ContainerCode; + task.ContainerCode += $" {container.ContainerCode}"; // 更新库位 container.Status = LocationStatus.任务锁; _unitwork.Update(container); @@ -380,7 +380,9 @@ namespace HHWMS.Web if (task != null) { - var locationList = _unitwork.Find(x => task.FromLocation.Equals(x.Code) || task.ToLocation.Equals(x.Code)).ToList(); + var locationList = _unitwork.Find(x => task.FromLocation.Equals(x.Code) + || task.ToLocation.Equals(x.Code) + || "G1,G2,T".Contains(x.Type)).ToList(); var begin = locationList.FirstOrDefault(x => x.Code.Equals(task.FromLocation)); var end = locationList.FirstOrDefault(x => x.Code.Equals(task.ToLocation)); // 根据不同任务类型 创建任务 @@ -418,6 +420,11 @@ namespace HHWMS.Web { if (container.Any(x => x == item.ContainerCode)) { + var g1 = locationList.First(x => x.ContainerCode.Equals(item.ContainerCode) + && x.Type.Equals(LocationTypeEnum.堆垛机工位)); + + end = locationList.First(x => x.Code.Equals(g1.ContiguousCode)); + taskInfoList.Add(new TaskInfo { TaskId = $"{task.TaskNo}-{item.FromLocation}",