工单排程添加物料检测

ZR.Admin.WebApi/Controllers/mes/pro/ProWorkplanV2Controller.cs

@@ -44,8 +44,7 @@ namespace ZR.Admin.WebApi.Controllers.mes.pro
         [HttpGet("list")]
         public IActionResult List(int pageNum, int pageSize, int year = -1, int week = -1, string partNumber = "", string color = "")
         {
-            (List<ProWorklplan_v2>, int) data = proWorkplanService.GetAllData(pageNum, pageSize, year, week, partNumber, color);
-
+            (List<ProWorklplanDto>, int) data = proWorkplanService.GetAllData(pageNum, pageSize, year, week, partNumber, color);
             return ToResponse(new ApiResult(200, "success", data));
         }
 
@@ -240,7 +239,26 @@ namespace ZR.Admin.WebApi.Controllers.mes.pro
             return ExportExcel(result.Item2, result.Item1);
         }
 
+        /// <summary>
+        /// 生产计划检查
+        /// </summary>
+        /// <param name="proWorkplan">生产计划对象</param>
+        /// <returns></returns>
+        [HttpPost("checkWorkPlan")]
+        public IActionResult CheckWorkPlan([FromBody] ProWorklplan_v2 proWorkplan)
+        {
+            try
+            {
+                int result = proWorkplanService.CheckWorkPlan(proWorkplan);
+                return ToResponse(new ApiResult(200, "success", result));
+            }
+            catch (Exception ex)
+            {
+                return ToResponse(new ApiResult(500, ex.Message, 0));
+            }
 
+            
+        }
 
     }
 }