mes优化

kingno

2 天以前 bdbc8b1459c415f24c3a5da0d27a05e034f7ba08

 src/Bro.M141.Process/M141Process_Mysql.cs

@@ -23,10 +23,8 @@
{
    public class M141Process_Mysql
    {

        string connStrAll = "server=localhost;port=3306;user id=root;password=123456;database=BroDB;charset=utf8";
        string connStrLocal = "server=localhost;port=3306;user id=root;password=123456;database=BroDB;charset=utf8";


        #region 基础操作
        public void IniDBIP(string IP)
@@ -107,7 +105,6 @@
        }

        #endregion



        public void NewProduct(ProductModel pro)
@@ -290,7 +287,7 @@
                            Operatoremysql(str2, connStrAll);
                        }

                        string mysqlstr = $"insert into forall (basketcode,device,plcnum,sn,data,time) values('{pro.BasketCode}','{devicestr}','{pro.SEQUENCE}','{pro.SN}','{JsonConvert.SerializeObject(pro, new JsonSerializerSettings() { TypeNameHandling = TypeNameHandling.All })}','{DateTime.Now.ToString("yyyyMMddHHmmss")}')";
                        string mysqlstr = $"insert into forall (basketcode,zword,device,plcnum,sn,data,time) values('{pro.BasketCode}','{pro.Zword}','{devicestr}','{pro.SEQUENCE}','{pro.SN}','{JsonConvert.SerializeObject(pro, new JsonSerializerSettings() { TypeNameHandling = TypeNameHandling.All })}','{DateTime.Now.ToString("yyyyMMddHHmmss")}')";

                        if (Operatoremysql(mysqlstr, connStrAll))
                        {
@@ -334,7 +331,6 @@
            return null;
        }


        public List<Netdefectdetail> GetNetdefectdetails(string plcnum)
        {
            try
@@ -373,8 +369,8 @@
                {
                    ProductModel p = null;
                    p = JsonConvert.DeserializeObject<ProductModel>(str, new JsonSerializerSettings() { TypeNameHandling = TypeNameHandling.All });
                   
                    return p.Result=="OK";

                    return p.Result == "OK";
                }
            }
            catch (Exception e)
@@ -384,13 +380,13 @@
            return false;
        }


        public string Getbasketcode(string plcnum, out string sn)
        public string Getbasketcode(string plcnum, out string sn, out string zword)
        {
            sn = "Noread";
            zword = "Noread";
            try
            {
                string mysqlstr = $"select basketcode,sn from forall where plcnum='{plcnum}' && device='S2' order by id desc limit 1";
                string mysqlstr = $"select basketcode,sn,zword from forall where plcnum='{plcnum}' && device='S2' order by id desc limit 1";
                var dt = selectdt(mysqlstr, connStrAll);
                if (dt == null || dt.Rows.Count == 0)
                {
@@ -399,6 +395,7 @@
                else
                {
                    sn = dt.Rows[0][1].ToString();
                    zword = dt.Rows[0][2].ToString();
                    return dt.Rows[0][0].ToString();
                }
            }
@@ -408,7 +405,6 @@
            }
            return "NoRead";
        }


        public List<ProductModel> GetProductList(string plcnum)
        {
@@ -442,8 +438,6 @@
            return null;
        }



        public DataTable getBasketCode()
        {
            try
@@ -468,7 +462,6 @@


        }


        public void NewBasketcode(string code)
        {