LA24030-LuLI_PackageLine.git

			@@ -31,13 +31,14 @@
			{
			var alertMsg = "";
			LogType logType = LogType.DataProcess_BZ01;
			string lastUpi = "";//æåè®°å½çUPIæ°æ®
			while (true)
			{
			Thread.Sleep(2000);//ä¼ç 2ç§ï¼å°ä¼ç åå°åé¢ï¼æ¯ä¸ºäºä¸é¢çcontinueæ¹æ³æ§è¡åä¸æ¾ç¤ºéè¯¯ä¿¡æ¯çæç¤ºï¼ï¼ï¼ãEditBy shaocx,2022-05-24ã
			Thread.Sleep(1000);//ä¼ç 2ç§ï¼å°ä¼ç åå°åé¢ï¼æ¯ä¸ºäºä¸é¢çcontinueæ¹æ³æ§è¡åä¸æ¾ç¤ºéè¯¯ä¿¡æ¯çæç¤ºï¼ï¼ï¼ãEditBy shaocx,2022-05-24ã
			SystemWarningMsg._lbl_alert_DataProcess_BZ01 = string.Empty;
			try
			{
			if (SystemValue.isAllowRuning_DataProcess_BZ01 && SystemValue.isStartedModel)
			if (SystemValue.isStartedModel)//SystemValue.isAllowRuning_DataProcess_BZ01 &&
			{
			if (FormCC.IsAllowRunOutMode == true)
			{
			@@ -50,6 +51,11 @@
			* 1ãä»æ°æ®åºä¸å¤ææ¯å¦é½å¥
			* 2ãæ ¹æ®é½å¥ç»æï¼æ¨éç»PLC
			*/
			if (FormCC.stationView == null)
			{
			SystemWarningMsg._lbl_alert_DataProcess_BZ01 = $"{rgvLocation.ToString()}-è·åPLCå¯¹è±¡ä¸ºnull";
			continue;
			}
			var obj = FormCC.stationView.R_StationForReadCommList.Where(x => x.StationCode == rgvLocation.ToString()).FirstOrDefault();
			if (obj.R_ReqParseData)
			{
			@@ -59,13 +65,23 @@
			SystemWarningMsg._lbl_alert_DataProcess_BZ01 = $"{rgvLocation.ToString()}-è¯·æ±äºè§£ç ï¼ä½æ¯ç»ææ¯ç©ºç,æ¤æ¬¡å¾ªç¯ç»æ";
			continue;
			}
			if (lastUpi == result)
			{
			SystemWarningMsg._lbl_alert_DataProcess_BZ01 = $"{rgvLocation.ToString()}-éå¤çUPI{result}";
			continue;
			}
			var upiCode = result;
			var qitaoReault = false;
			lastUpi = upiCode;

			var qitaoReault = false;//é½åç»æ
			using (WmsDBModel wmsDB = new WmsDBModel())
			{
			var upiObj = wmsDB.mes_batchOrderUPI_new.Where(x => x.UPI == upiCode).FirstOrDefault();
			if (upiObj == null)
			{
			//åå¥æ¥è¦ä¿¡æ¯
			await MyExtendHelper.WriteBoolPlcDataForWarning(PlcWarningAddressGloble.Num_BZ01_1);

			SystemWarningMsg._lbl_alert_DataProcess_BZ01 = $"{rgvLocation.ToString()},æ ¹æ®UPI:{upiCode}æ²¡ææ¾å°å¯¹è±¡ ";
			continue;
			}
			@@ -84,8 +100,6 @@
			x.AreaCode == (int)AreaCodeEnum.ç¼ååæ£åº
			\|\|
			x.AreaCode == (int)AreaCodeEnum.ç ååºå
			\|\|
			x.AreaCode == (int)AreaCodeEnum.æºå¨äººå²ç¼ååºå
			).ToList();
			if (isQiTaoList.Count() != allList.Count())
			{//ä¸é½å
			@@ -94,9 +108,113 @@
			}
			else
			{//é½å
			qitaoReault = true;
			upiObj.AreaCode = (int)AreaCodeEnum.ç ååºå;
			//è¿éåå¢å ä¸ªé»è¾ï¼å¿é¡»æ¯æç§æ¬¡åºè¿å¥çæçæ£çç®é½å [Editby shaocx,2024-12-06]
			//å¯»æ¾æ¬ååçåä¸åæ¿çä½ç½®
			int queryAreaCode = (int)AreaCodeEnum.å¾ç¼ååæ£åº;
			var lastUpiLineQueue = wmsDB.mes_upi_linequeue.Where(x => x.PackageCode == upiObj.PackageCode && x.AreaCode == queryAreaCode)
			.OrderBy(x => x.Id).FirstOrDefault();//æ¥è¯¢è¯¥åéåçç¬¬ä¸åæ¿
			if (lastUpiLineQueue == null)
			{//è¯´æ éåä¸æ²¡æè¯¥åçæ°æ®
			qitaoReault = false;
			upiObj.AreaCode = (int)AreaCodeEnum.ç¼ååæ£åº;
			}
			else
			{
			if (lastUpiLineQueue.Shelf != upiObj.Shelf)
			{
			qitaoReault = false;
			upiObj.AreaCode = (int)AreaCodeEnum.ç¼ååæ£åº;
			}
			else
			{
			var isJiXuValidate = true;
			if (upiObj.Shelf != 1)
			{
			var qianmianList = allList.Where(x => x.Shelf < upiObj.Shelf).ToList();
			//çä»¥åçæ¿å¨åªéï¼å¿é¡»é½å¨ ç ååºå
			var yiqianQuyu = AreaCodeEnum.ç ååºå;
			var count_MD = qianmianList.Where(x => x.AreaCode == (int)yiqianQuyu).Count();
			if (count_MD != qianmianList.Count())
			{
			isJiXuValidate = false;
			qitaoReault = false;
			upiObj.AreaCode = (int)AreaCodeEnum.ç¼ååæ£åº;
			}
			}

			if (isJiXuValidate)
			{//æ¯å¦ç»§ç»éªè¯
			//è¿éè¦éªè¯å¨è¿äºåºåä¸ï¼æ¯å¦æ£ç¡®æéï¼å¦ææ²¡ææ£ç¡®æéï¼é£ä¹å°±è®¤ä¸ºä¸é½å¥ ãEditby shaocx,2024-12-12ã
			var queueList = wmsDB.mes_upi_linequeue.Where(x => x.PackageCode == upiObj.PackageCode && x.AreaCode == queryAreaCode)
			.OrderBy(x => x.Id).ToList();
			var fisrtId = queueList.OrderBy(x => x.Id).First().Id;
			var endId = queueList.OrderByDescending(x => x.Id).First().Id;
			//ç»§ç»æ¥è¯¢è¿ä¸ªæ¶é´æ®µåçéåæ°æ®
			//éåè¯¥éå
			queueList = wmsDB.mes_upi_linequeue.Where(x => x.Id >= fisrtId && x.Id <= endId).OrderBy(x => x.Id).ToList();
			var syCount = allList.Where(x => x.Shelf >= upiObj.Shelf).Count();
			if (queueList.Count() != syCount)
			{
			qitaoReault = false;
			upiObj.AreaCode = (int)AreaCodeEnum.ç¼ååæ£åº;
			}
			else
			{
			//å¤ææ¯å¦ä¹±åº
			bool isLuanXuan = false;
			int temp_shelf = 0;
			for (int i = 0; i < queueList.Count; i++)
			{
			if (i == 0)
			{
			temp_shelf = queueList[i].Shelf;
			if (temp_shelf != upiObj.Shelf)
			{
			qitaoReault = false;
			isLuanXuan = true;
			upiObj.AreaCode = (int)AreaCodeEnum.ç¼ååæ£åº;
			break;//è·³åºå¾ªç¯
			}
			if (queueList[i].Upi != upiObj.UPI)
			{
			qitaoReault = false;
			isLuanXuan = true;
			upiObj.AreaCode = (int)AreaCodeEnum.ç¼ååæ£åº;
			break;//è·³åºå¾ªç¯
			}
			}
			else
			{
			temp_shelf = temp_shelf + 1;
			if (temp_shelf != queueList[i].Shelf)
			{//è®¤ä¸ºä¹±åºäº
			qitaoReault = false;
			isLuanXuan = true;
			upiObj.AreaCode = (int)AreaCodeEnum.ç¼ååæ£åº;
			break;//è·³åºå¾ªç¯
			}
			}
			}

			if (isLuanXuan == false)
			{
			qitaoReault = true;
			upiObj.AreaCode = (int)AreaCodeEnum.ç ååºå;
			}
			}
			}
			}

			//æ³¨æï¼è¦å é¤è¯¥éåæ°æ®å¦
			wmsDB.mes_upi_linequeue.Remove(lastUpiLineQueue);
			}
			}

			//if (qitaoReault == false) {
			// //ä¸´æ¶
			// SystemWarningMsg._lbl_alert_DataProcess_BZ01 = $"æ¨¡æååï¼æååå";
			// continue;
			//}

			using (StationServiceClient client = new StationServiceClient())
			{
			@@ -131,11 +249,14 @@
			rbRunMode.OrderId = upiObj.OrderId;
			rbRunMode.PackageCode = upiObj.PackageCode;

			WmsRecordUpiProcessHandler.SaveWmsRecordUpiProcess(wmsDB, upiObj, "BZ01", "é½åéªè¯:" + (qitaoReault ? "é½å" : "ä¸é½å"));

			wmsDB.SaveChanges();
			}
			}
			else
			{
			SystemWarningMsg._lbl_alert_DataProcess_BZ01 = $"{rgvLocation.ToString()}-æ²¡æè¦å¤ççæ°æ®";
			using (WmsDBModel wmsDB = new WmsDBModel())
			{
			var isAllow = IsAllloRunOutTaskMode(wmsDB, null);
			@@ -161,7 +282,8 @@
			private static bool IsAllloRunOutTaskMode(WmsDBModel wmsDB, mes_batchOrderUPI_new curUpiObj)
			{
			//é¦åæ¥è¯¢æ°æ®åºä¸æ¯å¦æ è¦åºåºçæ°æ®
			var isExistOutTaskForNewCreated = wmsDB.wms_rbline_task.Where(x => x.RbTaskType == (int)RbTaskTypeEnum.åºåºä»»å¡
			var isExistOutTaskForNewCreated = wmsDB.wms_rbline_task.Where(x =>
			(x.RbTaskType == (int)RbTaskTypeEnum.é½ååºåºä»»å¡ \|\| x.RbTaskType == (int)RbTaskTypeEnum.å¼ºå¶åºåºä»»å¡)
			&& x.TaskStatus == (int)TaskStatusEnum.æ°å»º
			).Count();
			if (isExistOutTaskForNewCreated == 0)