散料出入库扫描 站台,系统匹配料盒

This commit is contained in:
zgf committed 2023-11-22 11:22:01 +08:00
1 parent b833415dbf
commit b864a80e29
10 files changed
+140 -61

No files matched your search

@@ -116,24 +116,28 @@ public class ShipOutController : 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.FromLocation.Equals(boxCode))){
return JsonMore(null, 500, $"库内已存在{boxCode}的任务,请勿重复操作!");
};
var station = _unitWork.FindSingle<Location>(x => x.Code.Equals(boxCode)
&& x.Type == LocationTypeEnum.散料库站台);
if(station == null)
{
return JsonMore(null, 500, $"站台{boxCode}不存在,无法入库!");
}
// 判断箱号是否合理
var box = _unitWork.FindSingle<Location>(x => x.ContainerCode.Equals(boxCode));
var box = _unitWork.FindSingle<Location>(x => x.ContainerCode.Equals(station.ContainerCode)
&& x.Type != LocationTypeEnum.散料库站台);
if (box != null)
{
if(box.Type != LocationTypeEnum.散料库站台)
{
return JsonMore(null, 500, $"{boxCode}不在站台,无法入库!");
}
else
{
// 查找目标库位
var toLocation = _unitWork.FindSingle<Location>(x => x.Status.Equals(LocationStatus.空仓位)
&& x.Type.Equals(LocationTypeEnum.散料库位)
&& x.Code == boxCode
&& x.Row.Equals(box.Row));
//if(box.Type != LocationTypeEnum.散料库站台)
//{
// return JsonMore(null, 500, $"{boxCode}不在站台,无法入库!");
//}
//else
//{
// 查找目标库位 回原位
var toLocation = _unitWork.FindSingle<Location>(x => x.Code.Equals(box.Code));
if (toLocation != null)
{
@@ -143,8 +147,8 @@ public class ShipOutController : BaseController
ZoneCode = ZoneCodeEnum.散料库,
TaskNo = _unitWork.GetSerialNumber("CIn"),
TaskType = TaskTypeEnum.散料盒入库,
ContainerCode = boxCode,
FromLocation = box.Code,
ContainerCode = station.ContainerCode,
FromLocation = station.Code,
ToLocation = toLocation.Code,
Status = TaskStatusEnum.待下发,
CreateBy = Wtm.LoginUserInfo.ITCode,
@@ -160,7 +164,7 @@ public class ShipOutController : BaseController
{
return JsonMore(null, 500, $"库内无可用仓位,无法入库!");
}
}
//}
return JsonMore(data: null);
}
else