Merge branch 'production' of https://gitee.com/doan-tech/shanghaigangxiangtuzhuangMES

# Conflicts:
#	ZR.Admin.WebApi/appsettings.development.json

ZR.Admin.WebApi/Controllers/mes/wms/WMentryWarehousing_productController.cs

@@ -0,0 +1,59 @@
+using Infrastructure.Extensions;
+using JinianNet.JNTemplate;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.IdentityModel.Tokens;
+using ZR.Model.MES.qu;
+using ZR.Model.MES.wms;
+using ZR.Service.mes.wms.IService;
+
+namespace ZR.Admin.WebApi.Controllers.mes.wms
+{
+    /// <summary>
+    /// 入库模块
+    /// </summary>
+    [Route("/mes/wm/entrywarehouse")]
+    public class WMentryWarehousing_productController : BaseController
+    {
+
+        private readonly IWMentryWarehousing_productService wm_entryWarehousing_productService;
+        public WMentryWarehousing_productController(IWMentryWarehousing_productService wm_entryWarehousing_productService)
+        {
+           this.wm_entryWarehousing_productService = wm_entryWarehousing_productService;
+        }
+
+        /// <summary>
+        /// 1. 判断是否为库位码
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet("is_production_location")]
+        public IActionResult IsProductionLocation(string production_location_code = "")
+        {
+
+            // 查询 wm_info 表，根据库位码，查询在表中是否存在，true  false
+            bool state = this.wm_entryWarehousing_productService.IsProductionLoacation(production_location_code);
+
+            return ToResponse(new ApiResult(200, "success", state));
+        }
+
+        /// <summary>
+        /// 2. 判断是否为成品库箱子码
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet("is_production_package")]
+        public IActionResult IsProductionPackage(string package_code = "")
+        {
+            return ToResponse(new ApiResult(200, "success", true));
+        }
+
+        /// <summary>
+        /// 3.判断是否为满箱
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet("is_full_package")]
+        public IActionResult IsFullPackage(string package_code = "")
+        {
+            return ToResponse(new ApiResult(200, "success", true));
+        }
+    }
+  
+}

ZR.Admin.WebApi/Controllers/mes/wms/WMlocationInfoController.cs

@@ -0,0 +1,35 @@
+using Infrastructure.Extensions;
+using JinianNet.JNTemplate;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.IdentityModel.Tokens;
+using ZR.Model.MES.qu;
+using ZR.Model.MES.wms;
+using ZR.Service.mes.wms.IService;
+
+namespace ZR.Admin.WebApi.Controllers.mes.wms
+{
+
+    [Route("/mes/wm/storagelocation")]
+    public class WMlocationInfoController : BaseController
+    {
+
+        private readonly IWMlocationInfoService  wm_locationInfoService;
+        public WMlocationInfoController(IWMlocationInfoService wm_locationInfoService)
+        {
+            this.wm_locationInfoService = wm_locationInfoService;
+
+        }
+
+        /// <summary>
+        /// 查询仓库库位信息
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet("production_warehouse_info")]
+        public IActionResult Queryproduction_warehouse_info(string shelf = "", int layer = 0,int pageNum=0,int pageSize=0)
+        {
+            (List<WmInfo>, int) data = wm_locationInfoService.Getwminfo_product(shelf, layer, pageNum, pageSize);
+            return ToResponse(new ApiResult(200, "success", data));
+        }
+    }
+  
+}