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:
马健
2024-08-23 17:04:16 +08:00
parent d01df92326 f5d86c2f95
commit 0492407182
4 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1220,6 +1220,7 @@ namespace Tnb.ProductionMgr
processid = task.process_id,
workid = task.workstation_id,
triggerevent = EnumTriggerEvent.开工首件检,
plan_check_type = WmsWareHouseConst.SHOUJIAN_ID,
};
await _qcCheckPlanService.CreateTask(entity);
}
@@ -1847,6 +1848,7 @@ namespace Tnb.ProductionMgr
carry_code = report.material_box_code,
report_id = report.id,
batch = report.batch,
plan_check_type = WmsWareHouseConst.MOJIAN_ID,
};
await _qcCheckPlanService.CreateTask(entity);
}
@@ -1900,7 +1902,9 @@ namespace Tnb.ProductionMgr
carry_code = report.material_box_code,
report_id = report.id,
batch = report.batch,
check_type = WmsWareHouseConst.FULLREVIEW_CODE
check_type = WmsWareHouseConst.FULLREVIEW_CODE,
plan_check_type = WmsWareHouseConst.LINGBUJIANZUIZHONGJIANYAN_ID,
};
int? reported = prdMoTask.reported_work_qty == null ? 0 : prdMoTask.reported_work_qty;
int? scrap = prdMoTask.scrap_qty == null ? 0 : prdMoTask.scrap_qty;

1
QcMgr/Tnb.QcMgr.Entities/Dto/Trigger.cs
View File

@@ -54,6 +54,7 @@ namespace Tnb.QcMgr.Entities
/// </summary>
public string report_id { get; set; }
public string check_type { get; set; }
public string plan_check_type { get; set; }
public string batch { get; set; }
}

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

@@ -504,7 +504,7 @@ namespace Tnb.QcMgr
RemarkAttribute remark = RemarkAttribute.GetRemark(enumTriggerEvent);
string type = DictionaryData.Where(p => p.FullName == remark.CheckType).First().Id;
TriggerEvent = _repository.AsSugarClient().Queryable<QcTriggerEvent>().Where(p => p.type == type && p.name == remark.CheckContent).First();
Query = Query.Where((a, b, c, d, e) => b.triggertype == "3" && b.content!.Contains(TriggerEvent.id));
Query = Query.Where((a, b, c, d, e) => b.triggertype == "3" && b.content!.Contains(TriggerEvent.id) && a.checktype==entity.plan_check_type);
}
private void Filter(List<QcCheckPlanH> QcCheckPlanHs, TriggerPlanEntity entity)
{

6
WarehouseMgr/Tnb.WarehouseMgr/WmsRawmatTransferinstockService.cs
View File

@@ -164,8 +164,10 @@ namespace Tnb.WarehouseMgr
["dbizdate"] = instock.create_time.ToString("yyyy-MM-dd HH:mm:ss"),
["dplanarrivedate"] = instock.create_time.ToString("yyyy-MM-dd HH:mm:ss"),
["dplanoutdate"] = instock.create_time.ToString("yyyy-MM-dd HH:mm:ss"),
["nnum"] = item.qty,
["nshouldnum"] = item.pr_qty,
// ["nnum"] = item.qty,
// ["nshouldnum"] = item.pr_qty,
["nnum"] = wmsRawmatTransferinstockD.actual_qty,
["nshouldnum"] = wmsRawmatTransferinstockD.actual_qty,
["pk_group"] = erpOrg.pk_group,
["pk_org"] = erpOrg.pk_org,
["pk_org_v"] = erpOrg.pk_org_v,