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

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

@@ -5,6 +5,7 @@ using System.Reflection.Emit;
using HHWMS.Web.Models;
using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore;
using NPOI.SS.Formula.Functions;
using WalkingTec.Mvvm.Core;
using WalkingTec.Mvvm.Mvc;
@@ -92,12 +93,15 @@ public class ReceiptSLInController : BaseController
public ActionResult ScanBox(string boxCode)
{
// 判断任务重复
if (_unitWork.IsExit<TaskHeader>(x => x.ZoneCode.Equals(ZoneCodeEnum.散料库) && x.ContainerCode.Equals(boxCode) && x.Status < TaskStatusEnum.完成))
if (_unitWork.IsExit<TaskHeader>(x => x.ZoneCode.Equals(ZoneCodeEnum.散料库)
&& (x.FromLocation.Equals(boxCode) || x.ToLocation.Equals(boxCode))
&& x.Status < TaskStatusEnum.完成))
{
return JsonMore(null, 500, $"库内已存在{boxCode}的任务,请勿重复操作!");
};
// 判断箱号是否合理
var box = _unitWork.FindSingle<Location>(x => x.ContainerCode.Equals(boxCode));
var box = _unitWork.FindSingle<Location>(x => x.Code.Equals(boxCode) && x.Type == LocationTypeEnum.散料库站台);
if (box != null)
{
if (box.Type != LocationTypeEnum.散料库站台)
@@ -143,6 +147,7 @@ public class ReceiptSLInController : BaseController
var receiptHeaderList = _unitWork.Find<ReceiptHeader>(x =>
data.Select(x => x.ReceiptCode).ToList().Contains(x.ID.ToString()))
.Include(x => x.ReceiptDetails).ToList();
// 查找明细,修改对应状态,并且 绑定物料周转箱
foreach (Binding item in data.OrderBy(x => x.ReceiptCode))
{
@@ -162,6 +167,7 @@ public class ReceiptSLInController : BaseController
header.FirstStatus = ReceiptStatusEnum.收完;
}
}
var station = _unitWork.FindSingle<Location>(x => x.Code == item.BoxCode);
// 新建库存
var inventory = new Inventory
{
@@ -169,7 +175,8 @@ public class ReceiptSLInController : BaseController
UniqueCode = item.UniqueCode,
Qty = item.BindQty,
Lot = item.Size.ToString(),
ContainerCode = item.BoxCode,
LocationCode = item.BoxCode,
ContainerCode = station.ContainerCode,
Status = "0",
TaskStatus = InventoryTaskStatus.任务中
};
@@ -193,19 +200,28 @@ public class ReceiptSLInController : BaseController
return JsonMore(null, 500, $"库内已存在{boxCode}的任务,请勿重复操作!");
};
// 判断箱号是否合理
var box = _unitWork.FindSingle<Location>(x => x.ContainerCode.Equals(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(station.ContainerCode)
&& x.Type != LocationTypeEnum.散料库站台);
if (box != null)
{
if(box.Type != LocationTypeEnum.散料库站台)
{
return JsonMore(null, 500, $"{boxCode}不在站台,无法入库!");
}
else
{
//if(box.Type != LocationTypeEnum.散料库站台)
//{
// return JsonMore(null, 500, $"{boxCode}不在站台,无法入库!");
//}
//else
//{
// 查找目标库位,托盘回原库位
var toLocation = _unitWork.FindSingle<Location>(x => x.Code.Equals(boxCode));
var toLocation = _unitWork.FindSingle<Location>(x => x.Code.Equals(box.Code));
if (toLocation != null)
if (toLocation != null)
{
// 创建任务
var task = new TaskHeader
@@ -213,8 +229,8 @@ public class ReceiptSLInController : BaseController
ZoneCode = ZoneCodeEnum.散料库,
TaskNo = _unitWork.GetSerialNumber("CIn"),
TaskType = TaskTypeEnum.散料盒入库,
ContainerCode = boxCode,
FromLocation = box.Code,
ContainerCode = toLocation.Code,
FromLocation = station.Code,
ToLocation = toLocation.Code,
Status = TaskStatusEnum.待下发,
CreateBy = Wtm.LoginUserInfo.ITCode,
@@ -230,7 +246,7 @@ public class ReceiptSLInController : BaseController
{
return JsonMore(null, 500, $"库内无可用仓位,无法入库!");
}
}
//}
return JsonMore(data: null);
}
else