MeiRuiAn/HuaiAn.git

			@@ -9,6 +9,7 @@
			using WIDESEA_Common.TaskEnum;
			using WIDESEA_Core;
			using WIDESEA_Core.Helper;
			using WIDESEA_DTO.Task;
			using WIDESEA_Model.Models;

			namespace WIDESEA_TaskInfoService
			@@ -102,7 +103,7 @@
			Dt_Task task = Repository.QueryFirst(x => x.PalletCode == palletCode);
			if (task != null)
			{
			return WebResponseContent.Instance.Error($"璇ユ墭鐩樺凡鐢熸垚浠诲姟");
			return WebResponseContent.Instance.OK($"璇ユ墭鐩樺凡鐢熸垚浠诲姟", _mapper.Map<WMSTaskDTO>(task));
			}

			if (Repository.QueryFirst(x => x.SourceAddress == stationCode && x.TaskStatus == TaskStatusEnum.New.ObjToInt()) != null)
			@@ -158,8 +159,10 @@
			newTask.TaskId = taskId;
			_stockRepository.StockInfoRepository.UpdateData(stockInfo);
			_unitOfWorkManage.CommitTran();
			PushTasksToWCS(new List<Dt_Task> { newTask });
			return WebResponseContent.Instance.OK(data: newTask);
			WMSTaskDTO wMSTaskDTO = _mapper.Map<WMSTaskDTO>(newTask);

			//PushTasksToWCS(new List<Dt_Task> { newTask });
			return WebResponseContent.Instance.OK(data: wMSTaskDTO);
			}
			catch (Exception ex)
			{
			@@ -202,7 +205,7 @@
			LocationStatusEnum lastStatus = (LocationStatusEnum)locationInfo.LocationStatus;

			_unitOfWorkManage.BeginTran();
			_recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(locationInfo, lastStatus, LocationChangeType.InboundAssignLocation);
			_recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(locationInfo, lastStatus, LocationStatusEnum.Lock, LocationChangeType.InboundAssignLocation);
			_basicService.LocationInfoService.UpdateLocationStatus(locationInfo, (PalletTypeEnum)task.PalletType, LocationStatusEnum.Lock, task.WarehouseId);
			BaseDal.UpdateData(task);
			_unitOfWorkManage.CommitTran();