捡货方法再次修改,取消捡货后回传MES

入库时有出库的库存不再改变状态
交易记录新增容器和单号等信息
This commit is contained in:
zhougf committed 2024-04-21 21:15:16 +08:00
1 parent a64e3a36f4
commit c286bf55d7
3 files changed
+55 -34

No files matched your search

+8 -5
View File
@@ -133,7 +133,8 @@ namespace HHWMS.Web
tasktolocatioin.ContainerCode = task.ContainerCode;
_unitwork.Update(tasktolocatioin);
_unitwork.BatchUpdate<Inventory>(x => x.ContainerCode.Equals(task.ContainerCode),
_unitwork.BatchUpdate<Inventory>(x => x.ContainerCode.Equals(task.ContainerCode)
&& string.IsNullOrEmpty(x.SourceCode),
x => new Inventory
{
LocationCode = tasktolocatioin.Code,
@@ -303,7 +304,7 @@ namespace HHWMS.Web
station.ContainerCode = "";
_unitwork.Update(station);
}
// 查询料塔 是否还有已下发,未完成的盘料入库任务
// 查询料塔 是否还有已下发,未完成的盘料入库任务
if (!task.TaskDetails.Any(x => x.Status < TaskStatusEnum.完成))
{
task.Status = TaskStatusEnum.完成;
@@ -366,7 +367,8 @@ namespace HHWMS.Web
|| task.TaskType == TaskTypeEnum.散料盒入库)
{
var invList = _unitwork.Find<Inventory>(x => x.ContainerCode == task.ContainerCode
&& x.TaskStatus == InventoryTaskStatus.任务中)
&& x.TaskStatus == InventoryTaskStatus.任务中
&& string.IsNullOrEmpty(x.SourceCode))
.ToList();
var listInvtran = new List<InventoryTransaction>();
foreach (var inv in invList)
@@ -383,6 +385,7 @@ namespace HHWMS.Web
MaterialType = inv.MaterialType,
Batch = inv.Batch,
Lot = inv.Lot,
ContainerCode = task.ContainerCode,
CompanyCode = inv.CompanyCode,
LocationCode = inv.LocationCode,
SupplierCode = inv.SupplierCode,
@@ -464,11 +467,11 @@ namespace HHWMS.Web
// 料盒出库是为了入,还是为了出 1是出,2是入
/*if (task.Station == "1")
{
}
else if (task.Station == "2")
{
}*/
// 测试 创建盘料出库任务
var locationList = _unitwork.Find<Location>(x => x.Row == tasktolocatioin.Row && "T,G2".Contains(x.Type)).ToList();