提交代码

This commit is contained in:
hehaibing-1996
2024-04-23 08:31:37 +08:00
parent d40c3f253a
commit aaf7c17562
43 changed files with 2196 additions and 71 deletions

View File

@ -12,6 +12,7 @@ using WCS.BLL.Manager;
using WCS.BLL.Services.IService;
using WCS.DAL.Db;
using WCS.Model;
using WCS.Model.ApiModel.MatBaseInfo;
namespace WCS.BLL.Services.Service
{
@ -86,7 +87,7 @@ namespace WCS.BLL.Services.Service
var shelf = ShelfManager.Shelves.Where(t => t.ShelfCode == request.ShelfCode).FirstOrDefault();
if (shelf == null)//货架不存在
{
return new QueryByMatSnResponse()
return new ResponseCommon<MatInfo>()
{
Code = 201,
Message = $"操作失败:货架[{request.ShelfCode}]不存在!",
@ -95,7 +96,7 @@ namespace WCS.BLL.Services.Service
//判断当前是否是入库模式
if (shelf.CurentMode != Mode.)
{
return new QueryByMatSnResponse()
return new ResponseCommon<MatInfo>()
{
Code = 201,
Message = $"操作失败:货架[{request.ShelfCode}]不在入库模式!\r\n当前为{shelf.CurentMode}",
@ -105,7 +106,7 @@ namespace WCS.BLL.Services.Service
var inventory = await DbHelp.db.Queryable<InventoryDetail>().Where(t => t.MatSN == request.MatSn).FirstAsync();
if (inventory != null)
{
return new QueryByMatSnResponse()
return new ResponseCommon<MatInfo>()
{
Code = 201,
Message = $"操作失败:物料{inventory.MatSN}已入库,库位为{inventory.StoreCode}",
@ -134,17 +135,19 @@ namespace WCS.BLL.Services.Service
batchNo = matInfo.MatBatch,
supplier = matInfo.MatSupplier,
customer = matInfo.MatCustomer,
InstoreUser = request.UserName
};
return new QueryByMatSnResponse()
return new ResponseCommon<MatInfo>()
{
Code = 200,
Data = shelf.InStoreData,
Data = matInfo,
Message = "success"
};
}
else
return new QueryByMatSnResponse()
return new ResponseCommon<MatInfo>()
{
Code = 201,
Data = null,
@ -176,6 +179,7 @@ namespace WCS.BLL.Services.Service
Message = $"货架[{request.ShelfCode}]已退出入库模式!\r\n当前为{shelf.CurentMode}",
};
}
//这个时间相当于需要入库扫码后需要等待的时间
var timeOut = 5000;
var timeSpan = TimeSpan.FromMilliseconds(0);