Merge branch 'dev' of http://123.60.180.165:4647/ZZYDOP/DOPCore into dev

# Conflicts:
#	MicroServices/Business/Business.Application/ResourceExamineManagement/ResourceExamineAppService.cs

MicroServices/Business/Business.Application.Contracts/ResourceExamineManagement/IResourceExamineAppService.cs

@@ -17,7 +17,7 @@ namespace Business.ResourceExamineManagement
         /// </summary>
         /// <param name="workOrds"></param>
         /// <returns></returns>
-        Task<string> ProductionSchedule(List<string> workOrds);
+        Task<string> ProductionSchedule(string workOrds);
 
         /// <summary>
         /// ×ÊÔ´¼ì²é

MicroServices/Business/Business.Application/ResourceExamineManagement/ResourceExamineAppService.cs

@@ -2399,11 +2399,12 @@ namespace Business.ResourceExamineManagement
         /// <summary>
         /// 生产排产
         /// </summary>
-        /// <param name="workOrds"></param>
+        /// <param name="workOrd"></param>
         /// <returns></returns>
         /// <exception cref="NotImplementedException"></exception>
-        public async Task<string> ProductionSchedule(List<string> workOrds)
+        public async Task<string> ProductionSchedule(string workOrd)
         {
+            List<string> workOrds = workOrd.Split(",").ToList();
             if (workOrds.Count() == 0)
             {
                 return "";
@@ -2542,14 +2543,12 @@ namespace Business.ResourceExamineManagement
             //非虚拟件
             var notPhantoms = chdStructures.Where(p => p.StructureType.ToUpper() != "X").ToList();
             //存在非虚拟件
-            if (notPhantoms.Count() > 0)
+            foreach (var item in notPhantoms)
             {
-                notPhantoms.ForEach(p =>
-                {
-                    p.ParentItem = parentItem;
-                });
-                rtnStructures.AddRange(notPhantoms);
+                item.ParentItem = parentItem;
             }
+            rtnStructures.AddRange(notPhantoms);
+
             //虚拟件
             var phantoms = chdStructures.Where(p => p.StructureType.ToUpper() == "X").ToList();
             if (phantoms.Count() > 0)

MicroServices/Business/Business.HttpApi/Controllers/ResourceExamineController.cs

@@ -33,7 +33,7 @@ namespace Business.Controllers
         /// <returns></returns>
         [HttpPost]
         [Route("productionschedule")]
-        public Task<string> ProductionSchedule(List<string> workOrds)
+        public Task<string> ProductionSchedule(string workOrds)
         {
             return _ResourceExamineAppService.ProductionSchedule(workOrds);
         }