ZhuZhouYouRuiKe/YangJiPingKu.git

			@@ -19,6 +19,7 @@
			using OfficeOpenXml.FormulaParsing.Excel.Functions.Text;
			using SqlSugar;
			using System.Diagnostics.CodeAnalysis;
			using System.Threading.Tasks;
			using WIDESEAWCS_Common.LocationEnum;
			using WIDESEAWCS_Common.StockEnum;
			using WIDESEAWCS_Common.TaskEnum;
			@@ -46,7 +47,7 @@
			private readonly IRepository<dt_batchInfo> _batchinfoRepository;
			private readonly IRepository<Dt_Task_hty> _taskhtyRepository;
			private readonly IUnitOfWorkManage _unitOfWorkManage;
			private readonly IRepository<dt_errorInfo> _errorinfoRepository;
			private readonly IRepository<dt_errormsgInfo> _errorinfoRepository;
			private readonly Idt_ErrormsginfoService _ErrormsginfoService;
			private readonly IMapper _mapper;

			@@ -76,7 +77,7 @@
			IRepository<Dt_LocationInfo> locationRepository,
			IRepository<dt_batchInfo> batchRepository,
			IRepository<Dt_Task_hty> taskhtyRepository,
			IRepository<dt_errorInfo> errorinfoRepository,
			IRepository<dt_errormsgInfo> errorinfoRepository,
			Idt_ErrormsginfoService errormsginfoService,
			IUnitOfWorkManage unitOfWorkManage,
			IMapper mapper) : base(BaseDal)
			@@ -184,6 +185,17 @@
			}

			/// <summary>
			/// æ ¹æ®ä»»å¡ç¶ææ¥è¯¢ä»»å¡
			/// </summary>
			/// <param name="deviceNo">è®¾å¤ç¼å·</param>
			/// <param name="currentAddress">å½åå°å</param>
			/// <returns></returns>
			public Dt_Task QueryTaskState()
			{
			return BaseDal.QueryFirst(x => x.TaskState== (int)TaskInStatusEnum.InNew );
			}

			/// <summary>
			/// æ ¹æ®è®¾å¤ç¼å·ãå½åå°åæ¥è¯¢è¾éçº¿æªæ§è¡çä»»å¡
			/// </summary>
			/// <param name="deviceNo">è®¾å¤ç¼å·</param>
			@@ -251,20 +263,37 @@
			//ä¼åè¿åæ§è¡å°ä¸åçä»»å¡ç»§ç»æ§è¡
			return task;
			}
			//æ¥è¯¢å½åä»»å¡æ± ä¸æ¯å¦åå¨ç¶æä¸ºéæ°å»ºç
			task= BaseDal.QueryFirst(v => v.TaskState != (int)TaskInStatusEnum.InNew \|\| v.TaskState != (int)TaskOutStatusEnum.OutNew);
			if (task != null)
			else
			{
			throw new Exception($"å½åä»»å¡æ± ä¸åå¨æ§è¡ä¸çä»»å¡,ä»»å¡å·:ã{task.TaskNum}ã");
			//æ¥è¯¢å¤©è½¦ç§»å¨ä»»å¡
			task = BaseDal.QueryFirst(v => v.TaskType == (int)TaskMoveEnum.Mowe && v.TaskState == (int)TaskMoveStatusEnum.OutNewMove);
			if (task!=null)
			{
			return task;
			}
			}
			//æ¥è¯¢å½åä»»å¡æ± ä¸æ¯å¦åå¨ç¶æä¸ºéæ°å»ºç
			//task= BaseDal.QueryFirst(v => v.TaskState != (int)TaskInStatusEnum.InNew \|\| v.TaskState != (int)TaskOutStatusEnum.OutNew);
			//if (task != null)
			//{
			// throw new Exception($"å½åä»»å¡æ± ä¸åå¨æ§è¡ä¸çä»»å¡,ä»»å¡å·:ã{task.TaskNum}ã");
			//}
			//if (task != null)
			//{
			// if (task.TaskState != (int)TaskMoveStatusEnum.OutNewMove)
			// {

			// }
			//}
			if (workTpe.Equals("In"))
			{
			task = BaseDal.QueryData(v=>v.TaskType==(int)TaskInboundTypeEnum.Inbound && v.TaskState==(int)TaskInStatusEnum.InNew).OrderBy(v=>v.CreateDate).First();
			task = BaseDal.QueryData(v => v.TaskType == (int)TaskInboundTypeEnum.Inbound && v.TaskState == (int)TaskInStatusEnum.InNew).OrderByDescending(v => v.Grade).OrderBy(v => v.CreateDate).First();
			}
			else if (workTpe.Equals("Out"))
			{
			task = BaseDal.QueryData(v => v.TaskType == (int)TaskOutboundTypeEnum.Outbound && v.TaskState == (int)TaskOutStatusEnum.OutNew).OrderBy(v => v.CreateDate).First();
			task = BaseDal.QueryData(v => (v.TaskType == (int)TaskOutboundTypeEnum.Outbound \|\| v.TaskType == (int)TaskOutboundTypeEnum.OutInventory) && v.TaskState == (int)TaskOutStatusEnum.OutNew).OrderBy(v => v.CreateDate).First();
			}

			}
			catch (Exception)
			{
			@@ -272,6 +301,24 @@

			}
			return task;
			}

			public Dt_Task QueryTasking()
			{
			Dt_Task task = new Dt_Task();
			task = BaseDal.QueryFirst(v=>v.TaskState!=(int)TaskInStatusEnum.InNew
			&& v.TaskState != (int)TaskMoveStatusEnum.OutNewMove
			&& v.TaskState != (int)TaskOutStatusEnum.OutNew
			&& v.TaskState != (int)TaskOutStatusEnum.SC_OutExecuting
			&& v.TaskState != (int)TaskInStatusEnum.Line_Ingrab);
			if (task!=null)
			{
			return task;
			}
			else
			{
			return null;
			}
			}

			/// <summary>
			@@ -310,7 +357,7 @@
			/// <returns>è¿åä»»å¡å®ä½å¯¹è±¡ï¼å¯è½ä¸ºnull</returns>
			public Dt_Task QueryTakNnmTask(int taskNum)
			{
			return BaseDal.QueryFirst(v=>v.TaskNum== taskNum);
			return BaseDal.QueryFirst(v=>v.TaskId== taskNum);
			}
			/// <summary>
			/// ä¿®æ¹å¤©è½¦ä»»å¡ç¶æï¼å°å¥åºåè´§æ§è¡ä¸ä¿®æ¹ä¸ºå¥åºåè´§å®æ
			@@ -328,7 +375,7 @@
			catch (Exception ex)
			{
			content = WebResponseContent.Instance.Error(ex.Message);
			UpdateTaskExceptionMessage(task.TaskNum, ex.Message);
			UpdateTaskExceptionMessage(task.TaskId, ex.Message);
			}
			return content;
			}
			@@ -349,7 +396,7 @@
			catch (Exception ex)
			{
			content = WebResponseContent.Instance.Error(ex.Message);
			UpdateTaskExceptionMessage(task.TaskNum, ex.Message);
			UpdateTaskExceptionMessage(task.TaskId, ex.Message);
			}
			return content;
			}
			@@ -375,7 +422,7 @@
			WebResponseContent content = new WebResponseContent();
			try
			{
			Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
			Dt_Task task = BaseDal.QueryFirst(x => x.TaskId == taskNum);
			if (task == null) return WebResponseContent.Instance.Error($"æªæ¾å°è¯¥ä»»å¡ä¿¡æ¯,ä»»å¡å·:ã{taskNum}ã");
			//if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
			//{
			@@ -409,29 +456,33 @@
			{
			try
			{
			Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
			Dt_Task task = BaseDal.QueryFirst(x => x.TaskId == taskNum);
			if (status == 2 && task.TaskType == (int)TaskInboundTypeEnum.Inbound)
			{
			task.TaskState = (int)TaskInStatusEnum.Line_InGrabExecuting;
			}
			else if (status == 2 && task.TaskType == (int)TaskOutboundTypeEnum.Outbound)
			else if (status == 2 && (task.TaskType == (int)TaskOutboundTypeEnum.Outbound \|\| task.TaskType == (int)TaskOutboundTypeEnum.OutInventory))
			{
			task.TaskState = (int)TaskOutStatusEnum.Line_OutGrabExecuting;
			}
			if (status == 3 && task.TaskType == (int)TaskInboundTypeEnum.Inbound)
			else if (status == 3 && task.TaskType == (int)TaskInboundTypeEnum.Inbound)
			{
			task.TaskState = (int)TaskInStatusEnum.Line_InDownExecuting;
			}
			else if (status == 3 && task.TaskType == (int)TaskOutboundTypeEnum.Outbound)
			else if (status == 3 && (task.TaskType == (int)TaskOutboundTypeEnum.Outbound \|\| task.TaskType == (int)TaskOutboundTypeEnum.OutInventory))
			{
			task.TaskState = (int)TaskOutStatusEnum.Line_OutWownExecuting;
			}
			else if(status == 4 && task.TaskType == (int)TaskMoveEnum.Mowe)
			{
			task.TaskState = (int)TaskMoveStatusEnum.Line_OutMove;
			}
			task.ModifyDate = DateTime.Now;
			BaseDal.UpdateData(task);
			}
			catch (Exception ex)
			{
			_ErrormsginfoService.UpdateErrorMsg(ex.Message,1);
			UpdateTaskExceptionMessage(taskNum, ex.Message);
			}
			}

			@@ -565,11 +616,13 @@
			WebResponseContent content = new WebResponseContent();
			try
			{
			var nawtask = BaseDal.QueryFirst(v=>v.TaskNum== taskNum);
			var nawtask = BaseDal.QueryFirst(v=>v.TaskId== taskNum);
			if (nawtask == null)
			{
			throw new Exception(string.Format("å¤©è½¦æ¾è´§å®æä»»å¡æªæ¥è¯¢å°ä»»å¡å·{0}", taskNum));
			}


			if (nawtask.TaskType == (int)TaskInboundTypeEnum.Inbound)
			{
			var batck = _batchinfoRepository.QueryFirst(v=>v.Id==1);
			@@ -577,11 +630,35 @@
			Dt_StockInfo stock = new Dt_StockInfo();
			stock.LocationCode = nawtask.TargetAddress;
			stock.Weight = (decimal)weight;
			stock.StockStatus = (int)stockEnum.Lock;
			stock.BatchNo = batck.Batch;
			stock.StockStatus = (int)stockEnum.Free;
			stock.BatchNo = batck.InBatch;
			if (nawtask.Remark== (int)MateTypeEnum.ZiChan)
			{
			stock.Remark = (int)MateTypeEnum.ZiChan;
			}
			else
			{
			stock.Remark = (int)MateTypeEnum.WaiGou;
			}
			Dt_StockInfo stockTow = new Dt_StockInfo();
			stockTow.LocationCode = nawtask.NextAddress;
			stockTow.Weight = (decimal)weight;
			stockTow.StockStatus = (int)stockEnum.Free;
			stockTow.BatchNo = batck.InBatch;
			if (nawtask.Remark == (int)MateTypeEnum.ZiChan)
			{
			stockTow.Remark = (int)MateTypeEnum.ZiChan;
			}
			else
			{
			stockTow.Remark = (int)MateTypeEnum.WaiGou;
			}
			//ä¿®æ¹è´§ä½ä¿¡æ¯
			var location = _locationRepository.QueryFirst(v=>v.LocationCode==nawtask.TargetAddress);
			location.LocationStatus = (int)LocationStatusEnum.InStock;
			//ä¿®æ¹è´§ä½ä¿¡æ¯
			var locationtow = _locationRepository.QueryFirst(v => v.LocationCode == nawtask.NextAddress);
			locationtow.LocationStatus = (int)LocationStatusEnum.InStock;
			//å¤çä»»å¡ä¿¡æ¯
			Dt_Task_hty taskhty = new Dt_Task_hty();
			taskhty.TaskNum = nawtask.TaskNum;
			@@ -594,10 +671,16 @@
			taskhty.Grade = nawtask.Grade;
			taskhty.Dispatchertime = nawtask.Dispatchertime;
			taskhty.Remark = nawtask.Remark;
			taskhty.PalletCode = nawtask.PalletCode;
			taskhty.NextAddress = nawtask.NextAddress;
			taskhty.CurrentAddress = nawtask.CurrentAddress;

			//å¼å§æ°æ®åºäºå¡
			_unitOfWorkManage.BeginTran();
			_stockRepository.AddData(stock);
			_stockRepository.AddData(stockTow);
			_locationRepository.UpdateData(location);
			_locationRepository.UpdateData(locationtow);
			_taskhtyRepository.AddData(taskhty);
			BaseDal.DeleteData(nawtask);
			//æäº¤äºå¡
			@@ -606,35 +689,110 @@
			else if (nawtask.TaskType == (int)TaskOutboundTypeEnum.Outbound)
			{
			//æ¥æ¾åºå
			var stock = _stockRepository.QueryFirst(v=>v.LocationCode== nawtask.TargetAddress);
			var stock = _stockRepository.QueryFirst(v=>v.LocationCode== nawtask.SourceAddress);
			if (stock == null)
			{
			throw new Exception($"æªæ¾å°åºåä¿¡æ¯è´§ä½å·:ã{nawtask.TargetAddress}ã");
			}
			var Towstock = _stockRepository.QueryFirst(v => v.LocationCode == nawtask.NextAddress);
			//ä¿®æ¹è´§ä½ç¶æ
			var location = _locationRepository.QueryFirst(v => v.LocationCode == nawtask.TargetAddress);
			var location = _locationRepository.QueryFirst(v => v.LocationCode == nawtask.SourceAddress);
			location.LocationStatus = (int)LocationStatusEnum.Free;
			//ä¿®æ¹è´§ä½ç¶æ
			var locationTow = _locationRepository.QueryFirst(v => v.LocationCode == nawtask.NextAddress);
			locationTow.LocationStatus = (int)LocationStatusEnum.Free;
			//åå¤åå²ä»»å¡æ°æ®
			Dt_Task_hty taskhty = new Dt_Task_hty();
			taskhty.TaskNum = nawtask.TaskNum;
			taskhty.Roadway = nawtask.Roadway;
			taskhty.TaskType = nawtask.TaskType;
			taskhty.TaskState = (int)TaskInStatusEnum.Line_InFinish;
			taskhty.TaskState = (int)TaskOutStatusEnum.OutFinish;
			taskhty.SourceAddress = nawtask.SourceAddress;
			taskhty.TargetAddress = nawtask.TargetAddress;
			taskhty.ExceptionMessage = nawtask.ExceptionMessage;
			taskhty.Grade = nawtask.Grade;
			taskhty.Dispatchertime = nawtask.Dispatchertime;
			taskhty.Remark = nawtask.Remark;
			taskhty.PalletCode = nawtask.PalletCode;
			taskhty.NextAddress = nawtask.NextAddress;
			taskhty.CurrentAddress = nawtask.CurrentAddress;
			//å¦ææ¾è´§ä½ç½®è¡æ¯40ï¼åç«é©¬çæä¸æ¡ç§»å¨ä»»å¡
			//å¼å§åå»ºä»»å¡
			Dt_Task Movstask = new Dt_Task();
			Movstask.Roadway = "TC01";
			Movstask.TaskType = (int)TaskMoveEnum.Mowe;
			Movstask.TaskState = (int)TaskMoveStatusEnum.OutNewMove;
			Movstask.SourceAddress = "0";
			Movstask.TargetAddress = "1-5-1";
			Movstask.NextAddress = "text";
			Movstask.Grade = 1;
			Movstask.WMSId = 3;
			Movstask.Remark = 0;
			Movstask.PalletCode = "text";
			Movstask.CurrentAddress = "text";
			//å¼å§æ°æ®åºäºå¡

			_unitOfWorkManage.BeginTran();
			BaseDal.AddData(Movstask);
			_stockRepository.DeleteData(stock);
			_stockRepository.DeleteData(Towstock);
			_locationRepository.UpdateData(location);
			_locationRepository.UpdateData(locationTow);
			_taskhtyRepository.AddData(taskhty);
			BaseDal.DeleteData(nawtask);
			//æäº¤äºå¡
			_unitOfWorkManage.CommitTran();
			}
			else if (nawtask.TaskType == (int)TaskOutboundTypeEnum.OutInventory \|\| nawtask.TaskType == (int)TaskMoveEnum.Mowe)
			{
			//å¤çä»»å¡ä¿¡æ¯
			Dt_Task_hty taskhty = new Dt_Task_hty();
			taskhty.TaskNum = nawtask.TaskNum;
			taskhty.Roadway = nawtask.Roadway;
			taskhty.TaskType = nawtask.TaskType;
			taskhty.TaskState = (int)TaskOutStatusEnum.OutFinish;
			taskhty.SourceAddress = nawtask.SourceAddress;
			taskhty.TargetAddress = nawtask.TargetAddress;
			taskhty.ExceptionMessage = nawtask.ExceptionMessage;
			taskhty.Grade = nawtask.Grade;
			taskhty.Dispatchertime = nawtask.Dispatchertime;
			taskhty.Remark = nawtask.Remark;
			taskhty.PalletCode = nawtask.PalletCode;
			taskhty.NextAddress = nawtask.NextAddress;
			taskhty.CurrentAddress = nawtask.CurrentAddress;
			if (nawtask.TaskType == (int)TaskOutboundTypeEnum.OutInventory)
			{
			//å¼å§åå»ºä»»å¡
			Dt_Task Movstask = new Dt_Task();
			Movstask.Roadway = "TC01";
			Movstask.TaskType = (int)TaskMoveEnum.Mowe;
			Movstask.TaskState = (int)TaskMoveStatusEnum.OutNewMove;
			Movstask.SourceAddress = "0";
			Movstask.TargetAddress = "1-5-1";
			Movstask.NextAddress = "text";
			Movstask.Grade = 1;
			Movstask.WMSId = 3;
			Movstask.Remark = 0;
			Movstask.PalletCode = "text";
			Movstask.CurrentAddress = "text";
			//å¼å§æ°æ®åºäºå¡
			_unitOfWorkManage.BeginTran();
			BaseDal.AddData(Movstask);
			_taskhtyRepository.AddData(taskhty);
			BaseDal.DeleteData(nawtask);
			//æäº¤äºå¡
			_unitOfWorkManage.CommitTran();
			}
			else
			{
			//å¼å§æ°æ®åºäºå¡
			_unitOfWorkManage.BeginTran();
			_taskhtyRepository.AddData(taskhty);
			BaseDal.DeleteData(nawtask);
			//æäº¤äºå¡
			_unitOfWorkManage.CommitTran();
			}
			}
			content = WebResponseContent.Instance.OK();
			}
			catch (Exception ex)