diff --git a/DOAN.Admin.WebApi/Controllers/Mobile/PreparationTaskController.cs b/DOAN.Admin.WebApi/Controllers/Mobile/PreparationTaskController.cs
index 567ca2d..5b0451a 100644
--- a/DOAN.Admin.WebApi/Controllers/Mobile/PreparationTaskController.cs
+++ b/DOAN.Admin.WebApi/Controllers/Mobile/PreparationTaskController.cs
@@ -82,6 +82,12 @@ namespace DOAN.Admin.Mobile.Controllers
}
#region 产线任务
+ ///
+ /// 查询线别任务
+ ///
+ ///
+ ///
+ ///
[HttpGet("search_task_byline")]
public IActionResult SearchTaskByLine(string lineCode, DateTime hadleDate)
{
@@ -94,6 +100,21 @@ namespace DOAN.Admin.Mobile.Controllers
return SUCCESS(response);
}
+
+ //TODO 获取任务下的配料详情
+ [HttpGet("get_task_info_byline")]
+ public IActionResult GetTaskInfosByLine(string task_code)
+ {
+
+ if (string.IsNullOrEmpty(task_code)) return SUCCESS(null);
+
+ var response = preparationTask.GetTaskInfosByLine(task_code);
+
+ return SUCCESS(response);
+ }
+
+
+
#endregion
diff --git a/DOAN.Model/MES/mm/MmTaskMaterialInfoByLine.cs b/DOAN.Model/MES/mm/MmTaskMaterialInfoByLine.cs
new file mode 100644
index 0000000..9914694
--- /dev/null
+++ b/DOAN.Model/MES/mm/MmTaskMaterialInfoByLine.cs
@@ -0,0 +1,78 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+namespace DOAN.Model.MES.mm
+{
+ ///
+ /// 备料任务详情
+ ///
+ [SugarTable("mm_task_material_info_byline")]
+ public class MmTaskMaterialInfoByLine
+ {
+ ///
+ /// 雪花
+ ///
+ [SugarColumn(IsPrimaryKey = true, IsIdentity = false)]
+ public string Id { get; set; }
+
+ ///
+ /// 任务code
+ ///
+ [SugarColumn(IsPrimaryKey = true, IsIdentity = false, ColumnName = "fk_task_code")]
+ public string FkTaskCode { get; set; }
+
+ ///
+ /// 物料code
+ ///
+ [SugarColumn(ColumnName = "material_code")]
+ public string MaterialCode { get; set; }
+
+ ///
+ /// 物料名称
+ ///
+ [SugarColumn(ColumnName = "material_name")]
+ public string MaterialName { get; set; }
+
+ ///
+ /// 规格型号
+ ///
+ public string Specification { get; set; }
+
+ ///
+ /// 配料数量
+ ///
+ public decimal Quantity { get; set; }
+
+ ///
+ /// 单位
+ ///
+ public string Unit { get; set; }
+
+ ///
+ /// 创建人
+ ///
+ [SugarColumn(ColumnName = "cREATED_BY")]
+ public string CreatedBy { get; set; }
+
+ ///
+ /// 创建时间
+ ///
+ [SugarColumn(ColumnName = "cREATED_TIME")]
+ public DateTime? CreatedTime { get; set; }
+
+ ///
+ /// 更新人
+ ///
+ [SugarColumn(ColumnName = "uPDATED_BY")]
+ public string UpdatedBy { get; set; }
+
+ ///
+ /// 更新时间
+ ///
+ [SugarColumn(ColumnName = "uPDATED_TIME")]
+ public DateTime? UpdatedTime { get; set; }
+
+ }
+}
\ No newline at end of file
diff --git a/DOAN.Service/Mobile/IService/IPreparationTaskService.cs b/DOAN.Service/Mobile/IService/IPreparationTaskService.cs
index 543b903..ba1b1d6 100644
--- a/DOAN.Service/Mobile/IService/IPreparationTaskService.cs
+++ b/DOAN.Service/Mobile/IService/IPreparationTaskService.cs
@@ -24,11 +24,14 @@ namespace DOAN.Service.Mobile.IService
- List GetTaskInfos(string task_code);
+ List GetTaskInfos(string task_code);
- int GenerateIngredientTask(IngredientTaskRequestForm form);
+ int GenerateIngredientTask(IngredientTaskRequestForm form);
List SearchTaskByLine(string lineCode, DateTime hadleDate);
+
+ List GetTaskInfosByLine(string task_code);
+
}
}
diff --git a/DOAN.Service/Mobile/PreparationTaskService.cs b/DOAN.Service/Mobile/PreparationTaskService.cs
index db0f878..ae1bcd3 100644
--- a/DOAN.Service/Mobile/PreparationTaskService.cs
+++ b/DOAN.Service/Mobile/PreparationTaskService.cs
@@ -132,6 +132,10 @@ namespace DOAN.Service.Mobile
return Context.Queryable().Where(it => it.LineCode == lineCode)
.Where(it => it.TaskDate == hadleDate).ToList();
}
+ public List GetTaskInfosByLine(string task_code)
+ {
+ return Context.Queryable().Where(it => it.FkTaskCode == task_code).ToList();
+ }
}