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

Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev

Browse Source
This commit is contained in:
FanLian
2023-07-20 17:59:57 +08:00
parent f4134375f6 e22f7f277e
commit 7bb60e3018
3 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs
View File

@@ -1004,7 +1004,16 @@ namespace Tnb.ProductionMgr
var taskReportLogs = new List<PrdMoTask>(); var taskReportLogs = new List<PrdMoTask>();
var prdTaskList = await db.Queryable<PrdMoTask>().Where(it => input.TaskIds.Contains(it.id)).ToListAsync(); var prdTaskList = await db.Queryable<PrdMoTask>().Where(it => input.TaskIds.Contains(it.id)).ToListAsync();
if (prdTaskList?.Count > 0) if (prdTaskList?.Count > 0)
{ {
/*
if (prdTaskList.Where(p => p.mo_task_status == "Closed").Count() > 0 && status == "InProgress")
{
foreach (var task in prdTaskList.Where(p => p.mo_task_status == "Closed").ToList())
{
//质检
}
}
*/
prdTaskList.ForEach(x => x.mo_task_status = status); prdTaskList.ForEach(x => x.mo_task_status = status);
row = await db.Updateable(prdTaskList).ExecuteCommandAsync(); row = await db.Updateable(prdTaskList).ExecuteCommandAsync();
if (row > 0) if (row > 0)

2
QcMgr/Tnb.QcMgr/QcCheckPlanService.cs
View File

@@ -303,6 +303,8 @@ namespace Tnb.QcMgr
TriggerEvent = _repository.AsSugarClient().Queryable<QcTriggerEvent>().Where(p => p.type == DictionaryData.Where(p => p.FullName == "首件检").First().Id && p.name == "生产任务暂停").First(); TriggerEvent = _repository.AsSugarClient().Queryable<QcTriggerEvent>().Where(p => p.type == DictionaryData.Where(p => p.FullName == "首件检").First().Id && p.name == "生产任务暂停").First();
if (enumTriggerEvent == EnumTriggerEvent.出厂检按入厂频次) if (enumTriggerEvent == EnumTriggerEvent.出厂检按入厂频次)
TriggerEvent = _repository.AsSugarClient().Queryable<QcTriggerEvent>().Where(p => p.type == DictionaryData.Where(p => p.FullName == "出厂检").First().Id && p.name == "按入厂频次").First(); TriggerEvent = _repository.AsSugarClient().Queryable<QcTriggerEvent>().Where(p => p.type == DictionaryData.Where(p => p.FullName == "出厂检").First().Id && p.name == "按入厂频次").First();
if (enumTriggerEvent == EnumTriggerEvent.入厂检按物料频次)
TriggerEvent = _repository.AsSugarClient().Queryable<QcTriggerEvent>().Where(p => p.type == DictionaryData.Where(p => p.FullName == "入厂检").First().Id && p.name == "按物料频次").First();
if (enumTriggerEvent == EnumTriggerEvent.入厂检按物料编号) if (enumTriggerEvent == EnumTriggerEvent.入厂检按物料编号)
TriggerEvent = _repository.AsSugarClient().Queryable<QcTriggerEvent>().Where(p => p.type == DictionaryData.Where(p => p.FullName == "入厂检").First().Id && p.name == "按物料编号").First(); TriggerEvent = _repository.AsSugarClient().Queryable<QcTriggerEvent>().Where(p => p.type == DictionaryData.Where(p => p.FullName == "入厂检").First().Id && p.name == "按物料编号").First();
if (enumTriggerEvent == EnumTriggerEvent.生产检定量) if (enumTriggerEvent == EnumTriggerEvent.生产检定量)

15
WarehouseMgr/Tnb.WarehouseMgr/WmsOutStockService.cs
View File

@@ -368,16 +368,17 @@ namespace Tnb.WarehouseMgr
{ {
List<WmsCarryMat> carryMats = new(); List<WmsCarryMat> carryMats = new();
List<WmsCarryCode> carryCodes = new(); List<WmsCarryCode> carryCodes = new();
var whereExp = Expressionable.Create<WmsCarryH, WmsCarryCode, BasLocation>()
.And((a, b, c) => a.is_lock == 0)
.And((a, b, c) => !string.IsNullOrEmpty(a.location_id))
.And((a, b, c) => a.status == (int)EnumCarryStatus.占用)
.And((a, b, c) => c.is_type == ((int)EnumLocationType.存储库位).ToString());
foreach (var os in outStockDList) foreach (var os in outStockDList)
{ {
whereExp.And((a, b, c) => b.material_id == os.material_id) var whereExp = Expressionable.Create<WmsCarryH, WmsCarryCode, BasLocation>()
.AndIF(!string.IsNullOrEmpty(os.code_batch), (a, b, c) => b.code_batch == os.code_batch); .And((a, b, c) => a.is_lock == 0)
.And((a, b, c) => !string.IsNullOrEmpty(a.location_id))
.And((a, b, c) => a.status == (int)EnumCarryStatus.占用)
.And((a, b, c) => c.is_type == ((int)EnumLocationType.存储库位).ToString())
.And((a, b, c) => b.material_id == os.material_id)
.AndIF(!string.IsNullOrEmpty(os.code_batch), (a, b, c) => b.code_batch == os.code_batch);
var carryCodesPart = await _db.Queryable<WmsCarryH>().InnerJoin<WmsCarryCode>((a, b) => a.id == b.carry_id).InnerJoin<BasLocation>((a, b, c) => a.location_id == c.id) var carryCodesPart = await _db.Queryable<WmsCarryH>().InnerJoin<WmsCarryCode>((a, b) => a.id == b.carry_id).InnerJoin<BasLocation>((a, b, c) => a.location_id == c.id)
.Where(whereExp.ToExpression()) .Where(whereExp.ToExpression())