生产领料完成

ZR.Admin.WebApi/Controllers/System/ArticleCategoryController.cs

@@ -5,6 +5,7 @@ using ZR.Model.Dto;
 using ZR.Model.System;
 using ZR.Service.System.IService;
 
+
 namespace ZR.Admin.WebApi.Controllers
 {
     /// <summary>

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

@@ -102,11 +102,14 @@ namespace ZR.Admin.WebApi.Controllers.MES.pro
         public IActionResult ReleaseProduction(string id)
         {
 
-            int data = proWorkorderService.ReleaseProduction(id);
+            int data = proWorkorderService.ReleaseProduction(id, HttpContext);
 
             return ToResponse(new ApiResult(200, "success", data));
         }
 
+
+
+
         /// <summary>
         /// 对当前的，排产工单排序
         /// </summary>

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

@@ -8,8 +8,6 @@ using ZR.Service.MES.md;
 
 namespace ZR.Admin.WebApi.Controllers.MES.pro
 {
-    //
-    //
 
     [Route("mes/pro/workplan")]
     public class ProWorkplanController : BaseController
@@ -156,6 +154,7 @@ namespace ZR.Admin.WebApi.Controllers.MES.pro
                         // 计划数>0   计划数要大于等于当前工单总数
                         if(countWorkplan > 0 && (countWorkplan>= countWorkorder))
                         {
+                            proWorkorder.Partnumber = lstWorkplan[0].Partnumber;
                             proWorkorder.ToCreate(HttpContext);
                             data = proWorkplanService.AddWorkorder(proWorkorder);
                         }

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

@@ -0,0 +1,48 @@
+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.Extensions;
+using ZR.Model.MES.wm;
+using ZR.Service.mes.pro;
+using ZR.Service.mes.wm.IService;
+
+namespace ZR.Admin.WebApi.Controllers.mes.wm
+{
+
+    [Route("mes/wm/mr")]
+    public class MaterialRequisitionController : BaseController
+    {
+        private readonly IMaterialRequisitionService mquire;
+
+        public MaterialRequisitionController(IMaterialRequisitionService mquire)
+        {
+            this.mquire = mquire;
+        }
+
+
+
+        /// <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("getmaterialsRequisition")] 
+        public IActionResult GetmaterialsRequisition(int pageNum, int pageSize, int year = -1, int week = -1, int date = -1)
+        {
+
+            (List<WmMaterialrequisition>, int) data = mquire.GetmaterialsRequisition(pageNum, pageSize, year, week, date);
+
+            return ToResponse(new ApiResult(200, "success", data));
+        }
+
+    }
+
+}