diff --git a/HHWMS.Web/Areas/Api/IWCSController.cs b/HHWMS.Web/Areas/Api/IWCSController.cs index 9535908..3bb3179 100644 --- a/HHWMS.Web/Areas/Api/IWCSController.cs +++ b/HHWMS.Web/Areas/Api/IWCSController.cs @@ -2,6 +2,7 @@ using System; using System.Collections.Generic; using System.Linq; using AutoMapper; +using HHWMS.Web.Controllers; using HHWMS.Web.Models; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; @@ -36,14 +37,14 @@ namespace HHWMS.Web public IActionResult ReturnStatus(WcsRequest request) { // 返回状态 只接收100 - if(request.State != 100) + if (request.State != 100) { - return ApiResultError(msg:"State 不为100, 请检查后重新请求!"); + return ApiResultError(msg: "State 不为100, 请检查后重新请求!"); } // 判断任务是否合理 var task = _unitWork.FindSingle(x => x.TaskNo.Equals(request.TaskNo)); - if(task == null) + if (task == null) { return ApiResultError(msg: $"任务不存在, 任务号 {request.TaskNo} , 请检查后重新请求!"); } @@ -67,17 +68,18 @@ namespace HHWMS.Web IsLock = ContainerLockEnum.未锁, LocationCode = task.ToLocation }); + var inventoryList = _unitWork.Find(x => x.ContainerCode.Equals(task.ContainerCode)) + .ToList(); // 3.更新库位 _unitWork.BatchUpdate(x => x.Code.Equals(task.ToLocation), x => new Location { UpdateTime = DateTime.Now, UpdateBy = "WMS", - Status = LocationStatus.空容器, + Status = inventoryList.Count > 0 ? LocationStatus.有货 : LocationStatus.空容器, ContainerCode = task.ContainerCode }); // 4.插入库存交易 // 1.将任务容器的库存查出来 - var inventoryList = _unitWork.Find(x => x.ContainerCode.Equals(task.ContainerCode)).ToList(); if (inventoryList.Count > 0) { // 2.根据库存生成库存交易出库信息 @@ -120,7 +122,8 @@ namespace HHWMS.Web ContainerCode = "" }); // 1.将任务容器的库存查出来 - var inventoryList2 = _unitWork.Find(x => x.ContainerCode.Equals(task.ContainerCode)).ToList(); + var inventoryList2 = _unitWork.Find(x => x.ContainerCode.Equals(task.ContainerCode)) + .ToList(); if (inventoryList2.Count > 0) { // 2.根据库存生成库存交易出库信息 @@ -144,8 +147,9 @@ namespace HHWMS.Web // 3.批量插入库存交易 _unitWork.BatchAdd(inventoryTransactions2); - _unitWork.BatchDelete(x => x.ContainerCode.Equals(task.ContainerCode)); + _unitWork.BatchDelete(inventoryList2); } + // 下发AGV到出库口的任务 // 如果对接 执行下方任务,否则不执行 var interfaceAgv = _unitWork.FindSingle(x => x.Prefix == "interfaceAGV")?.Value; @@ -154,10 +158,10 @@ namespace HHWMS.Web var postAgv = new { - task_id = "123456" + task_id = "6970907a6b82e7fb" }; - var res = Wtm.CallAPI("ACS", "task_mould_do", HttpMethodEnum.POST, postAgv); + var res = Wtm.CallAPI("ACS", "task_mould_do", HttpMethodEnum.POST, postAgv); // if (res.Result.Data.ack == 0) // { // @@ -166,7 +170,7 @@ namespace HHWMS.Web break; default: - return ApiResultError(msg:$"任务类型不正确!任务号{request.TaskNo}"); + return ApiResultError(msg: $"任务类型不正确!任务号{request.TaskNo}"); } task.Status = TaskStatusEnum.完成; @@ -203,7 +207,7 @@ namespace HHWMS.Web } var location = _unitWork.FindSingle(x => x.Status == LocationStatus.空仓位); - if(location == null) + if (location == null) { return ApiResultError(msg: "没有空仓位"); } @@ -228,7 +232,7 @@ namespace HHWMS.Web public IActionResult EmptyOut(WcsRequest request) { var task = _unitWork.FindSingle(x => x.TaskNo.Equals(request.TaskNo)); - if(task == null) + if (task == null) { return ApiResultError(msg: $"任务不存在, 任务号 {request.TaskNo} , 请检查后重新请求!"); } diff --git a/HHWMS.Web/Areas/Inventory/Controllers/InventoryController.cs b/HHWMS.Web/Areas/Inventory/Controllers/InventoryController.cs index 48b085d..ddc8690 100644 --- a/HHWMS.Web/Areas/Inventory/Controllers/InventoryController.cs +++ b/HHWMS.Web/Areas/Inventory/Controllers/InventoryController.cs @@ -225,5 +225,74 @@ namespace HHWMS.Web.Controllers } #endregion + public IActionResult Out(int id) + { + var inv = _unitwork.FindById(id); + if (inv == null) + { + return FFResult().RefreshGrid().Alert("选定库存不存在!请检查后再执行出库任务!"); + } + + if (_unitwork.IsExit(x => x.ContainerCode.Equals(inv.ContainerCode))) + { + return FFResult().RefreshGrid().Alert("选定库存已存在任务!请检查后再执行出库任务!"); + } + var location = _unitwork.FindSingle(x => x.Code == inv.LocationCode); + if (location != null) + { + location.Status = LocationStatus.任务锁; + location.UpdateTime = DateTime.Now; + location.UpdateBy = Wtm.LoginUserInfo?.ITCode ?? "WMS"; + _unitwork.Update(location); + + // 查找container,并更新状态 + var container = _unitwork.FindSingle(x => x.Code == location.ContainerCode); + container.IsLock = ContainerLockEnum.任务锁; + container.UpdateTime = DateTime.Now; + container.UpdateBy = Wtm.LoginUserInfo?.ITCode ?? "WMS"; + _unitwork.Update(container); + + //创建出库任务 + var task = new TaskHeader + { + ZoneCode = ZoneCodeEnum.立库, + TaskNo = _unitwork.GetSerialNumber("Out"), + TaskType = TaskTypeEnum.立库出库, + ContainerCode = location.ContainerCode, + FromLocation = location.Code, + ToLocation = "", + Status = TaskStatusEnum.待下发, + CreateBy = Wtm.LoginUserInfo?.ITCode ?? "WMS", + CreateTime = DateTime.Now + }; + _unitwork.Add(task); + + // 下发任务到wcs + var postData = new + { + TaskNo = task.TaskNo, + PalletNo = task.ContainerCode, + FromLocation = task.FromLocation, + ToLocation = task.ToLocation + }; + var res = Wtm.CallAPI>("WCS", "TaskAssign", HttpMethodEnum.POST, postData) + .Result.Data; + if (res.Success) + { + task.Status = TaskStatusEnum.已下发; + } + else + { + task.ErrorMsg = res.Msg; + } + + task.UpdateTime = DateTime.Now; + task.UpdateBy = "WMS"; + _unitwork.Update(task); + } + + return FFResult().RefreshGrid().Message("任务创建成功!"); + + } } } diff --git a/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryListVM.cs b/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryListVM.cs index 4f7a0e0..af4c22a 100644 --- a/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryListVM.cs +++ b/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryListVM.cs @@ -24,7 +24,7 @@ namespace HHWMS.Web return new List { this.MakeStandardAction("Inventory", GridActionStandardTypesEnum.Create, Localizer["Sys.Create"],"inventory", dialogWidth: 800), - this.MakeAction("Inventory","ReturnToMes",Localizer["Inventory.ReturnToMes"],Localizer["Inventory.ReturnToMes"],GridActionParameterTypesEnum.SingleId,"inventory"), + this.MakeAction("Inventory","Out",Localizer["Inventory.Out"],Localizer["Inventory.Out"],GridActionParameterTypesEnum.SingleId,"inventory"), this.MakeStandardAction("Inventory", GridActionStandardTypesEnum.Edit, Localizer["Sys.Edit"], "inventory", dialogWidth: 800), this.MakeStandardAction("Inventory", GridActionStandardTypesEnum.Delete, Localizer["Sys.Delete"], "inventory", dialogWidth: 800), this.MakeStandardAction("Inventory", GridActionStandardTypesEnum.Details, Localizer["Sys.Details"], "inventory", dialogWidth: 800), @@ -55,15 +55,15 @@ namespace HHWMS.Web var data = ZoneCodes.FirstOrDefault(x => x.Value.ToString() == a.ZoneCode); return data?.Text ?? a.ZoneCode; }), - this.MakeGridHeader(x => x.ContainerCode).SetHide(), + this.MakeGridHeader(x => x.ContainerCode), this.MakeGridHeader(x => x.LocationCode), this.MakeGridHeader(x => x.MaterialCode), - this.MakeGridHeader(x => x.MaterialType), + // this.MakeGridHeader(x => x.MaterialType), this.MakeGridHeader(x => x.MaterialName), - this.MakeGridHeader(x => x.MaterialSpec), - this.MakeGridHeader(x => x.MaterialUnit), - this.MakeGridHeader(x => x.Batch), - this.MakeGridHeader(x => x.Lot), + // this.MakeGridHeader(x => x.MaterialSpec), + // this.MakeGridHeader(x => x.MaterialUnit), + // this.MakeGridHeader(x => x.Batch), + // this.MakeGridHeader(x => x.Lot), //this.MakeGridHeader(x => x.ManufactureDate), //this.MakeGridHeader(x => x.ExpirationDate), //this.MakeGridHeader(x => x.CompanyCode), diff --git a/HHWMS.Web/Areas/Receipt/Controllers/ReceiptInController.cs b/HHWMS.Web/Areas/Receipt/Controllers/ReceiptInController.cs index 391ad21..50fc598 100644 --- a/HHWMS.Web/Areas/Receipt/Controllers/ReceiptInController.cs +++ b/HHWMS.Web/Areas/Receipt/Controllers/ReceiptInController.cs @@ -1,4 +1,5 @@ using System; +using System.Linq; using HHWMS.Web.Models; using Microsoft.AspNetCore.Mvc; using WalkingTec.Mvvm.Core; @@ -28,7 +29,7 @@ namespace HHWMS.Web.Controllers #endregion Index [HttpPost] - public ActionResult TaskIn(string containerCode) + public ActionResult TaskIn(string containerCode, bool inv) { // 判断containerCode是否为空 if (string.IsNullOrEmpty(containerCode)) @@ -41,14 +42,24 @@ namespace HHWMS.Web.Controllers { return JsonMore(null, 500, $"库内没有编码为 {containerCode} 的容器!"); } + // 如果 container的库位不为空,或者islock为true,则返回错误信息 + if (!string.IsNullOrEmpty(container.LocationCode) || container.IsLock == ContainerLockEnum.任务锁) + { + return JsonMore(null, 500, $"容器 {containerCode} 已被占用!"); + } + container.IsLock = ContainerLockEnum.任务锁; container.UpdateTime = DateTime.Now; container.UpdateBy = Wtm.LoginUserInfo?.ITCode??"WMS"; - _unitWork.Update(container); + // _unitWork.Update(container); + + //查找仓位 + var location = _unitWork.Find(u => u.Status == LocationStatus.空仓位) + .OrderBy(x => x.Layer) + .ThenBy(x => x.Line) + .FirstOrDefault(); - //查询location表的一个空库位 更新仓位状态为锁定 - var location = _unitWork.FindSingle(u => u.Status == LocationStatus.空仓位); // 判断location是否为空 if (location == null) { @@ -59,6 +70,21 @@ namespace HHWMS.Web.Controllers location.UpdateBy = Wtm.LoginUserInfo?.ITCode??"WMS"; _unitWork.Update(location); + if (inv) //有货 + { + _unitWork.Add(new Inventory() + { + ZoneCode = ZoneCodeEnum.立库, + ContainerCode = containerCode, + LocationCode = location.Code, + MaterialCode = "123456", + MaterialName = "矿泉水", + Qty = 1, + TaskStatus = InventoryTaskStatus.任务中, + CreateTime = DateTime.Now + }); + } + _unitWork.Update(container); //创建容器编码为containercode的任务 var task = new TaskHeader { @@ -82,8 +108,9 @@ namespace HHWMS.Web.Controllers FromLocation = task.FromLocation, ToLocation = task.ToLocation }; - var res1 = Wtm.CallAPI>("WCS", "TaskAssign", HttpMethodEnum.POST, postData); - var res = res1.Result.Data; + var res = Wtm.CallAPI>("WCS", "TaskAssign", HttpMethodEnum.POST, postData) + .Result.Data; + if (res.Success) { task.Status = TaskStatusEnum.已下发; diff --git a/HHWMS.Web/Areas/Receipt/Views/ReceiptIn/Index.cshtml b/HHWMS.Web/Areas/Receipt/Views/ReceiptIn/Index.cshtml index 0b83f32..6d33177 100644 --- a/HHWMS.Web/Areas/Receipt/Views/ReceiptIn/Index.cshtml +++ b/HHWMS.Web/Areas/Receipt/Views/ReceiptIn/Index.cshtml @@ -1,11 +1,27 @@
- - - 入库 - + + + + + + + + + + + + 入库 + +