From 48961e94a37694f14bd0ac39e2ce91bfa49eddca Mon Sep 17 00:00:00 2001
From: peizhiyong <zhiyong.pei@broconcentric.com>
Date: 星期三, 06 八月 2025 18:40:52 +0800
Subject: [PATCH] Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M200
---
src/Bro.M141.Process/M141Process_Mysql.cs | 21 +++++++--------------
1 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/src/Bro.M141.Process/M141Process_Mysql.cs b/src/Bro.M141.Process/M141Process_Mysql.cs
index bb67d25..ae1408c 100644
--- a/src/Bro.M141.Process/M141Process_Mysql.cs
+++ b/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)
{
--
Gitblit v1.8.0