From baad883a45b5434117a7769354701c6aa607a5a9 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期日, 01 九月 2024 01:45:32 +0800
Subject: [PATCH] 工步增加工步名称和工步当前消息 优化了一些已知问题
---
Tiger.Business.MES/Transaction/CollectNode.cs | 1 +
Tiger.Business.MES/Transaction/PackingNode.cs | 3 ++-
Tiger.Api/Controllers/Base/LoginController.cs | 8 ++++----
Tiger.Business.MES/Transaction/Position.cs | 1 +
Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs | 1 +
Tiger.Business/MES/Biz.WorkStep.cs | 1 +
Tiger.Business.MES/Transaction/TestNode.cs | 1 +
7 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/Tiger.Api/Controllers/Base/LoginController.cs b/Tiger.Api/Controllers/Base/LoginController.cs
index 3dde641..69b4b4d 100644
--- a/Tiger.Api/Controllers/Base/LoginController.cs
+++ b/Tiger.Api/Controllers/Base/LoginController.cs
@@ -64,7 +64,7 @@
#region CS
/// <summary>
- /// 鐧诲綍
+ /// CS鐧诲綍
/// </summary>
/// <param name="action"></param>
/// <returns></returns>
@@ -75,19 +75,19 @@
}
/// <summary>
- /// 鑾峰彇鐧诲綍淇℃伅
+ /// 鑾峰彇CS鐧诲綍淇℃伅
/// </summary>
/// <param name="token"></param>
/// <returns></returns>
[HttpGet]
- public async Task<IActionResult> GetCSLoginInfo(string token)
+ public async Task<IActionResult> CSGetLoginInfo(string token)
{
var _token = string.IsNullOrEmpty(token) ? Request.Headers["Authorization"].ToString() : token;
return Ok(await DI.Resolve<ILogin>().GetCSLoginInfo(_token));
}
/// <summary>
- /// 娉ㄩ攢
+ /// CS鐧诲嚭
/// </summary>
/// <param name="action"></param>
/// <returns></returns>
diff --git a/Tiger.Business.MES/Transaction/CollectNode.cs b/Tiger.Business.MES/Transaction/CollectNode.cs
index 275cf5d..c0c3a39 100644
--- a/Tiger.Business.MES/Transaction/CollectNode.cs
+++ b/Tiger.Business.MES/Transaction/CollectNode.cs
@@ -405,6 +405,7 @@
Steps.Clear();
var curStep = new Biz.WorkStep(IWorkStep.NodeTypes.Node, this)
{
+ Name = "鎵弿浜у搧",
Sequence = Steps.Count + 1,
Node = curNode,
OperSetting = CurBatch.NodeSets.FirstOrDefault(q => q.NODE_ID == curNode.ID),
diff --git a/Tiger.Business.MES/Transaction/PackingNode.cs b/Tiger.Business.MES/Transaction/PackingNode.cs
index 4584680..3b194d9 100644
--- a/Tiger.Business.MES/Transaction/PackingNode.cs
+++ b/Tiger.Business.MES/Transaction/PackingNode.cs
@@ -437,7 +437,8 @@
Steps.Clear();
var curStep = new Biz.WorkStep(IWorkStep.NodeTypes.Node, this)
{
- Sequence = Steps.Count + 1,
+ Name = "鎵弿浜у搧",
+ Sequence = Steps.Count + 1,
Node = curNode,
OperSetting = CurBatch.NodeSets.FirstOrDefault(q => q.NODE_ID == curNode.ID),
DBSubmitAction = () =>
diff --git a/Tiger.Business.MES/Transaction/Position.cs b/Tiger.Business.MES/Transaction/Position.cs
index e718347..fae36cc 100644
--- a/Tiger.Business.MES/Transaction/Position.cs
+++ b/Tiger.Business.MES/Transaction/Position.cs
@@ -253,6 +253,7 @@
{
var next = new WorkStep(IWorkStep.NodeTypes.Action, this)
{
+ Name = act.ACT_NAME,
Sequence = parent.Sequence + 1,
Node = parent.Node,
OperSetting = CurBatch.NodeSets.FirstOrDefault(q => q.NODE_ID == parent.Node.ID),
diff --git a/Tiger.Business.MES/Transaction/TestNode.cs b/Tiger.Business.MES/Transaction/TestNode.cs
index f46b261..c3eec31 100644
--- a/Tiger.Business.MES/Transaction/TestNode.cs
+++ b/Tiger.Business.MES/Transaction/TestNode.cs
@@ -405,6 +405,7 @@
Steps.Clear();
var curStep = new Biz.WorkStep(IWorkStep.NodeTypes.Node, this)
{
+ Name = "鎵弿浜у搧",
Sequence = Steps.Count + 1,
Node = curNode,
OperSetting = CurBatch.NodeSets.FirstOrDefault(q => q.NODE_ID == curNode.ID),
diff --git a/Tiger.Business/MES/Biz.WorkStep.cs b/Tiger.Business/MES/Biz.WorkStep.cs
index 07c640c..7f27e25 100644
--- a/Tiger.Business/MES/Biz.WorkStep.cs
+++ b/Tiger.Business/MES/Biz.WorkStep.cs
@@ -117,6 +117,7 @@
{
return new WorkStepInfo() {
ID = ID,
+ Name = Name,
Sequence = Sequence,
NodeID = NodeID,
NodeType = NodeType.ToString(),
diff --git a/Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs b/Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs
index aae3cde..c3ade56 100644
--- a/Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs
+++ b/Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs
@@ -249,6 +249,7 @@
public class WorkStepInfo
{
public string ID { get; set; }
+ public string Name { get; set; }
public int Sequence { get; set; }
public string NodeID { get; set; }
public string NodeType { get; set; }
--
Gitblit v1.9.3