一些更改

Ben Lin

2024-09-13 1f72396c6294b9f78723d786a9b0965414d0601a

一些更改

 Tiger.Business.MES/Transaction/Position.cs

@@ -430,7 +430,7 @@
        /// <param name="labelPVs">过程变量列表</param>
        /// <param name="label">标签模板</param>
        /// <returns></returns>
        public BAS_LABEL_TEMP SetLabelVariables(List<BAS_LABEL_PV> labelPVs, BAS_LABEL_TEMP label)
        public BAS_LABEL_TEMP SetLabelVariables(List<BAS_LABEL_PV> labelPVs, BAS_LABEL_TEMP label, IWorkAction action)
        {
            foreach (var item in label.Variables)
            {
@@ -440,7 +440,7 @@
                        item.Value = item.VAR_VALUE;
                        break;
                    case BAS_LABEL_VAR.VAR_TYPEs.ProcessVariable:
                        item.Value = GetPrintProcessValue(labelPVs, item);
                        item.Value = GetPrintProcessValue(labelPVs, item, action);
                        break;
                    case BAS_LABEL_VAR.VAR_TYPEs.DateVariable:
                        item.Value = DateTime.Now.ToString(item.VAR_VALUE);
@@ -463,7 +463,7 @@
        /// <param name="labelPVs">过程变量列表</param>
        /// <param name="lv">标签模板变量</param>
        /// <returns></returns>
        public string GetPrintProcessValue(List<BAS_LABEL_PV> labelPVs, BAS_LABEL_VAR lv)
        public string GetPrintProcessValue(List<BAS_LABEL_PV> labelPVs, BAS_LABEL_VAR lv, IWorkAction action)
        {
            var pv = labelPVs.FirstOrDefault(q => q.VAR_CODE == lv.VAR_VALUE);
            if (!pv.IsNullOrEmpty())

 Tiger.Business.MES/WorkAction/PackingAction.cs

@@ -209,7 +209,7 @@
            else
            {
                //设置打印变量值
                LabelDic[min.PKG_LEVEL] = CurPosition.SetLabelVariables(LabelPV, LabelDic[min.PKG_LEVEL]);
                LabelDic[min.PKG_LEVEL] = CurPosition.SetLabelVariables(LabelPV, LabelDic[min.PKG_LEVEL], this);

                var data = new PackingActionOutput() { PkgInfo = CurPkg };
                data.ExecCode = "Print";
@@ -374,7 +374,7 @@
                                else
                                {
                                    //设置打印变量值
                                    LabelDic[dtl.PKG_LEVEL] = CurPosition.SetLabelVariables(LabelPV, LabelDic[dtl.PKG_LEVEL]);
                                    LabelDic[dtl.PKG_LEVEL] = CurPosition.SetLabelVariables(LabelPV, LabelDic[dtl.PKG_LEVEL], this);
    
                                    var data = new PackingActionOutput() { PkgInfo = CurPkg };
                                    data.ExecCode = "Print";
@@ -459,7 +459,7 @@
                        else
                        {
                            //设置打印变量值
                            LabelDic[dtl.PKG_LEVEL] = CurPosition.SetLabelVariables(LabelPV, LabelDic[dtl.PKG_LEVEL]);
                            LabelDic[dtl.PKG_LEVEL] = CurPosition.SetLabelVariables(LabelPV, LabelDic[dtl.PKG_LEVEL], this);

                            var data = new PackingActionOutput() { PkgInfo = CurPkg };
                            data.ExecCode = "Print";
@@ -651,7 +651,7 @@
                                else
                                {
                                    //设置打印变量值
                                    LabelDic[dtl.PKG_LEVEL] = CurPosition.SetLabelVariables(LabelPV, LabelDic[dtl.PKG_LEVEL]);
                                    LabelDic[dtl.PKG_LEVEL] = CurPosition.SetLabelVariables(LabelPV, LabelDic[dtl.PKG_LEVEL], this);
    
                                    var data = new PackingActionOutput() { PkgInfo = CurPkg };
                                    data.ExecCode = "Print";

 Tiger.Business.MES/WorkAction/PrintLabel.cs

@@ -67,7 +67,7 @@
            var action = new ApiAction<SubmitOutput>(new SubmitOutput());

            //设置打印变量值
            Label = CurPosition.SetLabelVariables(LabelPV, Label);
            Label = CurPosition.SetLabelVariables(LabelPV, Label, this);
            action.Data.Data = Label;

            //如果返回成功则认为当前行为可以开始执行，否则返回失败

 Tiger.Business.MES/WorkAction/ThreeInOne.cs

@@ -151,7 +151,7 @@
                else
                {
                    //设置打印变量值
                    Label = CurPosition.SetLabelVariables(LabelPV, Label);
                    Label = CurPosition.SetLabelVariables(LabelPV, Label, this);
                    action.Data.Data = new
                    {
                        NeedPrint = true,

 Tiger.IBusiness/MES/Transaction/IPosition.cs

@@ -58,14 +58,14 @@
        /// <param name="labelPVs">过程变量列表</param>
        /// <param name="label">标签模板</param>
        /// <returns></returns>
        public BAS_LABEL_TEMP SetLabelVariables(List<BAS_LABEL_PV> labelPVs, BAS_LABEL_TEMP label);
        public BAS_LABEL_TEMP SetLabelVariables(List<BAS_LABEL_PV> labelPVs, BAS_LABEL_TEMP label, IWorkAction action);
        /// <summary>
        /// 获取打印标签模板过程变量值
        /// </summary>
        /// <param name="labelPVs">过程变量列表</param>
        /// <param name="lv">标签模板变量</param>
        /// <returns></returns>
        public string GetPrintProcessValue(List<BAS_LABEL_PV> labelPVs, BAS_LABEL_VAR lv);
        public string GetPrintProcessValue(List<BAS_LABEL_PV> labelPVs, BAS_LABEL_VAR lv, IWorkAction action);
        #endregion Functions
    }
}