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:
周科达
2024-08-27 09:24:14 +08:00
parent 240a5e1fc1
commit f90318a50d
2 changed files with 53 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1226,43 +1226,6 @@ namespace Tnb.ProductionMgr
// } // }
// } // }
if (prdTaskList.Where(p => p.mo_task_status == "Pause").Count() > 0 && behavior==PrdTaskBehavior.Start)
{
TimerPoolHelper.GetInstance().StartTimer(TimeCallback,prdTaskList.Where(p => p.mo_task_status == "Pause").ToList(),TimeSpan.FromHours(1),Timeout.InfiniteTimeSpan);
}else if (prdTaskList.Where(p => p.mo_task_status == "ToBeStarted").Count() > 0 && behavior == PrdTaskBehavior.Start)
{
foreach (PrdMoTask? task in prdTaskList.Where(p => p.mo_task_status == "ToBeStarted").ToList())
{
ToolMolds toolMolds = await _db.Queryable<ToolMolds>().SingleAsync(x=>x.id==task.mold_id);
TriggerPlanEntity entity = new()
{
materialid = task.material_id,
processid = task.process_id,
workid = task.workstation_id,
triggerevent = EnumTriggerEvent.开工首件检,
plan_check_type = WmsWareHouseConst.SHOUJIAN_ID,
mo_task_code = task.mo_task_code,
newpronum = toolMolds?.mold_cavity
};
await _qcCheckPlanService.CreateTask(entity);
}
}
if (behavior == PrdTaskBehavior.Start)
{
TimerPoolHelper.GetInstance().StartTimer(TimeCallback2,prdTaskList.Where(p => p.mo_task_status == "Pause" || p.mo_task_status == "ToBeStarted").ToList(),TimeSpan.FromHours(2),Timeout.InfiniteTimeSpan,false);
}
if (behavior == PrdTaskBehavior.Pause)
{
foreach (PrdMoTask? task in prdTaskList.Where(p => p.mo_task_status == "ToBeStarted").ToList())
{
TimerPoolHelper.GetInstance().DisposeTimer(new Dictionary<string,string>()
{
["key"] = task.timer_key
});
}
}
#endregion #endregion
@@ -1586,6 +1549,45 @@ namespace Tnb.ProductionMgr
} }
} }
} }
if (prdTaskList.Where(p => p.mo_task_status == "Pause").Count() > 0 && behavior==PrdTaskBehavior.Start)
{
TimerPoolHelper.GetInstance().StartTimer(TimeCallback,prdTaskList.Where(p => p.mo_task_status == "Pause").ToList(),TimeSpan.FromMinutes(1),Timeout.InfiniteTimeSpan);
}else if (prdTaskList.Where(p => p.mo_task_status == "ToBeStarted").Count() > 0 && behavior == PrdTaskBehavior.Start)
{
foreach (PrdMoTask? task in prdTaskList.Where(p => p.mo_task_status == "ToBeStarted").ToList())
{
ToolMolds toolMolds = await _db.Queryable<ToolMolds>().SingleAsync(x=>x.id==task.mold_id);
TriggerPlanEntity entity = new()
{
materialid = task.material_id,
processid = task.process_id,
workid = task.workstation_id,
triggerevent = EnumTriggerEvent.开工首件检,
plan_check_type = WmsWareHouseConst.SHOUJIAN_ID,
mo_task_code = task.mo_task_code,
newpronum = toolMolds?.mold_cavity
};
await _qcCheckPlanService.CreateTask(entity);
}
}
if (behavior == PrdTaskBehavior.Start)
{
TimerPoolHelper.GetInstance().StartTimer(TimeCallback2,prdTaskList.Where(p => p.mo_task_status == "Pause" || p.mo_task_status == "ToBeStarted").ToList(),TimeSpan.FromMinutes(1),Timeout.InfiniteTimeSpan,false);
}
if (behavior == PrdTaskBehavior.Pause)
{
foreach (PrdMoTask? task in prdTaskList.Where(p => p.mo_task_status == "ToBeStarted").ToList())
{
TimerPoolHelper.GetInstance().DisposeTimer(new Dictionary<string,string>()
{
["key"] = task.timer_key
});
}
}
} }
await db.Ado.CommitTranAsync(); await db.Ado.CommitTranAsync();
@@ -1621,7 +1623,8 @@ namespace Tnb.ProductionMgr
workid = task.workstation_id, workid = task.workstation_id,
triggerevent = EnumTriggerEvent.开工首件检, triggerevent = EnumTriggerEvent.开工首件检,
mo_task_code = task.mo_task_code, mo_task_code = task.mo_task_code,
newpronum = toolMolds?.mold_cavity newpronum = toolMolds?.mold_cavity,
plan_check_type = WmsWareHouseConst.XUNJIAN_ID
// check_type = WmsWareHouseConst.FULLREVIEW_CODE // check_type = WmsWareHouseConst.FULLREVIEW_CODE
}; };
await _qcCheckPlanService.CreateTask(entity); await _qcCheckPlanService.CreateTask(entity);
@@ -1657,7 +1660,8 @@ namespace Tnb.ProductionMgr
workid = task.workstation_id, workid = task.workstation_id,
triggerevent = EnumTriggerEvent.巡检, triggerevent = EnumTriggerEvent.巡检,
mo_task_code = task.mo_task_code, mo_task_code = task.mo_task_code,
newpronum = toolMolds?.mold_cavity newpronum = toolMolds?.mold_cavity,
plan_check_type = WmsWareHouseConst.XUNJIAN_ID
// check_type = WmsWareHouseConst.FULLREVIEW_CODE // check_type = WmsWareHouseConst.FULLREVIEW_CODE
}; };
await _qcCheckPlanService.CreateTask(entity); await _qcCheckPlanService.CreateTask(entity);

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

@@ -184,8 +184,8 @@ namespace Tnb.WarehouseMgr
thirdWebapiRecord.third_name = WmsWareHouseConst.BIP; thirdWebapiRecord.third_name = WmsWareHouseConst.BIP;
thirdWebapiRecord.name = "调拨入库"; thirdWebapiRecord.name = "调拨入库";
thirdWebapiRecord.method = "POST"; thirdWebapiRecord.method = "POST";
thirdWebapiRecord.url = config.value + "uapws/rest/transIn/save"; // thirdWebapiRecord.url = config.value + "uapws/rest/transIn/save";
// thirdWebapiRecord.url = WmsWareHouseConst.BIP_DOMAIN + "uapws/rest/transIn/save"; thirdWebapiRecord.url = WmsWareHouseConst.BIP_DOMAIN + "uapws/rest/transIn/save";
thirdWebapiRecord.request_data = JsonConvert.SerializeObject(requestData); thirdWebapiRecord.request_data = JsonConvert.SerializeObject(requestData);
thirdWebapiRecord.create_time = DateTime.Now; thirdWebapiRecord.create_time = DateTime.Now;
await _db.Insertable(thirdWebapiRecord).ExecuteCommandAsync(); await _db.Insertable(thirdWebapiRecord).ExecuteCommandAsync();