Merge branch 'feature/智能货架'

WCS.WebApi/Controllers/MatBaseInfoController.cs

@@ -122,5 +122,17 @@ namespace WCS.WebApi.Controllers
         {
             return await _matBaseInfoService.getMatInfo(request);
         }
+
+        /// <summary>
+        /// 打印物料条码后上传打印
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [Route("printedMatInfo")]
+        [HttpPost(Name = "printedMatInfo")]
+        public async Task<ResponseBase> printedMatInfo(PrintedMatInfoRequest request)
+        {
+            return await _matBaseInfoService.printedMatInfo(request);
+        }
     }
 }

WCS.WebApi/Controllers/StoreInfoController.cs

@@ -11,7 +11,7 @@ using WCS.DAL.DbModels;
 namespace WCS.WebApi.Controllers
 {
     /// <summary>
-    /// 货架\、库位管理的页面
+    /// 货架管理、模组管理、库位管理的接口
     /// </summary>
     [ApiController]
     [Route("[controller]")]
@@ -23,6 +23,7 @@ namespace WCS.WebApi.Controllers
             _storeInfoService = storeInfoService;
         }
 
+        #region 货架管理
         [Route("getShelves")]
         [HttpPost(Name = "getShelves")]
         public async Task<ResponseBase> getShelves(GetShelvesRequest request)
@@ -41,5 +42,25 @@ namespace WCS.WebApi.Controllers
         {
             return await _storeInfoService.GenerateStoreInfo();
         }
+        #endregion
+
+
+        #region 模组管理
+        [Route("getModules")]
+        [HttpPost(Name = "getModules")]
+        public async Task<ResponseBase> getModules(GetModulesRequest request)
+        {
+            return await _storeInfoService.GetModules(request);
+        }
+        #endregion
+
+        #region 库位管理
+        [Route("getStores")]
+        [HttpPost(Name = "getStores")]
+        public async Task<ResponseBase> getStores(GetStoresRequest request)
+        {
+            return await _storeInfoService.GetStores(request);
+        }
+        #endregion
     }
 }