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-03 11:04:59 +08:00
parent 97888c6978
commit d283924ae1
48 changed files with 802 additions and 509 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
WCS.BLL/Services/IService/IGenerateService.cs
View File

@ -1,6 +1,5 @@

using WCS.BLL.DbModels;
using WCS.DAL.AuthDbModel;
using WCS.Model;
using WCS.Model.ApiModel;
using WCS.Model.ApiModel.MatBaseInfo;

1
WCS.BLL/Services/IService/IInterfaceRecordService.cs
View File

@ -1,6 +1,5 @@

using WCS.BLL.DbModels;
using WCS.DAL.AuthDbModel;
using WCS.Model;
using WCS.Model.ApiModel;
using WCS.Model.ApiModel.User;

1
WCS.BLL/Services/IService/IMatBaseInfoService.cs
View File

@ -1,6 +1,5 @@

using WCS.BLL.DbModels;
using WCS.DAL.AuthDbModel;
using WCS.Model;
using WCS.Model.ApiModel;
using WCS.Model.ApiModel.MatBaseInfo;

1
WCS.BLL/Services/IService/IMatInventoryDetailService.cs
View File

@ -1,6 +1,5 @@

using WCS.BLL.DbModels;
using WCS.DAL.AuthDbModel;
using WCS.Model;
using WCS.Model.ApiModel;
using WCS.Model.ApiModel.MatInventoryDetail;

2
WCS.BLL/Services/IService/IOutstoreService.cs
View File

@ -15,6 +15,8 @@ namespace WCS.BLL.Services.IService
public Task<ResponseBase> GetOutOrderList(GetOutOrderListRequest request);
public Task<ResponseBase> GetOutOrderListByStatus(GetOutOrderListByStatusRequest request);
public Task<ResponseBase> GetOutOrderDetail(GetOutOrderDetailRequest request);
public Task<ResponseBase> GetOutOrderMatDetail(GetOutOrderDetailRequest request);

2
WCS.BLL/Services/IService/IStockTakingService.cs
View File

@ -27,7 +27,7 @@ namespace WCS.BLL.Services.IService
public Task<ResponseBase> queryMatInfoInStocktakingOrder(QueryMatInfoInStocktakingOrderRequest request);
public Task<ResponseBase> comfirmStocktakingOrder(ComfirmStocktakingOrderRequest request);
public Task<ResponseBase> confirmStocktakingOrder(ConfirmStocktakingOrderRequest request);
public Task<ResponseBase> commitStockTakingOrder(GetStockTakingOrderMatDetailRequest request);
}

1
WCS.BLL/Services/IService/IStoreInfoService.cs
View File

@ -3,7 +3,6 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using WCS.DAL.AuthDbModel;
using WCS.Model.ApiModel.User;
using WCS.Model;
using WCS.DAL.DbModels;

3
WCS.BLL/Services/IService/IUserService.cs
View File

@ -1,5 +1,4 @@

using WCS.DAL.AuthDbModel;
using WCS.DAL.Db.AuthDb;
using WCS.Model;
using WCS.Model.ApiModel;
using WCS.Model.ApiModel.User;

1
WCS.BLL/Services/Service/GenerateService.cs
View File

@ -11,7 +11,6 @@ using TouchSocket.Core;
using WCS.BLL.DbModels;
using WCS.BLL.Services.IService;
using WCS.DAL;
using WCS.DAL.AuthDbModel;
using WCS.DAL.Db;
using WCS.Model;
using WCS.Model.ApiModel;

28
WCS.BLL/Services/Service/InstoreService.cs
View File

@ -23,7 +23,25 @@ namespace WCS.BLL.Services.Service
public ResponseBase shelfGoInInStore(ShelfGoInInstoreRequest request)
{
//校验货架编码规则
bool isValid = Regex.IsMatch(request.ModuleCode, LocalFile.ModuleCodePattern);
//取配置文件中得货架编码规则
bool isValid = false;
var patterns = LocalFile.Config.ModuleCodePatterns;
if (patterns != null && patterns.Count > 0)
{
foreach (var pattern in patterns)
{
isValid = Regex.IsMatch(request.ModuleCode, pattern);
//匹配到第一个符合条件的货架码 就直接退出循环 认为匹配成功
if (isValid)
break;
}
}
//如果配置文件缺失 使用默认正则进行匹配
else
{
isValid = Regex.IsMatch(request.ModuleCode, LocalFile.DefaultModuleCodePattern);
}
if (!isValid)
{
return new ResponseBase()
@ -50,7 +68,7 @@ namespace WCS.BLL.Services.Service
return new ShelfGoInInstoreResponse()
{
Code = 200,
Message = "货架进入入库模式成功！",
Message = $"货架进入入库模式成功！{string.Join(",", shelf.ExceptionMessages)}",
Data = new ShelfGoInInstoreDto()
{
ShelfCode = shelf.ShelfCode,
@ -130,7 +148,7 @@ namespace WCS.BLL.Services.Service
};
}
#region 获取物料数据 //调用接口或者直接查询数据库
//调用接口
//TODO做成配置 调用接口
if (1 != 1)
{
@ -141,7 +159,7 @@ namespace WCS.BLL.Services.Service
var matInfo = await DbHelp.db.Queryable<MatInfo>().Where(t => t.MatSn == request.MatSn).FirstAsync();
if (matInfo != null)
{
//TODO 改成wcs的实体
shelf.InStoreData = new MatInfoResponse()
{
materialBar = matInfo.MatSn,
@ -198,7 +216,7 @@ namespace WCS.BLL.Services.Service
};
}
//这个时间相当于需要入库扫码后需要等待的时间
//TODO 配置这个时间相当于需要入库扫码后需要等待的时间
var timeOut = 5000;
var timeSpan = TimeSpan.FromMilliseconds(0);
var beginTime = DateTime.Now;

1
WCS.BLL/Services/Service/InterfaceRecordService.cs
View File

@ -9,7 +9,6 @@ using TouchSocket.Core;
using WCS.BLL.DbModels;
using WCS.BLL.Services.IService;
using WCS.DAL;
using WCS.DAL.AuthDbModel;
using WCS.DAL.Db;
using WCS.Model;
using WCS.Model.ApiModel;

1
WCS.BLL/Services/Service/MatBaseInfoService.cs
View File

@ -10,7 +10,6 @@ using TouchSocket.Core;
using WCS.BLL.DbModels;
using WCS.BLL.Services.IService;
using WCS.DAL;
using WCS.DAL.AuthDbModel;
using WCS.DAL.Db;
using WCS.Model;
using WCS.Model.ApiModel;

2
WCS.BLL/Services/Service/MatInventoryDetailService.cs
View File

@ -8,8 +8,6 @@ using System.Threading.Tasks;
using TouchSocket.Core;
using WCS.BLL.DbModels;
using WCS.BLL.Services.IService;
using WCS.DAL;
using WCS.DAL.AuthDbModel;
using WCS.DAL.Db;
using WCS.DAL.DbModels;
using WCS.Model;

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

@ -204,6 +204,7 @@ namespace WCS.BLL.Services.Service
}
public async Task<ResponseBase> GetOutOrderList(GetOutOrderListRequest request)
{
//直接查询
@ -236,6 +237,43 @@ namespace WCS.BLL.Services.Service
};
}
public async Task<ResponseBase> GetOutOrderListByStatus(GetOutOrderListByStatusRequest request)
{
if (request.OrderExeStatus == null || request.OrderExeStatus.Count == 0)
{
//不传入状态不显示
return new PageQueryResponse<OutOrder>()
{
Code = 200,
Message = $"success",
Data = new PageQueryResponseData<OutOrder>()
{
Lists = new List<OutOrder>()
}
};
}
//直接查询
var recordsQueryable = DbHelp.db.Queryable<OutOrder>();
var totalCount = await recordsQueryable.CountAsync();
var records = await recordsQueryable
.OrderByDescending(t => t.CreateTime)
//.Take(request.PageSize)
.ToListAsync();
return new PageQueryResponse<OutOrder>()
{
Code = 200,
Message = $"success",
Data = new PageQueryResponseData<OutOrder>()
{
//TotalCount = totalCount,
//MaxPage = request.PageSize == 0 ? 0 : (int)Math.Ceiling((decimal)totalCount / request.PageSize),
//Count = records.Count,
Lists = records.ToList()
}
};
}
public async Task<ResponseBase> GetOutOrderDetail(GetOutOrderDetailRequest request)
{
OutOrder outOrder = null;
@ -288,7 +326,6 @@ namespace WCS.BLL.Services.Service
}
#endregion
return new ResponseCommon<List<OutOrderDetail>>()
{
Code = 200,
@ -428,7 +465,7 @@ namespace WCS.BLL.Services.Service
var matDetails = outOrderMatDetails.Where(t => t.StoreInfo.ShelfCode == shelf.ShelfCode)
.Distinct()
.ToList();
shelf.GoInOutstore(matDetails,order);
shelf.GoInOutstore(matDetails, order);
});
//返回

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

@ -606,7 +606,7 @@ namespace WCS.BLL.Services.Service
}
public async Task<ResponseBase> comfirmStocktakingOrder(ComfirmStocktakingOrderRequest request)
public async Task<ResponseBase> confirmStocktakingOrder(ConfirmStocktakingOrderRequest request)
{
//获取盘点物料明细
var stockTakingMatDetail =await DbHelp.db.Queryable<StockTakingOrderMatDetail>()

1
WCS.BLL/Services/Service/StoreInfoService.cs
View File

@ -8,7 +8,6 @@ using TouchSocket.Core;
using WCS.BLL.DbModels;
using WCS.BLL.Services.IService;
using WCS.DAL;
using WCS.DAL.AuthDbModel;
using WCS.DAL.Db;
using WCS.DAL.DbModels;
using WCS.Model;

2
WCS.BLL/Services/Service/UserService.cs
View File

@ -7,7 +7,7 @@ using System.Threading.Tasks;
using TouchSocket.Core;
using WCS.BLL.Services.IService;
using WCS.DAL;
using WCS.DAL.AuthDbModel;
using WCS.DAL.Db.AuthDb;
using WCS.Model;
using WCS.Model.ApiModel;
using WCS.Model.ApiModel.User;