From 0fa15afc31f7fb1a6100a78af3765d4d1bbab611 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期一, 28 十月 2024 21:23:55 +0800
Subject: [PATCH] 优化入库标签行为数据存储
---
Tiger.Business.MES/WorkAction/PrintInStoreLabel.cs | 10 +++++++---
Tiger.Business.MES/WorkAction/PackingAction.cs | 10 ++++++++++
Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs | 1 +
3 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/Tiger.Business.MES/WorkAction/PackingAction.cs b/Tiger.Business.MES/WorkAction/PackingAction.cs
index 87df59d..28e0046 100644
--- a/Tiger.Business.MES/WorkAction/PackingAction.cs
+++ b/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)
diff --git a/Tiger.Business.MES/WorkAction/PrintInStoreLabel.cs b/Tiger.Business.MES/WorkAction/PrintInStoreLabel.cs
index d370304..e066dbd 100644
--- a/Tiger.Business.MES/WorkAction/PrintInStoreLabel.cs
+++ b/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}]鎵撳嵃鎴愬姛",
diff --git a/Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs b/Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs
index 82074a3..010d93b 100644
--- a/Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs
+++ b/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; }
}
--
Gitblit v1.9.3