kingno
2 天以前 a9e1d576c88a828baa766b5c38cce7bad0f3f25c
src/Bro.M141.Process/M141Config.cs
@@ -6,6 +6,7 @@
using Bro.Common.Model;
using Bro.M135.Common;
using Bro.Process;
using MathNet.Numerics.Distributions;
using Newtonsoft.Json;
using System.ComponentModel;
using System.Drawing.Design;
@@ -13,16 +14,13 @@
using System.Drawing.Printing;
using System.Reflection;
using System.Windows.Forms.Design;
using Windows.Services.Maps;
using static Bro.Common.Helper.EnumHelper;
namespace Bro.M141.Process
{
    public class M141Config : ProcessConfigBase
    {
        [Category("打印机配置")]
@@ -73,7 +71,7 @@
        [Category("检测异常指示")]
        [Description("选择某个Spec,其表示检测过程中异常")]
        [DisplayName("异常指示标准")]
        [TypeConverter(typeof(SpecCodeSelectorConverter))]
        [TypeConverter(typeof(SpecCodeSelectorConverter))]
        public string CheckErrorSpecCode { get; set; } = "";
@@ -169,6 +167,15 @@
        [DisplayName("当前栏具码")]
        public string basketcode { get; set; } = "NoRead";
        [Category("栏具条码配置")]
        [Description("当前工单号")]
        [DisplayName("当前工单号")]
        public string zwoid { get; set; } = "";
        [Category("栏具条码配置")]
        [Description("本站是否读取栏具码")]
        [DisplayName("本站是否读取栏具码")]
@@ -187,6 +194,86 @@
        [Description("心跳地址")]
        [DisplayName("心跳地址")]
        public int heartadd { get; set; } = 1505;
        [Category("MES配置")]
        [Description("是否上传MES")]
        [DisplayName("是否上传MES")]
        public bool ISupMES { get; set; } = false;
        [Category("MES配置")]
        [Description("接口选择,0篮具接口,1数据上传接口,-1所有接口")]
        [DisplayName("接口选择")]
        public int MESchannel { get; set; } = 0;
        [Category("MES配置")]
        [Description("账号")]
        [DisplayName("账号")]
        public string zuser { get; set; } = "aoiUser";
        [Category("MES配置")]
        [Description("密码")]
        [DisplayName("密码")]
        public string zpassword { get; set; } = "Chia@aoi";
        [Category("MES配置")]
        [Description("IP")]
        [DisplayName("Ip")]
        public string zIP { get; set; } = "10.2.20.114";
        [Category("MES配置")]
        [Description("端口号")]
        [DisplayName("端口号")]
        public int zport { get; set; } = 15672;
        //[Category("MES配置")]
        //[Description("备用栏具码")]
        //[DisplayName("备用栏具码")]
        //public string basketcode2 { get; set; } = "NoRead";
        [Category("MES配置")]
        [Description("numpro")]
        [DisplayName("numpro")]
        [JsonIgnore]
        public int numpro { get; set; } = 0;
        [Category("MES配置")]
        [Description("mesnum1")]
        [DisplayName("mesnum1")]
        [JsonIgnore]
        public int mesnum1 { get; set; } = 0;
        [Category("MES配置")]
        [Description("mesnum2")]
        [DisplayName("mesnum2")]
        [JsonIgnore]
        public int mesnum2 { get; set; } = 0;
        [Category("MES配置")]
        [Description("mesnum3")]
        [DisplayName("mesnum3")]
        [JsonIgnore]
        public int mesnum3 { get; set; } = 0;
        [Category("MES配置")]
        [Description("mesnum4")]
        [DisplayName("mesnum4")]
        [JsonIgnore]
        public int mesnum4 { get; set; } = 0;
        [Category("MES配置")]
        [Description("plc序号和篮具码集合")]
        [DisplayName("plc序号和篮具码集合")]
        [TypeConverter(typeof(CollectionCountConvert))]
        [Editor(typeof(ComplexCollectionEditor<PlcAndBasketcode>), typeof(UITypeEditor))]
        public List<PlcAndBasketcode> PlcAndBasketcodes { get; set; } = new List<PlcAndBasketcode>();
    }
@@ -318,7 +405,7 @@
            {
                var temchar = data.Split(',');
                ret.alarmname = temchar[0];
                ret.address =Convert.ToInt32(temchar[1]);
                ret.address = Convert.ToInt32(temchar[1]);
                ret.address2 = Convert.ToInt32(temchar[2]);
            }
            catch (Exception ex)
@@ -378,7 +465,19 @@
    }
    public class PlcAndBasketcode
    {
        [Category("配置")]
        [Description("序号")]
        [DisplayName("序号")]
        public int id { get; set; } = 0;
        [Category("配置")]
        [Description("条码")]
        [DisplayName("条码")]
        public string code { get; set; }
    }