Merge branch 'YanShi' of http://8.130.121.29:3000/Develop/YunTongJackYunTask into YanShi

# Conflicts:
#	Reportapi/MyCode.Project.Services/MyCode.Project.Services.csproj

Reportapi/MyCode.Project.Services/IServices/IPrdOrderService.cs

@@ -0,0 +1,25 @@
+using MyCode.Project.Domain.Message.Act.Common;
+using MyCode.Project.Domain.Message.Response.LxmZHMDReport;
+using MyCode.Project.Infrastructure.Common;
+using MyCode.Project.Infrastructure.JackYun;
+
+namespace MyCode.Project.Services
+{
+    public interface IPrdOrderService
+    {
+        /// <summary>
+        /// 获取生产订单列表数据
+        /// </summary>
+        /// <param name="search"></param>
+        /// <returns></returns>
+        PageResult<PrdMoOrderResp> GetPrdMoPageList(PagedSearch search);
+
+        /// <summary>
+        /// 获取生产订单明细列表数据
+        /// </summary>
+        /// <param name="search"></param>
+        /// <returns></returns>
+        PageResult<PrdMoOrderEntryResp> GetPrdMoEntryPageList(PagedSearch<IdAct> search);
+
+    }
+}

Reportapi/MyCode.Project.Services/IServices/IZhuBinService.cs

@@ -1,10 +0,0 @@
-using MyCode.Project.Infrastructure.JackYun;
-
-namespace MyCode.Project.Services
-{
-    public interface IZhuBinService
-    {
-       
-
-    }
-}