HuaYiZhongHeng/BaiBuLiKu.git

			@@ -761,7 +761,7 @@
			{
			NGStation = efg.Select(x => x.stationNGChildCode).ToList();
			}
			content = await CreateNewTask(input, result.ProductionLine, NGStation, 2);
			content = await CreateNewTask(input, result.ProductionLine, result.ProcessCode, NGStation, 2);
			return content.Error("存在异常电芯");
			}

			@@ -798,7 +798,7 @@
			{
			// TODO 送至包装
			List<string> strings = stationManagers.Where(x => x.stationType == 0).Select(x => x.Roadway).ToList();
			content = await CreateNewTask(input, result.ProductionLine, strings, 3);
			content = await CreateNewTask(input, result.ProductionLine, result.ProcessCode, strings, 3);
			return content;
			}
			else
			@@ -806,7 +806,7 @@
			var config = _configService.GetByConfigKey("SYS_InStacker", "CW3InStacker");
			var strings = config.ConfigValue.Split(',').ToList();
			// TODO 入库
			content = await CreateNewTask(input, result.ProductionLine, strings);
			content = await CreateNewTask(input, result.ProductionLine, result.ProcessCode, strings);
			if (content.Status)
			await _boxingInfoRepository.AddDataNavAsync(boxing);
			}
			@@ -895,7 +895,7 @@
			List<string> strings = stationManagers.Roadway.Split(',').ToList();
			Console.WriteLine(strings.ToJsonString() + "b-----------------------");
			//// 调用CreateNewTask方法，创建新任务
			content = await CreateNewTask(input, result.ProductionLine, strings);
			content = await CreateNewTask(input, result.ProductionLine,result.ProcessCode, strings);
			if (content.Status)
			{
			var isBox = await _boxingInfoRepository.AddDataNavAsync(boxing);
			@@ -952,6 +952,7 @@
			CreateDate = DateTime.Now,
			TaskId = 0,
			ProductionLine = stock.ProductionLine,
			ProcessCode = stock.ProcessCode,
			};

			var taskDTO = CreateTaskDTO(taskNew);
			@@ -1125,7 +1126,7 @@
			}
			List<string> strings = stationManagers.Roadway.Split(',').ToList();

			return await CreateNewTask(input, result.ProductionLine, strings, 1);
			return await CreateNewTask(input, result.ProductionLine, result.ProcessCode,strings, 1);
			}
			catch (Exception)
			{
			@@ -1360,6 +1361,7 @@
			CreateDate = DateTime.Now,
			TaskId = 0,
			ProductionLine = stockInfo.ProductionLine,
			ProcessCode = stockInfo.ProcessCode,
			};
			}

			@@ -1729,7 +1731,8 @@
			TaskType = (int)TaskInboundTypeEnum.Inbound,
			TaskNum = await BaseDal.GetTaskNo(),
			Creater = "Systeam",
			ProductionLine = result.ProductionLine
			ProductionLine = result.ProductionLine,
			ProcessCode=result.ProcessCode,
			};

			// 创建WMS任务
			@@ -1766,7 +1769,8 @@
			TaskType = (int)TaskInboundTypeEnum.InTray,
			TaskNum = await BaseDal.GetTaskNo(),
			Creater = "Systeam",
			ProductionLine = result.ProductionLine
			ProductionLine = result.ProductionLine,
			ProcessCode = result.ProcessCode,
			};
			// 创建WMS任务
			WMSTaskDTO taskDTO = CreateWMSTaskDTO(task);
			@@ -2275,7 +2279,7 @@
			/// <param name="process">巷道</param>
			/// <param name="flag">标识（0-入库，1-空托盘入库，2-NG入库，3-出库）</param>
			/// <returns></returns>
			private async Task<WebResponseContent> CreateNewTask(RequestTaskDto input, string productionLine, List<string> process = null, int flag = 0)
			private async Task<WebResponseContent> CreateNewTask(RequestTaskDto input, string productionLine, string processCode, List<string> process = null, int flag = 0)
			{
			WebResponseContent content = new WebResponseContent();

			@@ -2304,7 +2308,8 @@
			TaskType = flag == 0 ? (int)TaskInboundTypeEnum.Inbound : flag == 1 ? (int)TaskInboundTypeEnum.InTray : flag == 2 ? (int)TaskInboundTypeEnum.InNG : (int)TaskOutboundTypeEnum.Outbound,
			TaskNum = await BaseDal.GetTaskNo(),
			Creater = "Systeam",
			ProductionLine = productionLine
			ProductionLine = productionLine,
			ProcessCode = processCode
			};

			// 尝试添加新任务