Rename BAS_LABEL_PV to BAS_PROCESS_VAR

Rodney Chen

2025-01-02 f2fb67bf0cf463eb020599342f5e0476356821d8

Rename BAS_LABEL_PV to BAS_PROCESS_VAR

 Tiger.Business.MES/Transaction/Position.cs

@@ -570,12 +570,12 @@
        /// <param name="labelPVs">过程变量列表</param>
        /// <param name="label">标签模板</param>
        /// <returns></returns>
        public BAS_LABEL_TEMP SetLabelVariables(List<BAS_LABEL_PV> labelPVs, BAS_LABEL_TEMP label, IWorkAction action)
        public BAS_LABEL_TEMP SetLabelVariables(List<BAS_PROCESS_VAR> labelPVs, BAS_LABEL_TEMP label, IWorkAction action)
        {
            return SetLabelVariables(labelPVs, label, action, null);
        }

        public BAS_LABEL_TEMP SetLabelVariables(List<BAS_LABEL_PV> labelPVs, BAS_LABEL_TEMP label, IWorkAction action, WipPkg? CurPkg)
        public BAS_LABEL_TEMP SetLabelVariables(List<BAS_PROCESS_VAR> labelPVs, BAS_LABEL_TEMP label, IWorkAction action, WipPkg? CurPkg)
        {
            foreach (var item in label.Variables.OrderBy(q => q.VAR_TYPE == BAS_LABEL_VAR.VAR_TYPEs.BarcodeGenerate.GetValue() ? 0 : 1))
            {
@@ -608,14 +608,14 @@
        /// <param name="labelPVs">过程变量列表</param>
        /// <param name="lv">标签模板变量</param>
        /// <returns></returns>
        public string GetPrintProcessValue(List<BAS_LABEL_PV> labelPVs, BAS_LABEL_VAR lv, List<BAS_LABEL_VAR> lvars, IWorkAction curAction, WipPkg? CurPkg)
        public string GetPrintProcessValue(List<BAS_PROCESS_VAR> labelPVs, BAS_LABEL_VAR lv, List<BAS_LABEL_VAR> lvars, IWorkAction curAction, WipPkg? CurPkg)
        {
            var pv = labelPVs.FirstOrDefault(q => q.VAR_CODE == lv.VAR_VALUE);
            if (!pv.IsNullOrEmpty())
            {
                switch (pv.VAR_TYPE.GetEnum<BAS_LABEL_PV.VAR_TYPEs>())
                switch (pv.VAR_TYPE.GetEnum<BAS_PROCESS_VAR.VAR_TYPEs>())
                {
                    case BAS_LABEL_PV.VAR_TYPEs.ServerMethod:
                    case BAS_PROCESS_VAR.VAR_TYPEs.ServerMethod:
                        {
                            switch (pv.VAR_METHOD)
                            {
@@ -759,9 +759,9 @@
                                    return "";
                            }
                        }
                    case BAS_LABEL_PV.VAR_TYPEs.WebApi:
                    case BAS_PROCESS_VAR.VAR_TYPEs.WebApi:
                        break;
                    case BAS_LABEL_PV.VAR_TYPEs.StoredProcedure:
                    case BAS_PROCESS_VAR.VAR_TYPEs.StoredProcedure:
                        break;
                    default:
                        break;
@@ -776,14 +776,14 @@
        /// <param name="labelPVs"></param>
        /// <param name="lv"></param>
        /// <returns></returns>
        public string GetGeneratePValue(List<BAS_LABEL_PV> labelPVs, BAS_LABEL_VAR lv)
        public string GetGeneratePValue(List<BAS_PROCESS_VAR> labelPVs, BAS_LABEL_VAR lv)
        {
            var pv = labelPVs.FirstOrDefault(q => q.VAR_CODE == lv.VAR_VALUE);
            if (!pv.IsNullOrEmpty())
            {
                switch (pv.VAR_TYPE.GetEnum<BAS_LABEL_PV.VAR_TYPEs>())
                switch (pv.VAR_TYPE.GetEnum<BAS_PROCESS_VAR.VAR_TYPEs>())
                {
                    case BAS_LABEL_PV.VAR_TYPEs.BarcodeGenerate:
                    case BAS_PROCESS_VAR.VAR_TYPEs.BarcodeGenerate:
                        {
                            switch (pv.VAR_METHOD)
                            {

 Tiger.Business.MES/Transaction/YadaPacking.cs

@@ -944,7 +944,7 @@
            try
            {
                var CurPkg = Context.ContainsKey("CurPackage") ? Context["CurPackage"] as WipPkg : null;
                var LabelPV = MainDB.Queryable<BAS_LABEL_PV>().ToList();
                var LabelPV = MainDB.Queryable<BAS_PROCESS_VAR>().ToList();
                var label = CurPkg.Item.LABEL_CODE.IsNullOrEmpty() ? null : MainDB.Queryable<BAS_LABEL_TEMP>().Where(q => q.LABEL_CODE == CurPkg.Item.LABEL_CODE).IncludesAllFirstLayer().First();
                var printLb = SetLabelVariables(LabelPV, label, new PackingAction(), CurPkg);
                action.Data = new PackingActionOutput()

 Tiger.Business.MES/WorkAction/PackingAction.cs

@@ -32,7 +32,7 @@
        public PackingActionOutput CurCmd { get; set; }
        public int PrintTimes = 0;
        public Dictionary<int, BAS_LABEL_TEMP> LabelDic { get; set; } = new();
        public List<BAS_LABEL_PV> LabelPV { get; set; } = new();
        public List<BAS_PROCESS_VAR> LabelPV { get; set; } = new();
        public int FinishLevel = 0;
        private bool IsManually => CurStep.IsNullOrEmpty();
        #endregion Propertys & Variables
@@ -62,7 +62,7 @@
                var label = code.LABEL_CODE.IsNullOrEmpty() ? null : MainDB.Queryable<BAS_LABEL_TEMP>().Where(q => q.LABEL_CODE == code.LABEL_CODE).IncludesAllFirstLayer().First();
                LabelDic.Add(code.PKG_LEVEL, label);
            }
            LabelPV = MainDB.Queryable<BAS_LABEL_PV>().ToList();
            LabelPV = MainDB.Queryable<BAS_PROCESS_VAR>().ToList();

            //如果工序上下文中没有包装记录则新建一个，有且未包装完成则获取当前的包装记录
            if (CurPosition.Context.ContainsKey("CurPackage") && !CurPosition.Context["CurPackage"].IsNullOrEmpty() && !(CurPosition.Context["CurPackage"] as WipPkg).IsFinished)
@@ -159,7 +159,7 @@

            //根据行为设置获取多层包装的标签打印模板字典
            LabelDic = CurPosition.Context["CurLabelDic"] as Dictionary<int, BAS_LABEL_TEMP>;
            LabelPV = MainDB.Queryable<BAS_LABEL_PV>().ToList();
            LabelPV = MainDB.Queryable<BAS_PROCESS_VAR>().ToList();
            //获取包装规则的称重范围
            PkgProd = MainDB.Queryable<BAS_PKG_PROD>().Where(q => q.PKG_RULE_ID == PkgRule.ID && q.ITEM_CODE == CurPkg.PROD_CODE).First();
            //把

 Tiger.Business.MES/WorkAction/PrintInStoreLabel.cs

@@ -25,7 +25,7 @@
        public MES_WO_ACTION Setting { get; set; }
        #endregion
        public BAS_LABEL_TEMP Label { get; set; }
        public List<BAS_LABEL_PV> LabelPV { get; set; }
        public List<BAS_PROCESS_VAR> LabelPV { get; set; }
        public WipPkg CurPkg { get; set; }
        public bool NoNeedInStorePrint { get; set; }
        #endregion Propertys & Variables
@@ -46,7 +46,7 @@
            #endregion

            Label = MainDB.Queryable<BAS_LABEL_TEMP>().Where(q => q.LABEL_CODE == setting.LABEL_CODE).IncludesAllFirstLayer().First();
            LabelPV = MainDB.Queryable<BAS_LABEL_PV>().ToList();
            LabelPV = MainDB.Queryable<BAS_PROCESS_VAR>().ToList();

            CurStep.Message = Biz.L("等待标签打印");
            CurStep.Status = StepStatus.Normal;

 Tiger.Business.MES/WorkAction/PrintLabel.cs

@@ -24,7 +24,7 @@
        public MES_WO_ACTION Setting { get; set; }
        #endregion
        public BAS_LABEL_TEMP Label { get; set; }
        public List<BAS_LABEL_PV> LabelPV { get; set; }
        public List<BAS_PROCESS_VAR> LabelPV { get; set; }
        #endregion Propertys & Variables

        #region Functions
@@ -43,7 +43,7 @@
            #endregion

            Label = MainDB.Queryable<BAS_LABEL_TEMP>().Where(q => q.LABEL_CODE == setting.LABEL_CODE).IncludesAllFirstLayer().First();
            LabelPV = MainDB.Queryable<BAS_LABEL_PV>().ToList();
            LabelPV = MainDB.Queryable<BAS_PROCESS_VAR>().ToList();

            CurStep.Message = Biz.L("等待标签打印");
            CurStep.Status = StepStatus.Normal;

 Tiger.Business.MES/WorkAction/ThreeInOne.cs

@@ -27,7 +27,7 @@
        public MES_CUST_SN FlowCSN  { get; set; }
        public MES_CUST_SN CustCSN { get; set; }
        public BAS_LABEL_TEMP Label { get; set; }
        public List<BAS_LABEL_PV> LabelPV { get; set; }
        public List<BAS_PROCESS_VAR> LabelPV { get; set; }
        public List<mes_MOPickList> MoPickList { get; set; }
        public BAS_ITEM_CUST CustInfo { get; set; }
        #endregion Propertys & Variables
@@ -49,7 +49,7 @@

            //获取打印模板
            Label = MainDB.Queryable<BAS_LABEL_TEMP>().Where(q => q.LABEL_CODE == setting.LABEL_CODE).IncludesAllFirstLayer().First();
            LabelPV = MainDB.Queryable<BAS_LABEL_PV>().ToList();
            LabelPV = MainDB.Queryable<BAS_PROCESS_VAR>().ToList();

            //获取当前产品在当前客户的关系
            CustInfo = MainDB.Queryable<BAS_ITEM_CUST>().Where(q => q.ITEM_ID == CurPosition.WorkBatch.WO.ItemInfo.ID && q.CUST_CODE == CurPosition.WorkBatch.WO.CUST_CODE).First();

 Tiger.IBusiness.MES/Transaction/IPosition.cs

@@ -66,14 +66,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, IWorkAction action);
        public BAS_LABEL_TEMP SetLabelVariables(List<BAS_PROCESS_VAR> 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, List<BAS_LABEL_VAR> lvars, IWorkAction curAction, WipPkg? CurPkg);
        public string GetPrintProcessValue(List<BAS_PROCESS_VAR> labelPVs, BAS_LABEL_VAR lv, List<BAS_LABEL_VAR> lvars, IWorkAction curAction, WipPkg? CurPkg);
        /// <summary>
        /// æ ¹æ®ä¼ å…¥çš„包装对象返回所有的包装实体列表
        /// </summary>

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

@@ -12,7 +12,7 @@
    [Description("Primary:ID")]
    [DisplayName("标签过程变量")]
    [Serializable]
    [SugarTable("BAS_LABEL_PV")]
    [SugarTable("BAS_PROCESS_VAR")]
    public class BAS_LABEL_PV : DbEntityWithAuth
    {
        #region æž„造函数
@@ -90,13 +90,13 @@
        #region å¤–键属性
        /*例子
        //一对一外键导航
        [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//一对一 ClassAId是BAS_LABEL_PV类里面的外键ID字段
        [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//一对一 ClassAId是BAS_PROCESS_VAR类里面的外键ID字段
        public ClassA ClassA { get; set; } //注意禁止手动赋值，只能是null
        //一对多外键导航
        [Navigate(NavigateType.OneToMany, nameof(ClassA.BAS_LABEL_PVId))]//ClassA表中的BAS_LABEL_PVId
        [Navigate(NavigateType.OneToMany, nameof(ClassA.BAS_PROCESS_VARId))]//ClassA表中的BAS_PROCESS_VARId
        public List<ClassA> ClassAList { get; set; }//注意禁止手动赋值，只能是null
        //多对多外键导航
        [Navigate(typeof(MappingClass), nameof(MappingClass.BAS_LABEL_PVId), nameof(MappingClass.ClassAId))]//注意顺序
        [Navigate(typeof(MappingClass), nameof(MappingClass.BAS_PROCESS_VARId), nameof(MappingClass.ClassAId))]//注意顺序
        public List<ClassA> ClassAList { get; set; } //注意禁止手动赋值，只能是null
        */
        #endregion

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,136 @@
using System;
using SqlSugar;
using System.Linq;
using System.ComponentModel;
using System.Collections.Generic;

namespace Tiger.Model
{
    /// <summary>
    /// å®žä½“：系统过程变量
    /// </summary>
    [Description("Primary:ID")]
    [DisplayName("系统过程变量")]
    [Serializable]
    [SugarTable("BAS_PROCESS_VAR")]
    public class BAS_PROCESS_VAR : DbEntityWithAuth
    {
        #region æž„造函数
        /// <summary>
        /// å®žä½“：系统过程变量
        /// </summary>
        public BAS_PROCESS_VAR() {}
        #endregion

        #region å…¬å…±å±žæ€§
        /// <summary>
        /// è¿‡ç¨‹å˜é‡ç¼–码
        /// </summary>
        [DisplayName("过程变量编码")]
        public string VAR_CODE { get; set; }
        /// <summary>
        /// è¿‡ç¨‹å˜é‡åç§°
        /// </summary>
        [DisplayName("过程变量名称")]
        public string VAR_NAME { get; set; }
        /// <summary>
        /// æ˜¯å¦åªè¯»(Y/N)
        /// </summary>
        [DisplayName("是否只读(Y/N)")]
        public string READONLY { get; set; }
        /// <summary>
        /// è‡ªå®šä¹‰æ–¹æ³•ç±»åž‹(0ServerMethod服务端方法|1BarcodeGenerate条码生成|2WebApiWebApi方法|3StoredProcedure存储过程)
        /// </summary>
        [DisplayName("自定义方法类型(0ServerMethod服务端方法|1BarcodeGenerate条码生成|2WebApiWebApi方法|3StoredProcedure存储过程)")]
        public int VAR_TYPE { get; set; }
        /// <summary>
        /// è‡ªå®šä¹‰æ–¹æ³•(调用方法的全名)
        /// </summary>
        [DisplayName("自定义方法(调用方法的全名)")]
        public string VAR_METHOD { get; set; }
        /// <summary>
        /// å¤‡ç”¨å€¼1
        /// </summary>
        [DisplayName("备用值1")]
        public string VALUE_1 { get; set; }
        /// <summary>
        /// å¤‡ç”¨å€¼2
        /// </summary>
        [DisplayName("备用值2")]
        public string VALUE_2 { get; set; }
        /// <summary>
        /// å¤‡ç”¨å€¼3
        /// </summary>
        [DisplayName("备用值3")]
        public string VALUE_3 { get; set; }
        /// <summary>
        /// å¤‡ç”¨å€¼4
        /// </summary>
        [DisplayName("备用值4")]
        public string VALUE_4 { get; set; }
        /// <summary>
        /// å¤‡ç”¨å€¼5
        /// </summary>
        [DisplayName("备用值5")]
        public string VALUE_5 { get; set; }
        /// <summary>
        /// å¤‡æ³¨
        /// </summary>
        [DisplayName("备注")]
        public string REMARK { get; set; }
        #endregion

        #region è™šæ‹Ÿå±žæ€§
        /*例子
        [SugarColumn(IsIgnore = true)]
        public string FieldName { get; set; }
        */
        #endregion

        #region å¤–键属性
        /*例子
        //一对一外键导航
        [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//一对一 ClassAId是BAS_PROCESS_VAR类里面的外键ID字段
        public ClassA ClassA { get; set; } //注意禁止手动赋值，只能是null
        //一对多外键导航
        [Navigate(NavigateType.OneToMany, nameof(ClassA.BAS_PROCESS_VARId))]//ClassA表中的BAS_PROCESS_VARId
        public List<ClassA> ClassAList { get; set; }//注意禁止手动赋值，只能是null
        //多对多外键导航
        [Navigate(typeof(MappingClass), nameof(MappingClass.BAS_PROCESS_VARId), nameof(MappingClass.ClassAId))]//注意顺序
        public List<ClassA> ClassAList { get; set; } //注意禁止手动赋值，只能是null
        */
        #endregion

        #region æžšä¸¾å˜é‡
        /*例子
        public enum FieldNames
        {
            [Description("枚举描述0")]
            Enum0,
            [Description("枚举描述1")]
            Enum1,
        }
        */

        /// <summary>
        /// æžšä¸¾ï¼šè‡ªå®šä¹‰æ–¹æ³•ç±»åž‹(0ServerMethod服务端方法|1BarcodeGenerate条码生成|2WebApiWebApi方法|3StoredProcedure存储过程)
        /// </summary>
        public enum VAR_TYPEs
        {
            [Description("服务端方法")]
            ServerMethod = 0,
            [Description("条码生成")]
            BarcodeGenerate = 1,
            [Description("方法")]
            WebApiWebApi = 2,
            [Description("存储过程")]
            StoredProcedure = 3,
        }
        #endregion

        #region å…¬å…±æ–¹æ³•

        #endregion

    }//endClass
}

 Tiger.Model.Net/Entitys/MES/MES_ROUTE_ACT_VAR.cs

@@ -64,6 +64,11 @@
        [DisplayName("是否显示(Y/N)")]
        public string VISIABLE { get; set; }
        /// <summary>
        /// ç³»ç»Ÿè¿‡ç¨‹å˜é‡ç¼–码
        /// </summary>
        [DisplayName("系统过程变量编码")]
        public string PROCESS_VAR { get; set; }
        /// <summary>
        /// é»˜è®¤å€¼
        /// </summary>
        [DisplayName("默认值")]

 Tiger.Model.Net/Entitys/MES/MES_WIP_ACT_VAR.cs

@@ -179,6 +179,11 @@
        [DisplayName("变量值类型(0String字符串|1Integer整形|2Float浮点型|3DateTime日期时间)")]
        public int VALUE_TYPE { get; set; }
        /// <summary>
        /// ç³»ç»Ÿè¿‡ç¨‹å˜é‡ç¼–码
        /// </summary>
        [DisplayName("系统过程变量编码")]
        public string PROCESS_VAR { get; set; }
        /// <summary>
        /// è¾“入值
        /// </summary>
        [DisplayName("输入值")]

 Tiger.Model.Net/Entitys/MES/MES_WO_ACT_VAR.cs

@@ -74,6 +74,11 @@
        [DisplayName("是否显示(Y/N)")]
        public string VISIABLE { get; set; }
        /// <summary>
        /// ç³»ç»Ÿè¿‡ç¨‹å˜é‡ç¼–码
        /// </summary>
        [DisplayName("系统过程变量编码")]
        public string PROCESS_VAR { get; set; }
        /// <summary>
        /// é»˜è®¤å€¼
        /// </summary>
        [DisplayName("默认值")]

 Tiger.Model.Net/Tiger.Model.Net.csproj

@@ -79,6 +79,7 @@
    <Compile Include="Base\TraceDebug.cs" />
    <Compile Include="DTO\MESDTO.cs" />
    <Compile Include="Entitys\BAS\BAS_CODE_TYPE.cs" />
    <Compile Include="Entitys\BAS\BAS_PROCESS_VAR.cs" />
    <Compile Include="Entitys\MES\MES_ROUTE_ACT_VAR.cs" />
    <Compile Include="Entitys\MES\MES_WIP_ACT_VAR.cs" />
    <Compile Include="Entitys\MES\MES_WO_ACT_VAR.cs" />