From b0dc8869680168a0c8fda011f8ae2492d843c159 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期二, 06 八月 2024 12:02:48 +0800
Subject: [PATCH] 已完成所有工步更新
---
Tiger.Business.MES/Transaction/CollectNode.cs | 2 +-
Tiger.Business.MES/Transaction/PackingNode.cs | 2 +-
Tiger.Business.MES/Transaction/Position.cs | 12 +++++-------
Tiger.Business.MES/WorkAction/PackingAction.cs | 1 +
Tiger.Business.MES/Transaction/TestNode.cs | 2 +-
5 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/Tiger.Business.MES/Transaction/CollectNode.cs b/Tiger.Business.MES/Transaction/CollectNode.cs
index 45b149d..9954d76 100644
--- a/Tiger.Business.MES/Transaction/CollectNode.cs
+++ b/Tiger.Business.MES/Transaction/CollectNode.cs
@@ -375,7 +375,7 @@
return result;
}
//宸插畬鎴愭墍鏈夊伐姝�
- else
+ if (IsFinishAllSteps)
{
action.Data.SetValue(CurBatch, CurStep, "", IsFinishAllSteps);
action = DoIfFinishAllSteps(action);
diff --git a/Tiger.Business.MES/Transaction/PackingNode.cs b/Tiger.Business.MES/Transaction/PackingNode.cs
index b6ca249..1d3f193 100644
--- a/Tiger.Business.MES/Transaction/PackingNode.cs
+++ b/Tiger.Business.MES/Transaction/PackingNode.cs
@@ -406,7 +406,7 @@
return result;
}
//宸插畬鎴愭墍鏈夊伐姝�
- else
+ if (IsFinishAllSteps)
{
action.Data.SetValue(CurBatch, CurStep, "", IsFinishAllSteps);
action = DoIfFinishAllSteps(action);
diff --git a/Tiger.Business.MES/Transaction/Position.cs b/Tiger.Business.MES/Transaction/Position.cs
index 4e11575..d875020 100644
--- a/Tiger.Business.MES/Transaction/Position.cs
+++ b/Tiger.Business.MES/Transaction/Position.cs
@@ -55,9 +55,9 @@
public MES_SHIFT_SYS CurShiftSys { get; set; }
public WorkBatch CurBatch { get; set; }
public IWorkBatch WorkBatch => CurBatch;
- public List<MES_WIP_DATA> CurWipSNs { get; set; }
- public string CurSN => CurWipSNs.First().TRAY_SN.IsNullOrEmpty() ? CurWipSNs.First().SN : CurWipSNs.First().TRAY_SN;
- public List<MES_WIP_HIS> CurWipSNHiss { get; set; }
+ public List<MES_WIP_DATA> CurWipSNs { get; set; } = new();
+ public string CurSN => CurWipSNs.Any() ? (CurWipSNs.First().TRAY_SN.IsNullOrEmpty() ? CurWipSNs.First().SN : CurWipSNs.First().TRAY_SN) : "";
+ public List<MES_WIP_HIS> CurWipSNHiss { get; set; } = new();
public Dictionary<string, object> Context { get; set; } = new();
public List<WorkStep> Steps { get; set; } = new();
public WorkStep CurStep { get; set; }
@@ -175,8 +175,8 @@
public virtual void ResetNode()
{
Steps.Clear();
- CurWipSNs = null;
- CurWipSNHiss = null;
+ CurWipSNs = new();
+ CurWipSNHiss = new();
CurStep = null;
}
@@ -412,8 +412,6 @@
switch (pv.VAR_METHOD)
{
case "GetSN":
- return string.Join(",", CurWipSNs.Select(q => q.SN));
- case "GetTraySN":
return CurSN;
case "GetBAS_ITEM":
return WorkBatch.Product.ToJson();
diff --git a/Tiger.Business.MES/Transaction/TestNode.cs b/Tiger.Business.MES/Transaction/TestNode.cs
index 4178dce..e44b3a3 100644
--- a/Tiger.Business.MES/Transaction/TestNode.cs
+++ b/Tiger.Business.MES/Transaction/TestNode.cs
@@ -376,7 +376,7 @@
return result;
}
//宸插畬鎴愭墍鏈夊伐姝�
- else
+ if (IsFinishAllSteps)
{
action.Data.SetValue(CurBatch, CurStep, "", IsFinishAllSteps);
action = DoIfFinishAllSteps(action);
diff --git a/Tiger.Business.MES/WorkAction/PackingAction.cs b/Tiger.Business.MES/WorkAction/PackingAction.cs
index 58008e4..d5b882d 100644
--- a/Tiger.Business.MES/WorkAction/PackingAction.cs
+++ b/Tiger.Business.MES/WorkAction/PackingAction.cs
@@ -62,6 +62,7 @@
var label = code.LABEL_CODE.IsNullOrEmpty() ? null : Biz.Db.Queryable<BAS_LABEL_TEMP>().Where(q => q.LABEL_CODE == code.LABEL_CODE).IncludesAllFirstLayer().First();
LabelDic.Add(code.PKG_LEVEL, label);
}
+ LabelPV = Biz.Db.Queryable<BAS_LABEL_PV>().ToList();
//濡傛灉宸ュ簭涓婁笅鏂囦腑娌℃湁鍖呰璁板綍鍒欐柊寤轰竴涓紝鏈夊垯鑾峰彇褰撳墠鐨勫寘瑁呰褰�
if (CurPosition.Context.ContainsKey("CurPackage") && !CurPosition.Context["CurPackage"].IsNullOrEmpty())
{
--
Gitblit v1.9.3