LA24030-LuLI_PackageLine.git

			@@ -23,7 +23,7 @@
			LogType logType = LogType.DataProcess_BZ12;
			while (true)
			{
			Thread.Sleep(2000);//ä¼ç 2ç§ï¼å°ä¼ç åå°åé¢ï¼æ¯ä¸ºäºä¸é¢çcontinueæ¹æ³æ§è¡åä¸æ¾ç¤ºéè¯¯ä¿¡æ¯çæç¤ºï¼ï¼ï¼ãEditBy shaocx,2022-05-24ã
			Thread.Sleep(600);//ä¼ç 2ç§ï¼å°ä¼ç åå°åé¢ï¼æ¯ä¸ºäºä¸é¢çcontinueæ¹æ³æ§è¡åä¸æ¾ç¤ºéè¯¯ä¿¡æ¯çæç¤ºï¼ï¼ï¼ãEditBy shaocx,2022-05-24ã
			SystemWarningMsg._lbl_alert_DataProcess_BZ12 = string.Empty;
			try
			{
			@@ -69,20 +69,27 @@
			}
			var upiCode = result.Replace("/r", ""); ;
			short lastnum = 0;//æ¯å¦æ«æ¿
			//short isrotate = 0;//æ¯å¦æè½¬
			//short placeX = 0;
			//short placeY = 0;
			//short placeZ = 0;

			string place = "";
			using (WmsDBModel wmsDB = new WmsDBModel())
			{
			//è¦æ¯æå·²ä¸åçä»»å¡ï¼å°±ä¸è¦æ§è¡
			var isValidate = TaskHandler.ValidateIssueTaskForNoFinishTaskByUpi(wmsDB, result);
			var isValidate = TaskHandler.ValidateIssueTaskForNoFinishTaskByUpi(wmsDB, result, false);
			if (!isValidate)
			{
			SystemWarningMsg._lbl_alert_DataProcess_BZ12 = $"{rgvLocation.ToString()}-æâå·²ä¸åâçä»»å¡ï¼ä¸è½å¤ç,æ¤æ¬¡å¾ªç¯ç»æ";
			SystemWarningMsg._lbl_alert_DataProcess_BZ12 = $"{rgvLocation.ToString()}-upiï¼{result}æâå·²ä¸åâçä»»å¡ï¼ä¸è½å¤ç,æ¤æ¬¡å¾ªç¯ç»æ";
			continue;
			}

			/*
			isValidate = TaskHandler.ValidateNoFinishOutTaskForç æ¿ä»»å¡(wmsDB);
			if (!isValidate)
			{
			SystemWarningMsg._lbl_alert_DataProcess_BZ12 = $"{rgvLocation.ToString()}-æ æªç»æ çä»»å¡ï¼ä¸è½å¤ç,æ¤æ¬¡å¾ªç¯ç»æ";
			continue;
			}
			//*/

			var upiObj = wmsDB.mes_batchOrderUPI_new.Where(x => x.UPI == upiCode).FirstOrDefault();
			if (upiObj == null)
			{
			@@ -109,58 +116,88 @@
			//æ¥å¤è¿åææçæ°é
			var upiList = wmsDB.mes_batchOrderUPI_new.Where(x => x.PackageCode == upiObj.PackageCode).ToList();
			//æ¥è¯¢æ¯å¦æ«æ¿å¹¶ä¸å¤æææ²¡ææ··æ¹
			var wms_rbline_runmode = wmsDB.wms_rbline_runmode.FirstOrDefault();
			if (wms_rbline_runmode != null)
			//å¢å å¯¹åæ°éç½®çç®¡ç ãEditby shaocx,2024-12-13ã
			var sysConfig = wmsDB.SysConfig.Where(x => x.Code == "LastPalletizingData").FirstOrDefault();
			if (sysConfig == null)
			{
			//æ¥è¯¢æ¯å¦æ··æ¹
			if (!string.IsNullOrEmpty(wms_rbline_runmode.PalletizingUPI))
			{
			if (upiObj.PackageCode != wms_rbline_runmode.PalletizingUPI)
			{
			//åå¥æ¥è¦ä¿¡æ¯
			await MyExtendHelper.WriteBoolPlcDataForWarning(PlcWarningAddressGloble.Num_BZ12_4);
			SystemWarningMsg._lbl_alert_DataProcess_BZ01 = $"æ²¡æè·åå° LastPalletizingData çéç½®ä¿¡æ¯ ";
			continue;
			}
			string palletizingUPI = "";
			int palletizingStation = 0;

			SystemWarningMsg._lbl_alert_DataProcess_BZ12 = $"{rgvLocation.ToString()},UPI:{upiCode}ç åé¨ä»¶æ··æ¹ ";
			continue;
			}
			}
			//è·åç åç®æ ä½
			if (wms_rbline_runmode.PalletizingStation != 0)
			var config_value = sysConfig.Value;
			if (config_value.IndexOf('\|') > -1)
			{//æ ¼å¼ä¸º åè£å·\|ç«ç¹
			var arr = config_value.Split('\|');
			palletizingUPI = arr[0];
			palletizingStation = Convert.ToInt32(arr[1]);
			}
			else
			{//è¡¨ç¤ºè¿æ²¡æéç½®
			}

			//æ¥è¯¢æ¯å¦æ··æ¹
			if (!string.IsNullOrEmpty(palletizingUPI))
			{
			if (upiObj.PackageCode != palletizingUPI)
			{
			place = wms_rbline_runmode.PalletizingStation.ToString();
			//åå¥æ¥è¦ä¿¡æ¯
			await MyExtendHelper.WriteBoolPlcDataForWarning(PlcWarningAddressGloble.Num_BZ12_4);

			SystemWarningMsg._lbl_alert_DataProcess_BZ12 = $"{rgvLocation.ToString()},UPI:{upiCode}ç åé¨ä»¶æ··æ¹ ";
			continue;
			}
			}
			//è·åç åç®æ ä½
			if (palletizingStation != 0)
			{
			place = palletizingStation.ToString();
			}
			else
			{//è¡¨ç¤ºè¿æ¯ åçç¬¬ä¸åæ¿
			palletizingUPI = upiObj.PackageCode;
			if (obj.R_PalletizingStation1 == 1)
			{
			place = "1";
			}
			else if (obj.R_PalletizingStation2 == 1)
			{
			place = "2";

			}
			else
			{
			lastnum = 1;
			wms_rbline_runmode.PalletizingUPI = upiObj.PackageCode;
			if (obj.R_PalletizingStation1 == 1)
			{
			place = "1";
			}
			else if (obj.R_PalletizingStation2 == 1)
			{
			place = "2";
			//å»ææ¥è¦ï¼ä¸åæ ¡éªè¿ä¸ªäº
			place = "1";
			/*
			//åå¥æ¥è¦ä¿¡æ¯
			await MyExtendHelper.WriteBoolPlcDataForWarning(PlcWarningAddressGloble.Num_BZ12_6);

			}
			else
			{
			//åå¥æ¥è¦ä¿¡æ¯
			await MyExtendHelper.WriteBoolPlcDataForWarning(PlcWarningAddressGloble.Num_BZ12_6);

			SystemWarningMsg._lbl_alert_DataProcess_BZ12 = $"{rgvLocation.ToString()},UPI:{upiCode}æ å¯ç¨ç åç®æ ä½ ";
			continue;
			}
			wms_rbline_runmode.PalletizingStation = int.Parse(place);
			}
			//å¦ææ¬¡åºçäºå½é±åæ»æ°éï¼æ¯å¦æ«æ¿ç½®ä¸ºtrue
			if (upiObj.Shelf == upiList.Count())
			{
			lastnum = 2;
			wms_rbline_runmode.PalletizingUPI = null;
			wms_rbline_runmode.PalletizingStation = 0;
			SystemWarningMsg._lbl_alert_DataProcess_BZ12 = $"{rgvLocation.ToString()},UPI:{upiCode}æ å¯ç¨ç åç®æ ä½ ";
			continue;
			//*/
			}

			palletizingStation = int.Parse(place);
			}
			//å¦ææ¬¡åºçäºå½é±åæ»æ°éï¼æ¯å¦æ«æ¿ç½®ä¸ºtrue
			if (upiObj.Shelf == upiList.Count())
			{
			lastnum = 2;//ï¼1é¦ä»¶ï¼2æ«ä»¶ï¼0ä¸ºä¸é´æ¿ï¼
			palletizingUPI = null;
			palletizingStation = 0;
			}
			else if (upiObj.Shelf == 1)
			{
			lastnum = 1;//ï¼1é¦ä»¶ï¼2æ«ä»¶ï¼0ä¸ºä¸é´æ¿ï¼
			}
			else
			{
			lastnum = 0;//ï¼1é¦ä»¶ï¼2æ«ä»¶ï¼0ä¸ºä¸é´æ¿ï¼
			}


			//æ¥è¯¢ææ²¡ææ¬¡åºå°äºå½åæ¬¡åºå¹¶ä¸æ²¡æç åç
			var oldupi = upiList.Where(x => x.Shelf < upiObj.Shelf && (x.UpiStatus != (int)UpiStatusEnum.å·²ç å && x.UpiStatus != (int)UpiStatusEnum.ç åä¸)).FirstOrDefault();
			if (oldupi != null)
			@@ -174,7 +211,8 @@

			//è®°å½ä»»å¡
			var _id = Yitter.IdGenerator.YitIdHelper.NextId();
			var plcTaskNo = BusinessHelper.CreatePlcTaskIdForSrmTask();
			var plcTaskNo = BusinessHelper.CreatePlcTaskId();
			plcTaskNo = MyExtendHelper.GetNewTaskNo(wmsDB, RbTaskTypeEnum.ç æ¿ä»»å¡, plcTaskNo);
			var task = new wms_rbline_task()
			{
			Id = _id,
			@@ -183,7 +221,7 @@
			Length = upiObj.Length,
			Width = upiObj.Width,
			Thk = upiObj.Thk,


			PlanNo = upiObj.PlanNo,
			OrderId = upiObj.OrderId,
			PackageCode = upiObj.PackageCode,
			@@ -191,9 +229,9 @@
			TaskStatus = (int)TaskStatusEnum.æ°å»º,
			TaskMsg = "ç æ¿",
			CreateTime = DateTime.Now,
			CreateUserName = "CC",
			CreateUserName = SysGloble.WCSSystem,
			UpdateTime = DateTime.Now,
			UpdateUserName = "CC",
			UpdateUserName = SysGloble.WCSSystem,
			PlaceCode = place,
			LastNum = lastnum,

			@@ -206,7 +244,8 @@

			wmsDB.wms_rbline_task.Add(task);


			//æ´æ°éç½®
			sysConfig.Value = palletizingUPI + "\|" + palletizingStation;


			WmsRecordUpiProcessHandler.SaveWmsRecordUpiProcess(wmsDB, upiObj, "BZ12ç«ç¹", "ç å");
			@@ -214,6 +253,10 @@
			wmsDB.SaveChanges();
			}
			}
			else
			{
			SystemWarningMsg._lbl_alert_DataProcess_BZ12 = $"{rgvLocation.ToString()}-æ²¡æè¦å¤ççæ°æ®";
			}
			}
			}
			catch (Exception ex)