ZhuHaiChuangZhi/GanFengLiYeNew.git

			@@ -53,8 +53,6 @@

			public Task Execute(IJobExecutionContext context)



			{
			try
			{
			@@ -131,7 +129,7 @@
			}

			// åå»ºå¹¶æ·»å æ°ä»»å¡å°ä»»å¡ä»åº
			task = CreateTask(fromAdd, czTask.TaskEndAddress, czTask.TaskOrderNo, czTask.TaskProductCode, taskType);
			task = CreateTask(fromAdd, czTask.TaskEndAddress, czTask.TaskOrderNo, czTask.TaskProductCode, taskType, czTask.Id);
			_taskRepository.AddData(task);
			ConsoleHelper.WriteInfoLine($"{nameof(CommonConveyorLineJob)}: {taskType}{requestType},ä»»å¡å·²çæï¼çå¾æ§è¡......");
			}
			@@ -148,7 +146,7 @@
			}

			string fromAdd = request.Value;
			string taskType = request.Value.Contains("ZJXL") ? "æ£æ" : "è´æ";
			string taskType = "è´æ"; //request.Value.Contains("ZJXL") ? "æ£æ" :

			// æ ¹æ®ä»»å¡ç±»åç¡®å®è¯·æ±å°å
			(string upRequest, string gmRequest, string gmState) = GetRequestAddresses(taskType);
			@@ -191,8 +189,13 @@
			}

			// è¾å©æ¹æ³ï¼åå»ºä»»å¡å¯¹è±¡
			private Dt_Task CreateTask(string currentAddress, string targetAddress, string remark, string palletCode, string taskType)
			private Dt_Task CreateTask(string currentAddress, string targetAddress, string remark, string palletCode, string taskType, int czTaskID = 0)
			{
			Dt_Task dt_Task = _taskRepository.QueryFirst(x => x.SourceAddress == currentAddress);
			if (dt_Task != null)
			{
			return null;
			}
			return new Dt_Task
			{
			TaskNum = _taskService.GetTaskNum(),
			@@ -208,7 +211,7 @@
			NextAddress = targetAddress,
			Barcode = "",
			Roadway = $"{taskType}AGV",
			WMSId = 0,
			WMSId = czTaskID > 0 ? czTaskID : 0,
			Remark = remark
			};
			}