盘料 散料收货扫完码自动滚动
批量新增明细,报错信息修改 散料扫完站台码,显示所有已绑定物料
This commit is contained in:
1 parent
8b4c33283c
commit
faa3f5a9d3
6 files changed
+64
-19
No files matched your search
@@ -168,18 +168,31 @@ namespace HHWMS.Web.Controllers
|
||||
}
|
||||
}
|
||||
var uniqueGroup = detailList.GroupBy(x => x.UniqueCode);
|
||||
|
||||
if (uniqueGroup.Any(x => x.Count() > 1))
|
||||
{
|
||||
return FFResult().Alert("新增明细中,存在重复的唯一码!");
|
||||
var codeList = uniqueGroup.Where(x => x.Count() > 1)
|
||||
.Select(x => x.Key)
|
||||
.ToList();
|
||||
return FFResult().Alert($"新增明细中,存在重复的唯一码!{String.Join(", ", codeList.ToArray())}");
|
||||
}
|
||||
|
||||
// 判断唯一码是否已在库内
|
||||
var reDetailList = _unitwork.Find<ReceiptDetail>(x => x.Status == ReceiptStatusEnum.新建)
|
||||
.Select(x => x.UniqueCode)
|
||||
.Select(x => new { x.UniqueCode, x.ReceiptHeader.Code })
|
||||
.ToList();
|
||||
if (reDetailList.Intersect(detailList.Select(x => x.UniqueCode)).Count() > 0)
|
||||
var reDel = reDetailList.Select(x => x.UniqueCode)
|
||||
.Intersect(detailList.Select(x => x.UniqueCode));
|
||||
if (reDel.Count() > 0)
|
||||
{
|
||||
return FFResult().Alert("新增明细中,存在已添加的唯一码!");
|
||||
var tt= reDetailList.Where(x => reDel.Contains(x.UniqueCode))
|
||||
.ToList();
|
||||
var returnStr = "";
|
||||
foreach (var item in tt)
|
||||
{
|
||||
returnStr += $"单号:{item.Code};唯一码:{item.UniqueCode};";
|
||||
}
|
||||
return FFResult().Alert($"新增明细中,存在已添加的唯一码!{returnStr}");
|
||||
}
|
||||
|
||||
// 判断唯一码是否已在库内
|
||||
|
||||
@@ -145,7 +145,9 @@ namespace HHWMS.Web.Controllers
|
||||
{
|
||||
// 更新入库单明细状态
|
||||
var header = receiptHeaderList.First(x => x.Code.Equals(item.ReceiptCode));
|
||||
var receipt = header.ReceiptDetails.First(x => x.UniqueCode.Equals(item.UniqueCode));
|
||||
var receipt = header.ReceiptDetails.First(x =>
|
||||
x.UniqueCode.Equals(item.UniqueCode)
|
||||
&& x.Status < ReceiptStatusEnum.收完);
|
||||
//var receipt = _unitWork.FindSingle<ReceiptDetail>(x => x.UniqueCode == item.UniqueCode);
|
||||
if (receipt != null)
|
||||
{
|
||||
|
||||
@@ -112,7 +112,9 @@ public class ReceiptSLInController : BaseController
|
||||
{
|
||||
return JsonMore(null, 500, $"{boxCode}站台没有料箱,无法入库!");
|
||||
}
|
||||
return JsonMore(null);
|
||||
var data = _unitWork.Find<Inventory>(x => x.LocationCode == boxCode
|
||||
&& x.TaskStatus == InventoryTaskStatus.任务中).ToList();
|
||||
return JsonMore(data);
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -187,6 +189,7 @@ public class ReceiptSLInController : BaseController
|
||||
Qty = item.BindQty,
|
||||
LocationCode = item.BoxCode,
|
||||
ContainerCode = station.ContainerCode,
|
||||
ReceiptCode = item.ReceiptCode,
|
||||
Status = "0",
|
||||
TaskStatus = InventoryTaskStatus.任务中,
|
||||
Flag = item.Size,
|
||||
|
||||
Reference in new issue
Block a user