diff --git a/HHWMS.Web/Areas/Api/IWCSController.cs b/HHWMS.Web/Areas/Api/IWCSController.cs index 7dbc6bb..df1b1fa 100644 --- a/HHWMS.Web/Areas/Api/IWCSController.cs +++ b/HHWMS.Web/Areas/Api/IWCSController.cs @@ -1,3 +1,4 @@ +using System; using System.Collections.Generic; using System.Linq; using AutoMapper; @@ -82,10 +83,79 @@ namespace HHWMS.Web /// /// [HttpPost] - public IActionResult TaskStatusResult(WcsRequest request) + public IActionResult ReturnStatus(WcsRequest request) + { + // 返回状态 只接收100 + if(request.State != 100) + { + return ApiResultError(msg:"State 不为100, 请检查后重新请求!"); + } + + // 判断任务是否合理 + var task = _unitwork.FindSingle(x => x.TaskNo.Equals(request.TaskNo)); + if(task == null) + { + return ApiResultError(msg: $"任务不存在, 任务号 {request.TaskNo} , 请检查后重新请求!"); + } + + // 根据任务类型 入/出 处理不同流程 + switch (task.TaskType) + { + case TaskTypeEnum.立库入库: + // 1.更新库存 + _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 + { + UpdateTime = DateTime.Now, + UpdateBy = "WMS", + Status = ContainerStatus.有, + LocationCode = task.ToLocation + }); + // 3.更新库位 + _unitwork.BatchUpdate(x => x.Code.Equals(task.ToLocation), x => new Location + { + UpdateTime = DateTime.Now, + UpdateBy = "WMS", + Status = LocationStatus.有货, + ContainerCode = task.ContainerCode + }); + // 4.插入库存交易 + break; + case TaskTypeEnum.立库出库: + break; + default: + return ApiResultError(msg:$"任务类型不正确!任务号{request.TaskNo}"); + } + task.Status = TaskStatusEnum.完成; + // 插到历史表,或者接下来流程 + return ApiResult(); + } + + /// + /// 满入 + /// + /// + [HttpPost] + public IActionResult FullIn(WcsRequest request) + { + return ApiResult(); + } + + + /// + /// 空出 + /// + /// + [HttpPost] + public IActionResult EmptyOut(WcsRequest request) { return ApiResult(); } - } } diff --git a/HHWMS.Web/Models/Enum/WMSEnum.cs b/HHWMS.Web/Models/Enum/WMSEnum.cs index 40676e0..d5b6c63 100644 --- a/HHWMS.Web/Models/Enum/WMSEnum.cs +++ b/HHWMS.Web/Models/Enum/WMSEnum.cs @@ -29,13 +29,13 @@ namespace HHWMS.Web.Models /// 入库任务 /// [Display(Name = "TaskType.In")] - 盘料盒入库 = 1, + 立库入库 = 1, /// /// 出库任务 /// [Display(Name = "TaskType.Out")] - 盘料盒出库 = 2, + 立库出库 = 2, /// /// 盘料入库 diff --git a/HHWMS.Web/appsettings.json b/HHWMS.Web/appsettings.json index 30322fa..d384554 100644 --- a/HHWMS.Web/appsettings.json +++ b/HHWMS.Web/appsettings.json @@ -22,17 +22,17 @@ }, "Connections": [ - //{ - // "Key": "default", - // "Value": "Server=127.0.0.1;Port=3306;Database=WMS;Uid=root;Password=abc123*;Character Set=utf8mb4;", - // "DBType": "mysql" - //}, { "Key": "default", - "Value": "Data Source=.;Initial Catalog=WMS;User=sa;Password=abc123*;Persist Security Info=True", - "DbContext": "DataContext", - "DBType": "sqlserver" //DataBase, you can choose mysql,sqlserver,pgsql,sqlite,oracle - } + "Value": "Server=127.0.0.1;Port=3306;Database=lkwms;Uid=root;Password=abc123*;Character Set=utf8mb4;", + "DBType": "mysql" + }, + //{ + // "Key": "default", + // "Value": "Data Source=.;Initial Catalog=WMS;User=sa;Password=abc123*;Persist Security Info=True", + // "DbContext": "DataContext", + // "DBType": "sqlserver" //DataBase, you can choose mysql,sqlserver,pgsql,sqlite,oracle + //} //{ // "Key": "default", // "Value": "Data Source=10.18.106.4;Initial Catalog=8357wms;User=wms;Password=abc123*;Persist Security Info=True",