base
This commit is contained in:
1 parent
d1781f7326
commit
aa33eadcb6
1066 files changed
+68
-335722
No files matched your search
@@ -237,129 +237,5 @@ namespace HHWMS.Web.Controllers
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region 任务取消
|
||||
[ActionDescription("TaskHeader.Cancel")]
|
||||
public ActionResult Cancel(string id)
|
||||
{
|
||||
var task = _unitwork.Find<TaskDetail>(x => x.ID == int.Parse(id))
|
||||
.Include(x => x.TaskHeader).FirstOrDefault();
|
||||
|
||||
if (task != null)
|
||||
{
|
||||
var isSend = 0;
|
||||
// 判断任务 是否能取消
|
||||
if (task.Status < TaskStatusEnum.已下发)
|
||||
{
|
||||
isSend = 1;
|
||||
}
|
||||
else if (task.Status == TaskStatusEnum.完成)
|
||||
{
|
||||
return FFResult().Alert($"此任务已完成,无需取消!");
|
||||
}
|
||||
|
||||
var taskInfo = new TaskInfo
|
||||
{
|
||||
TaskId = $"{task.TaskHeader.TaskNo}-{task.FromLocation}",
|
||||
TaskType = 99,
|
||||
};
|
||||
try
|
||||
{
|
||||
if (isSend == 0)
|
||||
{
|
||||
var res = Wtm.CallAPI<ApiJsonResult<dynamic>>("WCS", "TaskAssign", HttpMethodEnum.POST, taskInfo).Result.Data;
|
||||
if ((bool)res?.Success)
|
||||
{
|
||||
isSend = 1;
|
||||
}
|
||||
else
|
||||
{
|
||||
return FFResult().Alert($"操作失败,{res.Msg}");
|
||||
}
|
||||
}
|
||||
if (isSend == 1)
|
||||
{
|
||||
// 盘料入库,删除子表任务,并且删除子表对应库存,
|
||||
if (task.TaskHeader.TaskType.Equals(TaskTypeEnum.盘料入库))
|
||||
{
|
||||
List<TaskDetail> taskDetails = _unitwork.Find<TaskDetail>(x => x.TaskHeaderId == task.TaskHeader.ID
|
||||
&& x.ID != task.ID).ToList();
|
||||
Inventory inventory = _unitwork.Find<Inventory>(n => n.UniqueCode == task.UniqueCode
|
||||
&& n.ContainerCode == task.TaskHeader.FromLocation
|
||||
&& n.TaskStatus == InventoryTaskStatus.任务中).FirstOrDefault();
|
||||
if (inventory != null)
|
||||
{
|
||||
_unitwork.Delete(inventory);
|
||||
}
|
||||
_unitwork.Delete(task);
|
||||
//子表已经被全部删除,创建盘料盒回库任务
|
||||
if (taskDetails.Count() == 0)
|
||||
{
|
||||
var newTask = new TaskHeader
|
||||
{
|
||||
TaskDetails = new List<TaskDetail>()
|
||||
};
|
||||
var station = _unitwork.Find<Location>(x => x.Code == task.FromLocation).FirstOrDefault();
|
||||
// 创建料盒入库任务
|
||||
// 查找回库的任务起点,
|
||||
var fromLocation = _unitwork.FindSingle<Location>(x => x.Code.Equals(task.ToLocation)).ContiguousCode;
|
||||
newTask.ZoneCode = ZoneCodeEnum.盘料库;
|
||||
newTask.TaskNo = _unitwork.GetSerialNumber("Deletein", 4);
|
||||
newTask.TaskType = TaskTypeEnum.盘料盒入库;
|
||||
newTask.ContainerCode = task.TaskHeader.ContainerCode;
|
||||
newTask.FromLocation = fromLocation;
|
||||
newTask.ToLocation = task.TaskHeader.ContainerCode;
|
||||
newTask.Status = TaskStatusEnum.待下发;
|
||||
newTask.CreateTime = DateTime.Now;
|
||||
_unitwork.Add(newTask);
|
||||
//更新料塔占用
|
||||
station.ContainerCode = "";
|
||||
_unitwork.Update(station);
|
||||
}
|
||||
|
||||
}
|
||||
//盘料出库,删除子表任务,并且恢复子表对应库存,子表全部删除后创建盘料盒回库任务
|
||||
else if (task.TaskHeader.TaskType.Equals(TaskTypeEnum.盘料出库))
|
||||
{
|
||||
List<TaskDetail> taskDetails = _unitwork.Find<TaskDetail>(x => x.TaskHeaderId == task.TaskHeader.ID
|
||||
&& x.ID != task.ID).ToList();
|
||||
Inventory inventory = _unitwork.Find<Inventory>(n => n.UniqueCode == task.UniqueCode
|
||||
&& n.ContainerCode == task.TaskHeader.FromLocation
|
||||
&& n.TaskStatus == InventoryTaskStatus.任务中).FirstOrDefault();
|
||||
if (inventory != null)
|
||||
{
|
||||
inventory.ContainerCode = task.TaskHeader.ContainerCode;
|
||||
inventory.LocationCode = task.TaskHeader.ContainerCode;
|
||||
_unitwork.Update(inventory);
|
||||
}
|
||||
if (taskDetails.Count() == 0)
|
||||
{
|
||||
// 查找回库的任务起点,
|
||||
var fromLocation = _unitwork.FindSingle<Location>(x => x.Code.Equals(task.FromLocation)).ContiguousCode;
|
||||
// 下发盘料盒回库任务,回原位
|
||||
var newTask = new TaskHeader
|
||||
{
|
||||
TaskDetails = new List<TaskDetail>()
|
||||
};
|
||||
newTask.ZoneCode = ZoneCodeEnum.盘料库;
|
||||
newTask.TaskNo = _unitwork.GetSerialNumber("Deletein", 4);
|
||||
newTask.TaskType = TaskTypeEnum.盘料盒入库;
|
||||
newTask.ContainerCode = task.ContainerCode;
|
||||
newTask.FromLocation = fromLocation;
|
||||
newTask.ToLocation = task.ContainerCode;
|
||||
newTask.Status = TaskStatusEnum.待下发;
|
||||
newTask.CreateTime = DateTime.Now;
|
||||
_unitwork.Add(newTask);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
return FFResult().Alert($"操作失败,{ex.Message}");
|
||||
}
|
||||
}
|
||||
return FFResult().Message("任务取消成功").RefreshGrid();
|
||||
}
|
||||
#endregion 任务取消
|
||||
}
|
||||
}
|
||||
@@ -245,217 +245,5 @@ namespace HHWMS.Web.Controllers
|
||||
|
||||
#endregion Export
|
||||
|
||||
#region 任务下发
|
||||
|
||||
[ActionDescription("TaskHeader.Assign")]
|
||||
public ActionResult Assign(string id)
|
||||
{
|
||||
var task = _unitwork.Find<TaskHeader>(x => x.ID == int.Parse(id)).Include(x => x.TaskDetails).FirstOrDefault();
|
||||
var tt = task.TaskDetails.ToList().Exists(x => x.ContainerCode == "123");
|
||||
if (task == null)
|
||||
return FFResult().RefreshGrid().Alert($"操作失败,此任务不存在!");
|
||||
var taskInfo = new TaskInfo();
|
||||
|
||||
var beginlocation = _unitwork.FindSingle<Location>(x => x.Code.Equals(task.FromLocation));
|
||||
var endLocation = _unitwork.FindSingle<Location>(x => x.Code.Equals(task.ToLocation));
|
||||
var start = new CoordPos();
|
||||
var end = new CoordPos();
|
||||
|
||||
if (task.TaskType == TaskTypeEnum.盘料入库 || task.TaskType == TaskTypeEnum.盘料出库)
|
||||
{
|
||||
return FFResult().Alert($"盘料操作无法手动执行");
|
||||
// 盘料起点终点 与普通任务起点终点不一样,编码未在location中保存
|
||||
/*var taskdel = task.TaskDetails.FirstOrDefault(x => x.Status.Equals(TaskStatusEnum.新建));
|
||||
start.X = beginlocation.Line;
|
||||
end.X = endLocation.Line;
|
||||
if (task.TaskType == TaskTypeEnum.盘料入库)
|
||||
{
|
||||
start.Y = 2;
|
||||
start.Z = int.Parse(taskdel.FromLocation);
|
||||
|
||||
end.Y = int.Parse(taskdel.ToLocation);
|
||||
end.Z = 2;
|
||||
}
|
||||
else if (task.TaskType == TaskTypeEnum.盘料出库)
|
||||
{
|
||||
start.Y = int.Parse(taskdel.FromLocation);
|
||||
start.Z = 2;
|
||||
|
||||
end.Y = 2;
|
||||
end.Z = int.Parse(taskdel.FromLocation);
|
||||
}
|
||||
taskInfo.TaskId = $"{taskdel.TaskHeader.TaskNo}-{taskdel.FromLocation}";
|
||||
taskInfo.TaskType = (int)task.TaskType;
|
||||
taskInfo.ObjId = taskdel.ContainerCode;
|
||||
taskInfo.StartType = int.Parse(task.Station);
|
||||
taskInfo.StartPos = start;
|
||||
taskInfo.EndType = int.Parse(task.Station);
|
||||
taskInfo.EndPos = end;*/
|
||||
}
|
||||
else
|
||||
{
|
||||
start.X = beginlocation.Line;
|
||||
start.Y = beginlocation.Row;
|
||||
start.Z = beginlocation.Layer;
|
||||
|
||||
end.X = endLocation.Line;
|
||||
end.Y = endLocation.Row;
|
||||
end.Z = endLocation.Layer;
|
||||
|
||||
taskInfo.TaskId = task.TaskNo;
|
||||
taskInfo.TaskType = (int)task.TaskType;
|
||||
taskInfo.ObjId = task.ContainerCode;
|
||||
taskInfo.StartType = int.Parse(task.Station);
|
||||
taskInfo.StartPos = start;
|
||||
taskInfo.EndType = int.Parse(task.Station);
|
||||
taskInfo.EndPos = end;
|
||||
}
|
||||
|
||||
try
|
||||
{
|
||||
var res = Wtm.CallAPI<ApiJsonResult<dynamic>>("WCS", "TaskAssign", HttpMethodEnum.POST, taskInfo).Result.Data;
|
||||
if ((bool)res?.Success)
|
||||
{
|
||||
// 删除已回传MES的任务
|
||||
//_unitwork.Delete(item);
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
return FFResult().Alert($"操作失败,{ex.Message}");
|
||||
}
|
||||
return FFResult().RefreshGrid();
|
||||
}
|
||||
#endregion 任务下发
|
||||
|
||||
#region 任务取消
|
||||
[ActionDescription("TaskHeader.Cancel")]
|
||||
public ActionResult Cancel(string id)
|
||||
{
|
||||
var task = _unitwork.FindById<TaskHeader>(int.Parse(id));
|
||||
|
||||
if (task != null)
|
||||
{
|
||||
var isSend = 0;
|
||||
if (task.Status >= TaskStatusEnum.已下发)
|
||||
{
|
||||
isSend = 1;
|
||||
}
|
||||
// 判断任务 是否能取消
|
||||
if (task.TaskType.Equals(TaskTypeEnum.盘料入库) || task.TaskType.Equals(TaskTypeEnum.盘料出库))
|
||||
{
|
||||
return FFResult().Alert($"{task.TaskType}类型任务需要从子任务取消!");
|
||||
}
|
||||
var taskInfo = new TaskInfo
|
||||
{
|
||||
TaskId = task.TaskNo,
|
||||
TaskType = 99,
|
||||
};
|
||||
try
|
||||
{
|
||||
var res = new ApiJsonResult<dynamic>();
|
||||
if (isSend == 1)
|
||||
{
|
||||
res = Wtm.CallAPI<ApiJsonResult<dynamic>>("WCS", "TaskAssign", HttpMethodEnum.POST, taskInfo).Result.Data;
|
||||
}
|
||||
else
|
||||
{
|
||||
res.Success = true;
|
||||
}
|
||||
if ((bool)res?.Success)
|
||||
{
|
||||
//盘料盒出库任务删除,连带删除盘料入库和盘料出库任务
|
||||
if (task.TaskType.Equals(TaskTypeEnum.盘料盒出库))
|
||||
{
|
||||
//库位恢复原位
|
||||
List<Location> locations = _unitwork.Find<Location>(x => x.Code == task.FromLocation || x.Code == task.ToLocation).ToList();
|
||||
foreach (var location in locations)
|
||||
{
|
||||
//原仓位数据还原为在仓位的初始状态
|
||||
if (location.Code == task.ContainerCode)
|
||||
{
|
||||
location.ContainerCode = task.ContainerCode;
|
||||
location.Status = LocationStatus.有货;
|
||||
}
|
||||
else
|
||||
{
|
||||
location.ContainerCode = "";
|
||||
location.Status = LocationStatus.空仓位;
|
||||
}
|
||||
_unitwork.Update(location);
|
||||
}
|
||||
//物料恢复原位
|
||||
List<Inventory> inventories = _unitwork.Find<Inventory>(x => x.ContainerCode == task.ContainerCode).ToList();
|
||||
foreach (var inventorie in inventories)
|
||||
{
|
||||
inventorie.LocationCode = task.ContainerCode;
|
||||
inventorie.TaskStatus = InventoryTaskStatus.无任务;
|
||||
_unitwork.Update(inventorie);
|
||||
}
|
||||
//删除任务
|
||||
_unitwork.Delete(task);
|
||||
//删除盘料入库任务和库存
|
||||
TaskHeader taskHeader = _unitwork.Find<TaskHeader>(x => x.ContainerCode == task.ContainerCode
|
||||
&& (x.TaskType.Equals(TaskTypeEnum.盘料入库) || x.TaskType.Equals(TaskTypeEnum.盘料出库))).FirstOrDefault();
|
||||
if (taskHeader != null && taskHeader.TaskType.Equals(TaskTypeEnum.盘料入库))
|
||||
{
|
||||
List<Inventory> inventories1 = _unitwork.Find<Inventory>(x => x.ContainerCode == taskHeader.FromLocation
|
||||
&& x.TaskStatus == InventoryTaskStatus.任务中).ToList();
|
||||
foreach (var inventorie1 in inventories1)
|
||||
{
|
||||
_unitwork.Delete(inventorie1);
|
||||
}
|
||||
_unitwork.Delete(taskHeader);
|
||||
|
||||
}
|
||||
//删除盘料出库任务
|
||||
else if (taskHeader != null && taskHeader.TaskType.Equals(TaskTypeEnum.盘料出库))
|
||||
{
|
||||
_unitwork.Delete(taskHeader);
|
||||
}
|
||||
}
|
||||
//盘料盒入库任务删除,托盘恢复原位
|
||||
else if (task.TaskType.Equals(TaskTypeEnum.盘料盒入库))
|
||||
{
|
||||
// 删除任务,处理数据
|
||||
List<Location> locations = _unitwork.Find<Location>(x => x.ContainerCode == task.ContainerCode).ToList();
|
||||
foreach (var location in locations)
|
||||
{
|
||||
//原仓位数据还原为在仓位的初始状态
|
||||
if (location.Code == task.ContainerCode)
|
||||
{
|
||||
location.ContainerCode = task.ContainerCode;
|
||||
location.Status = LocationStatus.有货;
|
||||
}
|
||||
else
|
||||
{
|
||||
location.ContainerCode = "";
|
||||
location.Status = LocationStatus.空仓位;
|
||||
}
|
||||
_unitwork.Update(location);
|
||||
}
|
||||
List<Inventory> inventories = _unitwork.Find<Inventory>(x => x.ContainerCode == task.ContainerCode).ToList();
|
||||
foreach (var inventorie in inventories)
|
||||
{
|
||||
inventorie.LocationCode = task.ContainerCode;
|
||||
inventorie.TaskStatus = InventoryTaskStatus.无任务;
|
||||
_unitwork.Update(inventorie);
|
||||
}
|
||||
_unitwork.Delete(task);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
return FFResult().Alert($"操作失败,{res.Msg}");
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
return FFResult().Alert($"操作失败,{ex.Message}");
|
||||
}
|
||||
}
|
||||
return FFResult().Message("任务取消成功").RefreshGrid();
|
||||
}
|
||||
#endregion 任务取消
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user