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

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

ZR.Service/mes/wms/IService/IWMWarehousingService.cs

@@ -0,0 +1,22 @@
+using Microsoft.AspNetCore.Mvc;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using ZR.Model.MES.qc.DTO;
+using ZR.Model.MES.wms;
+
+namespace ZR.Service.mes.wms.IService
+{
+    public  interface IWMentryWarehousing_productService
+    {
+
+
+        // 获取库位列表
+        public bool IsProductionLoacation(string production_location_code);
+
+
+
+    }
+}

ZR.Service/mes/wms/IService/IWMlocationInfoService.cs

@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using ZR.Model.MES.qc.DTO;
+using ZR.Model.MES.wms;
+
+namespace ZR.Service.mes.wms.IService
+{
+    public  interface IWMlocationInfoService
+    {
+
+
+        // 获取成品库信息
+        public (List<WmInfo>,int) Getwminfo_product(string shelf , int layer, int pageNum , int pageSize);
+
+
+
+    }
+}