Tiger.Business.MES/WorkAction/PackingAction.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
Tiger.Business.MES/WorkAction/PrintInStoreLabel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
Tiger.Business.MES/WorkAction/PackingAction.cs
@@ -890,6 +890,7 @@ ACT_VALUE_1 = CurPkg.IsFinished ? "Y" : "N", ACT_VALUE_2 = CurPkg.ToJson(), ACT_VALUE_3 = CurPkg.IsFinished ? LabelDic[CurPkg.Item.PKG_LEVEL].ToJson() : "", ACT_VALUE_4 = "Customer", ELAPSED_TIME = CurStep.GetElapsedTime().TotalMilliseconds.ToInt64(), TRACE_INFO = $"产品条码[{string.Join(",", CurPosition.CurSN)}]包装完成", }; @@ -990,8 +991,17 @@ .SetColumns(q => q.ACT_VALUE_1 == (CurPkg.IsFinished ? "Y" : "N")) .SetColumns(q => q.ACT_VALUE_2 == CurPkg.ToJson()) .SetColumns(q => q.ACT_VALUE_3 == (CurPkg.IsFinished ? LabelDic[CurPkg.Item.PKG_LEVEL].ToJson() : "")) .SetColumns(q => q.ACT_VALUE_4 == "Customer") .Where(q => q.WORK_ORDER == wo && q.NODE_ID == nodeID && q.ACT_ID == actID && q.WIP_ID == _lastWipID) .ExecuteCommand(); var InStoreLabel = CurPkg.IsFinished ? CurPkg.InStoreLabel?.ToJson() : ""; db.Updateable<MES_WIP_ACT>() .SetColumns(q => q.ACT_VALUE_1 == (CurPkg.IsFinished ? "Y" : "N")) .SetColumns(q => q.ACT_VALUE_2 == CurPkg.ToJson()) .SetColumns(q => q.ACT_VALUE_3 == InStoreLabel) .SetColumns(q => q.ACT_VALUE_4 == "InStroe") .Where(q => q.WORK_ORDER == wo && q.NODE_ID == nodeID && q.ACT_ID == CurPkg.InStoreActID && q.WIP_ID == _lastWipID) .ExecuteCommand(); //包装信息保存到工单条码明细表 db.Updateable<BIZ_MES_WO_SN>() .SetColumns(q => q.TRAY_SN == CurPkg.Item.Package.SN) Tiger.Business.MES/WorkAction/PrintInStoreLabel.cs
@@ -78,7 +78,8 @@ Label = CurPosition.SetLabelVariables(LabelPV, Label, this); if (CurPosition.Context.ContainsKey("CurPackage")) { (CurPosition.Context["CurPackage"] as WipPkg).InStoreLabel = Label; (CurPosition.Context["CurPackage"] as WipPkg).InStoreActID = NodeAct.ID; (CurPosition.Context["CurPackage"] as WipPkg).InStoreLabel = Label; } //判断是否需要打印入库标签 @@ -139,6 +140,7 @@ { var action = new ApiAction<SubmitOutput>(new SubmitOutput()); var CurPkg = CurPosition.Context.ContainsKey("CurPackage") ? CurPosition.Context["CurPackage"] as WipPkg : null; //记录行为操作记录 var wipActs = new List<MES_WIP_ACT>(); foreach (var wipSn in CurPosition.CurWipSNs) @@ -176,8 +178,10 @@ PRD_CODE = wipSn.PRD_CODE, ACT_TYPE = NodeAct.ACT_TYPE, ACT_SN = wipSn.SN, ACT_VALUE_1 = Label?.LABEL_CODE, ACT_VALUE_2 = Label?.ToJson(), ACT_VALUE_1 = CurPkg?.IsFinished == true ? "Y" : "N", ACT_VALUE_2 = CurPkg?.ToJson(), ACT_VALUE_3 = Label?.ToJson(), ACT_VALUE_4 = "InStroe", ACT_RESULT = "Y", ELAPSED_TIME = CurStep.GetElapsedTime().TotalMilliseconds.ToInt64(), TRACE_INFO = NoNeedInStorePrint ? $"无需打印入库标签" : $"标签{Label?.LABEL_NAME}[{Label?.LABEL_CODE}]打印成功", Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs
@@ -177,6 +177,7 @@ public WeightInfo WeightInfo { get; set; } = new WeightInfo(); public bool IsFinished => Item.IsFinished; public bool IsReachedEndNode { get; set; } = false; public string InStoreActID { get; set; } public BAS_LABEL_TEMP InStoreLabel { get; set; } }