修改WCS任务反馈逻辑,添加盘料入库扫描料箱号占用站台逻辑,修改盘料库启动入库逻辑,将启动入库功能迁移到盘料操作界面中,修改盘料出库料塔取料逻辑,创建出库单据分解定时器,任务下发定时器添加盘料出库任务逻辑
This commit is contained in:
1 parent
79d4512266
commit
1fa11ab235
11 files changed
+536
-136
No files matched your search
@@ -53,6 +53,41 @@ namespace HHWMS.Web.Controllers
|
||||
return JsonMore(null);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 盘料入库扫描料箱号
|
||||
/// </summary>
|
||||
/// <param name="boxCode"></param>
|
||||
/// <returns></returns>
|
||||
[HttpPost]
|
||||
public ActionResult ScanBox(string boxCode)
|
||||
{
|
||||
// 判断任务重复
|
||||
if (_unitWork.IsExit<TaskHeader>(x => x.ZoneCode.Equals(ZoneCodeEnum.盘料库) && x.ContainerCode.Equals(boxCode)))
|
||||
{
|
||||
return JsonMore(null, 500, $"库内已存在{boxCode}的任务,请勿重复操作!");
|
||||
};
|
||||
// 判断箱号是否合理
|
||||
var box = _unitWork.FindSingle<Location>(x => x.Code.Equals(boxCode));
|
||||
if (box != null)
|
||||
{
|
||||
if (string.IsNullOrEmpty(box.ContainerCode))
|
||||
{
|
||||
box.ContainerCode = boxCode;
|
||||
_unitWork.Update(box);
|
||||
}
|
||||
else
|
||||
{
|
||||
return JsonMore(null, 500, $"{boxCode}已经被其他任务占用,无法入库!");
|
||||
}
|
||||
return JsonMore(null);
|
||||
}
|
||||
else
|
||||
{
|
||||
return JsonMore(null, 500, $"{boxCode}不正确!");
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 入库盘料绑定操作
|
||||
/// </summary>
|
||||
@@ -73,11 +108,7 @@ namespace HHWMS.Web.Controllers
|
||||
//var receipt = _unitWork.FindSingle<ReceiptDetail>(x => x.UniqueCode == item.UniqueCode);
|
||||
if (receipt != null)
|
||||
{
|
||||
if (receipt.Status == ReceiptStatusEnum.收完) continue;
|
||||
receipt.CompletedQty += item.BindQty;
|
||||
}
|
||||
if (receipt.CompletedQty == receipt.Qty)
|
||||
{
|
||||
receipt.CompletedQty = receipt.Qty;
|
||||
receipt.Status = ReceiptStatusEnum.收完;
|
||||
if (!header.ReceiptDetails.Any(x => x.Status < ReceiptStatusEnum.收完))
|
||||
{
|
||||
@@ -85,14 +116,15 @@ namespace HHWMS.Web.Controllers
|
||||
_unitWork.Update(header);
|
||||
}
|
||||
}
|
||||
_unitWork.Update(receipt);
|
||||
// 新建库存
|
||||
var inventory = new Inventory
|
||||
{
|
||||
ZoneCode = ZoneCodeEnum.盘料库,
|
||||
UniqueCode = item.UniqueCode,
|
||||
Flag = item.Index,
|
||||
Flag = item.Size,
|
||||
Qty = receipt.Qty,
|
||||
Lot = item.Size.ToString(),
|
||||
Lot = item.Index.ToString(),
|
||||
ContainerCode = item.BoxCode,
|
||||
TaskStatus = InventoryTaskStatus.任务中
|
||||
};
|
||||
|
||||
@@ -35,36 +35,36 @@ public class ReceiptInOperationController : BaseController
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
[HttpPost]
|
||||
public ActionResult InOperation(List<InData> data)
|
||||
public ActionResult InOperation(string boxCode)
|
||||
{
|
||||
// 创建盘料入库任务
|
||||
foreach(var inData in data)
|
||||
// 查找已绑定库存,没有,跳过
|
||||
var invList = _unitWork.Find<Inventory>(x => x.ContainerCode.Equals(boxCode))
|
||||
.ToList();
|
||||
if (invList.Count == 0)
|
||||
{
|
||||
// 查找已绑定库存,没有,跳过
|
||||
var invList = _unitWork.Find<Inventory>(x => x.ContainerCode.Equals(inData.BoxName))
|
||||
.ToList();
|
||||
if (invList.Count == 0) continue;
|
||||
var task = new TaskHeader
|
||||
{
|
||||
TaskNo = _unitWork.GetSerialNumber("pin", 4),
|
||||
TaskType = TaskTypeEnum.盘料入库,
|
||||
Status = TaskStatusEnum.待下发,
|
||||
FromLocation = inData.Station == "1" ? "L01": "L02",
|
||||
TaskDetails = new List<TaskDetail>(),
|
||||
};
|
||||
foreach(var item in invList)
|
||||
{
|
||||
var detail = new TaskDetail
|
||||
{
|
||||
UniqueCode = item.UniqueCode,
|
||||
FromLocation = item.Lot,
|
||||
Status = TaskStatusEnum.新建,
|
||||
CreateTime = DateTime.Now
|
||||
};
|
||||
task.TaskDetails.Add(detail);
|
||||
}
|
||||
_unitWork.Add(task);
|
||||
return JsonMore(null, 500, $"站台{boxCode}没有绑定数据,请正确操作!");
|
||||
}
|
||||
var task = new TaskHeader
|
||||
{
|
||||
TaskNo = _unitWork.GetSerialNumber("pin", 4),
|
||||
TaskType = TaskTypeEnum.盘料入库,
|
||||
Status = TaskStatusEnum.待下发,
|
||||
FromLocation = boxCode,
|
||||
TaskDetails = new List<TaskDetail>(),
|
||||
};
|
||||
foreach(var item in invList)
|
||||
{
|
||||
var detail = new TaskDetail
|
||||
{
|
||||
UniqueCode = item.UniqueCode,
|
||||
FromLocation = item.Lot,
|
||||
Status = TaskStatusEnum.新建,
|
||||
CreateTime = DateTime.Now
|
||||
};
|
||||
task.TaskDetails.Add(detail);
|
||||
}
|
||||
_unitWork.Add(task);
|
||||
return JsonMore(null);
|
||||
}
|
||||
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Reflection.Emit;
|
||||
using HHWMS.Web.Models;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
@@ -63,11 +64,15 @@ public class ReceiptSLInController : BaseController
|
||||
ContainerCode = box.ContainerCode,
|
||||
FromLocation = box.Code,
|
||||
ToLocation = toLocation,
|
||||
Status = TaskStatusEnum.新建,
|
||||
Status = TaskStatusEnum.待下发,
|
||||
CreateTime = DateTime.Now,
|
||||
CreateBy = Wtm.LoginUserInfo.ITCode
|
||||
};
|
||||
_unitWork.Add(task);
|
||||
|
||||
//更新起点仓位状态
|
||||
box.Status = LocationStatus.任务锁;
|
||||
_unitWork.Update(box);
|
||||
return JsonMore(null);
|
||||
}
|
||||
|
||||
@@ -175,7 +180,8 @@ public class ReceiptSLInController : BaseController
|
||||
public ActionResult BoxBack(string boxCode, bool isFull)
|
||||
{
|
||||
// 判断任务重复
|
||||
if(!_unitWork.IsExit<TaskHeader>(x => x.ZoneCode.Equals(ZoneCodeEnum.散料库) && x.ContainerCode.Equals(boxCode))){
|
||||
if (_unitWork.IsExit<TaskHeader>(x => x.ZoneCode.Equals(ZoneCodeEnum.散料库) && x.ContainerCode.Equals(boxCode)))
|
||||
{
|
||||
return JsonMore(null, 500, $"库内已存在{boxCode}的任务,请勿重复操作!");
|
||||
};
|
||||
// 判断箱号是否合理
|
||||
@@ -188,10 +194,8 @@ public class ReceiptSLInController : BaseController
|
||||
}
|
||||
else
|
||||
{
|
||||
// 查找目标库位
|
||||
var toLocation = _unitWork.FindSingle<Location>(x => x.Status.Equals(LocationStatus.空仓位)
|
||||
&& x.Type.Equals(LocationTypeEnum.散料库位)
|
||||
&& x.Row.Equals(box.Row));
|
||||
// 查找目标库位,托盘回原库位
|
||||
var toLocation = _unitWork.FindSingle<Location>(x => x.Code.Equals(boxCode));
|
||||
|
||||
if (toLocation != null)
|
||||
{
|
||||
@@ -204,7 +208,7 @@ public class ReceiptSLInController : BaseController
|
||||
ContainerCode = boxCode,
|
||||
FromLocation = box.Code,
|
||||
ToLocation = toLocation.Code,
|
||||
Status = TaskStatusEnum.新建,
|
||||
Status = TaskStatusEnum.待下发,
|
||||
CreateBy = Wtm.LoginUserInfo.ITCode,
|
||||
CreateTime = DateTime.Now
|
||||
};
|
||||
|
||||
Reference in new issue
Block a user