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
2024-06-07 11:26:31 +08:00
parent 769d2da1e0 80b1bbccf9
commit ceeef502ba
8 changed files with 413 additions and 0 deletions
--- a/ZR.Model/MES/mm/Dto/MmIngredientTaskDto.cs
+++ b/ZR.Model/MES/mm/Dto/MmIngredientTaskDto.cs
@@ -0,0 +1,54 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace ZR.Model.MES.mm.Dto
+{
+    /// <summary>
+    /// 配料任务清单查询对象
+    /// </summary>
+    public class MmIngredientTaskQueryDto : PagerInfo 
+    {
+       public string Workorder { get; set; }
+
+       public  DateTime Starttime { get; set; }
+       public  DateTime Endtime { get; set; }
+
+
+    }
+
+    /// <summary>
+    /// 配料任务清单输入输出对象
+    /// </summary>
+    public class MmIngredientTaskDto
+    {
+        [Required(ErrorMessage = "id不能为空")]
+        public int Id { get; set; }
+
+        public string AgvPosition { get; set; }
+
+        public string AgvPositionEnd { get; set; }
+
+        [Required(ErrorMessage = "配料任务id不能为空")]
+        public string TaskId { get; set; }
+
+        public string Workorder { get; set; }
+
+        public string Blanknumber { get; set; }
+
+        public int? Isfinal { get; set; }
+
+        public int? PreviousNumber { get; set; }
+
+        public int? PreviousNumbered { get; set; }
+
+        public string CreatedBy { get; set; }
+
+        public DateTime? CreatedTime { get; set; }
+
+        public string UpdatedBy { get; set; }
+
+        public DateTime? UpdatedTime { get; set; }
+
+
+
+    }
+}