基础修改
This commit is contained in:
1 parent
502342b15f
commit
f8e5ea23a9
3 files changed
+82
-12
No files matched your search
@@ -1,3 +1,4 @@
|
|||||||
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using AutoMapper;
|
using AutoMapper;
|
||||||
@@ -82,10 +83,79 @@ namespace HHWMS.Web
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
[HttpPost]
|
[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<TaskHeader>(x => x.TaskNo.Equals(request.TaskNo));
|
||||||
|
if(task == null)
|
||||||
|
{
|
||||||
|
return ApiResultError(msg: $"任务不存在, 任务号 {request.TaskNo} , 请检查后重新请求!");
|
||||||
|
}
|
||||||
|
|
||||||
|
// 根据任务类型 入/出 处理不同流程
|
||||||
|
switch (task.TaskType)
|
||||||
|
{
|
||||||
|
case TaskTypeEnum.立库入库:
|
||||||
|
// 1.更新库存
|
||||||
|
_unitwork.BatchUpdate<Inventory>(x => x.ContainerCode.Equals(task.ContainerCode), x => new Inventory
|
||||||
|
{
|
||||||
|
UpdateTime = DateTime.Now,
|
||||||
|
UpdateBy = "WMS",
|
||||||
|
TaskStatus = InventoryTaskStatus.无任务
|
||||||
|
});
|
||||||
|
// 2.更新容器
|
||||||
|
_unitwork.BatchUpdate<Container>(x => x.Code.Equals(task.ContainerCode), x => new Container
|
||||||
|
{
|
||||||
|
UpdateTime = DateTime.Now,
|
||||||
|
UpdateBy = "WMS",
|
||||||
|
Status = ContainerStatus.有,
|
||||||
|
LocationCode = task.ToLocation
|
||||||
|
});
|
||||||
|
// 3.更新库位
|
||||||
|
_unitwork.BatchUpdate<Location>(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();
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 满入
|
||||||
|
/// </summary>
|
||||||
|
/// <returns></returns>
|
||||||
|
[HttpPost]
|
||||||
|
public IActionResult FullIn(WcsRequest request)
|
||||||
{
|
{
|
||||||
return ApiResult();
|
return ApiResult();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 空出
|
||||||
|
/// </summary>
|
||||||
|
/// <returns></returns>
|
||||||
|
[HttpPost]
|
||||||
|
public IActionResult EmptyOut(WcsRequest request)
|
||||||
|
{
|
||||||
|
return ApiResult();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -29,13 +29,13 @@ namespace HHWMS.Web.Models
|
|||||||
/// 入库任务
|
/// 入库任务
|
||||||
/// </summary>
|
/// </summary>
|
||||||
[Display(Name = "TaskType.In")]
|
[Display(Name = "TaskType.In")]
|
||||||
盘料盒入库 = 1,
|
立库入库 = 1,
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 出库任务
|
/// 出库任务
|
||||||
/// </summary>
|
/// </summary>
|
||||||
[Display(Name = "TaskType.Out")]
|
[Display(Name = "TaskType.Out")]
|
||||||
盘料盒出库 = 2,
|
立库出库 = 2,
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 盘料入库
|
/// 盘料入库
|
||||||
|
|||||||
@@ -22,17 +22,17 @@
|
|||||||
},
|
},
|
||||||
|
|
||||||
"Connections": [
|
"Connections": [
|
||||||
//{
|
|
||||||
// "Key": "default",
|
|
||||||
// "Value": "Server=127.0.0.1;Port=3306;Database=WMS;Uid=root;Password=abc123*;Character Set=utf8mb4;",
|
|
||||||
// "DBType": "mysql"
|
|
||||||
//},
|
|
||||||
{
|
{
|
||||||
"Key": "default",
|
"Key": "default",
|
||||||
"Value": "Data Source=.;Initial Catalog=WMS;User=sa;Password=abc123*;Persist Security Info=True",
|
"Value": "Server=127.0.0.1;Port=3306;Database=lkwms;Uid=root;Password=abc123*;Character Set=utf8mb4;",
|
||||||
"DbContext": "DataContext",
|
"DBType": "mysql"
|
||||||
"DBType": "sqlserver" //DataBase, you can choose mysql,sqlserver,pgsql,sqlite,oracle
|
},
|
||||||
}
|
//{
|
||||||
|
// "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",
|
// "Key": "default",
|
||||||
// "Value": "Data Source=10.18.106.4;Initial Catalog=8357wms;User=wms;Password=abc123*;Persist Security Info=True",
|
// "Value": "Data Source=10.18.106.4;Initial Catalog=8357wms;User=wms;Password=abc123*;Persist Security Info=True",
|
||||||
|
|||||||
Reference in new issue
Block a user