LA24030-LuLI_PackageLine.git

			@@ -8,6 +8,7 @@
			using System;
			using System.Linq;
			using System.Threading;
			using System.Threading.Tasks;

			namespace iWareCC.ThreadService
			{
			@@ -22,13 +23,18 @@
			LogType logType = LogType.DataProcess_RobotBuffer_FinishTaskForOutbound;
			while (true)
			{
			Thread.Sleep(2000);//ä¼ç 2ç§ï¼å°ä¼ç åå°åé¢ï¼æ¯ä¸ºäºä¸é¢çcontinueæ¹æ³æ§è¡åä¸æ¾ç¤ºéè¯¯ä¿¡æ¯çæç¤ºï¼ï¼ï¼ãEditBy shaocx,2022-05-24ã
			Thread.Sleep(500);//ä¼ç 2ç§ï¼å°ä¼ç åå°åé¢ï¼æ¯ä¸ºäºä¸é¢çcontinueæ¹æ³æ§è¡åä¸æ¾ç¤ºéè¯¯ä¿¡æ¯çæç¤ºï¼ï¼ï¼ãEditBy shaocx,2022-05-24ã
			SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_FinishTaskForOutbound = string.Empty;
			try
			{
			if (SystemValue.isAllowRuning_DataProcess_RobotBuffer_FinishTaskForOutbound && SystemValue.isStartedModel)
			{//SystemValue.isAllowRuning_DataProcess_RobotBuffer_FinishTaskForOutbound &&
			if (SystemValue.isStartedModel)
			{
			var rgvLocation = StationLocationEnum.BZ39.ToString();
			if (FormCC.stationView == null)
			{
			SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_FinishTaskForOutbound = $"{rgvLocation.ToString()}-è·åPLCå¯¹è±¡ä¸ºnull";
			continue;
			}
			var obj = FormCC.stationView.R_StationForReadCommList.Where(x => x.StationCode == rgvLocation.ToString()).FirstOrDefault();
			if (obj.R_OutboundFinish)
			{
			@@ -52,48 +58,109 @@
			{
			var task = wmsDB.wms_rbline_task.Where(x =>
			x.TaskNo == obj.R_Outbound_TaskID.ToString()
			&& x.RbTaskType == (int)RbTaskTypeEnum.åºåºä»»å¡
			&& x.TaskStatus == (int)TaskStatusEnum.å·²ä¸å).FirstOrDefault();
			//å¢å è¿ä¸¤ä¸ªéå¶æ¡ä»¶ ãEditby shaocx,2025-03-27ã
			&& x.TaskStatus == (int)TaskStatusEnum.å·²ä¸å
			&& (x.IsFlagFinish == false)
			&& (x.RbTaskType == (int)RbTaskTypeEnum.é½ååºåºä»»å¡ \|\| x.RbTaskType == (int)RbTaskTypeEnum.å¼ºå¶åºåºä»»å¡)
			).OrderByDescending(x => x.Id).FirstOrDefault();
			if (task == null)
			{
			SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_FinishTaskForOutbound = $"{rgvLocation.ToString()},æ ¹æ® R_OutboundNumber:{obj.R_OutboundNumber}æ²¡ææ¾å°å·²ä¸åçä»»å¡ ";
			continue;
			}

			var upiCode = task.UPI;
			var upiObj = wmsDB.mes_batchOrderUPI_new.Where(x => x.UPI == upiCode).FirstOrDefault();
			if (upiObj == null)
			else
			{
			SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_FinishTaskForOutbound = $"{rgvLocation.ToString()},æ ¹æ®UPI:{upiCode}æ²¡ææ¾å°å¯¹è±¡ ";
			continue;
			}
			//åºååå°
			wms_stock_quan qun = wmsDB.wms_stock_quan.Where(x => x.PlaceCode == task.PlaceCode).FirstOrDefault();
			wmsDB.wms_stock_quan.Remove(qun);

			task.TaskStatus = (int)TaskStatusEnum.å·²å®æ;
			task.TaskStatusName = TaskStatusEnum.å·²å®æ.ToString();
			task.FinishedTime = DateTime.Now;

			var place = StationHandler.GetPlaceByPlaceCode(task.PlaceCode, wmsDB);
			place.PlaceStatus = (int)PlaceStatusEnum.æ£å¸¸;

			//ç»PLCæ¨éä»»å¡å®æç¡®è®¤ä¿¡å·
			using (StationServiceClient client = new StationServiceClient())
			{
			var res = await client.OutboundFinishConfirmAsync((int)EDevice.Station, true, rgvLocation);
			if (!res.result)
			if (task.TaskStatus == (int)TaskStatusEnum.å·²å®æ)
			{
			SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_FinishTaskForOutbound = $"{rgvLocation.ToString()}-ä¸ååºåºä»»å¡ å¤±è´¥,OutboundFinishConfirmAsync è¿å:{res.resMsg}";
			using (StationServiceClient client = new StationServiceClient())
			{
			var res = await client.OutboundFinishConfirmAsync((int)EDevice.Station, true, rgvLocation, false);
			}
			continue;
			}
			else
			{
			Log4NetHelper.WriteInfoLog(logType, $"{rgvLocation.ToString()}-ä¸ååºåºä»»å¡ æå,OutboundFinishConfirmAsyncï¼åæ°: ç«ç¹{rgvLocation}");
			}

			}

			wmsDB.SaveChanges();
			var isSuccess = await HandlerData(wmsDB, task, rgvLocation, logType, false);
			if (isSuccess == false)
			{
			continue;
			}

			//var upiCode = task.Upi;
			//var upiObj = wmsDB.mes_batchOrderUPI_new.Where(x => x.UPI == upiCode).FirstOrDefault();
			//if (upiObj == null)
			//{
			// SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_FinishTaskForOutbound = $"{rgvLocation.ToString()},æ ¹æ®UPI:{upiCode}æ²¡ææ¾å°å¯¹è±¡ ";
			// continue;
			//}
			////æ´æ°æ¿ä»¶çç¶æååºå
			//if (task.RbTaskType == (int)RbTaskTypeEnum.é½ååºåºä»»å¡)
			//{
			// upiObj.UpiStatus = (int)UpiStatusEnum.å·²é½å;
			// upiObj.AreaCode = (int)AreaCodeEnum.ç ååºå;
			//}
			//else if (task.RbTaskType == (int)RbTaskTypeEnum.å¼ºå¶åºåºä»»å¡)
			//{
			// upiObj.UpiStatus = (int)UpiStatusEnum.å·²ä¸çº¿;
			// upiObj.AreaCode = (int)AreaCodeEnum.ä¸çº¿åºå;
			//}

			////åºååå°
			//wms_stock_quan qun = wmsDB.wms_stock_quan.Where(x => x.PlaceCode == task.PlaceCode).FirstOrDefault();
			//wmsDB.wms_stock_quan.Remove(qun);

			//task.TaskStatus = (int)TaskStatusEnum.å·²å®æ;
			//task.FinishedTime = DateTime.Now;

			//var place = StationHandler.GetPlaceByPlaceCode(task.PlaceCode, wmsDB);
			//place.PlaceStatus = (int)PlaceStatusEnum.æ£å¸¸;

			////ç»PLCæ¨éä»»å¡å®æç¡®è®¤ä¿¡å·
			//using (StationServiceClient client = new StationServiceClient())
			//{
			// var res = await client.OutboundFinishConfirmAsync((int)EDevice.Station, true, rgvLocation, true);
			// if (!res.result)
			// {
			// SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_FinishTaskForOutbound = $"{rgvLocation.ToString()}-ä¸ååºåºä»»å¡ å¤±è´¥,OutboundFinishConfirmAsync è¿å:{res.resMsg}";
			// continue;
			// }
			// else
			// {
			// Log4NetHelper.WriteInfoLog(logType, $"{rgvLocation.ToString()}-ä¸ååºåºä»»å¡ æå,OutboundFinishConfirmAsyncï¼åæ°: ç«ç¹{rgvLocation}");
			// }
			//}

			//WmsRecordUpiProcessHandler.SaveWmsRecordUpiProcess(wmsDB, upiObj, task.PlaceCode, $"åºç¼ååºï¼{task.PlaceCode}," + task.TaskMsg);

			//wmsDB.SaveChanges();
			}
			}
			else
			{
			using (StationServiceClient client = new StationServiceClient())
			{
			var res = await client.OutboundFinishConfirmAsync((int)EDevice.Station, false, rgvLocation, false);
			}

			using (WmsDBModel wmsDB = new WmsDBModel())
			{
			var task = wmsDB.wms_rbline_task.Where(x =>
			x.IsFlagFinish == true
			&& (x.RbTaskType == (int)RbTaskTypeEnum.é½ååºåºä»»å¡ \|\| x.RbTaskType == (int)RbTaskTypeEnum.å¼ºå¶åºåºä»»å¡)
			&& x.TaskStatus == (int)TaskStatusEnum.å·²ä¸å
			).OrderByDescending(x => x.Id).FirstOrDefault();
			if (task == null)
			{
			SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_FinishTaskForOutbound = $"{rgvLocation.ToString()},æ²¡ææ¾å°å·²ä¸å,å¹¶ä¸æ è®°å¼ºå¶å®æçä»»å¡ ";
			continue;
			}

			var isSuccess = await HandlerData(wmsDB, task, rgvLocation, logType, true);
			if (isSuccess == false)
			{
			continue;
			}
			}
			}
			}
			@@ -106,5 +173,63 @@
			}
			}


			public static async Task<bool> HandlerData(WmsDBModel wmsDB, wms_rbline_task task, string rgvLocation, iWareCommon.Utils.LogType logType, bool isFlagFinish)
			{
			var upiCode = task.Upi;
			var upiObj = wmsDB.mes_batchOrderUPI_new.Where(x => x.UPI == upiCode).FirstOrDefault();
			if (upiObj == null)
			{
			SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_FinishTaskForOutbound = $"{rgvLocation.ToString()},æ ¹æ®UPI:{upiCode}æ²¡ææ¾å°å¯¹è±¡ ";
			return false;
			}
			//æ´æ°æ¿ä»¶çç¶æååºå
			if (task.RbTaskType == (int)RbTaskTypeEnum.é½ååºåºä»»å¡)
			{
			upiObj.UpiStatus = (int)UpiStatusEnum.å·²é½å;
			upiObj.AreaCode = (int)AreaCodeEnum.ç ååºå;
			}
			else if (task.RbTaskType == (int)RbTaskTypeEnum.å¼ºå¶åºåºä»»å¡)
			{
			upiObj.UpiStatus = (int)UpiStatusEnum.å·²ä¸çº¿;
			upiObj.AreaCode = (int)AreaCodeEnum.ä¸çº¿åºå;
			}

			//åºååå°
			wms_stock_quan qun = wmsDB.wms_stock_quan.Where(x => x.PlaceCode == task.PlaceCode).FirstOrDefault();
			wmsDB.wms_stock_quan.Remove(qun);

			task.TaskStatus = (int)TaskStatusEnum.å·²å®æ;
			task.FinishedTime = DateTime.Now;

			var place = StationHandler.GetPlaceByPlaceCode(task.PlaceCode, wmsDB);
			place.PlaceStatus = (int)PlaceStatusEnum.æ£å¸¸;

			if (isFlagFinish == false)
			{
			//ç»PLCæ¨éä»»å¡å®æç¡®è®¤ä¿¡å·
			using (StationServiceClient client = new StationServiceClient())
			{
			var res = await client.OutboundFinishConfirmAsync((int)EDevice.Station, true, rgvLocation, true);
			if (!res.result)
			{
			SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_FinishTaskForOutbound = $"{rgvLocation.ToString()}-ä¸ååºåºä»»å¡ å¤±è´¥,OutboundFinishConfirmAsync è¿å:{res.resMsg}";
			return false;
			}
			else
			{
			Log4NetHelper.WriteInfoLog(logType, $"{rgvLocation.ToString()}-ä¸ååºåºä»»å¡ æå,OutboundFinishConfirmAsyncï¼åæ°: ç«ç¹{rgvLocation}");
			}
			}
			}

			var flag = isFlagFinish ? "äººå·¥å¼ºå¶å®æ" : "ï¼èªå¨å®æï¼";
			WmsRecordUpiProcessHandler.SaveWmsRecordUpiProcess(wmsDB, upiObj, task.PlaceCode, $"åºç¼ååºï¼{task.PlaceCode}(" + flag + ")," + task.TaskMsg);

			wmsDB.SaveChanges();

			return true;
			}

			}
			}