盘料盒散料盒入库 更新交易记录
入库单据异常处理
This commit is contained in:
1 parent
caab84071c
commit
40a6810713
3 files changed
+37
-29
No files matched your search
@@ -133,15 +133,6 @@ namespace HHWMS.Web
|
||||
tasktolocatioin.ContainerCode = task.ContainerCode;
|
||||
_unitwork.Update(tasktolocatioin);
|
||||
|
||||
_unitwork.BatchUpdate<Inventory>(x => x.ContainerCode.Equals(task.ContainerCode)
|
||||
&& string.IsNullOrEmpty(x.SourceCode),
|
||||
x => new Inventory
|
||||
{
|
||||
LocationCode = tasktolocatioin.Code,
|
||||
TaskStatus = InventoryTaskStatus.无任务,
|
||||
UpdateTime = DateTime.Now,
|
||||
UpdateBy = "wcs"
|
||||
});
|
||||
break;
|
||||
case TaskTypeEnum.散料盒出库:
|
||||
// 更新库位
|
||||
@@ -194,16 +185,6 @@ namespace HHWMS.Web
|
||||
}
|
||||
_unitwork.Update(tasktolocatioin);
|
||||
|
||||
_unitwork.BatchUpdate<Inventory>(x => x.ContainerCode.Equals(task.ContainerCode)
|
||||
&& string.IsNullOrEmpty(x.SourceCode),
|
||||
x => new Inventory
|
||||
{
|
||||
LocationCode = tasktolocatioin.Code,
|
||||
TaskStatus = InventoryTaskStatus.无任务,
|
||||
UpdateTime = DateTime.Now,
|
||||
UpdateBy = "wcs"
|
||||
});
|
||||
|
||||
break;
|
||||
case TaskTypeEnum.盘料盒出库:
|
||||
// 更新库位
|
||||
@@ -375,9 +356,10 @@ namespace HHWMS.Web
|
||||
if (task.TaskType == TaskTypeEnum.盘料盒入库
|
||||
|| task.TaskType == TaskTypeEnum.散料盒入库)
|
||||
{
|
||||
var invList = _unitwork.Find<Inventory>(x => x.ContainerCode == task.ContainerCode
|
||||
&& x.TaskStatus == InventoryTaskStatus.任务中
|
||||
&& string.IsNullOrEmpty(x.SourceCode))
|
||||
var invList = _unitwork.Find<Inventory>(x => x.ContainerCode.Equals(task.ContainerCode)
|
||||
&& x.TaskStatus.Equals(InventoryTaskStatus.任务中)
|
||||
&& string.IsNullOrEmpty(x.SourceCode)
|
||||
)
|
||||
.ToList();
|
||||
var listInvtran = new List<InventoryTransaction>();
|
||||
foreach (var inv in invList)
|
||||
@@ -403,6 +385,16 @@ namespace HHWMS.Web
|
||||
});
|
||||
}
|
||||
_unitwork.BatchAdd(listInvtran.ToArray());
|
||||
|
||||
_unitwork.BatchUpdate<Inventory>(x => x.ContainerCode.Equals(task.ContainerCode)
|
||||
&& string.IsNullOrEmpty(x.SourceCode),
|
||||
x => new Inventory
|
||||
{
|
||||
LocationCode = tasktolocatioin.Code,
|
||||
TaskStatus = InventoryTaskStatus.无任务,
|
||||
UpdateTime = DateTime.Now,
|
||||
UpdateBy = "wcs"
|
||||
});
|
||||
}
|
||||
_unitwork.Update(task);
|
||||
if (task.Status == TaskStatusEnum.完成)
|
||||
|
||||
@@ -137,13 +137,14 @@ namespace HHWMS.Web.Controllers
|
||||
return JsonMore(null, 500, $"尺寸{item.Key}的盘料盒无法满足入库需求,剩余数量{num}");
|
||||
|
||||
}*/
|
||||
var receiptHeaderList = _unitWork.Find<ReceiptHeader>(x =>
|
||||
data.Select(x => x.ReceiptCode).ToList().Contains(x.Code))
|
||||
.Include(x => x.ReceiptDetails).ToList();
|
||||
|
||||
using (var tran = Wtm.DC.Database.BeginTransaction())
|
||||
{
|
||||
try
|
||||
{
|
||||
var receiptHeaderList = _unitWork.Find<ReceiptHeader>(x =>
|
||||
data.Select(x => x.ReceiptCode).ToList().Contains(x.Code))
|
||||
.Include(x => x.ReceiptDetails).ToList();
|
||||
// 查找明细,修改对应状态,并且 绑定物料周转箱
|
||||
foreach (Binding item in data)
|
||||
{
|
||||
@@ -157,6 +158,7 @@ namespace HHWMS.Web.Controllers
|
||||
{
|
||||
receipt.CompletedQty = receipt.Qty;
|
||||
receipt.Status = ReceiptStatusEnum.收完;
|
||||
_unitWork.Update(receipt);
|
||||
if (!header.ReceiptDetails.Any(x => x.Status < ReceiptStatusEnum.收完))
|
||||
{
|
||||
header.FirstStatus = ReceiptStatusEnum.收完;
|
||||
@@ -168,7 +170,6 @@ namespace HHWMS.Web.Controllers
|
||||
throw new Exception($"入库单{item.ReceiptCode}不存在{item.UniqueCode}的明细!");
|
||||
}
|
||||
|
||||
_unitWork.Update(receipt);
|
||||
// 新建库存
|
||||
var inventory = new Inventory
|
||||
{
|
||||
|
||||
@@ -25,6 +25,21 @@ namespace HHWMS.Web
|
||||
_unitwork.BatchDelete<ReceiptHeader>(x => x.FirstStatus == ReceiptStatusEnum.收完);
|
||||
}
|
||||
|
||||
var errorRec = _unitwork.Find<ReceiptHeader>(x =>
|
||||
x.FirstStatus < ReceiptStatusEnum.收完
|
||||
&& x.CreateTime < DateTime.Now.AddDays(-1))
|
||||
.Include(u =>
|
||||
u.ReceiptDetails)
|
||||
.ToList();
|
||||
foreach (var rec in errorRec.Where(x =>
|
||||
x.ReceiptDetails.Any()
|
||||
&& x.ReceiptDetails.All(y => y.Status == ReceiptStatusEnum.收完)))
|
||||
{
|
||||
rec.FirstStatus = ReceiptStatusEnum.收完;
|
||||
_unitwork.Update(rec);
|
||||
|
||||
}
|
||||
|
||||
if (_unitwork.IsExit<ShipmentHeader>(x => x.FirstStatus == ShipStatusEnum.拣货完成))
|
||||
{
|
||||
_unitwork.BatchDelete<ShipmentHeader>(x => x.FirstStatus == ShipStatusEnum.拣货完成);
|
||||
@@ -40,10 +55,10 @@ namespace HHWMS.Web
|
||||
{
|
||||
if (ship.ShipmentDetails.All(x => x.Status != ShipStatusEnum.新建))
|
||||
{
|
||||
var invs = _unitwork.Find<Inventory>(x =>
|
||||
var invs = _unitwork.GetCount<Inventory>(x =>
|
||||
ship.ShipmentDetails.Select(y => y.UniqueCode).ToList()
|
||||
.Contains(x.UniqueCode))
|
||||
.Count();
|
||||
.Contains(x.UniqueCode)
|
||||
&& !string.IsNullOrEmpty(x.SourceCode));
|
||||
if (invs == 0)
|
||||
{
|
||||
_unitwork.Delete(errorShip);
|
||||
|
||||
Reference in new issue
Block a user