LA20025_YunNeiDongLi.git

			@@ -13,7 +13,7 @@
			namespace yunneiWCS.ThreadTask
			{
			/// <summary>
			/// MES数据传输(真正的MES)
			/// MES出入库数据传输(真正的MES)
			/// </summary>
			public class mesDataTranfficForRealMes
			{
			@@ -29,15 +29,16 @@
			//Log4NetHelper.WriteInfoLog(_logType, "测试啊啊啊啊 ");
			using (dbmodel mod = new dbmodel())
			{
			List<Wms_outInStockRecord_V2_Mes> sendMesData = mod.Wms_outInStockRecord_V2_Mes.Where(x => x.isSendToMes == 0).ToList();
			List<Wms_outInStockRecord_V2_Mes> sendMesData = mod.Wms_outInStockRecord_V2_Mes.Where(x => x.isSendToMes == 0).OrderBy(x => x.ID).ToList();

			if (sendMesData.Count > 0)
			{
			SystemWarningMsg.msg_mesDataTranfficForRealMes = $"{MyExtend.MsgTimeStr()},要推送{sendMesData.Count()}条!";
			foreach (var itemTask in sendMesData)
			{
			try
			{
			ApiResponse<object> ret = null;
			mesMsg ret = null;

			//获取信息明细
			var details = mod.Wms_outInStockRecord_Details_V2_Mes.Where(x => x.mainId == itemTask.ID).ToList();
			@@ -46,6 +47,7 @@
			{
			pushData.Add(new InboundStockInfoToMes()
			{
			identifier = de.ID.ToString(),
			containerCode = itemTask.containerCode,
			createTime = itemTask.CreateTime?.ToString("yyyy-MM-dd HH:mm:ss"),
			materialCode = de.productCode,
			@@ -55,60 +57,60 @@
			serialNumber = de.serialNumber,
			supplier = itemTask.supplier,
			version = itemTask.version,
			});

			Creator = string.IsNullOrEmpty(itemTask.Creator) ? "wms" : itemTask.Creator

			});;
			}

			if (Form1.isvirtual)
			{//模拟环境
			ret = new ApiResponse<object>();
			ret.Success = true;
			ret.Message = "系统模拟完成";

			switch (itemTask.outInFlag)
			{
			case (int)OutInFlag.入库:
			ret = PushMesHandler.Mes_InStockSend(pushData, _logType);
			break;
			case (int)OutInFlag.出库:
			ret = PushMesHandler.Mes_OutStockSend(pushData, _logType);
			break;
			default:
			break;
			}

			SystemWarningMsg.msg_mesDataTranfficForRealMes = $"{MyExtend.MsgTimeStr()},已推送结束，返回:{JsonConvert.SerializeObject(ret)}";
			if (ret.ErrorCode == 0)
			{
			itemTask.isSendToMes = 1;//推送成功
			}
			else
			{
			switch (itemTask.outInFlag)
			{
			case (int)OutInFlag.入库:
			ret = PushMesHandler.Mes_InStockSend(pushData, itemTask.ID.ToString(), _logType);
			break;
			case (int)OutInFlag.出库:
			ret = PushMesHandler.Mes_OutStockSend(pushData, itemTask.ID.ToString(), _logType);
			break;
			default:
			break;
			}
			}

			if (ret.Success)
			{
			itemTask.isSendToMes = 1;
			}
			else
			{
			itemTask.isSendToMes = 0;
			itemTask.isSendToMes = 0;//推送失败
			}
			itemTask.SendToMesTime = DateTime.Now;
			itemTask.MesRet = ret.Message;
			itemTask.MesRet = ret.ErrorMsg;
			itemTask.SendToMesCount = (itemTask.SendToMesCount ?? 0) + 1;
			if (itemTask.isSendToMes == 0 && itemTask.SendToMesCount > 100)
			{
			itemTask.isSendToMes = 3;//表示强制推送成功
			}
			mod.SaveChanges();

			}
			catch (Exception ex)
			{
			SystemWarningMsg.msg_mesDataTranfficForRealMes = "推送给MES数据异常:" + JsonConvert.SerializeObject(ex);
			SystemWarningMsg.msg_mesDataTranfficForRealMes = $"{MyExtend.MsgTimeStr()},推送给MES数据异常:" + JsonConvert.SerializeObject(ex);
			Log4NetHelper.WriteErrorLog(_logType, SystemWarningMsg.msg_mesDataTranfficForRealMes, ex);
			}
			}
			}
			else
			{
			SystemWarningMsg.msg_mesDataTranfficForRealMes = "没有数据要推送给MES!";
			SystemWarningMsg.msg_mesDataTranfficForRealMes = $"{MyExtend.MsgTimeStr()},没有数据要推送给MES!";
			}
			}
			}
			catch (Exception ex)
			{
			SystemWarningMsg.msg_mesDataTranfficForRealMes = "数据要推送给MES出现异常:" + ex.Message;
			SystemWarningMsg.msg_mesDataTranfficForRealMes = $"{MyExtend.MsgTimeStr()},数据要推送给MES出现异常:" + ex.Message;
			Log4NetHelper.WriteErrorLog(_logType, SystemWarningMsg.msg_mesDataTranfficForRealMes, ex);
			}
			}