From 2072785a30d4e13d5c63360668375fca4d9ea3a3 Mon Sep 17 00:00:00 2001
From: "qianhao.xu" <qianhao.xu@doan-tech.com>
Date: Fri, 20 Sep 2024 13:26:39 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E4=BB=BB=E5=8A=A1=E4=B8=8B?=
 =?UTF-8?q?=E7=9A=84=E9=85=8D=E6=96=99=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Mobile/PreparationTaskController.cs       | 21 +++++
 DOAN.Model/MES/mm/MmTaskMaterialInfoByLine.cs | 78 +++++++++++++++++++
 .../IService/IPreparationTaskService.cs       |  7 +-
 DOAN.Service/Mobile/PreparationTaskService.cs |  4 +
 4 files changed, 108 insertions(+), 2 deletions(-)
 create mode 100644 DOAN.Model/MES/mm/MmTaskMaterialInfoByLine.cs

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  产线任务
 
+        /// <summary>
+        /// 查询线别任务
+        /// </summary>
+        /// <param name="lineCode"></param>
+        /// <param name="hadleDate"></param>
+        /// <returns></returns>
         [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
+{
+    /// <summary>
+    /// 备料任务详情
+    /// </summary>
+    [SugarTable("mm_task_material_info_byline")]
+    public class MmTaskMaterialInfoByLine
+    {
+        /// <summary>
+        /// 雪花 
+        /// </summary>
+        [SugarColumn(IsPrimaryKey = true, IsIdentity = false)]
+        public string Id { get; set; }
+
+        /// <summary>
+        /// 任务code 
+        /// </summary>
+        [SugarColumn(IsPrimaryKey = true, IsIdentity = false, ColumnName = "fk_task_code")]
+        public string FkTaskCode { get; set; }
+
+        /// <summary>
+        /// 物料code 
+        /// </summary>
+        [SugarColumn(ColumnName = "material_code")]
+        public string MaterialCode { get; set; }
+
+        /// <summary>
+        /// 物料名称 
+        /// </summary>
+        [SugarColumn(ColumnName = "material_name")]
+        public string MaterialName { get; set; }
+
+        /// <summary>
+        /// 规格型号 
+        /// </summary>
+        public string Specification { get; set; }
+
+        /// <summary>
+        /// 配料数量 
+        /// </summary>
+        public decimal Quantity { get; set; }
+
+        /// <summary>
+        /// 单位 
+        /// </summary>
+        public string Unit { get; set; }
+
+        /// <summary>
+        /// 创建人 
+        /// </summary>
+        [SugarColumn(ColumnName = "cREATED_BY")]
+        public string CreatedBy { get; set; }
+
+        /// <summary>
+        /// 创建时间 
+        /// </summary>
+        [SugarColumn(ColumnName = "cREATED_TIME")]
+        public DateTime? CreatedTime { get; set; }
+
+        /// <summary>
+        /// 更新人 
+        /// </summary>
+        [SugarColumn(ColumnName = "uPDATED_BY")]
+        public string UpdatedBy { get; set; }
+
+        /// <summary>
+        /// 更新时间 
+        /// </summary>
+        [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<MmTaskMaterialInfo> GetTaskInfos(string task_code);
+        List<MmTaskMaterialInfo> GetTaskInfos(string task_code);
 
-       int  GenerateIngredientTask(IngredientTaskRequestForm form);
+        int GenerateIngredientTask(IngredientTaskRequestForm form);
 
         List<MmPreparationTaskLine> SearchTaskByLine(string lineCode, DateTime hadleDate);
 
+
+        List<MmTaskMaterialInfoByLine> 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<MmPreparationTaskLine>().Where(it => it.LineCode == lineCode)
                 .Where(it => it.TaskDate == hadleDate).ToList();
         }
+        public List<MmTaskMaterialInfoByLine> GetTaskInfosByLine(string task_code)
+        {
+            return Context.Queryable<MmTaskMaterialInfoByLine>().Where(it => it.FkTaskCode == task_code).ToList();
+        }
 
 
     }