一些已知更改

Ben Lin

2024-09-20 ac0d220e150a8103b586a81340faf39ddb5e08fe

一些已知更改

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

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

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

 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
            {

 Tiger.Model.Net/Entitys/BAS/BAS_ITEM.cs

@@ -155,7 +155,7 @@
        public List<ClassA> ClassAList { get; set; } //注意禁止手动赋值，只能是null
        */
        [Navigate(NavigateType.OneToOne, nameof(ID), nameof(BAS_ITEM_EXT.ITEM_ID), "GHOST_ROW = 0")]//一对一 ClassAId是BAS_ITEM_EXT类里面的外键ID字段
        public BAS_CUSTOMER ExtInfo { get; set; } //注意禁止手动赋值，只能是null
        public BAS_ITEM_EXT ExtInfo { get; set; } //注意禁止手动赋值，只能是null
        #endregion

        #region 枚举变量