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-09-11 15:01:17 +08:00
parent eaee86e0d5 a7831e1f79
commit 421ef28f38
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ProductionMgr/Tnb.ProductionMgr/MesForErpService.cs
View File

@@ -137,7 +137,7 @@ namespace Tnb.ProductionMgr
item.material_id = basMaterial.id; item.material_id = basMaterial.id;
item.mo_source = "1"; item.mo_source = "1";
item.mo_type = moTypeDic[item.mo_type]; item.mo_type = moTypeDic[item.mo_type];
item.mo_code = item.mo_code; item.mo_code = item.mo_code+"-"+item.erp_lineno;
item.create_id = WmsWareHouseConst.AdministratorUserId; item.create_id = WmsWareHouseConst.AdministratorUserId;
item.create_time = DateTime.Now; item.create_time = DateTime.Now;
item.mo_status = DictConst.ToBeScheduledId; item.mo_status = DictConst.ToBeScheduledId;

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

@@ -571,11 +571,11 @@ namespace Tnb.QcMgr
} }
if (enumTriggerEvent == EnumTriggerEvent.零部件最终检验) if (enumTriggerEvent == EnumTriggerEvent.零部件最终检验)
{ {
int? number = _repository.AsSugarClient().Queryable<QcCheckPlanAdd>().Where(p => p.mainid == plan.id).First().number; // int? number = _repository.AsSugarClient().Queryable<QcCheckPlanAdd>().Where(p => p.mainid == plan.id).First().number;
if ((entity.newpronum + (entity.oldpronum / number)) <= (entity.oldpronum / number)) // if ((entity.newpronum + (entity.oldpronum / number)) <= (entity.oldpronum / number))
{ // {
removePlanHs.Add(plan); // removePlanHs.Add(plan);
} // }
} }
if (enumTriggerEvent == EnumTriggerEvent.开工首件检) if (enumTriggerEvent == EnumTriggerEvent.开工首件检)
{ {