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-05 16:57:20 +08:00
parent d283924ae1
commit 311a695498
44 changed files with 2272 additions and 307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
WCS.BLL/Services/Service/StockTakingService.cs
View File

@ -312,21 +312,22 @@ namespace WCS.BLL.Services.Service
{
var recordsQueryable = DbHelp.db.Queryable<StockTakingOrder>()
.WhereIF(!string.IsNullOrEmpty(request.StocktakingOrderNumber), t => t.StocktakingOrderNumber.Contains(request.StocktakingOrderNumber));
.WhereIF(!string.IsNullOrEmpty(request.StocktakingOrderNumber), t => t.StocktakingOrderNumber.Contains(request.StocktakingOrderNumber))
.WhereIF(!string.IsNullOrEmpty(request.StocktakingOrderSource), t => t.StocktakingOrderSource!=null && t.StocktakingOrderSource.Contains(request.StocktakingOrderSource));
switch (request.StocktakingOrderStatus)
{
case Model.ApiModel.Stocktaking.StocktakingOrderStatus.未盘点:
recordsQueryable = recordsQueryable.Where(t => t.StocktakingOrderStatus == DbModels.StocktakingOrderStatus.未盘点);
recordsQueryable = recordsQueryable.Where(t => t.StocktakingOrderStatus == StocktakingOrderStatus.未盘点);
break;
case Model.ApiModel.Stocktaking.StocktakingOrderStatus.部分盘点:
recordsQueryable = recordsQueryable.Where(t => t.StocktakingOrderStatus == DbModels.StocktakingOrderStatus.部分盘点);
recordsQueryable = recordsQueryable.Where(t => t.StocktakingOrderStatus == StocktakingOrderStatus.部分盘点);
break;
case Model.ApiModel.Stocktaking.StocktakingOrderStatus.已提交:
recordsQueryable = recordsQueryable.Where(t => t.StocktakingOrderStatus == DbModels.StocktakingOrderStatus.已提交);
recordsQueryable = recordsQueryable.Where(t => t.StocktakingOrderStatus == StocktakingOrderStatus.已提交);
break;
case Model.ApiModel.Stocktaking.StocktakingOrderStatus.盘点完成:
recordsQueryable = recordsQueryable.Where(t => t.StocktakingOrderStatus == DbModels.StocktakingOrderStatus.盘点完成);
recordsQueryable = recordsQueryable.Where(t => t.StocktakingOrderStatus == StocktakingOrderStatus.盘点完成);
break;
default:
break;
@ -530,7 +531,7 @@ namespace WCS.BLL.Services.Service
#endregion
#region 查询当前盘点盘已启动的货架
var shelfs = ShelfManager.Shelves.Where(t => t.CurentMode == HardWare.Mode.盘点模式 && t.OrderNumber == order.StocktakingOrderNumber).ToList();
var shelfs = ShelfManager.Shelves.Where(t => t.CurrentMode == HardWare.Mode.盘点模式 && t.OrderNumber == order.StocktakingOrderNumber).ToList();
shelfs.ForEach(t =>
{
t.GoOutStocktaking();
@ -674,7 +675,7 @@ namespace WCS.BLL.Services.Service
#endregion
#region 判断单据状态
if (order.StocktakingOrderStatus != DbModels.StocktakingOrderStatus.已提交)
if (order.StocktakingOrderStatus != StocktakingOrderStatus.已提交)
{
return new ResponseCommon()
{
@ -682,7 +683,7 @@ namespace WCS.BLL.Services.Service
Message = $"单据已提交，请勿重复提交！",
};
}
else if (order.StocktakingOrderStatus != DbModels.StocktakingOrderStatus.盘点完成)
else if (order.StocktakingOrderStatus != StocktakingOrderStatus.盘点完成)
{
return new ResponseCommon()
{