diff --git a/HHWMS.Web/Areas/Api/ApiController.cs b/HHWMS.Web/Areas/Api/ApiController.cs index ab9a85e..fd4e59b 100644 --- a/HHWMS.Web/Areas/Api/ApiController.cs +++ b/HHWMS.Web/Areas/Api/ApiController.cs @@ -8,12 +8,12 @@ namespace HHWMS.Web { protected JsonResult ApiResult(object data = null, string msg = "success") { - return new JsonResult(new ApiJsonResult { Data = data, Success = true, Status = true, Msg = msg }); + return new JsonResult(new ApiJsonResult { Data = data, Success = true, Msg = msg }); } - protected JsonResult ApiResultError(object data = null, string msg = "faield") + protected JsonResult ApiResultError(object data = null, string msg = "failed") { - return new JsonResult(new ApiJsonResult { Data = data, Success = false, Status = false, Msg = msg }); + return new JsonResult(new ApiJsonResult { Data = data, Success = false, Msg = msg }); } } } diff --git a/HHWMS.Web/Areas/Api/IWCSController.cs b/HHWMS.Web/Areas/Api/IWCSController.cs index df1b1fa..9535908 100644 --- a/HHWMS.Web/Areas/Api/IWCSController.cs +++ b/HHWMS.Web/Areas/Api/IWCSController.cs @@ -10,7 +10,7 @@ using WalkingTec.Mvvm.Core; namespace HHWMS.Web { /// - /// WCS接口 + /// 提供WCS调用接口 /// 调用方向 WCS --> WMS /// [Public] @@ -19,65 +19,15 @@ namespace HHWMS.Web [Route("api/[controller]/[action]"), ApiExplorerSettings(GroupName = "User")] public class IWCSController : ApiController { - private readonly IUnitWork _unitwork; + private readonly IUnitWork _unitWork; private readonly IMapper _mapper; - public IWCSController(IUnitWork unitwork, IMapper mapper) + public IWCSController(IUnitWork unitWork, IMapper mapper) { - _unitwork = unitwork; + _unitWork = unitWork; _mapper = mapper; } - /// - /// 请求入库 - /// - /// - [HttpPost] - public IActionResult RequestIn(WcsRequest request) - { - //var inv = new List(); - //for (int i = 0; i < 10; i++) - // inv.Add(new Inventory - // { - // ContainerCode = "test" + i - // }); - //_unitwork.BatchAdd(inv); - //_unitwork.DeleteById(1441); - //_unitwork.BatchUpdate(x => x.ID > 1030, x=>new Inventory { Batch = "test"}); - - // 测试 删除数据 保存到历史表 主子表数据 - /*var receipt = _unitwork.Find(x => x.ID == 3) - .FirstOrDefault(); - - var details = _unitwork.Find(x => x.HeaderId == 3) - .ToArray(); - var his = _mapper.Map(receipt); - var his2 = _mapper.Map>(details); - _unitwork.Add(his); - _unitwork.BatchAdd(his2);*/ - - /*var receipt = _unitwork.Find(x => x.ID == 3) - .FirstOrDefault(); - - var details = _unitwork.Find(x => x.HeaderId == 3) - .ToArray(); - var his = _mapper.Map(receipt); - var his2 = _mapper.Map>(details); - _unitwork.Add(his); - _unitwork.BatchAdd(his2);*/ - - var receipt = _unitwork.Find(x => 1==1) - .FirstOrDefault(); - - var details = _unitwork.Find(x => x.HeaderId == receipt.ID) - .ToArray(); - var his = _mapper.Map(receipt); - var his2 = _mapper.Map>(details); - _unitwork.Add(his); - _unitwork.BatchAdd(his2); - return ApiResult(); - } - /// /// 状态返回 /// @@ -92,7 +42,7 @@ namespace HHWMS.Web } // 判断任务是否合理 - var task = _unitwork.FindSingle(x => x.TaskNo.Equals(request.TaskNo)); + var task = _unitWork.FindSingle(x => x.TaskNo.Equals(request.TaskNo)); if(task == null) { return ApiResultError(msg: $"任务不存在, 任务号 {request.TaskNo} , 请检查后重新请求!"); @@ -103,37 +53,139 @@ namespace HHWMS.Web { case TaskTypeEnum.立库入库: // 1.更新库存 - _unitwork.BatchUpdate(x => x.ContainerCode.Equals(task.ContainerCode), x => new Inventory + _unitWork.BatchUpdate(x => x.ContainerCode.Equals(task.ContainerCode), x => new Inventory { UpdateTime = DateTime.Now, UpdateBy = "WMS", TaskStatus = InventoryTaskStatus.无任务 }); // 2.更新容器 - _unitwork.BatchUpdate(x => x.Code.Equals(task.ContainerCode), x => new Container + _unitWork.BatchUpdate(x => x.Code.Equals(task.ContainerCode), x => new Container { UpdateTime = DateTime.Now, UpdateBy = "WMS", - Status = ContainerStatus.有, + IsLock = ContainerLockEnum.未锁, LocationCode = task.ToLocation }); // 3.更新库位 - _unitwork.BatchUpdate(x => x.Code.Equals(task.ToLocation), x => new Location + _unitWork.BatchUpdate(x => x.Code.Equals(task.ToLocation), x => new Location { UpdateTime = DateTime.Now, UpdateBy = "WMS", - Status = LocationStatus.有货, + Status = LocationStatus.空容器, ContainerCode = task.ContainerCode }); // 4.插入库存交易 + // 1.将任务容器的库存查出来 + var inventoryList = _unitWork.Find(x => x.ContainerCode.Equals(task.ContainerCode)).ToList(); + if (inventoryList.Count > 0) + { + // 2.根据库存生成库存交易出库信息 + var inventoryTransactions = inventoryList.Select(inventory => new InventoryTransaction + { + BillType = InventoryTranType.入库, + MaterialCode = inventory.MaterialCode, + MaterialName = inventory.MaterialName, + MaterialUnit = inventory.MaterialUnit, + Batch = inventory.Batch, + Lot = inventory.Lot, + LocationCode = inventory.LocationCode, + ContainerCode = inventory.ContainerCode, + Qty = inventory.Qty, + CreateTime = DateTime.Now, + CreateBy = "WMS", + UpdateTime = DateTime.Now, + UpdateBy = "WMS" + }).ToList(); + + // 3.批量插入库存交易 + _unitWork.BatchAdd(inventoryTransactions); + } + break; case TaskTypeEnum.立库出库: + + _unitWork.BatchUpdate(x => x.Code.Equals(task.ContainerCode), x => new Container + { + UpdateTime = DateTime.Now, + UpdateBy = "WMS", + IsLock = ContainerLockEnum.未锁, + LocationCode = "" + }); + _unitWork.BatchUpdate(x => x.Code.Equals(task.FromLocation), x => new Location + { + UpdateTime = DateTime.Now, + UpdateBy = "WMS", + Status = LocationStatus.空仓位, + ContainerCode = "" + }); + // 1.将任务容器的库存查出来 + var inventoryList2 = _unitWork.Find(x => x.ContainerCode.Equals(task.ContainerCode)).ToList(); + if (inventoryList2.Count > 0) + { + // 2.根据库存生成库存交易出库信息 + var inventoryTransactions2 = inventoryList2.Select(inventory => new InventoryTransaction + { + BillType = InventoryTranType.出库, + MaterialCode = inventory.MaterialCode, + MaterialName = inventory.MaterialName, + MaterialUnit = inventory.MaterialUnit, + Batch = inventory.Batch, + Lot = inventory.Lot, + LocationCode = inventory.LocationCode, + ContainerCode = inventory.ContainerCode, + Qty = inventory.Qty, + CreateTime = DateTime.Now, + CreateBy = "WMS", + UpdateTime = DateTime.Now, + UpdateBy = "WMS" + }).ToList(); + + // 3.批量插入库存交易 + _unitWork.BatchAdd(inventoryTransactions2); + + _unitWork.BatchDelete(x => x.ContainerCode.Equals(task.ContainerCode)); + } + // 下发AGV到出库口的任务 + // 如果对接 执行下方任务,否则不执行 + var interfaceAgv = _unitWork.FindSingle(x => x.Prefix == "interfaceAGV")?.Value; + if (interfaceAgv == 1) + { + + var postAgv = new + { + task_id = "123456" + }; + + var res = Wtm.CallAPI("ACS", "task_mould_do", HttpMethodEnum.POST, postAgv); + // if (res.Result.Data.ack == 0) + // { + // + // } + } + break; default: return ApiResultError(msg:$"任务类型不正确!任务号{request.TaskNo}"); } + task.Status = TaskStatusEnum.完成; // 插到历史表,或者接下来流程 + + _unitWork.Add(new TaskHeaderHistory + { + TaskNo = task.TaskNo, + TaskType = task.TaskType, + FromLocation = task.FromLocation, + ToLocation = task.ToLocation, + ContainerCode = task.ContainerCode, + Status = task.Status, + CreateTime = DateTime.Now, + CreateBy = "WMS" + }); + + _unitWork.Delete(task); + return ApiResult(); } @@ -144,9 +196,29 @@ namespace HHWMS.Web [HttpPost] public IActionResult FullIn(WcsRequest request) { - return ApiResult(); - } + var task = _unitWork.FindSingle(x => x.TaskNo.Equals(request.TaskNo)); + if (task == null) + { + return ApiResultError(msg: $"任务不存在, 任务号 {request.TaskNo} , 请检查后重新请求!"); + } + var location = _unitWork.FindSingle(x => x.Status == LocationStatus.空仓位); + if(location == null) + { + return ApiResultError(msg: "没有空仓位"); + } + + task.ToLocation = location.Code; + _unitWork.Update(task); + + location.Status = LocationStatus.任务锁; + _unitWork.Update(location); + + return ApiResult(new + { + locationCode = location.Code + }); + } /// /// 空出 @@ -155,7 +227,27 @@ namespace HHWMS.Web [HttpPost] public IActionResult EmptyOut(WcsRequest request) { + var task = _unitWork.FindSingle(x => x.TaskNo.Equals(request.TaskNo)); + if(task == null) + { + return ApiResultError(msg: $"任务不存在, 任务号 {request.TaskNo} , 请检查后重新请求!"); + } + + _unitWork.Add(new TaskHeaderHistory + { + TaskNo = task.TaskNo, + TaskType = task.TaskType, + FromLocation = task.FromLocation, + ToLocation = task.ToLocation, + ContainerCode = task.ContainerCode, + Status = task.Status, + CreateTime = DateTime.Now, + CreateBy = "WMS" + }); + + _unitWork.Delete(task); return ApiResult(); } + } } diff --git a/HHWMS.Web/Areas/Configs/Controllers/ContainerController.cs b/HHWMS.Web/Areas/Configs/Controllers/ContainerController.cs index 5a702bc..f53854f 100644 --- a/HHWMS.Web/Areas/Configs/Controllers/ContainerController.cs +++ b/HHWMS.Web/Areas/Configs/Controllers/ContainerController.cs @@ -265,8 +265,10 @@ namespace HHWMS.Web.Controllers vm.MSD.AddModelError(vm.Entity.BatchError, "数量和类型必填,且数量要大于0!"); return PartialView(vm); } - var maxContainer = _unitwork.Find(x => x.Type == vm.Entity.Type).ToList().MaxBy(x => x.Code); - int maxNum = 1; + var maxContainer = _unitwork.Find(x => x.Type == vm.Entity.Type) + .ToList() + .MaxBy(x => x.Code); + int maxNum = 0; if (maxContainer != null) int.TryParse(maxContainer?.Code.Substring(1, 4), out maxNum); // 查询已有的最大托盘值 在此基础上累加 diff --git a/HHWMS.Web/Areas/Configs/ViewModels/ContainerVMs/ContainerListVM.cs b/HHWMS.Web/Areas/Configs/ViewModels/ContainerVMs/ContainerListVM.cs index 8d4572a..a8b29d7 100644 --- a/HHWMS.Web/Areas/Configs/ViewModels/ContainerVMs/ContainerListVM.cs +++ b/HHWMS.Web/Areas/Configs/ViewModels/ContainerVMs/ContainerListVM.cs @@ -31,6 +31,8 @@ namespace HHWMS.Web this.MakeStandardAction("Container", GridActionStandardTypesEnum.Import, Localizer["Sys.Import"], "configs", dialogWidth: 800), this.MakeStandardAction("Container", GridActionStandardTypesEnum.ExportExcel, Localizer["Sys.Export"], "configs"), this.MakeAction("Container","AddContainer",Localizer["Container.AddContainer"],Localizer["Container.AddContainer"],GridActionParameterTypesEnum.NoId,"configs"), + this.MakeAction("Location","Print",Localizer["Sys.Print"],Localizer["Sys.Print"],GridActionParameterTypesEnum.MultiIds,"configs") + .SetShowDialog(false).SetOnClickScript("print"), }; } diff --git a/HHWMS.Web/Areas/Configs/ViewModels/MaterialVMs/MaterialImportVM.cs b/HHWMS.Web/Areas/Configs/ViewModels/MaterialVMs/MaterialImportVM.cs index 70a13a2..427f3d4 100644 --- a/HHWMS.Web/Areas/Configs/ViewModels/MaterialVMs/MaterialImportVM.cs +++ b/HHWMS.Web/Areas/Configs/ViewModels/MaterialVMs/MaterialImportVM.cs @@ -12,12 +12,6 @@ namespace HHWMS.Web { public partial class MaterialTemplateVM : BaseTemplateVM { - [Display(Name = "Inventory.UniqueCode")] - public ExcelPropety UniqueCode_Excel = ExcelPropety.CreateProperty(x => x.UniqueCode); - [Display(Name = "Inventory.QRCode")] - public ExcelPropety QRCode_Excel = ExcelPropety.CreateProperty(x => x.QRCode); - [Display(Name = "Inventory.SourceCode")] - public ExcelPropety SourceCode_Excel = ExcelPropety.CreateProperty(x => x.SourceCode); [Display(Name = "Inventory.MaterialCode")] public ExcelPropety MaterialCode_Excel = ExcelPropety.CreateProperty(x => x.MaterialCode); [Display(Name = "Inventory.MaterialType")] diff --git a/HHWMS.Web/Areas/Configs/ViewModels/MaterialVMs/MaterialListVM.cs b/HHWMS.Web/Areas/Configs/ViewModels/MaterialVMs/MaterialListVM.cs index f8deb72..7f8f03a 100644 --- a/HHWMS.Web/Areas/Configs/ViewModels/MaterialVMs/MaterialListVM.cs +++ b/HHWMS.Web/Areas/Configs/ViewModels/MaterialVMs/MaterialListVM.cs @@ -32,9 +32,6 @@ namespace HHWMS.Web protected override IEnumerable> InitGridHeader() { return new List>{ - this.MakeGridHeader(x => x.UniqueCode).SetHide(), - this.MakeGridHeader(x => x.QRCode), - this.MakeGridHeader(x => x.SourceCode).SetHide(), this.MakeGridHeader(x => x.MaterialCode), this.MakeGridHeader(x => x.MaterialType), this.MakeGridHeader(x => x.MaterialName), @@ -52,15 +49,10 @@ namespace HHWMS.Web public override IOrderedQueryable GetSearchQuery() { var query = DC.Set() - .CheckContain(Searcher.UniqueCode, x=>x.UniqueCode) - .CheckContain(Searcher.QRCode, x=>x.QRCode) .CheckContain(Searcher.MaterialCode, x=>x.MaterialCode) .Select(x => new Material_View { ID = x.ID, - UniqueCode = x.UniqueCode, - QRCode = x.QRCode, - SourceCode = x.SourceCode, MaterialCode = x.MaterialCode, MaterialType = x.MaterialType, MaterialName = x.MaterialName, diff --git a/HHWMS.Web/Areas/Configs/ViewModels/MaterialVMs/MaterialSearcher.cs b/HHWMS.Web/Areas/Configs/ViewModels/MaterialVMs/MaterialSearcher.cs index 9f4326a..82e0049 100644 --- a/HHWMS.Web/Areas/Configs/ViewModels/MaterialVMs/MaterialSearcher.cs +++ b/HHWMS.Web/Areas/Configs/ViewModels/MaterialVMs/MaterialSearcher.cs @@ -12,10 +12,6 @@ namespace HHWMS.Web { public partial class MaterialSearcher : BaseSearcher { - [Display(Name = "Inventory.UniqueCode")] - public String UniqueCode { get; set; } - [Display(Name = "Inventory.QRCode")] - public String QRCode { get; set; } [Display(Name = "Inventory.MaterialCode")] public String MaterialCode { get; set; } diff --git a/HHWMS.Web/Areas/Configs/Views/Container/AddContainer.cshtml b/HHWMS.Web/Areas/Configs/Views/Container/AddContainer.cshtml index cb369c4..d794620 100644 --- a/HHWMS.Web/Areas/Configs/Views/Container/AddContainer.cshtml +++ b/HHWMS.Web/Areas/Configs/Views/Container/AddContainer.cshtml @@ -3,7 +3,7 @@ - + diff --git a/HHWMS.Web/Areas/Configs/Views/Container/Index.cshtml b/HHWMS.Web/Areas/Configs/Views/Container/Index.cshtml index d7c5e47..d0a2594 100644 --- a/HHWMS.Web/Areas/Configs/Views/Container/Index.cshtml +++ b/HHWMS.Web/Areas/Configs/Views/Container/Index.cshtml @@ -14,3 +14,20 @@ + diff --git a/HHWMS.Web/Areas/Configs/Views/Material/Create.cshtml b/HHWMS.Web/Areas/Configs/Views/Material/Create.cshtml index d0b0e0b..0d8fb9e 100644 --- a/HHWMS.Web/Areas/Configs/Views/Material/Create.cshtml +++ b/HHWMS.Web/Areas/Configs/Views/Material/Create.cshtml @@ -3,9 +3,6 @@ - - - diff --git a/HHWMS.Web/Areas/Configs/Views/Material/Delete.cshtml b/HHWMS.Web/Areas/Configs/Views/Material/Delete.cshtml index abeb034..bb479d0 100644 --- a/HHWMS.Web/Areas/Configs/Views/Material/Delete.cshtml +++ b/HHWMS.Web/Areas/Configs/Views/Material/Delete.cshtml @@ -4,9 +4,6 @@ @Localizer["Sys.DeleteConfirm"] - - - diff --git a/HHWMS.Web/Areas/Configs/Views/Material/Details.cshtml b/HHWMS.Web/Areas/Configs/Views/Material/Details.cshtml index 4269bb3..61f2e93 100644 --- a/HHWMS.Web/Areas/Configs/Views/Material/Details.cshtml +++ b/HHWMS.Web/Areas/Configs/Views/Material/Details.cshtml @@ -3,9 +3,6 @@ - - - diff --git a/HHWMS.Web/Areas/Configs/Views/Material/Edit.cshtml b/HHWMS.Web/Areas/Configs/Views/Material/Edit.cshtml index 1727767..2770d08 100644 --- a/HHWMS.Web/Areas/Configs/Views/Material/Edit.cshtml +++ b/HHWMS.Web/Areas/Configs/Views/Material/Edit.cshtml @@ -3,9 +3,6 @@ - - - diff --git a/HHWMS.Web/Areas/Configs/Views/Material/Index.cshtml b/HHWMS.Web/Areas/Configs/Views/Material/Index.cshtml index da33ae4..5ec0875 100644 --- a/HHWMS.Web/Areas/Configs/Views/Material/Index.cshtml +++ b/HHWMS.Web/Areas/Configs/Views/Material/Index.cshtml @@ -3,8 +3,6 @@ - - diff --git a/HHWMS.Web/Areas/Receipt/Controllers/ReceiptInController.cs b/HHWMS.Web/Areas/Receipt/Controllers/ReceiptInController.cs index c0c8ab3..391ad21 100644 --- a/HHWMS.Web/Areas/Receipt/Controllers/ReceiptInController.cs +++ b/HHWMS.Web/Areas/Receipt/Controllers/ReceiptInController.cs @@ -1,3 +1,5 @@ +using System; +using HHWMS.Web.Models; using Microsoft.AspNetCore.Mvc; using WalkingTec.Mvvm.Core; using WalkingTec.Mvvm.Mvc; @@ -5,14 +7,14 @@ using WalkingTec.Mvvm.Mvc; namespace HHWMS.Web.Controllers { [Area("receipt")] - [ActionDescription("盘料操作")] + [ActionDescription("入库操作")] public partial class ReceiptInController : BaseController { private readonly IUnitWork _unitWork; - public ReceiptInController(IUnitWork unitwork) + public ReceiptInController(IUnitWork unitWork) { - _unitWork = unitwork; + _unitWork = unitWork; } #region Index @@ -24,5 +26,77 @@ namespace HHWMS.Web.Controllers } #endregion Index + + [HttpPost] + public ActionResult TaskIn(string containerCode) + { + // 判断containerCode是否为空 + if (string.IsNullOrEmpty(containerCode)) + { + return JsonMore(null, 500, "容器编码为空!请检查后重新提交!"); + } + // 查询container表code为containercode的值 + var container = _unitWork.FindSingle(u => u.Code == containerCode); + if (container == null) + { + return JsonMore(null, 500, $"库内没有编码为 {containerCode} 的容器!"); + } + + container.IsLock = ContainerLockEnum.任务锁; + container.UpdateTime = DateTime.Now; + container.UpdateBy = Wtm.LoginUserInfo?.ITCode??"WMS"; + _unitWork.Update(container); + + //查询location表的一个空库位 更新仓位状态为锁定 + var location = _unitWork.FindSingle(u => u.Status == LocationStatus.空仓位); + // 判断location是否为空 + if (location == null) + { + return JsonMore(null, 500, "库内没有空闲仓位!"); + } + location.Status = LocationStatus.任务锁; + location.UpdateTime = DateTime.Now; + location.UpdateBy = Wtm.LoginUserInfo?.ITCode??"WMS"; + _unitWork.Update(location); + + //创建容器编码为containercode的任务 + var task = new TaskHeader + { + ZoneCode = ZoneCodeEnum.立库, + TaskNo = _unitWork.GetSerialNumber("In"), + TaskType = TaskTypeEnum.立库入库, + ContainerCode = containerCode, + FromLocation = "", + ToLocation = location.Code, + 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 res1 = Wtm.CallAPI>("WCS", "TaskAssign", HttpMethodEnum.POST, postData); + var res = res1.Result.Data; + if (res.Success) + { + task.Status = TaskStatusEnum.已下发; + } + else + { + task.ErrorMsg = res.Msg; + } + task.UpdateTime = DateTime.Now; + task.UpdateBy = "WMS"; + _unitWork.Update(task); + + return JsonMore(null); + } } } diff --git a/HHWMS.Web/Areas/Receipt/Views/ReceiptIn/Index.cshtml b/HHWMS.Web/Areas/Receipt/Views/ReceiptIn/Index.cshtml index 490d2d1..0b83f32 100644 --- a/HHWMS.Web/Areas/Receipt/Views/ReceiptIn/Index.cshtml +++ b/HHWMS.Web/Areas/Receipt/Views/ReceiptIn/Index.cshtml @@ -1,342 +1,56 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 绑定入库 - 重置 - @* 启动入库 *@ - - - - - - +
+ + + + 入库 + + +
diff --git a/HHWMS.Web/Areas/Shipment/Controllers/ShipOutController.cs b/HHWMS.Web/Areas/Shipment/Controllers/ShipOutController.cs index 6b4c327..5cb415b 100644 --- a/HHWMS.Web/Areas/Shipment/Controllers/ShipOutController.cs +++ b/HHWMS.Web/Areas/Shipment/Controllers/ShipOutController.cs @@ -1,3 +1,5 @@ +using System; +using HHWMS.Web.Models; using Microsoft.AspNetCore.Mvc; using WalkingTec.Mvvm.Core; using WalkingTec.Mvvm.Mvc; @@ -24,4 +26,96 @@ public class ShipOutController : BaseController } #endregion + [HttpPost] + public IActionResult CallBox() + { + // 查找库位状态为空容器的库位 + var location = _unitWork.FindSingle(x => x.Status == LocationStatus.空容器); + 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 res1 = Wtm.CallAPI>("WCS", "TaskAssign", HttpMethodEnum.POST, postData); + var res = res1.Result.Data; + if (res.Success) + { + task.Status = TaskStatusEnum.已下发; + } + else + { + task.ErrorMsg = res.Msg; + } + task.UpdateTime = DateTime.Now; + task.UpdateBy = "WMS"; + _unitWork.Update(task); + + return JsonMore(null); + } + else + { + return JsonMore(null, 500, "库内无可用容器!"); + } + } + + public IActionResult AgvTask(string type) + { + var task_id = "123"; + switch (type) + { + case "In": + task_id = "1"; + break; + case "Out": + task_id = "2"; + break; + case "Charge": + task_id = "3"; + break; + default: + return JsonMore(null,500,"参数错误!"); + } + var res = Wtm.CallAPI("ACS", "task_mould_do", HttpMethodEnum.POST, new + { + task_id = task_id + }); + if (res.Result.Data.ack != 0) + { + return JsonMore(null,500,res.Result.Data.msg); + } + return JsonMore(null); + } + } diff --git a/HHWMS.Web/Areas/Shipment/Views/ShipOut/Index.cshtml b/HHWMS.Web/Areas/Shipment/Views/ShipOut/Index.cshtml index 31c642d..fd42ae4 100644 --- a/HHWMS.Web/Areas/Shipment/Views/ShipOut/Index.cshtml +++ b/HHWMS.Web/Areas/Shipment/Views/ShipOut/Index.cshtml @@ -1,299 +1,91 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
+ + @* *@ + + 呼叫出库 + - - 拣货 - 回库 - - - - - + + 到入库点 + + + 充电任务 + + + + 到出库点 + + +
diff --git a/HHWMS.Web/Areas/System/Controllers/SysDictDataController.cs b/HHWMS.Web/Areas/System/Controllers/SysDictDataController.cs index 2f3c3b7..4c35362 100644 --- a/HHWMS.Web/Areas/System/Controllers/SysDictDataController.cs +++ b/HHWMS.Web/Areas/System/Controllers/SysDictDataController.cs @@ -144,7 +144,7 @@ namespace HHWMS.Web.Controllers } else { - return FFResult().CloseDialog().RefreshGridRow(vm.Entity.ID); + return FFResult().CloseDialog().RefreshGrid(index:1); } } } @@ -172,7 +172,7 @@ namespace HHWMS.Web.Controllers } else { - return FFResult().CloseDialog().RefreshGrid(); + return FFResult().CloseDialog().RefreshGrid(index:1); } } diff --git a/HHWMS.Web/Areas/System/Controllers/jobs/SendWcsJob.cs b/HHWMS.Web/Areas/System/Controllers/jobs/SendWcsJob.cs new file mode 100644 index 0000000..0bdd510 --- /dev/null +++ b/HHWMS.Web/Areas/System/Controllers/jobs/SendWcsJob.cs @@ -0,0 +1,76 @@ +using System; +using System.Threading.Tasks; +using HHWMS.Web.Models; +using Quartz; +using WalkingTec.Mvvm.Core; +using WalkingTec.Mvvm.Core.Support.Quartz; + +namespace HHWMS.Web +{ + //[QuartzRepeat(10,10, true, 30)] + [PersistJobDataAfterExecution] + [DisallowConcurrentExecution] + public class SendWcsJob : WtmJob + { + public override Task Execute(IJobExecutionContext context) + { + try + { + var _unitWork = new UnitWork(Wtm); + var task = _unitWork.FindSingle(x => x.Status == TaskStatusEnum.待下发); + if (task != null) + { + // 下发任务到wcs + var postData = new + { + TaskNo = task.TaskNo, + PalletNo = task.ContainerCode, + FromLocation = task.FromLocation, + ToLocation = task.ToLocation + }; + var res1 = Wtm.CallAPI>("WCS", "TaskAssign", HttpMethodEnum.POST, postData); + var res = res1.Result.Data; + if (res.Success) + { + task.Status = TaskStatusEnum.已下发; + } + else + { + task.ErrorMsg = res.Msg; + } + task.UpdateTime = DateTime.Now; + task.UpdateBy = "WMS"; + _unitWork.Update(task); + } + + Wtm.DoLog("下发WCS任务", ActionLogTypesEnum.Job, "SendWcsJob"); + + #region 更新时间 + var job = _unitWork.FindSingle(x => + x.JobName == context.JobDetail.Key.Name + ); + if (job != null) + { + job.LastFireTime = TimeZoneInfo.ConvertTimeFromUtc( + context.FireTimeUtc.DateTime, + TimeZoneInfo.Local + ); + // 只执行一次 没有下次执行时间 + if (context.NextFireTimeUtc != null) + { + job.NextFireTime = TimeZoneInfo.ConvertTimeFromUtc( + context.NextFireTimeUtc.Value.DateTime, + TimeZoneInfo.Local + ); + } + _unitWork.Update(job); + } + #endregion + } + catch(Exception ex) { + Wtm.DoLog("下发WCS任务", ActionLogTypesEnum.Job, "SendWcsJob", request:"error", result:ex.Message); + } + return Task.CompletedTask; + } + } +} diff --git a/HHWMS.Web/Areas/TaskManage/ViewModels/TaskHeaderVMs/TaskHeaderListVM.cs b/HHWMS.Web/Areas/TaskManage/ViewModels/TaskHeaderVMs/TaskHeaderListVM.cs index 614ce16..ad22968 100644 --- a/HHWMS.Web/Areas/TaskManage/ViewModels/TaskHeaderVMs/TaskHeaderListVM.cs +++ b/HHWMS.Web/Areas/TaskManage/ViewModels/TaskHeaderVMs/TaskHeaderListVM.cs @@ -57,15 +57,15 @@ namespace HHWMS.Web { string rv = UIService.MakeScriptButton(ButtonTypesEnum.Link,a.TaskNo,$"details('{a.ID}')"); return rv; - }).SetWidth(220), + }).SetWidth(180), this.MakeGridHeader(x => x.TaskType,150), + this.MakeGridHeader(x => x.ContainerCode, 150), this.MakeGridHeader(x => x.FromLocation,150), this.MakeGridHeader(x => x.ToLocation, 150), - this.MakeGridHeader(x => x.Station,150), - this.MakeGridHeader(x => x.ContainerCode, 150), + this.MakeGridHeader(x => x.Status, 150), + this.MakeGridHeader(x => x.Station,150).SetHide(), this.MakeGridHeader(x => x.RoadWay, 150).SetHide(), this.MakeGridHeader(x => x.Priority, 150).SetHide(), - this.MakeGridHeader(x => x.Status, 150), this.MakeGridHeader(x => x.CreateTime, 150).SetHide(), this.MakeGridHeader(x => x.ErrorMsg, 150).SetHide(), this.MakeGridHeaderAction(width: 200) diff --git a/HHWMS.Web/Areas/TaskManage/Views/TaskHeader/Index.cshtml b/HHWMS.Web/Areas/TaskManage/Views/TaskHeader/Index.cshtml index 60e7aa0..c909ef0 100644 --- a/HHWMS.Web/Areas/TaskManage/Views/TaskHeader/Index.cshtml +++ b/HHWMS.Web/Areas/TaskManage/Views/TaskHeader/Index.cshtml @@ -14,7 +14,7 @@
- +@* *@ + - +