From d34d9c35ba844da8b805993bd4c69b0253694fc0 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期五, 02 八月 2024 22:48:08 +0800
Subject: [PATCH] 优化SubmitOutput字段
---
Tiger.IBusiness/MES/IWorkStep.cs | 1 -
Tiger.IBusiness/Extensions/ModelExtension.cs | 5 +++--
Tiger.Business/MES/Biz.WorkBatch.cs | 2 +-
Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs | 10 +++++++---
Tiger.Business/MES/Biz.WorkStep.cs | 1 -
5 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/Tiger.Business/MES/Biz.WorkBatch.cs b/Tiger.Business/MES/Biz.WorkBatch.cs
index a34b4a8..d97df4d 100644
--- a/Tiger.Business/MES/Biz.WorkBatch.cs
+++ b/Tiger.Business/MES/Biz.WorkBatch.cs
@@ -55,7 +55,7 @@
public WorkBatch Init(string lineCode)
{
LineCode = lineCode;
- WO = Biz.Db.Queryable<BIZ_MES_WO>().Where(q => q.ORDER_NO == OrderNo).First();
+ WO = Biz.Db.Queryable<BIZ_MES_WO>().Where(q => q.ORDER_NO == OrderNo).IncludesAllFirstLayer().First();
Product = Biz.Db.Queryable<BAS_ITEM>().Where(q => q.ITEM_CODE == WO.ITEM_CODE && q.AUTH_ORG == WO.AUTH_ORG).First();
Batch = Biz.Db.Queryable<BIZ_MES_WO_BATCH>().Where(q => q.ORDER_NO == OrderNo && q.ACT_LINE == LineCode).First();
Customer = Biz.Db.Queryable<BAS_CUSTOMER>().Where(q => q.CUST_CODE == WO.CUST_CODE).First();
diff --git a/Tiger.Business/MES/Biz.WorkStep.cs b/Tiger.Business/MES/Biz.WorkStep.cs
index 5b906c1..dfff6ea 100644
--- a/Tiger.Business/MES/Biz.WorkStep.cs
+++ b/Tiger.Business/MES/Biz.WorkStep.cs
@@ -40,7 +40,6 @@
public int Sequence { get; set; }
public List<string> PrepNodeIDs { get; set; } = new();
public string NodeID => Type == IWorkStep.Types.Action ? NodeAct.ID : Node.ID;
- public string NodeName => Type == IWorkStep.Types.Action ? NodeAct.ACT_NAME : Node.NODE_NAME;
private bool _IsFinished = false;
public bool IsFinished
{
diff --git a/Tiger.IBusiness/Extensions/ModelExtension.cs b/Tiger.IBusiness/Extensions/ModelExtension.cs
index 476cba1..5db8dfd 100644
--- a/Tiger.IBusiness/Extensions/ModelExtension.cs
+++ b/Tiger.IBusiness/Extensions/ModelExtension.cs
@@ -15,8 +15,9 @@
value.IsFinished = IsNodeFinished;
value.CurWO = CurBatch?.WO;
value.CurBatch = CurBatch?.Batch;
- value.CurNode = CurStep?.NodeName;
- value.StepActCode = CurStep?.NodeAct?.ACT_CODE;
+ value.NodeName = CurStep?.Node?.NODE_NAME;
+ value.ActionName = CurStep?.NodeAct?.ACT_NAME;
+ value.ActionType = CurStep?.GetType().FullName;
value.NextStepID = NextStepID;
}
diff --git a/Tiger.IBusiness/MES/IWorkStep.cs b/Tiger.IBusiness/MES/IWorkStep.cs
index 0de2f20..4321411 100644
--- a/Tiger.IBusiness/MES/IWorkStep.cs
+++ b/Tiger.IBusiness/MES/IWorkStep.cs
@@ -22,7 +22,6 @@
public IWorkAction CurAction { get; set; }
public List<string> PrepNodeIDs { get; set; }
public string NodeID { get; }
- public string NodeName { get; }
public bool IsFinished { get; set; }
public Action DBSubmitAction { get; set; }
#endregion Propertys & Variables
diff --git a/Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs b/Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs
index 5437c96..c333f07 100644
--- a/Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs
+++ b/Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs
@@ -64,11 +64,15 @@
/// <summary>
/// 褰撳墠鎿嶄綔鐨勮妭鐐瑰悕绉�
/// </summary>
- public string CurNode { get; set; }
+ public string NodeName { get; set; }
/// <summary>
- /// 濡傛灉褰撳墠鑺傜偣涓哄伐搴忚涓鸿妭鐐癸紝鍒欒涓哄畾涔夌紪鐮侊紝鍚﹀垯鐣欑┖
+ /// 褰撳墠鎿嶄綔鐨勮涓哄悕绉帮紝濡傛灉鏄笉鏄涓猴紝鍚﹀垯鐣欑┖
/// </summary>
- public string StepActCode { get; set; }
+ public string ActionName { get; set; }
+ /// <summary>
+ /// 褰撳墠鎿嶄綔鐨勮涓虹殑绫诲悕锛屽鏋滄槸涓嶆槸琛屼负锛屽惁鍒欑暀绌�
+ /// </summary>
+ public string ActionType { get; set; }
/// <summary>
/// 涓嬩竴涓搷浣滅殑宸ユID
/// </summary>
--
Gitblit v1.9.3