ZhuHaiChuangZhi/GanFengLiYeNew.git

			@@ -52,6 +52,9 @@
			}

			public Task Execute(IJobExecutionContext context)



			{
			try
			{
			@@ -112,7 +115,7 @@
			string taskType = request.Value.Contains("ZJXL") ? "æ£æ" : "è´æ";

			// æ¥è¯¢æ¯å¦åå¨å·²çæçæ°ä»»å¡
			var task = _taskRepository.QueryFirst(x => x.SourceAddress == fromAdd && x.TaskState == (int)TaskInStatusEnum.InNew);
			var task = _taskRepository.QueryFirst(x => x.SourceAddress == fromAdd);//&& x.TaskState == (int)TaskInStatusEnum.InNew
			if (task != null)
			{
			ConsoleHelper.WriteInfoLine($"{nameof(CommonConveyorLineJob)}: {taskType}{requestType},ä»»å¡å·²çæåå¨ï¼ç¨åéè¯......");
			@@ -145,7 +148,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);
			@@ -190,6 +193,11 @@
			// è¾å©æ¹æ³ï¼åå»ºä»»å¡å¯¹è±¡
			private Dt_Task CreateTask(string currentAddress, string targetAddress, string remark, string palletCode, string taskType)
			{
			Dt_Task dt_Task = _taskRepository.QueryFirst(x => x.SourceAddress == currentAddress);
			if (dt_Task != null)
			{
			return null;
			}
			return new Dt_Task
			{
			TaskNum = _taskService.GetTaskNum(),
			@@ -198,11 +206,12 @@
			CurrentAddress = currentAddress,
			SourceAddress = currentAddress,
			TaskState = targetAddress != "WaitBind" ? (int)TaskInStatusEnum.InNew : (int)TaskInStatusEnum.InPending,
			TaskType = (int)TaskInboundTypeEnum.Inbound,
			TaskType = (int)TaskOutboundTypeEnum.Outbound,
			Grade = 1,
			PalletCode = palletCode,
			TargetAddress = targetAddress,
			NextAddress = targetAddress,
			Barcode = "",
			Roadway = $"{taskType}AGV",
			WMSId = 0,
			Remark = remark