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-09-10 11:30:23 +08:00
parent 6f826598cb
commit ddae9f34d7
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
QcMgr/Tnb.QcMgr/QcCheckTaskService.cs
View File

@@ -391,9 +391,9 @@ namespace Tnb.QcMgr
} }
}else if (QcCheckExecH.checktype == WmsWareHouseConst.XUNJIAN_ID || QcCheckExecH.checktype == WmsWareHouseConst.SHOUJIAN_ID || QcCheckExecH.checktype == WmsWareHouseConst.MOJIAN_ID ) }else if (QcCheckExecH.checktype == WmsWareHouseConst.XUNJIAN_ID || QcCheckExecH.checktype == WmsWareHouseConst.SHOUJIAN_ID || QcCheckExecH.checktype == WmsWareHouseConst.MOJIAN_ID )
{ {
PrdMoTask prdMoTask = await db.Queryable<PrdMoTask>().Where(x=>x.mo_task_code==QcCheckExecH.mo_task_code && x.id!=null).FirstAsync();
if (CheckTaskInput.result == "no") if (CheckTaskInput.result == "no")
{ {
PrdMoTask prdMoTask = await db.Queryable<PrdMoTask>().Where(x=>x.mo_task_code==QcCheckExecH.mo_task_code && x.id!=null).FirstAsync();
string pauseReason = QcCheckExecH.checktype == WmsWareHouseConst.XUNJIAN_ID ? "巡检不合格" : QcCheckExecH.checktype == WmsWareHouseConst.SHOUJIAN_ID ? "首检不合格" : "末检不合格"; string pauseReason = QcCheckExecH.checktype == WmsWareHouseConst.XUNJIAN_ID ? "巡检不合格" : QcCheckExecH.checktype == WmsWareHouseConst.SHOUJIAN_ID ? "首检不合格" : "末检不合格";
await _prdMoTaskService.PrdTaskRelease2(new PrdTaskReleaseUpInput() await _prdMoTaskService.PrdTaskRelease2(new PrdTaskReleaseUpInput()
{ {
@@ -428,6 +428,18 @@ namespace Tnb.QcMgr
.Where(x => carryCodes.Contains(x.carry_code)) .Where(x => carryCodes.Contains(x.carry_code))
.ExecuteCommandAsync(); .ExecuteCommandAsync();
} }
else
{
//末检自动完工
if (QcCheckExecH.checktype == WmsWareHouseConst.MOJIAN_ID)
{
await _prdMoTaskService.PrdTaskRelease2(new PrdTaskReleaseUpInput()
{
TaskIds = NPOI.Util.Arrays.AsList(prdMoTask.id),
Behavior = "Compled",
},db);
}
}
} }
await db.Ado.CommitTranAsync(); await db.Ado.CommitTranAsync();

5
WarehouseMgr/Tnb.WarehouseMgr/WmsPrdInstockHService.cs
View File

@@ -392,8 +392,9 @@ namespace Tnb.WarehouseMgr
erpRequestData.Add("creationtime", nowStr); erpRequestData.Add("creationtime", nowStr);
erpRequestData.Add("creator", erpCreateId); erpRequestData.Add("creator", erpCreateId);
erpRequestData.Add("ctrantypeid", "0001H11000000000D30X");//先写死 erpRequestData.Add("ctrantypeid", "0001H11000000000D30X");//先写死
erpRequestData.Add("cprowarehouseid", wmsPrdInstockD.scwarehouse_id); // erpRequestData.Add("cprowarehouseid", wmsPrdInstockD.scwarehouse_id);
erpRequestData.Add("cwarehouseid", wmsPrdInstockD.warehouse_id);//先写死 erpRequestData.Add("cprowarehouseid", wmsPrdInstockD.warehouse_id);
erpRequestData.Add("cwarehouseid", wmsPrdInstockD.warehouse_id);//todo 现在是我们的仓库id 要改
erpRequestData.Add("cwhsmanagerid", null); erpRequestData.Add("cwhsmanagerid", null);
erpRequestData.Add("dbilldate", nowStr); erpRequestData.Add("dbilldate", nowStr);
erpRequestData.Add("dmakedate", nowStr); erpRequestData.Add("dmakedate", nowStr);