ICM-WCS/wcs
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加盘点模式

Browse Source
This commit is contained in:
hehaibing-1996
2024-05-09 09:43:28 +08:00
parent 311a695498
commit cb6090bf0b
43 changed files with 2909 additions and 423 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
WCS.BLL/Services/Service/OutstoreService.cs
View File

@ -33,12 +33,6 @@ namespace WCS.BLL.Services.Service
Message = "单据同步失败：缺少需要出库的物料类型！"
};
}
//判断是否有单据号 没有单据号系统自动生成一个
if (string.IsNullOrEmpty(request.OrderNumber))
{
request.OrderNumber = GenerateOrderNumber();
}
Console.WriteLine(DateTime.Now);
//保存数据
await DbHelp.db.BeginTranAsync();
try
@ -132,12 +126,6 @@ namespace WCS.BLL.Services.Service
};
}
//判断是否有单据号 没有单据号系统自动生成一个
if (string.IsNullOrEmpty(request.OrderNumber))
{
request.OrderNumber = GenerateOrderNumber();
}
#region 保存数据
//锁库存
@ -205,7 +193,6 @@ namespace WCS.BLL.Services.Service
}
public async Task<ResponseBase> GetOutOrderList(GetOutOrderListRequest request)
{
//直接查询
@ -254,7 +241,7 @@ namespace WCS.BLL.Services.Service
};
}
//直接查询
var recordsQueryable = DbHelp.db.Queryable<OutOrder>();
var recordsQueryable = DbHelp.db.Queryable<OutOrder>().Where(t => request.OrderExeStatus.Contains(t.OutOrderExeStatus));
var totalCount = await recordsQueryable.CountAsync();
var records = await recordsQueryable
@ -396,12 +383,6 @@ namespace WCS.BLL.Services.Service
};
}
private string GenerateOrderNumber()
{
var orderNumber = "PD" + DateTime.Now.ToString("yyyyMMddHHmmss");
return orderNumber;
}
public async Task<ResponseBase> GoInOutstore(GetOutOrderDetailRequest request)
{
try
@ -421,6 +402,7 @@ namespace WCS.BLL.Services.Service
};
}
//如果是按物料编码出库 需要计算物料明细、并进行物料锁定
if (order.SyncType == SyncTypeEnum.ByMatCode)
{
@ -442,10 +424,17 @@ namespace WCS.BLL.Services.Service
return new ResponseCommon()
{
Code = 201,
Message = $"出库单据{request.OrderNumber}物料已全部出库！",
Message = $"出库单据{request.OrderNumber}物料已全部完成出库！",
Data = null
};
}
if (request.IsStart)//&& order.OutOrderExeStatus != OutOrderExeStatus.发料完成
{
order.OutOrderExeStatus = OutOrderExeStatus.开始发料;
DbHelp.db.Updateable(order).ExecuteCommand();
}
//按货架分组 按物料找到对应的货架
var shelfIds = outOrderMatDetails.Select(t => t.StoreInfo.ShelfId)
.Distinct()
@ -488,14 +477,13 @@ namespace WCS.BLL.Services.Service
//对应的货架对应位置 进入出库模式 亮灯
shelfs.ForEach(shelf =>
{
var matDetails = outOrderMatDetails.Where(t => t.StoreInfo.ShelfCode == shelf.ShelfCode)
.Distinct()
.ToList();
shelf.GoInOutstore(matDetails, order);
shelf.OrderNumber = order.OrderNumber;
});
{
var matDetails = outOrderMatDetails.Where(t => t.StoreInfo.ShelfCode == shelf.ShelfCode)
.Distinct()
.ToList();
shelf.GoInOutstore(matDetails, order);
shelf.OrderNumber = order.OrderNumber;
});
//返回
return new ResponseCommon()
@ -507,11 +495,11 @@ namespace WCS.BLL.Services.Service
}
catch (Exception ex)
{
await GoInOutstore(request);
await GoOutOutstore(request);
throw ex;
}
}
//计算、加锁
private ResponseBase CaculateOutOrderMatDetails(OutOrder order)
{
try
@ -546,7 +534,7 @@ namespace WCS.BLL.Services.Service
List<OutOrderMatDetail> outOrderMatDetails = new List<OutOrderMatDetail>();
foreach (var outOrderDetail in outOrderDetails)
{
//2.1筛选 满足 图号 批次的库存
//2.1筛选 满足 物料编码、批次的库存
var matInventoryDetails = DbHelp.db.Queryable<InventoryDetail>()
.Where(t => t.MatCode == outOrderDetail.MatCode)
.WhereIF(!string.IsNullOrEmpty(outOrderDetail.MatBatch), t => t.MatBatch == outOrderDetail.MatBatch)
@ -561,8 +549,8 @@ namespace WCS.BLL.Services.Service
{
outOrderMatDetails.Add(new OutOrderMatDetail()
{
OrderId = outOrderDetail.Id,
OrderNumber = outOrderDetail.OrderNumber,
OrderId = order.Id,
OrderNumber = order.OrderNumber,
OutOrderDetailId = outOrderDetail.Id,
InventoryDetailId = matInventoryDetails[i].Id,
StoreId = matInventoryDetails[i].StoreId,
@ -589,8 +577,8 @@ namespace WCS.BLL.Services.Service
outOrderMatDetails.Add(new OutOrderMatDetail()
{
OrderId = outOrderDetail.Id,
OrderNumber = outOrderDetail.OrderNumber,
OrderId = order.Id,
OrderNumber = order.OrderNumber,
OutOrderDetailId = outOrderDetail.Id,
InventoryDetailId = matInventoryDetails[i].Id,
StoreId = matInventoryDetails[i].StoreId,
@ -631,6 +619,7 @@ namespace WCS.BLL.Services.Service
}
}
//解锁
private ResponseBase CancelOutOrderMatDetails(OutOrder order)
{
try
@ -638,7 +627,9 @@ namespace WCS.BLL.Services.Service
DbHelp.db.BeginTran();
var outOrderMatDetails = DbHelp.db.Queryable<OutOrderMatDetail>()
.Where(t => t.OrderId == order.Id)
.Where(t => t.IsSended == false)
.ToList();
var inventoryIds = outOrderMatDetails.Select(t => t.Id).ToList();
var inventoryDetails = DbHelp.db.Queryable<InventoryDetail>()
.Where(t => inventoryIds.Contains(t.Id))
@ -646,6 +637,7 @@ namespace WCS.BLL.Services.Service
inventoryDetails.ForEach(t => { t.IsLocked = false; });
DbHelp.db.Deleteable(outOrderMatDetails).ExecuteCommand();
DbHelp.db.Updateable(inventoryDetails).ExecuteCommand();
DbHelp.db.CommitTran();
return new ResponseCommon()
{
@ -666,6 +658,7 @@ namespace WCS.BLL.Services.Service
public async Task<ResponseBase> GoOutOutstore(GetOutOrderDetailRequest request)
{
//获取出库单
var order = await DbHelp.db.Queryable<OutOrder>()
.WhereIF(request.OrderId != 0, t => t.Id == request.OrderId)
@ -681,10 +674,28 @@ namespace WCS.BLL.Services.Service
};
}
//执行状态改为暂停
if (request.IsPause && order.OutOrderExeStatus != OutOrderExeStatus.发料完成)
{
order.OutOrderExeStatus = OutOrderExeStatus.暂停发料;
DbHelp.db.Updateable(order).ExecuteCommand();
}
//找到正在出对应出库单的货架
var shelves = ShelfManager.Shelves.Where(t => t.OrderNumber == request.OrderNumber)
.Where(t => t.CurrentMode == HardWare.Mode.出库模式)
.ToList();
if (shelves == null || shelves.Count == 0)
{
return new ResponseCommon()
{
Code = 201,
Message = $"单据【{request.OrderNumber}】不在出库中！",
Data = null
};
}
//退出出库模式
shelves.ForEach(t =>
{
@ -695,12 +706,15 @@ namespace WCS.BLL.Services.Service
if (order.SyncType == SyncTypeEnum.ByMatCode)
CancelOutOrderMatDetails(order);
return new ResponseCommon()
{
Code = 200,
Message = "Success",
Data = null
};
}
}
}