HuiXingJingGong/HuBeiChu.git

			@@ -135,24 +135,6 @@
			//åéæ¶å°ç¼å·ä¿¡å·
			device.SetValue(ConveyorLineName.W_ReceivedD, 1, item.StationCode);
			k = true;

			//åMESåéæ¥å·¥å
			//if (Stock.MaterialCode1 != null && !Stock.MaterialCode1.Equals(""))
			//{
			// MESReport(Stock.MaterialCode1);
			//}
			//if (Stock.MaterialCode2 != null && !Stock.MaterialCode2.Equals(""))
			//{
			// MESReport(Stock.MaterialCode2);
			//}
			//if (Stock.MaterialCode3 != null && !Stock.MaterialCode3.Equals(""))
			//{
			// MESReport(Stock.MaterialCode3);
			//}
			//if (Stock.MaterialCode4 != null && !Stock.MaterialCode4.Equals(""))
			//{
			// MESReport(Stock.MaterialCode4);
			//}
			}

			}
			@@ -163,63 +145,29 @@
			{
			comm.R_StatusB((short)conveyorLineInfoRead.R_State);
			comm.R_PickB((short)conveyorLineInfoRead.R_Pick);
			if (conveyorLineInfoRead.R_Pick == 1 && conveyorLineInfoRead.R_State == 1 && sc == 2)
			{
			//if (conveyorLineInfoRead.R_Pick == 1 && conveyorLineInfoRead.R_State == 1 && sc == 2)
			//{

			//å¤æä»»å¡æ¯å¦éå¤
			Dt_Task task = _TaskRepository.QueryFirst(x => x.TaskType == (int)TaskTypeEnum.OutEmpty);
			if (task == null)
			{
			LogLock.OutLogAOP("è¾éçº¿ä»»å¡æ¥å¿", new string[] { device.DeviceCode, $"{"ç©ºæ¡¶åºåºä»»å¡çæ" + "ç³è¯·å(æ¾)æï¼" + conveyorLineInfoRead.R_Pick + "è®¾å¤ç¶æï¼" + conveyorLineInfoRead.R_State}" });
			//WMSçæä»»å¡
			string address = AppSettings.Get("WMSApiAddress");
			if (!string.IsNullOrEmpty(address))
			{
			HttpHelper.Post($"{address}/api/Task/addOutEmptyTask/?location={item.location}", "");
			}
			}
			// //å¤æä»»å¡æ¯å¦éå¤
			// Dt_Task task = _TaskRepository.QueryFirst(x => x.TaskType == (int)TaskTypeEnum.OutEmpty);
			// if (task == null)
			// {
			// LogLock.OutLogAOP("è¾éçº¿ä»»å¡æ¥å¿", new string[] { device.DeviceCode, $"{"ç©ºæ¡¶åºåºä»»å¡çæ" + "ç³è¯·å(æ¾)æï¼" + conveyorLineInfoRead.R_Pick + "è®¾å¤ç¶æï¼" + conveyorLineInfoRead.R_State}" });
			// //WMSçæä»»å¡
			// string address = AppSettings.Get("WMSApiAddress");
			// if (!string.IsNullOrEmpty(address))
			// {
			// HttpHelper.Post($"{address}/api/Task/addOutEmptyTask/?location={item.location}", "");
			// }
			// }

			}
			//}
			}
			//æ»¡æ¡¶åº
			if (item.StationName == "æ»¡æ¡¶åº")
			{
			comm.R_StatusD((short)conveyorLineInfoRead.R_State);
			comm.R_PickD((short)conveyorLineInfoRead.R_Pick);
			//åè¯WMSå¯ä»¥åºåº
			if (conveyorLineInfoRead.R_Pick == 1 && conveyorLineInfoRead.R_State == 1)
			{
			if (m)
			{
			//WMSçæä»»å¡
			string address = AppSettings.Get("WMSApiAddress");
			if (!string.IsNullOrEmpty(address))
			{
			HttpHelper.Post($"{address}/api/Task/WCSSignal/?k=1", "");
			}
			m = false;
			n = true;
			//åå¥æ¥å¿
			LogLock.OutLogAOP("è¾éçº¿ä»»å¡æ¥å¿", new string[] { device.DeviceCode, $"{"æ»¡æ¡¶åºåºä»»å¡çæ" + "ç³è¯·å(æ¾)æï¼" + conveyorLineInfoRead.R_Pick + "è®¾å¤ç¶æï¼" + conveyorLineInfoRead.R_State}" });
			}
			}
			//åè¯WMSä¸å¯ä»¥åºåº
			else
			{
			if (n)
			{
			//WMSçæä»»å¡
			string address = AppSettings.Get("WMSApiAddress");
			if (!string.IsNullOrEmpty(address))
			{
			HttpHelper.Post($"{address}/api/Task/WCSSignal/?k=0", "");
			}
			n = false;
			m = true;
			//åå¥æ¥å¿
			LogLock.OutLogAOP("è¾éçº¿ä»»å¡æ¥å¿", new string[] { device.DeviceCode, $"{"æ»¡æ¡¶åºåºä»»å¡çæ" + "ç³è¯·å(æ¾)æï¼" + conveyorLineInfoRead.R_Pick + "è®¾å¤ç¶æï¼" + conveyorLineInfoRead.R_State}" });
			}
			}
			}
			}
			}
			@@ -233,36 +181,5 @@
			}
			return Task.CompletedTask;
			}

			//MESæ¥å·¥
			//public void MESReport(string MaterialCode)
			//{
			// try
			// {
			// Reports reports = new Reports();

			// //æ¥è¯¢äºç»´ç
			// Dt_FillingOrder FillingOrder = _FillingOrderRepository.QueryFirst(x => x.BarCode == MaterialCode);

			// reports.report.Qty = FillingOrder.BarNum;
			// reports.report.DispatchID = FillingOrder.WorkID + "";
			// reports.barcodeSN[0].Barcode = FillingOrder.BarCode;
			// reports.barcodeSN[0].BatchNum = int.Parse(FillingOrder.batchNum);
			// reports.barcodeSN[0].Id = FillingOrder.BarCodeID;
			// reports.barcodeSN[0].MaterialId = FillingOrder.ArticleNumID;
			// reports.barcodeSN[0].Quantity = (int)FillingOrder.BarNum;
			// reports.barcodeSN[0].DispatchId = FillingOrder.WorkID;

			// string mes = AppSettings.Get("MSE");
			// if (!string.IsNullOrEmpty(mes))
			// {
			// HttpHelper.Post($"{mes}/Task/SaveReportRaw/", reports.Serialize());
			// }
			// }
			// catch (Exception ex)
			// {
			// WriteInfo("MESæ¥å·¥éè¯¯", $"{ex.Message}");
			// }
			//}
			}
			}