加事务

This commit is contained in:
Mac mini git server 2024-04-17 21:47:06 +08:00
parent 9f6f95828c
commit 2453e8405b
4 changed files with 497 additions and 420 deletions

View File

@ -99,306 +99,317 @@ namespace HHWMS.Web
var task = _unitwork.Find<TaskHeader>(x => x.TaskNo.Equals(taskno)
&& x.Status != TaskStatusEnum.完成)
.Include(x => x.TaskDetails).FirstOrDefault();
if (task != null)
using (var tran = Wtm.DC.Database.BeginTransaction())
{
if (task.Status != TaskStatusEnum.完成 && response.Result == (int)TaskStatusEnum.完成)
try
{
var newTask = new TaskHeader
if (task != null)
{
TaskDetails = new List<TaskDetail>()
};
var tasktolocatioin = _unitwork.FindSingle<Location>(x => x.Code.Equals(task.ToLocation));
var taskfromlocatioin = _unitwork.FindSingle<Location>(x => x.Code.Equals(task.FromLocation));
switch (task.TaskType)
{
case TaskTypeEnum.散料盒入库:
// 更新库位
// 起始库位为空
// 目标库位为有货
// 更新库存
task.Status = TaskStatusEnum.完成;
taskfromlocatioin.Status = LocationStatus.空仓位;
taskfromlocatioin.ContainerCode = "";
_unitwork.Update(taskfromlocatioin);
tasktolocatioin.Status = tasktolocatioin.Length == 1 ? LocationStatus.满货 : LocationStatus.有货;
if (!_unitwork.IsExit<Inventory>(x => x.ContainerCode == tasktolocatioin.Code))
{
tasktolocatioin.Status = LocationStatus.空容器;
}
tasktolocatioin.ContainerCode = task.ContainerCode;
_unitwork.Update(tasktolocatioin);
_unitwork.BatchUpdate<Inventory>(x => x.ContainerCode.Equals(task.ContainerCode),
x => new Inventory
{
LocationCode = tasktolocatioin.Code,
TaskStatus = InventoryTaskStatus.无任务,
UpdateTime = DateTime.Now,
UpdateBy = "wcs"
});
break;
case TaskTypeEnum.散料盒出库:
// 更新库位
// 起始库位为空
// 目标库位为有货
// 更新库存
task.Status = TaskStatusEnum.完成;
//taskfromlocatioin.Status = LocationStatus.空仓位;
//taskfromlocatioin.ContainerCode = "";
//_unitwork.Update(taskfromlocatioin);
tasktolocatioin.Status = LocationStatus.有货;
tasktolocatioin.ContainerCode = task.ContainerCode;
_unitwork.Update(tasktolocatioin);
_unitwork.BatchUpdate<Inventory>(x => x.ContainerCode.Equals(task.ContainerCode),
x => new Inventory
{
LocationCode = tasktolocatioin.Code,
UpdateTime = DateTime.Now,
UpdateBy = "wcs"
});
break;
case TaskTypeEnum.盘料盒入库:
// 更新库位
// 起始库位为空
// 目标库位为有货
// 更新库存
task.Status = TaskStatusEnum.完成;
taskfromlocatioin.ContainerCode = "";
taskfromlocatioin.Status = LocationStatus.空仓位;
_unitwork.Update(taskfromlocatioin);
var invCount = _unitwork.GetCount<Inventory>(x => x.ContainerCode == tasktolocatioin.ContainerCode);
tasktolocatioin.Width = invCount;
if (invCount == tasktolocatioin.Length)
{
tasktolocatioin.Status = LocationStatus.满货;
}
else if (invCount < tasktolocatioin.Length && invCount != 0)
{
tasktolocatioin.Status = LocationStatus.有货;
}
else if (invCount == 0)
{
tasktolocatioin.Status = LocationStatus.空容器;
}
_unitwork.Update(tasktolocatioin);
_unitwork.BatchUpdate<Inventory>(x => x.ContainerCode.Equals(task.ContainerCode),
x => new Inventory
{
LocationCode = tasktolocatioin.Code,
TaskStatus = InventoryTaskStatus.无任务,
UpdateTime = DateTime.Now,
UpdateBy = "wcs"
});
break;
case TaskTypeEnum.盘料盒出库:
// 更新库位
// 起始库位为空
// 目标库位为有货
// 更新库存
task.Status = TaskStatusEnum.完成;
tasktolocatioin.ContainerCode = task.ContainerCode;
tasktolocatioin.Status = LocationStatus.任务锁;
_unitwork.Update(tasktolocatioin);
// 料盒出库是为了入,还是为了出 1是出,2是入
if (task.Station == "1")
{
// 下发盘料出库
var plrTask = _unitwork.Find<TaskHeader>(x => x.TaskType.Equals(TaskTypeEnum.盘料出库)
&& x.ContainerCode.Contains(task.ContainerCode))
.Include(x => x.TaskDetails).FirstOrDefault();
if (plrTask != null)
{
var details = plrTask.TaskDetails.Where(x => !string.IsNullOrEmpty(x.ContainerCode)
&& x.ContainerCode.Equals(task.ContainerCode)
&& !string.IsNullOrEmpty(x.ToLocation));
foreach (var detail in details)
{
detail.Status = TaskStatusEnum.待下发;
detail.UpdateTime = DateTime.Now;
}
plrTask.Status = TaskStatusEnum.待下发;
_unitwork.Update(plrTask);
}
}
else if (task.Station == "2")
{
// 下发盘料入库
var plrTask = _unitwork.Find<TaskHeader>(x => x.TaskType.Equals(TaskTypeEnum.盘料入库) && !string.IsNullOrEmpty(x.ContainerCode)
&& x.ContainerCode.Contains(task.ContainerCode))
.Include(x => x.TaskDetails).FirstOrDefault();
if (plrTask != null)
{
plrTask.Status = TaskStatusEnum.待下发;
// 更新目的仓位
var to = _unitwork.FindSingle<Location>(x => x.ContiguousCode == task.ToLocation
&& x.Type.Equals(LocationTypeEnum.机械臂工位))?.Code;
plrTask.ToLocation = to;
// 更新明细为待下发
var details = plrTask.TaskDetails.Where(x =>!string.IsNullOrEmpty(x.ContainerCode) && x.ContainerCode.Contains(task.ContainerCode));
foreach(var item in details)
{
item.Status = TaskStatusEnum.待下发;
item.UpdateTime = DateTime.Now;
}
_unitwork.Update(plrTask);
}
}
break;
case TaskTypeEnum.盘料入库:
var ll = response.TaskId.Split("-")[1];
//更新库存数据
var taskdetail = task.TaskDetails.First(x => x.FromLocation == ll);
var invIn = _unitwork.Find<Inventory>(n => n.UniqueCode == taskdetail.UniqueCode
&& n.ContainerCode == task.FromLocation
&& n.TaskStatus == InventoryTaskStatus.任务中).FirstOrDefault();
if (invIn != null)
{
invIn.ContainerCode = taskdetail.ContainerCode;
invIn.LocationCode = taskdetail.ContainerCode;
invIn.Lot = taskdetail.ToLocation;
_unitwork.Update(invIn);
}
task.TaskDetails.First(x => x.FromLocation == ll).Status = TaskStatusEnum.完成;
var containerCode = task.TaskDetails.First(x => x.FromLocation == ll).ContainerCode;
// 查询料塔 是否还有 此料盒 已下发,未完成的盘料入库任务 有不操作,没有 创建料盒入库任务
if (!task.TaskDetails.Any(x => x.Status < TaskStatusEnum.完成 && !string.IsNullOrEmpty(x.ContainerCode) && x.ContainerCode.Equals(containerCode)))
{
var station = _unitwork.Find<Location>(x => x.Code == task.FromLocation).FirstOrDefault();
// 创建料盒入库任务
// 查找回库的任务起点,
var fromLocation = _unitwork.FindSingle<Location>(x => x.Code.Equals(task.ToLocation)).ContiguousCode;
newTask.ZoneCode = ZoneCodeEnum.盘料库;
if (task.TaskNo.Contains("PLoop"))
{
newTask.TaskNo = _unitwork.GetSerialNumber("PLoopin", 4);
}
else
{
newTask.TaskNo = _unitwork.GetSerialNumber("in", 4);
}
newTask.TaskType = TaskTypeEnum.盘料盒入库;
newTask.ContainerCode = containerCode;
newTask.FromLocation = fromLocation;
newTask.ToLocation = containerCode;
newTask.Status = TaskStatusEnum.待下发;
newTask.CreateTime = DateTime.Now;
_unitwork.Add(newTask);
//更新料塔占用
station.ContainerCode = "";
_unitwork.Update(station);
}
// 查询料塔 是否还有已下发,未完成的盘料入库任务
if (!task.TaskDetails.Any(x => x.Status < TaskStatusEnum.完成))
{
task.Status = TaskStatusEnum.完成;
}
break;
case TaskTypeEnum.盘料出库:
var lll = response.TaskId.Split("-")[1];
var taskde = task.TaskDetails.First(x => x.FromLocation == lll);
taskde.Status = TaskStatusEnum.完成;
//更新托盘物料数量
var container = _unitwork.Find<Location>(n => n.Code == task.ContainerCode).FirstOrDefault();
container.Width -= 1;
if (container.Width < 0) container.Width = 0;
_unitwork.Update(container);
//更新物料在料塔上的位置
var tolocation = _unitwork.Find<Location>(n => n.Code == task.ToLocation).FirstOrDefault();
var inv = _unitwork.Find<Inventory>(n => n.UniqueCode == taskde.UniqueCode
&& n.ContainerCode == task.ContainerCode
&& n.TaskStatus == InventoryTaskStatus.任务中).FirstOrDefault();
if (inv != null)
{
inv.ContainerCode = tolocation.ContainerCode;
inv.LocationCode = task.ToLocation;
inv.Lot = taskde.ToLocation;
_unitwork.Update(inv);
}
// 查询工位 是否还有已下发,未完成的盘料出库任务 有不操作,没有 创建料盒入库任务
if (!task.TaskDetails.Any(x => x.Status < TaskStatusEnum.完成))
{
task.Status = TaskStatusEnum.完成;
// 查找回库的任务起点,
var fromLocation = _unitwork.FindSingle<Location>(x => x.Code.Equals(task.FromLocation)).ContiguousCode;
// 下发盘料盒回库任务,回原位
newTask.ZoneCode = ZoneCodeEnum.盘料库;
if (task.TaskNo.Contains("PLoop"))
{
newTask.TaskNo = _unitwork.GetSerialNumber("PLoopin", 4);
}
else
{
newTask.TaskNo = _unitwork.GetSerialNumber("in", 4);
}
newTask.TaskType = TaskTypeEnum.盘料盒入库;
newTask.ContainerCode = task.ContainerCode;
newTask.FromLocation = fromLocation;
newTask.ToLocation = task.ContainerCode;
newTask.Status = TaskStatusEnum.待下发;
newTask.CreateTime = DateTime.Now;
_unitwork.Add(newTask);
}
break;
default:
break;
}
if(task.TaskType == TaskTypeEnum.盘料盒入库
|| task.TaskType == TaskTypeEnum.散料盒入库)
{
var invList = _unitwork.Find<Inventory>(x => x.ContainerCode == task.ContainerCode
&& x.TaskStatus == InventoryTaskStatus.任务中)
.ToList();
var listInvtran = new List<InventoryTransaction>();
foreach (var inv in invList)
if (task.Status != TaskStatusEnum.完成 && response.Result == (int)TaskStatusEnum.完成)
{
listInvtran.Add(new InventoryTransaction
var newTask = new TaskHeader
{
BillType = "in",
ZoneCode = inv.ZoneCode,
Type = inv.UniqueCode,
MaterialCode = inv.MaterialCode,
MaterialName = inv.MaterialName,
MaterialSpec = inv.MaterialSpec,
MaterialUnit = inv.MaterialUnit,
MaterialType = inv.MaterialType,
Batch = inv.Batch,
Lot = inv.Lot,
CompanyCode = inv.CompanyCode,
LocationCode = inv.LocationCode,
SupplierCode = inv.SupplierCode,
Qty = inv.Qty,
CreateTime = DateTime.Now
});
TaskDetails = new List<TaskDetail>()
};
var tasktolocatioin = _unitwork.FindSingle<Location>(x => x.Code.Equals(task.ToLocation));
var taskfromlocatioin = _unitwork.FindSingle<Location>(x => x.Code.Equals(task.FromLocation));
switch (task.TaskType)
{
case TaskTypeEnum.散料盒入库:
// 更新库位
// 起始库位为空
// 目标库位为有货
// 更新库存
task.Status = TaskStatusEnum.完成;
taskfromlocatioin.Status = LocationStatus.空仓位;
taskfromlocatioin.ContainerCode = "";
_unitwork.Update(taskfromlocatioin);
tasktolocatioin.Status = tasktolocatioin.Length == 1 ? LocationStatus.满货 : LocationStatus.有货;
if (!_unitwork.IsExit<Inventory>(x => x.ContainerCode == tasktolocatioin.Code))
{
tasktolocatioin.Status = LocationStatus.空容器;
}
tasktolocatioin.ContainerCode = task.ContainerCode;
_unitwork.Update(tasktolocatioin);
_unitwork.BatchUpdate<Inventory>(x => x.ContainerCode.Equals(task.ContainerCode),
x => new Inventory
{
LocationCode = tasktolocatioin.Code,
TaskStatus = InventoryTaskStatus.无任务,
UpdateTime = DateTime.Now,
UpdateBy = "wcs"
});
break;
case TaskTypeEnum.散料盒出库:
// 更新库位
// 起始库位为空
// 目标库位为有货
// 更新库存
task.Status = TaskStatusEnum.完成;
//taskfromlocatioin.Status = LocationStatus.空仓位;
//taskfromlocatioin.ContainerCode = "";
//_unitwork.Update(taskfromlocatioin);
tasktolocatioin.Status = LocationStatus.有货;
tasktolocatioin.ContainerCode = task.ContainerCode;
_unitwork.Update(tasktolocatioin);
_unitwork.BatchUpdate<Inventory>(x => x.ContainerCode.Equals(task.ContainerCode),
x => new Inventory
{
LocationCode = tasktolocatioin.Code,
UpdateTime = DateTime.Now,
UpdateBy = "wcs"
});
break;
case TaskTypeEnum.盘料盒入库:
// 更新库位
// 起始库位为空
// 目标库位为有货
// 更新库存
task.Status = TaskStatusEnum.完成;
taskfromlocatioin.ContainerCode = "";
taskfromlocatioin.Status = LocationStatus.空仓位;
_unitwork.Update(taskfromlocatioin);
var invCount = _unitwork.GetCount<Inventory>(x => x.ContainerCode == tasktolocatioin.ContainerCode);
tasktolocatioin.Width = invCount;
if (invCount == tasktolocatioin.Length)
{
tasktolocatioin.Status = LocationStatus.满货;
}
else if (invCount < tasktolocatioin.Length && invCount != 0)
{
tasktolocatioin.Status = LocationStatus.有货;
}
else if (invCount == 0)
{
tasktolocatioin.Status = LocationStatus.空容器;
}
_unitwork.Update(tasktolocatioin);
_unitwork.BatchUpdate<Inventory>(x => x.ContainerCode.Equals(task.ContainerCode),
x => new Inventory
{
LocationCode = tasktolocatioin.Code,
TaskStatus = InventoryTaskStatus.无任务,
UpdateTime = DateTime.Now,
UpdateBy = "wcs"
});
break;
case TaskTypeEnum.盘料盒出库:
// 更新库位
// 起始库位为空
// 目标库位为有货
// 更新库存
task.Status = TaskStatusEnum.完成;
tasktolocatioin.ContainerCode = task.ContainerCode;
tasktolocatioin.Status = LocationStatus.任务锁;
_unitwork.Update(tasktolocatioin);
// 料盒出库是为了入,还是为了出 1是出,2是入
if (task.Station == "1")
{
// 下发盘料出库
var plrTask = _unitwork.Find<TaskHeader>(x => x.TaskType.Equals(TaskTypeEnum.盘料出库)
&& x.ContainerCode.Contains(task.ContainerCode))
.Include(x => x.TaskDetails).FirstOrDefault();
if (plrTask != null)
{
var details = plrTask.TaskDetails.Where(x => !string.IsNullOrEmpty(x.ContainerCode)
&& x.ContainerCode.Equals(task.ContainerCode)
&& !string.IsNullOrEmpty(x.ToLocation));
foreach (var detail in details)
{
detail.Status = TaskStatusEnum.待下发;
detail.UpdateTime = DateTime.Now;
}
plrTask.Status = TaskStatusEnum.待下发;
_unitwork.Update(plrTask);
}
}
else if (task.Station == "2")
{
// 下发盘料入库
var plrTask = _unitwork.Find<TaskHeader>(x => x.TaskType.Equals(TaskTypeEnum.盘料入库) && !string.IsNullOrEmpty(x.ContainerCode)
&& x.ContainerCode.Contains(task.ContainerCode))
.Include(x => x.TaskDetails).FirstOrDefault();
if (plrTask != null)
{
plrTask.Status = TaskStatusEnum.待下发;
// 更新目的仓位
var to = _unitwork.FindSingle<Location>(x => x.ContiguousCode == task.ToLocation
&& x.Type.Equals(LocationTypeEnum.机械臂工位))?.Code;
plrTask.ToLocation = to;
// 更新明细为待下发
var details = plrTask.TaskDetails.Where(x => !string.IsNullOrEmpty(x.ContainerCode) && x.ContainerCode.Contains(task.ContainerCode));
foreach (var item in details)
{
item.Status = TaskStatusEnum.待下发;
item.UpdateTime = DateTime.Now;
}
_unitwork.Update(plrTask);
}
}
break;
case TaskTypeEnum.盘料入库:
var ll = response.TaskId.Split("-")[1];
//更新库存数据
var taskdetail = task.TaskDetails.First(x => x.FromLocation == ll);
var invIn = _unitwork.Find<Inventory>(n => n.UniqueCode == taskdetail.UniqueCode
&& n.ContainerCode == task.FromLocation
&& n.TaskStatus == InventoryTaskStatus.任务中).FirstOrDefault();
if (invIn != null)
{
invIn.ContainerCode = taskdetail.ContainerCode;
invIn.LocationCode = taskdetail.ContainerCode;
invIn.Lot = taskdetail.ToLocation;
_unitwork.Update(invIn);
}
task.TaskDetails.First(x => x.FromLocation == ll).Status = TaskStatusEnum.完成;
var containerCode = task.TaskDetails.First(x => x.FromLocation == ll).ContainerCode;
// 查询料塔 是否还有 此料盒 已下发,未完成的盘料入库任务 有不操作,没有 创建料盒入库任务
if (!task.TaskDetails.Any(x => x.Status < TaskStatusEnum.完成 && !string.IsNullOrEmpty(x.ContainerCode) && x.ContainerCode.Equals(containerCode)))
{
var station = _unitwork.Find<Location>(x => x.Code == task.FromLocation).FirstOrDefault();
// 创建料盒入库任务
// 查找回库的任务起点,
var fromLocation = _unitwork.FindSingle<Location>(x => x.Code.Equals(task.ToLocation)).ContiguousCode;
newTask.ZoneCode = ZoneCodeEnum.盘料库;
if (task.TaskNo.Contains("PLoop"))
{
newTask.TaskNo = _unitwork.GetSerialNumber("PLoopin", 4);
}
else
{
newTask.TaskNo = _unitwork.GetSerialNumber("in", 4);
}
newTask.TaskType = TaskTypeEnum.盘料盒入库;
newTask.ContainerCode = containerCode;
newTask.FromLocation = fromLocation;
newTask.ToLocation = containerCode;
newTask.Status = TaskStatusEnum.待下发;
newTask.CreateTime = DateTime.Now;
_unitwork.Add(newTask);
//更新料塔占用
station.ContainerCode = "";
_unitwork.Update(station);
}
// 查询料塔 是否还有已下发,未完成的盘料入库任务
if (!task.TaskDetails.Any(x => x.Status < TaskStatusEnum.完成))
{
task.Status = TaskStatusEnum.完成;
}
break;
case TaskTypeEnum.盘料出库:
var lll = response.TaskId.Split("-")[1];
var taskde = task.TaskDetails.First(x => x.FromLocation == lll);
taskde.Status = TaskStatusEnum.完成;
//更新托盘物料数量
var container = _unitwork.Find<Location>(n => n.Code == task.ContainerCode).FirstOrDefault();
container.Width -= 1;
if (container.Width < 0) container.Width = 0;
_unitwork.Update(container);
//更新物料在料塔上的位置
var tolocation = _unitwork.Find<Location>(n => n.Code == task.ToLocation).FirstOrDefault();
var inv = _unitwork.Find<Inventory>(n => n.UniqueCode == taskde.UniqueCode
&& n.ContainerCode == task.ContainerCode
&& n.TaskStatus == InventoryTaskStatus.任务中).FirstOrDefault();
if (inv != null)
{
inv.ContainerCode = tolocation.ContainerCode;
inv.LocationCode = task.ToLocation;
inv.Lot = taskde.ToLocation;
_unitwork.Update(inv);
}
// 查询工位 是否还有已下发,未完成的盘料出库任务 有不操作,没有 创建料盒入库任务
if (!task.TaskDetails.Any(x => x.Status < TaskStatusEnum.完成))
{
task.Status = TaskStatusEnum.完成;
// 查找回库的任务起点,
var fromLocation = _unitwork.FindSingle<Location>(x => x.Code.Equals(task.FromLocation)).ContiguousCode;
// 下发盘料盒回库任务,回原位
newTask.ZoneCode = ZoneCodeEnum.盘料库;
if (task.TaskNo.Contains("PLoop"))
{
newTask.TaskNo = _unitwork.GetSerialNumber("PLoopin", 4);
}
else
{
newTask.TaskNo = _unitwork.GetSerialNumber("in", 4);
}
newTask.TaskType = TaskTypeEnum.盘料盒入库;
newTask.ContainerCode = task.ContainerCode;
newTask.FromLocation = fromLocation;
newTask.ToLocation = task.ContainerCode;
newTask.Status = TaskStatusEnum.待下发;
newTask.CreateTime = DateTime.Now;
_unitwork.Add(newTask);
}
break;
default:
break;
}
if (task.TaskType == TaskTypeEnum.盘料盒入库
|| task.TaskType == TaskTypeEnum.散料盒入库)
{
var invList = _unitwork.Find<Inventory>(x => x.ContainerCode == task.ContainerCode
&& x.TaskStatus == InventoryTaskStatus.任务中)
.ToList();
var listInvtran = new List<InventoryTransaction>();
foreach (var inv in invList)
{
listInvtran.Add(new InventoryTransaction
{
BillType = "in",
ZoneCode = inv.ZoneCode,
Type = inv.UniqueCode,
MaterialCode = inv.MaterialCode,
MaterialName = inv.MaterialName,
MaterialSpec = inv.MaterialSpec,
MaterialUnit = inv.MaterialUnit,
MaterialType = inv.MaterialType,
Batch = inv.Batch,
Lot = inv.Lot,
CompanyCode = inv.CompanyCode,
LocationCode = inv.LocationCode,
SupplierCode = inv.SupplierCode,
Qty = inv.Qty,
CreateTime = DateTime.Now
});
}
_unitwork.BatchAdd(listInvtran.ToArray());
}
_unitwork.Update(task);
if (task.Status == TaskStatusEnum.完成)
{
_unitwork.Delete(task);
}
}
_unitwork.BatchAdd(listInvtran.ToArray());
}
_unitwork.Update(task);
if (task.Status == TaskStatusEnum.完成)
else
{
_unitwork.Delete(task);
return ApiResult();
}
tran.Commit();
}
catch(Exception ex)
{
tran.Rollback();
return JsonMore(null, 500, ex.Message);
}
}
else
{
return ApiResult();
}
return ApiResult();
}

View File

@ -2,6 +2,7 @@ using System;
using System.Collections.Generic;
using System.Linq;
using System.Reflection.Emit;
using System.Threading.Tasks;
using HHWMS.Web.Models;
using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore;
@ -153,50 +154,62 @@ 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))
using (var tran = Wtm.DC.Database.BeginTransaction())
{
// 更新入库单明细状态
var header = receiptHeaderList.Find(x => x.ID.ToString().Equals(item.ReceiptCode));
var receipt = header.ReceiptDetails.First(x => x.UniqueCode.Equals(item.UniqueCode));
if (receipt != null)
try
{
if (receipt.Status == ReceiptStatusEnum.收完) continue;
receipt.CompletedQty += item.BindQty;
}
if(receipt.CompletedQty == receipt.Qty)
{
receipt.Status = ReceiptStatusEnum.收完;
if (!header.ReceiptDetails.Any(x => x.Status < ReceiptStatusEnum.收完))
// 查找明细,修改对应状态,并且 绑定物料周转箱
foreach (Binding item in data.OrderBy(x => x.ReceiptCode))
{
header.FirstStatus = ReceiptStatusEnum.收完;
// 更新入库单明细状态
var header = receiptHeaderList.Find(x => x.ID.ToString().Equals(item.ReceiptCode));
var receipt = header.ReceiptDetails.First(x => x.UniqueCode.Equals(item.UniqueCode));
if (receipt != null)
{
if (receipt.Status == ReceiptStatusEnum.收完) continue;
receipt.CompletedQty += item.BindQty;
}
if (receipt.CompletedQty == receipt.Qty)
{
receipt.Status = ReceiptStatusEnum.收完;
if (!header.ReceiptDetails.Any(x => x.Status < ReceiptStatusEnum.收完))
{
header.FirstStatus = ReceiptStatusEnum.收完;
}
}
var station = _unitWork.FindSingle<Location>(x => x.Code == item.BoxCode);
// 新建库存
var inventory = new Inventory
{
ZoneCode = ZoneCodeEnum.散料库,
UniqueCode = item.UniqueCode,
MaterialCode = receipt.MaterialCode,
MaterialType = receipt.MaterialType,
MaterialName = receipt.MaterialName,
MaterialSpec = receipt.MaterialSpec,
Batch = receipt.Batch,
MaterialUnit = receipt.MaterialUnit,
SupplierCode = receipt.SupplierCode,
Qty = item.BindQty,
LocationCode = item.BoxCode,
ContainerCode = station.ContainerCode,
ReceiptCode = item.ReceiptCode,
Status = "0",
TaskStatus = InventoryTaskStatus.任务中,
Flag = item.Size,
};
_unitWork.Add(inventory);
}
_unitWork.BatchUpdate(receiptHeaderList.ToArray());
tran.Commit();
}
var station = _unitWork.FindSingle<Location>(x => x.Code == item.BoxCode);
// 新建库存
var inventory = new Inventory
catch (Exception ex)
{
ZoneCode = ZoneCodeEnum.散料库,
UniqueCode = item.UniqueCode,
MaterialCode = receipt.MaterialCode,
MaterialType = receipt.MaterialType,
MaterialName = receipt.MaterialName,
MaterialSpec = receipt.MaterialSpec,
Batch = receipt.Batch,
MaterialUnit = receipt.MaterialUnit,
SupplierCode = receipt.SupplierCode,
Qty = item.BindQty,
LocationCode = item.BoxCode,
ContainerCode = station.ContainerCode,
ReceiptCode = item.ReceiptCode,
Status = "0",
TaskStatus = InventoryTaskStatus.任务中,
Flag = item.Size,
};
_unitWork.Add(inventory);
tran.Rollback();
return JsonMore(null, 500, ex.Message);
}
}
_unitWork.BatchUpdate(receiptHeaderList.ToArray());
return JsonMore(null);
}
/// <summary>
@ -224,52 +237,92 @@ public class ReceiptSLInController : BaseController
{
return JsonMore(null, 500, $"{boxCode}站台没有料箱,无法入库!");
}
// 判断箱号是否合理
var box = _unitWork.FindSingle<Location>(x => x.ContainerCode.Equals(station.ContainerCode)
&& x.Type != LocationTypeEnum.散料库站台);
if (box != null)
using (var tran = Wtm.DC.Database.BeginTransaction())
{
//if(box.Type != LocationTypeEnum.散料库站台)
//{
// return JsonMore(null, 500, $"{boxCode}不在站台,无法入库!");
//}
//else
//{
// 查找目标库位,托盘回原库位
var toLocation = _unitWork.FindSingle<Location>(x => x.Code.Equals(box.Code));
try
{
// 判断箱号是否合理
var box = _unitWork.FindSingle<Location>(x => x.ContainerCode.Equals(station.ContainerCode)
&& x.Type != LocationTypeEnum.散料库站台);
if (toLocation != null)
if (box != null)
{
// 创建任务
var task = new TaskHeader
{
ZoneCode = ZoneCodeEnum.散料库,
TaskNo = _unitWork.GetSerialNumber("CIn"),
TaskType = TaskTypeEnum.散料盒入库,
ContainerCode = toLocation.Code,
FromLocation = station.Code,
ToLocation = toLocation.Code,
Status = TaskStatusEnum.待下发,
CreateBy = Wtm.LoginUserInfo.ITCode,
CreateTime = DateTime.Now
};
_unitWork.Add(task);
//if(box.Type != LocationTypeEnum.散料库站台)
//{
// return JsonMore(null, 500, $"{boxCode}不在站台,无法入库!");
//}
//else
//{
// 查找目标库位,托盘回原库位
var toLocation = _unitWork.FindSingle<Location>(x => x.Code.Equals(box.Code));
toLocation.Status = LocationStatus.任务锁;
toLocation.Length = isFull ? 1 : 0; // 是否满盘
_unitWork.Update(toLocation);
if (toLocation != null)
{
// 创建任务
var task = new TaskHeader
{
ZoneCode = ZoneCodeEnum.散料库,
TaskNo = _unitWork.GetSerialNumber("CIn"),
TaskType = TaskTypeEnum.散料盒入库,
ContainerCode = toLocation.Code,
FromLocation = station.Code,
ToLocation = toLocation.Code,
Status = TaskStatusEnum.待下发,
CreateBy = Wtm.LoginUserInfo.ITCode,
CreateTime = DateTime.Now
};
_unitWork.Add(task);
toLocation.Status = LocationStatus.任务锁;
toLocation.Length = isFull ? 1 : 0; // 是否满盘
_unitWork.Update(toLocation);
var listInvtran = new List<InventoryTransaction>();
var invList = _unitWork.Find<Inventory>(x =>
x.ContainerCode.Equals(task.ContainerCode)
&& x.TaskStatus == InventoryTaskStatus.任务中
).ToList();
foreach (var inv in invList)
{
listInvtran.Add(new InventoryTransaction
{
BillType = "in",
ZoneCode = inv.ZoneCode,
Type = inv.UniqueCode,
MaterialCode = inv.MaterialCode,
MaterialName = inv.MaterialName,
MaterialSpec = inv.MaterialSpec,
MaterialUnit = inv.MaterialUnit,
MaterialType = inv.MaterialType,
Batch = inv.Batch,
Lot = inv.Lot,
CompanyCode = inv.CompanyCode,
LocationCode = inv.LocationCode,
SupplierCode = inv.SupplierCode,
Qty = inv.Qty,
CreateTime = DateTime.Now
});
}
_unitWork.BatchAdd(listInvtran.ToArray());
tran.Commit();
}
else
{
return JsonMore(null, 500, $"库内无可用仓位,无法入库!");
}
//}
return JsonMore(data: null);
}
else
{
return JsonMore(null, 500, $"库内无可用仓位,无法入库!");
return JsonMore(null, 500, $"{boxCode}不正确!");
}
//}
return JsonMore(data: null);
}
else
{
return JsonMore(null, 500, $"{boxCode}不正确!");
}
catch(Exception ex)
{
tran.Rollback();
return JsonMore(null, 500, ex.Message);
}
}
}
}

View File

@ -66,67 +66,80 @@ public class ReceiptShelfInController : BaseController
var invList = new List<Inventory>();
var listInvtran = new List<InventoryTransaction>();
// 查找明细,修改对应状态,并且 绑定物料周转箱
foreach (Binding item in data.OrderBy(x => x.ReceiptCode))
using (var tran = Wtm.DC.Database.BeginTransaction())
{
// 更新入库单明细状态
var header = receiptHeaderList.Find(x => x.ID.ToString().Equals(item.ReceiptCode));
var receipt = header.ReceiptDetails.First(x => x.UniqueCode.Equals(item.UniqueCode));
if (receipt != null)
try
{
receipt.Status = ReceiptStatusEnum.收完;
if (!header.ReceiptDetails.Any(x => x.Status < ReceiptStatusEnum.收完))
// 查找明细,修改对应状态,并且 绑定物料周转箱
foreach (Binding item in data.OrderBy(x => x.ReceiptCode))
{
header.FirstStatus = ReceiptStatusEnum.收完;
}
receipt.UpdateTime = DateTime.Now;
}
// 更新入库单明细状态
var header = receiptHeaderList.Find(x => x.ID.ToString().Equals(item.ReceiptCode));
var receipt = header.ReceiptDetails.First(x => x.UniqueCode.Equals(item.UniqueCode));
if (receipt != null)
{
receipt.Status = ReceiptStatusEnum.收完;
if (!header.ReceiptDetails.Any(x => x.Status < ReceiptStatusEnum.收完))
{
header.FirstStatus = ReceiptStatusEnum.收完;
}
receipt.UpdateTime = DateTime.Now;
}
// 新建库存
invList.Add(new Inventory
// 新建库存
invList.Add(new Inventory
{
ZoneCode = ZoneCodeEnum.货架库,
LocationCode = item.BoxCode,
UniqueCode = item.UniqueCode,
MaterialCode = receipt.MaterialCode,
MaterialType = receipt.MaterialType,
MaterialName = receipt.MaterialName,
MaterialSpec = receipt.MaterialSpec,
Batch = receipt.Batch,
MaterialUnit = receipt.MaterialUnit,
SupplierCode = receipt.SupplierCode,
Qty = receipt.Qty,
Status = "0",
TaskStatus = InventoryTaskStatus.无任务,
CreateBy = Wtm.LoginUserInfo.ITCode,
CreateTime = DateTime.Now
}); ;
foreach (var inv in invList)
{
listInvtran.Add(new InventoryTransaction
{
BillType = "in",
ZoneCode = inv.ZoneCode,
Type = inv.UniqueCode,
MaterialCode = inv.MaterialCode,
MaterialName = inv.MaterialName,
MaterialSpec = inv.MaterialSpec,
MaterialUnit = inv.MaterialUnit,
MaterialType = inv.MaterialType,
Batch = inv.Batch,
Lot = inv.Lot,
CompanyCode = inv.CompanyCode,
LocationCode = inv.LocationCode,
SupplierCode = inv.SupplierCode,
Qty = inv.Qty,
CreateTime = DateTime.Now
});
}
}
_unitWork.BatchAdd(invList.ToArray());
_unitWork.BatchAdd(listInvtran.ToArray());
_unitWork.BatchUpdate(receiptHeaderList.ToArray());
tran.Commit();
}
catch (Exception ex)
{
ZoneCode = ZoneCodeEnum.货架库,
LocationCode = item.BoxCode,
UniqueCode = item.UniqueCode,
MaterialCode = receipt.MaterialCode,
MaterialType = receipt.MaterialType,
MaterialName = receipt.MaterialName,
MaterialSpec = receipt.MaterialSpec,
Batch = receipt.Batch,
MaterialUnit = receipt.MaterialUnit,
SupplierCode = receipt.SupplierCode,
Qty = receipt.Qty,
Status = "0",
TaskStatus = InventoryTaskStatus.无任务,
CreateBy = Wtm.LoginUserInfo.ITCode,
CreateTime = DateTime.Now
}); ;
foreach (var inv in invList)
{
listInvtran.Add(new InventoryTransaction
{
BillType = "in",
ZoneCode = inv.ZoneCode,
Type = inv.UniqueCode,
MaterialCode = inv.MaterialCode,
MaterialName = inv.MaterialName,
MaterialSpec = inv.MaterialSpec,
MaterialUnit = inv.MaterialUnit,
MaterialType = inv.MaterialType,
Batch = inv.Batch,
Lot = inv.Lot,
CompanyCode = inv.CompanyCode,
LocationCode = inv.LocationCode,
SupplierCode = inv.SupplierCode,
Qty = inv.Qty,
CreateTime = DateTime.Now
});
tran.Rollback();
return JsonMore(null, 500, ex.Message);
}
}
_unitWork.BatchAdd(invList.ToArray());
_unitWork.BatchAdd(listInvtran.ToArray());
_unitWork.BatchUpdate(receiptHeaderList.ToArray());
return JsonMore(null);
}

View File

@ -239,7 +239,7 @@
_this.disabledbackbutton = false;
} else {
_this.$message({
message: "绑定失败!",
message: "绑定失败!"+ json.Msg,
type: "warning",
duration: "10000",
});