From 8b3541c95039e65eac076c330af75ca109ff1643 Mon Sep 17 00:00:00 2001
From: zhoukeda <1315948824@qq.com>
Date: Fri, 10 Nov 2023 13:38:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E5=B7=A5=E4=BD=8D=E8=8E=B7?=
=?UTF-8?q?=E5=8F=96=E8=BF=9B=E8=A1=8C=E4=B8=AD=E5=BE=85=E5=BC=80=E5=B7=A5?=
=?UTF-8?q?=E6=9A=82=E5=81=9C=E7=9A=84=E4=BB=BB=E5=8A=A1=E5=8D=95=E4=BF=A1?=
=?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../IPrdMoTaskService.cs | 7 +++++
.../Tnb.ProductionMgr/PrdMoTaskService.cs | 27 +++++++++++++++++++
2 files changed, 34 insertions(+)
diff --git a/ProductionMgr/Tnb.ProductionMgr.Interfaces/IPrdMoTaskService.cs b/ProductionMgr/Tnb.ProductionMgr.Interfaces/IPrdMoTaskService.cs
index a2a45e06..3a28f090 100644
--- a/ProductionMgr/Tnb.ProductionMgr.Interfaces/IPrdMoTaskService.cs
+++ b/ProductionMgr/Tnb.ProductionMgr.Interfaces/IPrdMoTaskService.cs
@@ -28,6 +28,13 @@ namespace Tnb.ProductionMgr.Interfaces
///
Task GetPrdMoTaskInfoByStationId(Dictionary dic);
+ ///
+ /// 根据工位获取进行中待开工暂停的任务单信息
+ ///
+ ///
+ ///
+ Task> GetPrdMoTaskListByStationId(Dictionary dic);
+
///
/// 外包装根据工位id获取喷码数据
///
diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs
index ad0bbe82..567eca46 100644
--- a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs
+++ b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs
@@ -2739,6 +2739,33 @@ namespace Tnb.ProductionMgr
return prdMoTask;
}
+ ///
+ /// 根据工位获取进行中待开工暂停的任务单信息
+ ///
+ ///
+ ///
+ [HttpPost]
+ public async Task> GetPrdMoTaskListByStationId(Dictionary dic)
+ {
+ string station_id = dic.ContainsKey("station_id") ? dic["station_id"] : "";
+ if (string.IsNullOrEmpty(station_id))
+ {
+ throw Oops.Bah("工位错误");
+ }
+
+ List list = await _db.Queryable().Where(x => x.workstation_id == station_id && x.parent_id != null && (x.mo_task_status == DictConst.InProgressEnCode || x.mo_task_status == DictConst.ToBeStartedEnCode || x.mo_task_status == DictConst.MoStatusPauseCode )).ToListAsync();
+ if (list != null && list.Count>0)
+ {
+ foreach (var prdMoTask in list)
+ {
+ BasMaterial basMaterial = await _db.Queryable().SingleAsync(x => x.id == prdMoTask.material_id);
+ prdMoTask.material_name = basMaterial.name;
+ }
+ }
+
+ return list;
+ }
+
///
/// 外包装根据工位id获取喷码数据
///