IQC开始

ZR.Admin.WebApi/Controllers/mes/qc/QcRoughController.cs

@@ -14,11 +14,11 @@ using ZR.Service.mes.qu.IService;
 namespace ZR.Admin.WebApi.Controllers.mes.qu
 {
     [Route("mes/qu/rough")]
-    public class QuRoughController : BaseController
+    public class QcRoughController : BaseController
     {
-        private readonly IQuRoughService quRoughService;
+        private readonly IQcRoughService quRoughService;
 
-        public QuRoughController(IQuRoughService quRoughService)
+        public QcRoughController(IQcRoughService quRoughService)
         {
             this.quRoughService = quRoughService;
         }

ZR.Admin.WebApi/Controllers/mes/wm/MaterialReturnController.cs

@@ -0,0 +1,46 @@
+using Infrastructure.Extensions;
+using JinianNet.JNTemplate;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.IdentityModel.Tokens;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System.Text.Json;
+using ZR.Admin.WebApi.Controllers;
+using ZR.Admin.WebApi.Extensions;
+using ZR.Model.MES.wm;
+using ZR.Service.mes.pro;
+using ZR.Service.mes.wm;
+using ZR.Service.mes.wm.IService;
+
+
+[Route("mes/wm/return")]
+public class MaterialReturnController : BaseController
+{
+    private readonly IMaterialreturnService  materialreturn;
+
+    public MaterialReturnController(IMaterialreturnService materialreturn)
+    {
+        this.materialreturn = materialreturn;
+    }
+
+    /// <summary>
+    /// 查询领料单
+    /// </summary>
+    /// <param name="pageNum"></param>
+    /// <param name="pageSize"></param>
+    /// <param name="year"></param>
+    /// <param name="week"></param>
+    /// <param name="date"></param>
+    /// <returns></returns>
+    [HttpGet("getmaterialreturn")]
+    public IActionResult Getmaterialreturn(int pageNum, int pageSize, int year = -1, int week = -1, int date = -1)
+    {
+
+        (List<WmMaterialreturn>, int) data = materialreturn.Getmaterialreturn(pageNum, pageSize, year, week, date);
+
+        return ToResponse(new ApiResult(200, "success", data));
+    }
+
+}
+
+