Merge branch 'main' of https://gitee.com/doan-tech/shanghaigangxiangtuzhuangMES

# Conflicts:
#	server/ZR.Admin.WebApi/Controllers/mes/qc/FQC/CommonFQCController.cs
#	server/ZR.Admin.WebApi/Extensions/SqlSugarCache.cs
#	server/ZR.Model/MES/qc/DTO/QcCommonFqcDto.cs
#	server/ZR.Service/mes/qc/CommonFQCService.cs
#	server/ZR.Service/mes/qc/IService/ICommonFQCService.cs

ZR.Admin.WebApi/Controllers/mes/mm/MmIngredientTaskController.cs

@@ -0,0 +1,111 @@
+using Microsoft.AspNetCore.Mvc;
+using ZR.Model.Dto;
+using ZR.Service.mes.mm.IService;
+using ZR.Service.mes.mm;
+using ZR.Admin.WebApi.Extensions;
+using ZR.Admin.WebApi.Filters;
+using ZR.Model.MES.mm.Dto;
+using ZR.Model.MES.mm;
+
+//创建时间：2024-06-05
+namespace ZR.Admin.WebApi.Controllers
+{
+    /// <summary>
+    /// 配料任务清单
+    /// </summary>
+    [Verify]
+    [Route("mes/mm/MmIngredientTask")]
+    public class MmIngredientTaskController : BaseController
+    {
+        /// <summary>
+        /// 配料任务清单接口
+        /// </summary>
+        private readonly IMmIngredientTaskService _MmIngredientTaskService;
+
+        public MmIngredientTaskController(IMmIngredientTaskService MmIngredientTaskService)
+        {
+            _MmIngredientTaskService = MmIngredientTaskService;
+        }
+
+        /// <summary>
+        /// 查询配料任务清单列表
+        /// </summary>
+        /// <param name="parm"></param>
+        /// <returns></returns>
+        [HttpGet("list")]
+        [ActionPermissionFilter(Permission = "business:mmingredienttask:list")]
+        public IActionResult QueryMmIngredientTask([FromQuery] MmIngredientTaskQueryDto parm)
+        {
+            var response = _MmIngredientTaskService.GetList(parm);
+            return SUCCESS(response);
+        }
+
+
+        /// <summary>
+        /// 查询配料任务清单详情
+        /// </summary>
+        /// <param name="Id"></param>
+        /// <returns></returns>
+        [HttpGet("{Id}")]
+        [ActionPermissionFilter(Permission = "business:mmingredienttask:query")]
+        public IActionResult GetMmIngredientTask(int Id)
+        {
+            var response = _MmIngredientTaskService.GetInfo(Id);
+            
+            var info = response.Adapt<MmIngredientTask>();
+            return SUCCESS(info);
+        }
+
+        /// <summary>
+        /// 添加配料任务清单
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ActionPermissionFilter(Permission = "business:mmingredienttask:add")]
+        [Log(Title = "配料任务清单", BusinessType = BusinessType.INSERT)]
+        public IActionResult AddMmIngredientTask([FromBody] MmIngredientTaskDto parm)
+        {
+            var modal = parm.Adapt<MmIngredientTask>().ToCreate(HttpContext);
+
+            var response = _MmIngredientTaskService.AddMmIngredientTask(modal);
+
+            return SUCCESS(response);
+        }
+
+        /// <summary>
+        /// 更新配料任务清单
+        /// </summary>
+        /// <returns></returns>
+        [HttpPut]
+        [ActionPermissionFilter(Permission = "business:mmingredienttask:edit")]
+        [Log(Title = "配料任务清单", BusinessType = BusinessType.UPDATE)]
+        public IActionResult UpdateMmIngredientTask([FromBody] MmIngredientTaskDto parm)
+        {
+            var modal = parm.Adapt<MmIngredientTask>().ToUpdate(HttpContext);
+            var response = _MmIngredientTaskService.UpdateMmIngredientTask(modal);
+
+            return ToResponse(response);
+        }
+
+        /// <summary>
+        /// 删除配料任务清单
+        /// </summary>
+        /// <returns></returns>
+        [HttpDelete("{ids}")]
+        [ActionPermissionFilter(Permission = "business:mmingredienttask:delete")]
+        [Log(Title = "配料任务清单", BusinessType = BusinessType.DELETE)]
+        public IActionResult DeleteMmIngredientTask(string ids)
+        {
+            int[] idsArr = Tools.SpitIntArrary(ids);
+            if (idsArr.Length <= 0) { return ToResponse(ApiResult.Error($"删除失败Id 不能为空")); }
+
+            var response = _MmIngredientTaskService.Delete(idsArr);
+
+            return ToResponse(response);
+        }
+
+
+
+
+    }
+}