工步增加工步名称和工步当前消息 优化了一些已知问题

Rodney Chen

2024-09-01 baad883a45b5434117a7769354701c6aa607a5a9

工步增加工步名称和工步当前消息
优化了一些已知问题

 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>

 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),

 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 = () =>

 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),

 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),

 Tiger.Business/MES/Biz.WorkStep.cs

@@ -117,6 +117,7 @@
            {
                return new WorkStepInfo() { 
                    ID = ID,
                    Name = Name,
                    Sequence = Sequence,
                    NodeID = NodeID,
                    NodeType = NodeType.ToString(),

 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; }