diff --git a/ProductionMgr/Tnb.ProductionMgr.Interfaces/IPrdMoTaskService.cs b/ProductionMgr/Tnb.ProductionMgr.Interfaces/IPrdMoTaskService.cs
index fb5fbf2c..514a27a9 100644
--- a/ProductionMgr/Tnb.ProductionMgr.Interfaces/IPrdMoTaskService.cs
+++ b/ProductionMgr/Tnb.ProductionMgr.Interfaces/IPrdMoTaskService.cs
@@ -66,6 +66,13 @@ namespace Tnb.ProductionMgr.Interfaces
///
///
///
- Task PrdTaskRelease(PrdTaskReleaseUpInput input, ISqlSugarClient db = null);
+ Task PrdTaskRelease(PrdTaskReleaseUpInput input);
+
+ ///
+ /// /生产任务下发,开始 、结束、完成
+ ///
+ ///
+ ///
+ Task PrdTaskRelease2(PrdTaskReleaseUpInput input, ISqlSugarClient db = null);
}
}
diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs
index bb8d4e55..7a503e1e 100644
--- a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs
+++ b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs
@@ -72,6 +72,7 @@ namespace Tnb.ProductionMgr
private static readonly Dictionary _dicWorkLine = new();
private static readonly Dictionary _dicProcess = new();
private readonly ISqlSugarClient _db;
+ private ISqlSugarClient _db2;
private readonly IBillRullService _billRuleService;
private readonly IPrdInstockService _prdInstockService;
private readonly WmsPrdInstockHService _wmsPrdInstockHService;
@@ -1114,7 +1115,7 @@ namespace Tnb.ProductionMgr
///
///
[HttpPost]
- public async Task PrdTaskRelease(PrdTaskReleaseUpInput input,ISqlSugarClient db = null)
+ public async Task PrdTaskRelease(PrdTaskReleaseUpInput input)
{
int row = -1;
if (input is null)
@@ -1132,9 +1133,14 @@ namespace Tnb.ProductionMgr
}
bool tranFlag = true;
- if (db==null)
+ ISqlSugarClient db = null;
+ if (_db2!=null)
{
tranFlag = false;
+ db = _db2;
+ }
+ else
+ {
db = _repository.AsSugarClient();
}
@@ -1628,6 +1634,13 @@ namespace Tnb.ProductionMgr
return "保存成功";
}
+
+ public async Task PrdTaskRelease2(PrdTaskReleaseUpInput input,ISqlSugarClient db)
+ {
+ this._db2 = db;
+ await PrdTaskRelease(input);
+ return "保存成功";
+ }
public async void TimeCallback(object args)
{
@@ -3946,6 +3959,12 @@ namespace Tnb.ProductionMgr
return !result.IsSuccess ? throw Oops.Oh(ErrorCode.COM1008) : (dynamic)(result.IsSuccess ? "操作成功" : result.ErrorMessage);
}
+
+ [HttpPost]
+ public async Task GetSchedulingInfo(string id)
+ {
+ return await _db.Queryable().SingleAsync(x => x.id == id);
+ }
}
diff --git a/QcMgr/Tnb.QcMgr/QcCheckTaskService.cs b/QcMgr/Tnb.QcMgr/QcCheckTaskService.cs
index b50b55b5..7269c28b 100644
--- a/QcMgr/Tnb.QcMgr/QcCheckTaskService.cs
+++ b/QcMgr/Tnb.QcMgr/QcCheckTaskService.cs
@@ -393,12 +393,12 @@ namespace Tnb.QcMgr
{
PrdMoTask prdMoTask = await db.Queryable().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 ? "首检不合格" : "末检不合格";
- await _prdMoTaskService.PrdTaskRelease(new PrdTaskReleaseUpInput()
+ await _prdMoTaskService.PrdTaskRelease2(new PrdTaskReleaseUpInput()
{
TaskIds = NPOI.Util.Arrays.AsList(prdMoTask.id),
Behavior = "Pause",
PauseReeson = pauseReason
- });
+ },db);
List carryCodes = await db.Queryable().Where(x=>x.mo_task_id==prdMoTask.id).Select(x=>x.material_box_code).Distinct().ToListAsync();
await db.Updateable()
.SetColumns(x => x.is_check == ((int)EnumCheckConclusion.暂控).ToString())