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-21 18:46:18 +08:00
parent 85a35ac34f
commit ce4a2fbe3a
12 changed files with 468 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
WCS.BLL/Services/Service/MXL4Service.cs
View File

@ -39,15 +39,15 @@ namespace WCS.BLL.Services.Service
var storeCodeList = request.List.Select(t => t.StoreCode)
.Distinct()
.ToList();
var stores = DbHelp.db.Queryable<StoreInfo>()
var moduleInfo = DbHelp.db.Queryable<ModuleInfo>()
.LeftJoin<ShelfTypeInfo>((si, sti) => si.ShelfTypeId == sti.Id)
.Where((si, sti) => sti.ShelfTypeName == "液晶货架")
.Where((si, sti) => storeCodeList.Contains(si.StoreCode))
.Select((st, sti) => st)
.Where((si, sti) => sti.ShelfTypeName == "液晶标签货架")
.Where((si, sti) => storeCodeList.Contains(si.ModuleCode))
.Select((si, sti) => si)
.ToList();
if (stores.Count < storeCodeList.Count)
if (moduleInfo.Count < storeCodeList.Count)
{
var storeCodesInDB = stores.Select(t => t.StoreCode).ToList();
var storeCodesInDB = moduleInfo.Select(t => t.ModuleCode).ToList();
storeCodeList.RemoveAll(t => storeCodesInDB.Contains(t));
return new ResponseCommon<object>
{
@ -72,20 +72,36 @@ namespace WCS.BLL.Services.Service
};
}
//获取taskId
var list = new List<int>() { 1, 2, 3, 4, 5, 6, 7 };
//已存在的taskID
var exsitIds = currenTasks.Select(t => t.TaskID)
.ToList();
exsitIds.ForEach(t =>
{
list.RemoveAll(l => l == t);
});
var tasks = new List<CurrentTask>();
//生成任务数据
foreach (var orderDetail in request.List)
{
var store = stores.Where(t => t.StoreCode == orderDetail.StoreCode).First();
var taskId = list.First();
list.RemoveAll(l => l == taskId);
var module = moduleInfo.Where(t => t.ModuleCode == orderDetail.StoreCode).First();
var task = new CurrentTask()
{
StoreId = store.Id,
StoreCode = store.StoreCode,
ModuleId = module.Id,
ModuleCode = module.ModuleCode,
ShelfId = module.ShelfId,
ShelfCode = module.ShelfCode,
Guid = orderDetail.Guid,
ItemNo = orderDetail.ItemNo,
TaskMode = request.OrderType,
OrderNumber = request.OrderNumber,
ButtonColor = request.Corlor,
TaskID = taskId,
ButtonColor = DbModels.Task.ButtonColorEnum.绿色,
MatCode = orderDetail.MatCode,
MatName = orderDetail.MatName,
MatSpec = orderDetail.MatSpec,