S5上传mes逻辑修改及打印机逻辑修改和数据库存储数据增加

quanzhou

2 天以前 86f899fa91e811415614dff1a699141144bfc802

 src/Bro.M141.Process/M141Config.cs

@@ -66,6 +66,14 @@
        public List<MeasureBind> MeasureBindCollection { get; set; } = new List<MeasureBind>();


        [Category("点检配置")]
        [Description("点检配置集合，配置检测的工位，图片索引，相机和检测调用项关系")]
        [DisplayName("点检配置集合")]
        [TypeConverter(typeof(CollectionCountConvert))]
        [Editor(typeof(ComplexCollectionEditor<MeasureBind>), typeof(UITypeEditor))]
        public List<MeasureBind> MeasureBindCollection_Check { get; set; } = new List<MeasureBind>();



        [Category("检测超时设置")]
        [Description("检测超时设置，获取检测结果时的允许最大等待时间，单位ms")]
@@ -318,8 +326,72 @@
        public List<PlcAndBasketcode> PlcAndBasketcodes { get; set; } = new List<PlcAndBasketcode>();


        [Category("MES配置")]
        [Description("产品ID集合")]
        [DisplayName("产品ID集合")]
        [TypeConverter(typeof(CollectionCountConvert))]
        [Editor(typeof(ComplexCollectionEditor<ProductionID>), typeof(UITypeEditor))]
        public List<ProductionID> Productioncode { get; set; } = new List<ProductionID>();

        [Category("MES配置")]
        [Description("条码集合")]
        [DisplayName("条码集合")]
        [TypeConverter(typeof(CollectionCountConvert))]
        [Editor(typeof(ComplexCollectionEditor<MES_code>), typeof(UITypeEditor))]
        public List<MES_code> MES_codes { get; set; } = new List<MES_code>();


    }
    public class MES_code: IComplexDisplay
    {
        [Category("配置")]
        [Description("MES下发的条码")]
        [DisplayName("条码")]
        public string Printers_code { get; set; }
        public string GetDisplayText()
        {
            return $"{Printers_code}";
        }
    }


    public class ProductionID : IComplexDisplay
    {
        [Category("配置")]
        [Description("序号")]
        [DisplayName("序号")]
        public int Uptomesid { get; set; } = 0;

        [Category("配置")]
        [Description("条码")]
        [DisplayName("PID")]
        public string PID { get; set; }

        [Category("配置")]
        [Description("条码")]
        [DisplayName("SEQUENCE")]
        public string SEQUENCE { get; set; }

        [Category("配置")]
        [Description("条码")]
        [DisplayName("BasketCode")]
        public string BasketCode { get; set; }

        [Category("配置")]
        [Description("条码")]
        [DisplayName("Zword")]
        public string Zword { get; set; }

        [Category("配置")]
        [Description("条码")]
        [DisplayName("SN")]
        public string SN { get; set; }

        public string GetDisplayText()
        {
            return $"产品{PID}上传批次序号{Uptomesid}";
        }
    }

    public class WorkPositionSet : IComplexDisplay
    {
@@ -392,6 +464,7 @@
        public string plcname { get; set; } = "";



        [Category("PLC配置")]
        [DisplayName("是否启用")]
        [Description("是否启用")]
@@ -427,6 +500,12 @@
        [DisplayName("报警名称")]
        [Description("报警名称")]
        public string alarmname { get; set; } = "";

        [Category("配置")]
        [DisplayName("报警种类")]
        [Description("报警种类")]
        public string alarmtype { get; set; } = "";


        [Browsable(false)]
        [JsonIgnore]
@@ -520,12 +599,6 @@
        public string code { get; set; }

    }






    public class MeasureBind : IComplexDisplay, IHalconToolPath
    {
        [Category("索引配置")]
@@ -1104,14 +1177,10 @@
        [Editor(typeof(FoldDialogEditor), typeof(UITypeEditor))]
        public string ImageFolder { get; set; }



        [Category("检测功能")]
        [Description("图片在批量测试过程中最终图片结果会存储较慢需要设置延时确保图片不被资源自动释放")]
        [DisplayName("图片存图延时")]
        public int SaveImageTime { get; set; } = 0;



        [Category("检测功能")]
        [Description("true：启动OK测试 false：启动NG测试")]