wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

在线开发，任务单调整，删除功能代码调整

Browse Source
This commit is contained in:
DEVICE8\12494
2023-05-05 17:36:32 +08:00
parent b74f5a9701
commit fa4d9be965
1 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
ProductionMgr/Tnb.ProductionMgr/PrdMoService.cs
View File

@@ -15,6 +15,7 @@ using Microsoft.AspNetCore.Mvc;
using Senparc.Weixin.Work.AdvancedAPIs.MailList; using Senparc.Weixin.Work.AdvancedAPIs.MailList;
using SqlSugar; using SqlSugar;
using Tnb.BasicData; using Tnb.BasicData;
using Tnb.BasicData.Entitys.Entity;
using Tnb.EquipMgr.Entities; using Tnb.EquipMgr.Entities;
using Tnb.ProductionMgr.Entities; using Tnb.ProductionMgr.Entities;
using Tnb.ProductionMgr.Entities.Dto; using Tnb.ProductionMgr.Entities.Dto;
@@ -321,7 +322,6 @@ namespace Tnb.ProductionMgr
//同组工单排产 //同组工单排产
if (entities.Count > 0) if (entities.Count > 0)
{ {
//var icmoEntities = entities.Adapt<List<PrdTask>>();
icmoEntities = entities.Select(x => new PrdTask icmoEntities = entities.Select(x => new PrdTask
{ {
id = SnowflakeIdHelper.NextId(), id = SnowflakeIdHelper.NextId(),
@@ -381,21 +381,11 @@ namespace Tnb.ProductionMgr
} }
} }
if (row > 0) if (row > 0)
{ {
if (icmoEntities?.Count > 0 && combineMoCodes?.FirstOrDefault() is not null) if (icmoEntities?.Count > 0 && combineMoCodes?.FirstOrDefault() is not null)
{ {
var moList = await db.Queryable<PrdMo>().Where(it => combineMoCodes.Contains(it.combine_mo_code)).ToListAsync(); var moList = await db.Queryable<PrdMo>().Where(it => combineMoCodes.Contains(it.combine_mo_code)).ToListAsync();
//var icmoList = moList.Select(x => new PrdTask
//{
// id = SnowflakeIdHelper.NextId(),
// item_id = x.item_id,
// item_code = x.item_code,
// mo_type = input.mo_type,
// plan_start_date = x.plan_start_date,
// plan_end_date = x.plan_end_date,
//}).ToList();
var combinePlanQty = icmoEntities?.Sum(x => x.plan_qty); //合并工单后的计划数量 var combinePlanQty = icmoEntities?.Sum(x => x.plan_qty); //合并工单后的计划数量
var combineScheduledQty = icmoEntities?.Sum(x => x.scheduled_qty); //合并后的已排产数量 var combineScheduledQty = icmoEntities?.Sum(x => x.scheduled_qty); //合并后的已排产数量
if (combineScheduledQty < combinePlanQty) if (combineScheduledQty < combinePlanQty)
@@ -446,8 +436,6 @@ namespace Tnb.ProductionMgr
//修改工单状态为待排产，同事修改已排产数量 //修改工单状态为待排产，同事修改已排产数量
moStatus = DictConst.WaitProductId; moStatus = DictConst.WaitProductId;
icmoStatus = DictConst.ToBeScheduledEncode; icmoStatus = DictConst.ToBeScheduledEncode;
} }
row = await db.Updateable<PrdMo>().SetColumns(it => new PrdMo row = await db.Updateable<PrdMo>().SetColumns(it => new PrdMo
{ {
@@ -547,9 +535,12 @@ namespace Tnb.ProductionMgr
if (row > 0) if (row > 0)
{ {
var prdMo = await db.Queryable<PrdMo>().FirstAsync(it => it.id == prdTask.mo_id); var prdMo = await db.Queryable<PrdMo>().FirstAsync(it => it.id == prdTask.mo_id);
prdMo.input_qty += prdTask.scheduled_qty; if (prdMo is not null)
prdMo.icmo_status = DictConst.ToBeScheduledEncode; {
row = await db.Updateable(prdMo).ExecuteCommandAsync(); prdMo.input_qty += prdTask.scheduled_qty;
prdMo.icmo_status = DictConst.ToBeScheduledEncode;
row = await db.Updateable(prdMo).ExecuteCommandAsync();
}
} }
return row > 0; return row > 0;
}); });