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-12-10 19:09:43 +08:00
parent c94af9e987
commit 85a35ac34f
17 changed files with 393 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,6 +6,7 @@ using System.Text;
using System.Threading.Tasks;
using WCS.BLL.Config;
using WCS.BLL.DbModels;
using WCS.BLL.DbModels.Task;
using WCS.BLL.Manager;
using WCS.BLL.Services.IService;
using WCS.DAL.Db;
@ -566,7 +567,7 @@ namespace WCS.BLL.Services.Service
.ToList();
var shelfs = ShelfManager.Shelves.Where(t => shelfIds.Contains(t.ShelfId)).ToList(); ;
var outherModeShelfs = shelfs.Where(t => t.CurrentMode != HardWare.Mode.待机模式).Select(t => t.ShelfCode).ToList();
var outherModeShelfs = shelfs.Where(t => t.CurrentMode != TaskModeEnum.待机模式).Select(t => t.ShelfCode).ToList();
if (outherModeShelfs != null && outherModeShelfs.Count > 0)
{
return new ResponseCommon()
@ -651,7 +652,7 @@ namespace WCS.BLL.Services.Service
#endregion
#region 查询当前盘点单 已启动的货架
var shelfs = ShelfManager.Shelves.Where(t => t.CurrentMode == HardWare.Mode.盘点模式 && t.OrderNumber == order.StocktakingOrderNumber).ToList();
var shelfs = ShelfManager.Shelves.Where(t => t.CurrentMode == TaskModeEnum.盘点模式 && t.OrderNumber == order.StocktakingOrderNumber).ToList();
shelfs.ForEach(t =>
{
t.GoOutStocktaking();
@ -704,7 +705,7 @@ namespace WCS.BLL.Services.Service
Message = $"货架{inventoryDetail.ShelfCode}不存在！",
};
}
else if (shelf.CurrentMode != HardWare.Mode.盘点模式)
else if (shelf.CurrentMode != TaskModeEnum.盘点模式)
{
return new ResponseCommon()
{
@ -787,7 +788,7 @@ namespace WCS.BLL.Services.Service
Message = $"货架{stockTakingMatDetail.StoreInfo.ShelfCode}不存在！",
};
}
else if (shelf.CurrentMode != HardWare.Mode.盘点模式)
else if (shelf.CurrentMode != TaskModeEnum.盘点模式)
{
DbHelp.db.RollbackTran();
return new ResponseCommon()
@ -826,7 +827,7 @@ namespace WCS.BLL.Services.Service
//更新时间 避免被自动退出
Task.Run(() =>
{
var shelves = ShelfManager.Shelves.Where(t => t.CurrentMode == HardWare.Mode.盘点模式 && t.OrderNumber == request.StocktakingOrderNumber)
var shelves = ShelfManager.Shelves.Where(t => t.CurrentMode == TaskModeEnum.盘点模式 && t.OrderNumber == request.StocktakingOrderNumber)
.ToList();
foreach (var shelf in shelves)
{