TigerClouds-Tech/Server/TigerApi6_2024.git

Ben Lin

2024-08-20 b97c46c3a70ac278c36b1e51342cdba5ab363ed1

扫描出错后返回信息更新

已修改4个文件

	Tiger.Business.MES/Transaction/CollectNode.cs	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Tiger.Business.MES/Transaction/PackingNode.cs	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Tiger.Business.MES/Transaction/TestNode.cs	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Tiger.Business.MES/WorkAction/Weighing.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 Tiger.Business.MES/Transaction/CollectNode.cs

@@ -93,7 +93,13 @@
                                }
                                //条码过站
                                action = NodeSubmit(action, input);
                                if (!IsFinishAllSteps)
                                if (!action.IsSuccessed && !CurWipSNs.Any())
                                {
                                    var info = WoContext.GetSnOperInfo(input.SN).Data;
                                    info.InputQty = OperInfoDic[CurBatch.Batch.BATCH_NO].InputQty;
                                    action.Data.OperInfo = info;
                                }
                                else if (!IsFinishAllSteps)
                                {
                                    action.Data.OperInfo = SetOperNodeInfo(OperInfoDic[CurBatch.Batch.BATCH_NO]);
                                }
@@ -382,7 +388,9 @@
                    CurWipSNHiss.Clear();
                    foreach (var wipSN in wipSNs)
                    {
                        CurWipSNHiss.Add(new MES_WIP_HIS(wipSN, $"工单[{wipSN.WORK_ORDER}]条码[{wipSN.SN}]在岗位[{wipSN.POST_CODE}]过站工序[{wipSN.NODE_NAME}]成功"));
                        var his = new MES_WIP_HIS(wipSN, $"工单[{wipSN.WORK_ORDER}]条码[{wipSN.SN}]在岗位[{wipSN.POST_CODE}]过站工序[{wipSN.NODE_NAME}]成功");
                        wipSN.History.Add(his);
                        CurWipSNHiss.Add(his);
                    }

                    //创建变量克隆对象用于传入DBSubmitAction中保存当前需要暂存的数据值

 Tiger.Business.MES/Transaction/PackingNode.cs

@@ -125,7 +125,13 @@
                                    }
                                    //条码过站
                                    action = NodeSubmit(action, input);
                                    if (!IsFinishAllSteps)
                                    if (!action.IsSuccessed && !CurWipSNs.Any())
                                    {
                                        var info = WoContext.GetSnOperInfo(input.SN).Data;
                                        info.InputQty = OperInfoDic[CurBatch.Batch.BATCH_NO].InputQty;
                                        action.Data.OperInfo = info;
                                    }
                                    else if (!IsFinishAllSteps)
                                    {
                                        action.Data.OperInfo = SetOperNodeInfo(OperInfoDic[CurBatch.Batch.BATCH_NO]);
                                    }
@@ -414,7 +420,9 @@
                    CurWipSNHiss.Clear();
                    foreach (var wipSN in wipSNs)
                    {
                        CurWipSNHiss.Add(new MES_WIP_HIS(wipSN, $"工单[{wipSN.WORK_ORDER}]条码[{wipSN.SN}]在岗位[{wipSN.POST_CODE}]过站工序[{wipSN.NODE_NAME}]成功"));
                        var his = new MES_WIP_HIS(wipSN, $"工单[{wipSN.WORK_ORDER}]条码[{wipSN.SN}]在岗位[{wipSN.POST_CODE}]过站工序[{wipSN.NODE_NAME}]成功");
                        wipSN.History.Add(his);
                        CurWipSNHiss.Add(his);
                    }

                    //创建变量克隆对象用于传入DBSubmitAction中保存当前需要暂存的数据值

 Tiger.Business.MES/Transaction/TestNode.cs

@@ -94,7 +94,13 @@
                                }
                                //条码过站
                                action = NodeSubmit(action, input);
                                if (!IsFinishAllSteps)
                                if (!action.IsSuccessed && !CurWipSNs.Any())
                                {
                                    var info = WoContext.GetSnOperInfo(input.SN).Data;
                                    info.InputQty = OperInfoDic[CurBatch.Batch.BATCH_NO].InputQty;
                                    action.Data.OperInfo = info;
                                }
                                else if (!IsFinishAllSteps)
                                {
                                    action.Data.OperInfo = SetOperNodeInfo(OperInfoDic[CurBatch.Batch.BATCH_NO]);
                                }
@@ -382,7 +388,9 @@
                    CurWipSNHiss.Clear();
                    foreach (var wipSN in wipSNs)
                    {
                        CurWipSNHiss.Add(new MES_WIP_HIS(wipSN, $"工单[{wipSN.WORK_ORDER}]条码[{wipSN.SN}]在岗位[{wipSN.POST_CODE}]过站工序[{wipSN.NODE_NAME}]成功"));
                        var his = new MES_WIP_HIS(wipSN, $"工单[{wipSN.WORK_ORDER}]条码[{wipSN.SN}]在岗位[{wipSN.POST_CODE}]过站工序[{wipSN.NODE_NAME}]成功");
                        wipSN.History.Add(his);
                        CurWipSNHiss.Add(his);
                    }

                    //创建变量克隆对象用于传入DBSubmitAction中保存当前需要暂存的数据值

 Tiger.Business.MES/WorkAction/Weighing.cs

@@ -124,7 +124,7 @@
            catch (System.Exception ex)
            {
                action.Data.ShortMsg = new("称重异常", ShortMessage.Types.Error);
                action.CatchExceptionWithLog(ex, $"称重行为：条码[{CurPosition.CurSN}]称重数据[{input?.Data.ToString()}]保存异常");
                action.CatchExceptionWithLog(ex, $"称重行为：条码[{CurPosition.CurSN}]称重数据[{input?.Data?.ToString()}]保存异常");
                action.LocaleMsg = new("MES.WorkAction.Weighing.SaveWeightInfoException", CurPosition.CurSN, input?.Data.ToString());
            }
            return action;

			@@ -93,7 +93,13 @@
			}
			//条码过站
			action = NodeSubmit(action, input);
			if (!IsFinishAllSteps)
			if (!action.IsSuccessed && !CurWipSNs.Any())
			{
			var info = WoContext.GetSnOperInfo(input.SN).Data;
			info.InputQty = OperInfoDic[CurBatch.Batch.BATCH_NO].InputQty;
			action.Data.OperInfo = info;
			}
			else if (!IsFinishAllSteps)
			{
			action.Data.OperInfo = SetOperNodeInfo(OperInfoDic[CurBatch.Batch.BATCH_NO]);
			}
			@@ -382,7 +388,9 @@
			CurWipSNHiss.Clear();
			foreach (var wipSN in wipSNs)
			{
			CurWipSNHiss.Add(new MES_WIP_HIS(wipSN, $"工单[{wipSN.WORK_ORDER}]条码[{wipSN.SN}]在岗位[{wipSN.POST_CODE}]过站工序[{wipSN.NODE_NAME}]成功"));
			var his = new MES_WIP_HIS(wipSN, $"工单[{wipSN.WORK_ORDER}]条码[{wipSN.SN}]在岗位[{wipSN.POST_CODE}]过站工序[{wipSN.NODE_NAME}]成功");
			wipSN.History.Add(his);
			CurWipSNHiss.Add(his);
			}

			//创建变量克隆对象用于传入DBSubmitAction中保存当前需要暂存的数据值

			@@ -125,7 +125,13 @@
			}
			//条码过站
			action = NodeSubmit(action, input);
			if (!IsFinishAllSteps)
			if (!action.IsSuccessed && !CurWipSNs.Any())
			{
			var info = WoContext.GetSnOperInfo(input.SN).Data;
			info.InputQty = OperInfoDic[CurBatch.Batch.BATCH_NO].InputQty;
			action.Data.OperInfo = info;
			}
			else if (!IsFinishAllSteps)
			{
			action.Data.OperInfo = SetOperNodeInfo(OperInfoDic[CurBatch.Batch.BATCH_NO]);
			}
			@@ -414,7 +420,9 @@
			CurWipSNHiss.Clear();
			foreach (var wipSN in wipSNs)
			{
			CurWipSNHiss.Add(new MES_WIP_HIS(wipSN, $"工单[{wipSN.WORK_ORDER}]条码[{wipSN.SN}]在岗位[{wipSN.POST_CODE}]过站工序[{wipSN.NODE_NAME}]成功"));
			var his = new MES_WIP_HIS(wipSN, $"工单[{wipSN.WORK_ORDER}]条码[{wipSN.SN}]在岗位[{wipSN.POST_CODE}]过站工序[{wipSN.NODE_NAME}]成功");
			wipSN.History.Add(his);
			CurWipSNHiss.Add(his);
			}

			//创建变量克隆对象用于传入DBSubmitAction中保存当前需要暂存的数据值

			@@ -94,7 +94,13 @@
			}
			//条码过站
			action = NodeSubmit(action, input);
			if (!IsFinishAllSteps)
			if (!action.IsSuccessed && !CurWipSNs.Any())
			{
			var info = WoContext.GetSnOperInfo(input.SN).Data;
			info.InputQty = OperInfoDic[CurBatch.Batch.BATCH_NO].InputQty;
			action.Data.OperInfo = info;
			}
			else if (!IsFinishAllSteps)
			{
			action.Data.OperInfo = SetOperNodeInfo(OperInfoDic[CurBatch.Batch.BATCH_NO]);
			}
			@@ -382,7 +388,9 @@
			CurWipSNHiss.Clear();
			foreach (var wipSN in wipSNs)
			{
			CurWipSNHiss.Add(new MES_WIP_HIS(wipSN, $"工单[{wipSN.WORK_ORDER}]条码[{wipSN.SN}]在岗位[{wipSN.POST_CODE}]过站工序[{wipSN.NODE_NAME}]成功"));
			var his = new MES_WIP_HIS(wipSN, $"工单[{wipSN.WORK_ORDER}]条码[{wipSN.SN}]在岗位[{wipSN.POST_CODE}]过站工序[{wipSN.NODE_NAME}]成功");
			wipSN.History.Add(his);
			CurWipSNHiss.Add(his);
			}

			//创建变量克隆对象用于传入DBSubmitAction中保存当前需要暂存的数据值

			@@ -124,7 +124,7 @@
			catch (System.Exception ex)
			{
			action.Data.ShortMsg = new("称重异常", ShortMessage.Types.Error);
			action.CatchExceptionWithLog(ex, $"称重行为：条码[{CurPosition.CurSN}]称重数据[{input?.Data.ToString()}]保存异常");
			action.CatchExceptionWithLog(ex, $"称重行为：条码[{CurPosition.CurSN}]称重数据[{input?.Data?.ToString()}]保存异常");
			action.LocaleMsg = new("MES.WorkAction.Weighing.SaveWeightInfoException", CurPosition.CurSN, input?.Data.ToString());
			}
			return action;