From ac0d220e150a8103b586a81340faf39ddb5e08fe Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期五, 20 九月 2024 10:12:49 +0800
Subject: [PATCH] 一些已知更改
---
Tiger.Business.MES/Transaction/CollectNode.cs | 2 ++
Tiger.Business.MES/Transaction/PackingNode.cs | 2 ++
Tiger.Model.Net/Entitys/BAS/BAS_ITEM.cs | 2 +-
Tiger.Business/MES/Biz.WorkStep.cs | 14 +++++++-------
Tiger.Business.MES/Transaction/TestNode.cs | 2 ++
5 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/Tiger.Business.MES/Transaction/CollectNode.cs b/Tiger.Business.MES/Transaction/CollectNode.cs
index 82ace7f..15af038 100644
--- a/Tiger.Business.MES/Transaction/CollectNode.cs
+++ b/Tiger.Business.MES/Transaction/CollectNode.cs
@@ -462,6 +462,7 @@
}
//瀹屾垚绗竴涓伐搴忚妭鐐瑰伐姝�
+ curStep.IsFinished = true;
curStep.Status = StepStatus.Finished;
CurStep = curStep;
}
@@ -470,6 +471,7 @@
var curStep = Steps.Where(q => q.NodeType == IWorkStep.NodeTypes.Node && !q.IsFinished).OrderBy(q => q.Sequence).First();
//瀹屾垚褰撳墠宸ュ簭鑺傜偣宸ユ
+ curStep.IsFinished = true;
curStep.Status = StepStatus.Finished;
CurStep = curStep;
}
diff --git a/Tiger.Business.MES/Transaction/PackingNode.cs b/Tiger.Business.MES/Transaction/PackingNode.cs
index 0676096..478e893 100644
--- a/Tiger.Business.MES/Transaction/PackingNode.cs
+++ b/Tiger.Business.MES/Transaction/PackingNode.cs
@@ -503,6 +503,7 @@
}
//瀹屾垚绗竴涓伐搴忚妭鐐瑰伐姝�
+ curStep.IsFinished = true;
curStep.Status = StepStatus.Finished;
CurStep = curStep;
}
@@ -511,6 +512,7 @@
var curStep = Steps.Where(q => q.NodeType == IWorkStep.NodeTypes.Node && !q.IsFinished).OrderBy(q => q.Sequence).First();
//瀹屾垚褰撳墠宸ュ簭鑺傜偣宸ユ
+ curStep.IsFinished = true;
curStep.Status = StepStatus.Finished;
CurStep = curStep;
}
diff --git a/Tiger.Business.MES/Transaction/TestNode.cs b/Tiger.Business.MES/Transaction/TestNode.cs
index 4fd4de0..248e204 100644
--- a/Tiger.Business.MES/Transaction/TestNode.cs
+++ b/Tiger.Business.MES/Transaction/TestNode.cs
@@ -462,6 +462,7 @@
}
//瀹屾垚绗竴涓伐搴忚妭鐐瑰伐姝�
+ curStep.IsFinished = true;
curStep.Status = StepStatus.Finished;
CurStep = curStep;
}
@@ -470,6 +471,7 @@
var curStep = Steps.Where(q => q.NodeType == IWorkStep.NodeTypes.Node && !q.IsFinished).OrderBy(q => q.Sequence).First();
//瀹屾垚褰撳墠宸ュ簭鑺傜偣宸ユ
+ curStep.IsFinished = true;
curStep.Status = StepStatus.Finished;
CurStep = curStep;
}
diff --git a/Tiger.Business/MES/Biz.WorkStep.cs b/Tiger.Business/MES/Biz.WorkStep.cs
index b64748e..769d1a7 100644
--- a/Tiger.Business/MES/Biz.WorkStep.cs
+++ b/Tiger.Business/MES/Biz.WorkStep.cs
@@ -41,14 +41,14 @@
public int Sequence { get; set; }
public List<string> PrepNodeIDs { get; set; } = new();
public string NodeID => NodeType == IWorkStep.NodeTypes.Action ? NodeAct.ID : Node.ID;
- //private bool _IsFinished = false;
- //public bool IsFinished
- //{
- // get => NodeType == IWorkStep.NodeTypes.Action ? CurAction.IsFinished : _IsFinished;
- // set { _IsFinished = value; }
- //}
+ private bool _IsFinished = false;
+ public bool IsFinished
+ {
+ get => NodeType == IWorkStep.NodeTypes.Action ? CurAction.IsFinished : _IsFinished;
+ set { _IsFinished = value; }
+ }
public StepStatus Status { get; set; } = StepStatus.Normal;
- public bool IsFinished => Status == StepStatus.Finished;
+ //public bool IsFinished => Status == StepStatus.Finished;
private Locale _Message;
public Locale Message
{
diff --git a/Tiger.Model.Net/Entitys/BAS/BAS_ITEM.cs b/Tiger.Model.Net/Entitys/BAS/BAS_ITEM.cs
index 61fd052..2d85227 100644
--- a/Tiger.Model.Net/Entitys/BAS/BAS_ITEM.cs
+++ b/Tiger.Model.Net/Entitys/BAS/BAS_ITEM.cs
@@ -155,7 +155,7 @@
public List<ClassA> ClassAList { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
*/
[Navigate(NavigateType.OneToOne, nameof(ID), nameof(BAS_ITEM_EXT.ITEM_ID), "GHOST_ROW = 0")]//涓�瀵逛竴 ClassAId鏄疊AS_ITEM_EXT绫婚噷闈㈢殑澶栭敭ID瀛楁
- public BAS_CUSTOMER ExtInfo { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
+ public BAS_ITEM_EXT ExtInfo { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
#endregion
#region 鏋氫妇鍙橀噺
--
Gitblit v1.9.3