Skip to content

G
GK-HTRB-GB
提交 5a143667 authored 作者: yangbinjay's avatar yangbinjay
浏览文件
操作

增加烘箱协议

上级 a5fc7a97
全部展开 显示空白字符变更
内嵌 并排
正在显示 包含 169 行增加 和 50 行删除
GK-HTRB-C16P.Upgradation/CsvFileUtilityDt.cs
浏览文件 @ 5a143667
......@@ -102,6 +102,7 @@ namespace GK_HTRB_C16P.Upgradation
return false;
if (dataList.Rows.Count <= 0)
return false;
uIForm.HideStatusForm();
uIForm.ShowStatusForm(dataList.Rows.Count, "数据加载......", 0);
for (int i = 0; i < dataList.Rows.Count; i++)
{
......
GK-HTRB-C16P.Upgradation/FrmUpgradation.cs
浏览文件 @ 5a143667
......@@ -196,8 +196,9 @@ namespace GK_HTRB_C16P.Upgradation
Dev_Thorou dev_Thorou = new Dev_Thorou();
dr[1] = i;
dr[2] = typesbr;
dr[3] = Convert.ToInt16(config.Rows[0]["Station"].ToString());
dr[4] = Convert.ToInt16(config.Rows[0]["DeviceCode"].ToString());
dr[3] = 0;
dr[4] = Convert.ToInt16(config.Rows[0]["Station"].ToString());
dr[5] = Convert.ToInt16(config.Rows[0]["DeviceCode"].ToString());
string sqltxt = toolExport.DataTableToInsertSql(dr, name, cols);
int result = toolExport.Add(OldPathDb, sqltxt);
if (Config == "ChineseSimplified")
......@@ -283,6 +284,30 @@ namespace GK_HTRB_C16P.Upgradation
ListboxLog("table：" + name + "，data input：" + dr[0]);
}
break;
case "Test_Model":
int dpm = toolExport.DropTable(OldPathDb, name);
var Sqlm = Newtable.Rows[n][2].ToString();
int resm = toolExport.CreateTable(OldPathDb, Sqlm);
if (Config == "ChineseSimplified")
ListboxLog("创建表：" + name);
else
ListboxLog("create table：" + name);
var dtm5 = toolExport.IsExitData(OldPathDb, name);//目前是否存在数据
if (dtm5)
toolExport.DeleteData(OldPathDb, name);//删除
var newPathTablm = toolExport.TableData(NewPathDb, name);
string colm= string.Join(",", newPathTablm.Columns.Cast<DataColumn>().Select(x => $"[{x.ColumnName}]").ToArray());
for (int nt = 0; nt < newPathTablm.Rows.Count; nt++)
{
var dr = newPathTablm.Rows[nt];
string sqltxt = toolExport.DataTableToInsertSql(dr, name, colm);
int result = toolExport.Add(OldPathDb, sqltxt);
if (Config == "ChineseSimplified")
ListboxLog("table：" + name + "，写入数据：" + dr[0]);
else
ListboxLog("table：" + name + "，data input：" + dr[0]);
}
break;
case "Dev_Config":
var newtbfile = toolExport.TableInfo(NewPathDb, name);
for (int i = 0; i < newtbfile.Rows.Count; i++)
......@@ -349,6 +374,8 @@ namespace GK_HTRB_C16P.Upgradation
ListboxLog("table：" + name + "开始检查数据是否需要生成文件" + newParmdata.Rows.Count);
else
ListboxLog("table：" + name + "Start to check whether the data needs to generate files" + newParmdata.Rows.Count);
var correspondenceBll = new DevCorrespondenceBll();
CalculationAo.CorrPowerDic = correspondenceBll.GetList().Where(x => x.PassagewayId <= CalculationAo.ThisDevConfig.Passageway).ToDictionary(x => x.PassagewayId, x => x);
for (int jp = 0; jp < newParmdata.Rows.Count; jp++)
{
var aId = Convert.ToInt32(newParmdata.Rows[jp]["Id"]);
......@@ -396,7 +423,8 @@ namespace GK_HTRB_C16P.Upgradation
}
else
{
//if (isqbnt == "9644320\\9643953-168H-4")
//string[] stnamesp = { "9191242/9191245-832H-10" };
//if (stnamesp.Contains(isqbnt))
isqbnt = isqbnt.Replace(@"/", "").Replace(@"\", "");
ListboxLog("Bridg：" + path);
if (!CalculationAo.Thorous.ContainsKey(aId))
......@@ -417,7 +445,9 @@ namespace GK_HTRB_C16P.Upgradation
CsvFileUtilityDt.Docmentnotes(path, LotInfo, BoardInfo, isqbnt, devm.DevName, aId, EleUpper, devm.BackVol, newHead.Length, newHead);
stationlist = stationTbridoDataBll.GetobjectextOld(pid, isqb, CalculationAo.DicBoardInfo[aId]);
if (stationlist == null)
{
stationlist = stationTbridoDataBll.GetobjectextNew(pid, DestPath, isqb, CalculationAo.DicBoardInfo[aId]);
}
CsvFileUtilityDt.SaveArrayToCSVFiledt<DataTable>(this, stationlist, path, stationlist.Columns.Count);
}
}
......@@ -425,6 +455,7 @@ namespace GK_HTRB_C16P.Upgradation
{
ListboxLog("table：" + name + "Already exists!");
}
//continue;
if (!File.Exists(DestPath + "Data\\" + isqb + ".db"))
{
if (!DirEx.Exists(DestPath + "Data"))
......@@ -449,7 +480,7 @@ namespace GK_HTRB_C16P.Upgradation
CalculationAo.DicBoardInfo[aId] = stationTbridoDataBll.DicHeaderStationFun(CalculationAo.ThisDevConfig.ReportDisTemp, Stations, aId);
stationlist = stationTbridoDataBll.GetobjectextOld(pid, isqb, CalculationAo.DicBoardInfo[aId]);
}
int ret = stationTbridoDataBll.CreateUpgtadation(DestPath, isqb, isqb + "_Index", Stations);
int ret = stationTbridoDataBll.CreateUpgtadation(DestPath, isqb, isqb + "_Index", Stations,aId);
CsvFileUtilityDt.SaveStationTbrDatatableToDb(this, stationlist, DestPath, isqb, aId);
}
Summary summary = new Summary();
......
GK-HTRB-C16P.Upgradation/bin/Upgradation/Languages/ChineseSimplified.xml
浏览文件 @ 5a143667
......@@ -211,6 +211,7 @@
<DataGridViewCell name="Column1" HeaderText="板号"/>
<DataGridViewCell name="Column2" HeaderText="批次信息"/>
<DataGridViewCell name="Column3" HeaderText="器件名称"/>
<DataGridViewCell name="Column3" HeaderText="插板"/>
</DataGridViewCells>
<DataGridViewRows>
<DataGridViewRows name="Id" value="0" value2="1" go="4" to="3" text1="添加" text2="删除" text3="删除"/>
......@@ -313,12 +314,6 @@
<Control name="uiGroupBox2" text="驱动板控制:"/>
<Control name="uiSymbolButton10" text="设置"/>
</Controls>
<UIRadioButtonGroup>
<Txt_SupplyRGPW>
<UIRadioButtonGroup name="0" text="正向"/>
<UIRadioButtonGroup name="1" text="反向"/>
</Txt_SupplyRGPW>
</UIRadioButtonGroup>
<UIRadioButtonGroup>
<Txt_PolarityRG>
<UIRadioButtonGroup name="0" text="正向"/>
......@@ -364,11 +359,13 @@
<Control name="uiLabel3" text="创建时间："/>
<Control name="uiLabel4" text="器件库："/>
<Control name="uiLabel2" text="器件名称："/>
<Control name="uiLabel7" text="漏电流下限(uA)："/>
<Control name="uiLabel7" text="漏电流下限："/>
<Control name="uiLabel9" text="反偏电压值(V)："/>
<Control name="uiLabel6" text="老化时间(h)："/>
<Control name="uiLabel8" text="漏电流上限(uA)："/>
<Control name="uiLabel8" text="漏电流上限："/>
<Control name="uiLabel24" text="Gb电压方向"/>
<Control name="Com_Text_Type" text="0"/>
<Control name="Com_SupplyRGPW" text="0"/>
<Control name="uiLabel10" text="上电电压(上桥):"/>
<Control name="uiLabel11" text="下电电压(上桥):"/>
<Control name="uiLabel17" text="上电电压(下桥):"/>
......@@ -889,6 +886,7 @@
<negativegate>工位下桥栅压没达标，请检查!</negativegate>
<tdpower>请先建批次!</tdpower>
<powervolgate>有通道没有设置Vg，确定继续设置电压?</powervolgate>
<editcontit>修改该配置，需要先删除批次!</editcontit>
<vgnouintit>Vg不能大于0</vgnouintit>
<direction1>正向</direction1>
<direction2>反向</direction2>
......@@ -920,6 +918,7 @@
<Tips17>停止设置成功！</Tips17>
<Tips18>请先下电</Tips18>
<Tips19>请将校准后保存的文件，放置在安装文件夹！</Tips19>
<Tips20>通道试验已完成，请先降温再下电:</Tips20>
</RunSetting>
<AutoTemper>
<Tips1>试验箱温度设置为#℃，是否继续</Tips1>
......
GK-HTRB-C16P.Upgradation/bin/Upgradation/Languages/English.xml
浏览文件 @ 5a143667
......@@ -206,6 +206,7 @@
<DataGridViewCell name="Column1" HeaderText="Slot"/>
<DataGridViewCell name="Column2" HeaderText="LotID"/>
<DataGridViewCell name="Column3" HeaderText="Device name"/>
<DataGridViewCell name="Column3" HeaderText="BIB"/>
</DataGridViewCells>
<DataGridViewRows>
<DataGridViewRows name="Id" value="0" value2="1" go="4" to="3" text1="Add" text2="Del" text3="Del"/>
......@@ -296,7 +297,6 @@
<Control name="uiLabe8" text="Verify"/>
<Control name="uiLabe9" text="Resistance"/>
<Control name="uiLabel27" text="Test time："/>
<Control name="Txt_SupplyRGPW" text="PS"/>
<Control name="Txt_PolarityRG" text="Current"/>
<Control name="uiSymbolButton1" text="Set"/>
<Control name="uiSymbolButton2" text="Control"/>
......@@ -308,12 +308,6 @@
<Control name="uiGroupBox2" text="Driver board control:"/>
<Control name="uiSymbolButton10" text="Set up"/>
</Controls>
<UIRadioButtonGroup>
<Txt_SupplyRGPW>
<UIRadioButtonGroup name="0" text="Forward"/>
<UIRadioButtonGroup name="1" text="Reverse"/>
</Txt_SupplyRGPW>
</UIRadioButtonGroup>
<UIRadioButtonGroup>
<Txt_PolarityRG>
<UIRadioButtonGroup name="0" text="Just"/>
......@@ -359,11 +353,13 @@
<Control name="uiLabel3" text="Create Time："/>
<Control name="uiLabel4" text="Device Library："/>
<Control name="uiLabel2" text="Device Name："/>
<Control name="uiLabel7" text="IR-min(uA)："/>
<Control name="uiLabel7" text="IR-min："/>
<Control name="uiLabel9" text="VR(V)："/>
<Control name="uiLabel6" text="Burn-in Time(h)："/>
<Control name="uiLabel8" text="IR-max(uA)："/>
<Control name="uiLabel8" text="IR-max："/>
<Control name="uiLabel24" text="Gb voltage direction:"/>
<Control name="Com_Text_Type" text="0"/>
<Control name="Com_SupplyRGPW" text="0"/>
<Control name="uiLabel10" text="Power on voltage:"/>
<Control name="uiLabel11" text="Power down voltage:"/>
<Control name="uiLabel17" text="Power on voltage:"/>
......@@ -875,6 +871,7 @@
<positivegrid>Positive grid voltage not up to standard, please check!</positivegrid>
<negativegate>Station negative gate voltage not up to standard, please check!</negativegate>
<tdpower>Please create a batch first!</tdpower>
<editcontit>To modify this configuration, you need to first delete the batch!</editcontit>
<powervolgate>There is a channel without Vg set, confirm to continue setting the voltage</powervolgate>
<vgnouintit>Vg Cannot be greater than 0</vgnouintit>
<direction1>Forward</direction1>
......@@ -907,6 +904,7 @@
<Tips17>Successfully stopped setting！</Tips17>
<Tips18>Please power off first</Tips18>
<Tips19>Please place the files saved after calibration in the installation folder!</Tips19>
<Tips20>The channel test has been completed. Please cool down before turning off the power:</Tips20>
</RunSetting>
<AutoTemper>
<Tips1>The temperature of the test chamber is set to #℃, whether to continue?</Tips1>
......
GKHTRBC16P.Bll/CreateTbBll.cs
浏览文件 @ 5a143667
......@@ -4,6 +4,7 @@ using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SQLite;
using System.Data.SqlTypes;
using System.Linq;
using System.Reflection;
using System.Text;
......@@ -42,16 +43,21 @@ namespace GKHTRBC16P.Bll
return Csql1+ Csql2 + Csql3;
}
public string CreateTableTbrido(string tablename, string indexname, int StaionNum)
public string CreateTableTbrido(string tablename, string indexname, int StaionNum,int td)
{
// 'IR1_2' float(10,3), 'IR1_2_' float(10, 3),
string Csql1 = string.Format(@"CREATE TABLE '{0}' (
string Csql1 = "";
if (CalculationAo.CorrPowerDic[td].PowerId.Split(',').Length == 4)
{
Csql1 = string.Format(@"CREATE TABLE '{0}' (
'Id' integer PRIMARY KEY AUTOINCREMENT,
'ParmId' integer,
'CreateTime' varchar(30) NOT NULL,
'RunTime' float(10,2),
'VR' float(10,3),
'_VR' float(10,3),
'VR2' float(10,3),
'_VR2' float(10,3),
'VgsP' float(10,3),
'VgsN' float(10,3),
'TemA' float(10,3),
......@@ -60,6 +66,25 @@ namespace GKHTRBC16P.Bll
'TemD' Float(10,3),
'TemE' float(10,3),
'Humi' float(10,3),", tablename);
}
else if (CalculationAo.CorrPowerDic[td].PowerId.Split(',').Length == 2)
{
Csql1 = string.Format(@"CREATE TABLE '{0}' (
'Id' integer PRIMARY KEY AUTOINCREMENT,
'ParmId' integer,
'CreateTime' varchar(30) NOT NULL,
'RunTime' float(10,2),
'VR' float(10,3),
'_VR' float(10,3),
'VgsP' float(10,3),
'VgsN' float(10,3),
'TemA' float(10,3),
'TemB' float(10,3),
'TemC' Float(10,3),
'TemD' Float(10,3),
'TemE' float(10,3),
'Humi' float(10,3),", tablename);
}
string Csql2 = "";
for (int i = 1; i <= StaionNum; i=i+2)
{
......
GKHTRBC16P.Bll/DevDevDirBll.cs 0 → 100644
浏览文件 @ 5a143667
using GKHTRBC16P.Model;
using GKHTRBC16P.Toolbox;
using System;
using System.Collections.Generic;
using System.Data.SQLite;
using System.Data;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Dapper;
namespace GKHTRBC16P.Bll
{
public class DevDevDirBll
{
public List<Dev_DevDir> GetList()
{
List<Dev_DevDir> dev_DevDirs = null;
using (IDbConnection cnn = new SQLiteConnection(DapperConntionData.Conectionvoidstring()))
{
cnn.Open();
dev_DevDirs = cnn.Query<Dev_DevDir>("select * from Dev_DevDir where status = @status;", new
{
status = 0
}).ToList();
}
return dev_DevDirs;
}
}
}
GKHTRBC16P.Bll/DeviceBll.cs
浏览文件 @ 5a143667
......@@ -32,7 +32,7 @@ namespace GKHTRBC16P.Bll
using (IDbConnection cnn = new SQLiteConnection(DapperConntionData.Conectionvoidstring()))
{
cnn.Open();
dev_Devices = cnn.Query<Dev_Device>("select * from Dev_Device where 1=1;").ToList();
dev_Devices = cnn.Query<Dev_Device>("select * from Dev_Device where 1=1 order by Id desc;").ToList();
}
return dev_Devices;
}
......@@ -41,8 +41,8 @@ namespace GKHTRBC16P.Bll
int result = 0;
using (IDbConnection cnn = new SQLiteConnection(DapperConntionData.Conectionvoidstring()))
{
result = cnn.Execute("insert into Dev_Device(MainId,DevName,TestId,AgingNo,AgingTime,EleLower,EleUpper,BackVol,TjUpper,Rqaw,AgeingImage,Devimage,VgsP,VgsN,Vg,PowerIf,OvenIf,Stage,OnVoltage1,OnVoltage2,OffVoltage1,OffVoltage2,WhereTemp,OnTemp,OnHimi,OffTemp,OffHimi,ReachTime,HimiReachTime,Status,UserId,Createtime) " +
"values(@MainId,@DevName,@TestId,@AgingNo,@AgingTime,@EleLower,@EleUpper,@BackVol,@TjUpper,@Rqaw,@AgeingImage,@Devimage,@VgsP,@VgsN,@Vg,@PowerIf,@OvenIf,@Stage,@OnVoltage1,@OnVoltage2,@OffVoltage1,@OffVoltage2,@WhereTemp,@OnTemp,@OnHimi,@OffTemp,@OffHimi,@ReachTime,@HimiReachTime,@Status,@UserId,@Createtime)", dev_Device);
result = cnn.Execute("insert into Dev_Device(MainId,DevName,TestId,AgingNo,AgingTime,EleLower,EleUpper,BackVol,TjUpper,Rqaw,SupplyRGPW,AgeingImage,Devimage,VgsP,VgsN,Vg,PowerIf,OvenIf,Stage,OnVoltage1,OnVoltage2,OffVoltage1,OffVoltage2,WhereTemp,OnTemp,OnHimi,OffTemp,OffHimi,ReachTime,HimiReachTime,Status,UserId,Createtime) " +
"values(@MainId,@DevName,@TestId,@AgingNo,@AgingTime,@EleLower,@EleUpper,@BackVol,@TjUpper,@Rqaw,@SupplyRGPW,@AgeingImage,@Devimage,@VgsP,@VgsN,@Vg,@PowerIf,@OvenIf,@Stage,@OnVoltage1,@OnVoltage2,@OffVoltage1,@OffVoltage2,@WhereTemp,@OnTemp,@OnHimi,@OffTemp,@OffHimi,@ReachTime,@HimiReachTime,@Status,@UserId,@Createtime)", dev_Device);
}
return result;
}
......@@ -53,7 +53,7 @@ namespace GKHTRBC16P.Bll
{
result = cnn.Execute("update Dev_Device set MainId = @MainId,DevName=@DevName,TestId =@TestId,AgingNo = @AgingNo,AgingTime = @AgingTime,EleLower=@EleLower,EleUpper=@EleUpper,BackVol=@BackVol,VgsP=@VgsP,VgsN=@VgsN,Vg=@Vg," +
"PowerIf=@PowerIf,OvenIf=@OvenIf,Stage=@Stage,OnVoltage1=@OnVoltage1,OnVoltage2=@OnVoltage2,OffVoltage1=@OffVoltage1,OffVoltage2=@OffVoltage2,WhereTemp=@WhereTemp,OnTemp=@OnTemp,OnHimi=@OnHimi,OffTemp=@OffTemp,OffHimi=@OffHimi,ReachTime=@ReachTime,HimiReachTime=@HimiReachTime," +
"TjUpper=@TjUpper,Rqaw=@Rqaw,AgeingImage=@AgeingImage,Devimage=@Devimage,Status=@Status,UserId=@UserId,Createtime=@Createtime " +
"TjUpper=@TjUpper,Rqaw=@Rqaw,SupplyRGPW=@SupplyRGPW,AgeingImage=@AgeingImage,Devimage=@Devimage,Status=@Status,UserId=@UserId,Createtime=@Createtime " +
"where Id=" + dev_Device.Id, dev_Device);
}
return result;
......@@ -64,9 +64,8 @@ namespace GKHTRBC16P.Bll
using (IDbConnection cnn = new SQLiteConnection(DapperConntionData.Conectionvoidstring()))
{
cnn.Open();
dev_Main = cnn.Query<Dev_Device>("select * from Dev_Device where Status = @Status and Id=@Id;", new
dev_Main = cnn.Query<Dev_Device>("select * from Dev_Device where Id=@Id;", new
{
Status = 0,
Id = Id
}).FirstOrDefault();
}
......
GKHTRBC16P.Bll/GKHTRBC16P.Bll.csproj
浏览文件 @ 5a143667
......@@ -61,6 +61,7 @@
<Compile Include="DevBrRawBll.cs" />
<Compile Include="DevConfigBll.cs" />
<Compile Include="DevCorrespondenceBll.cs" />
<Compile Include="DevDevDirBll.cs" />
<Compile Include="DeviceBll.cs" />
<Compile Include="DevProtocolBll.cs" />
<Compile Include="DevThorouBll.cs" />
......
GKHTRBC16P.Bll/MainBll.cs
浏览文件 @ 5a143667
......@@ -51,9 +51,8 @@ namespace GKHTRBC16P.Bll
using (IDbConnection cnn = new SQLiteConnection(DapperConntionData.Conectionvoidstring()))
{
cnn.Open();
dev_Main = cnn.Query<Dev_Main>("select * from Dev_Main where Status = @Status and Id=@Id;", new
dev_Main = cnn.Query<Dev_Main>("select * from Dev_Main where Id=@Id;", new
{
Status = 0,
Id = Id
}).FirstOrDefault();
}
......
GKHTRBC16P.Bll/PowerOvenAutoBll.cs
浏览文件 @ 5a143667
......@@ -47,7 +47,7 @@ namespace GKHTRBC16P.Bll
public List<Power_Oven_Auto> GetPageList(int pageIndex, int pageSize, out int total)
{
total = 0;
string where = "1=1";
string where = "1=1 and status = 0";
try
{
CreateTbBll createTbBll = new CreateTbBll();
......
GKHTRBC16P.Bll/StationTbridoDataBll.cs
浏览文件 @ 5a143667
......@@ -14,12 +14,12 @@ namespace GKHTRBC16P.Bll
{
public class StationTbridoDataBll
{
public int Create(string name, string index,int num)
public int Create(string name, string index,int num,int td)
{
try
{
CreateTbBll createTbBll = new CreateTbBll();
string sql = createTbBll.CreateTableTbrido(name, index, num);
string sql = createTbBll.CreateTableTbrido(name, index, num, td);
int result = 0;
using (IDbConnection cnn = new SQLiteConnection(DapperConntionData.ConectionBatch(name)))
{
......@@ -34,12 +34,12 @@ namespace GKHTRBC16P.Bll
return 0;
}
}
public int CreateUpgtadation(string path,string name, string index,int num)
public int CreateUpgtadation(string path,string name, string index,int num,int td)
{
try
{
CreateTbBll createTbBll = new CreateTbBll();
string sql = createTbBll.CreateTableTbrido(name, index, num);
string sql = createTbBll.CreateTableTbrido(name, index, num, td);
int result = 0;
using (IDbConnection cnn = new SQLiteConnection(DapperConntionData.ConectionBatchParm(path,name)))
{
......@@ -103,6 +103,15 @@ namespace GKHTRBC16P.Bll
List<string> list1 = new List<string>() { "CreateTime", "RunTime", "VR", "_VR" };
List<string> listsq = new List<string>() { "ParmId", "CreateTime", "RunTime", "VR", "_VR" };
List<string> listsp = new List<string>();
if (CalculationAo.CorrPowerDic[td].PowerId.Split(',').Length == 4)
{
list0.Add("VR2");
list0.Add("_VR2");
list1.Add("VR2");
list1.Add("_VR2");
listsq.Add("VR2");
listsq.Add("_VR2");
}
if (DisTemp == 0)
{
list0.Add("TemA");
......@@ -398,6 +407,11 @@ namespace GKHTRBC16P.Bll
{
station_Data._VR = power_Data[1].Voltage;
}
if (CalculationAo.CorrPowerDic[test_Parameter.Id].PowerId.Split(',').Length == 4)
{
station_Data.VR2 = power_Data[2].Voltage;
station_Data._VR2 = power_Data[3].Voltage;
}
//station_Data._VR = power_Data[1] == null ? 0 : power_Data[1].Voltage;
if (CalculationAo.VgsList.ContainsKey(test_Parameter.Id))
{
......@@ -612,7 +626,7 @@ namespace GKHTRBC16P.Bll
IDbTransaction transaction = cnn.BeginTransaction();
try
{
result = cnn.ExecuteScalar<int>(insertSql, station_Data);
result = cnn.Execute(insertSql, station_Data);
transaction.Commit();
}
catch
......
GKHTRBC16P.Bll/TestParmBll.cs
浏览文件 @ 5a143667
......@@ -64,7 +64,7 @@ namespace GKHTRBC16P.Bll
using (IDbConnection cnn = new SQLiteConnection(DapperConntionData.Conectionvoidstring()))
{
cnn.Open();
test_Parameters = cnn.Query<Test_Parameter>("select a.*,b.DevName from Test_Parameter a left join Dev_Device b on a.DeviceId = b.Id where a.BatchName is not null;").ToList();
test_Parameters = cnn.Query<Test_Parameter>("select a.*,b.DevName from Test_Parameter a left join Dev_Device b on a.DeviceId = b.Id where a.BatchName is not null order by a.Id desc;").ToList();
}
return test_Parameters;
}
......
GKHTRBC16P.Bll/obj/Debug/GKHTRBC16P.Bll.csproj.CoreCompileInputs.cache
浏览文件 @ 5a143667
1139408a4898071b350b7136d69489ac324489bbbb2ced8ad7079c31804aa080
80d8ada0bd08f8ba8ac3cba332a418d46f12a6306ce3cf9008005623b1b0fcb8
GKHTRBC16P.Bll/obj/Debug/GKHTRBC16P.Bll.csproj.FileListAbsolute.txt
浏览文件 @ 5a143667
......@@ -30,16 +30,16 @@ E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Bll\bin\Debug\Dapper.d
E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Bll\bin\Debug\GKHTRBC16P.Model.dll
E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Bll\bin\Debug\GKHTRBC16P.Toolbox.dll
E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Bll\bin\Debug\System.Data.SQLite.dll
E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Bll\bin\Debug\log4net.dll
E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Bll\bin\Debug\HTICOLClient.dll
E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Bll\bin\Debug\MQTTnet.dll
E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Bll\bin\Debug\Newtonsoft.Json.dll
E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Bll\bin\Debug\GKHTRBC16P.Model.pdb
E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Bll\bin\Debug\GKHTRBC16P.Toolbox.pdb
E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Bll\bin\Debug\log4net.xml
E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Bll\obj\Debug\GKHTRBC16P.Bll.csproj.AssemblyReference.cache
E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Bll\obj\Debug\GKHTRBC16P.Bll.csproj.CoreCompileInputs.cache
E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Bll\obj\Debug\GKHTRBC1.DFBB4EF2.Up2Date
E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Bll\obj\Debug\GKHTRBC16P.Bll.dll
E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Bll\obj\Debug\GKHTRBC16P.Bll.pdb
E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Bll\bin\Debug\Newtonsoft.Json.xml
E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Bll\bin\Debug\log4net.dll
E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Bll\bin\Debug\HTICOLClient.dll
E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Bll\bin\Debug\MQTTnet.dll
E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Bll\bin\Debug\log4net.xml
GKHTRBC16P.Calibrationfm/FrmCalibHighc.cs
浏览文件 @ 5a143667
......@@ -342,8 +342,6 @@ namespace GKHTRBC16P.Calibrationfm
{
uPublic.WriteLog(ps + "电压设置为：" + SV + "失败");
}
LogisTrac.WriteLog(this.GetType(), "电压设置" + Vx);
break;
case 2:
break;
......@@ -357,7 +355,7 @@ namespace GKHTRBC16P.Calibrationfm
if (status == 1)
{
ShowSuccessTip("ok");
LogisTrac.WriteLog(this.GetType(), "电压设置" + Vx);
uPublic.WriteLog("电压设置" + EditVSet);
}
//uiSymbolButton1_Click_1(sender, e);
}
......@@ -377,7 +375,7 @@ namespace GKHTRBC16P.Calibrationfm
if (!string.IsNullOrEmpty(PowerVs))
{
ShowSuccessTip("ok");
LogisTrac.WriteLog(this.GetType(), "电压设置" + EditVSet);
uPublic.WriteLog("电压设置" + EditVSet);
}
}
......
GKHTRBC16P.CommTool/obj/Release/GKHTRBC16P.CommTool_MarkupCompile.cache
浏览文件 @ 5a143667
......@@ -4,12 +4,12 @@
winexe
C#
.cs
E:\Customer\GK-HTRB-C16P-gaokun\GKHTRBC16P\GKHTRBC16P.CommTool\obj\Release\
E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.CommTool\obj\Release\
GKHTRBC16P.CommTool
none
false
TRACE
E:\Customer\GK-HTRB-C16P-gaokun\GKHTRBC16P\GKHTRBC16P.CommTool\App.xaml
E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.CommTool\App.xaml
1219584333
6-1859266896
......
GKHTRBC16P.CommTool/obj/Release/GKHTRBC16P.CommTool_MarkupCompile.lref
浏览文件 @ 5a143667

FE:\Customer\GK-HTRB-C16P-gaokun\GKHTRBC16P\GKHTRBC16P.CommTool\MainWindow.xaml;;
FE:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.CommTool\MainWindow.xaml;;
GKHTRBC16P.Escript/obj/Debug/GKHTRBC16P.Escript.csproj.FileListAbsolute.txt
浏览文件 @ 5a143667
......@@ -70,3 +70,4 @@ E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Escript\obj\Debug\GKHT
E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Escript\obj\Debug\GKHTRBC1.2C4D3FDE.Up2Date
E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Escript\obj\Debug\GKHTRBC16P.Escript.exe
E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Escript\obj\Debug\GKHTRBC16P.Escript.pdb
E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Escript\bin\Debug\Newtonsoft.Json.xml
GKHTRBC16P.Model/Dev_DevDir.cs 0 → 100644
浏览文件 @ 5a143667
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace GKHTRBC16P.Model
{
public class Dev_DevDir
{
public int Id { get; set; }
public string ModelName { get; set; }
public string ModelNameEn { get; set; }
public int Status { get; set; }
public string CreateTime { get; set; }
}
}
GKHTRBC16P.Model/Dev_Device.cs
浏览文件 @ 5a143667
......@@ -20,6 +20,7 @@ namespace GKHTRBC16P.Model
public decimal BackVol { get; set; }
public decimal TjUpper { get; set; }
public decimal Rqaw { get; set; }
public int SupplyRGPW { get; set; }
[JsonIgnore]
public byte[] AgeingImage { get; set; }
[JsonIgnore]
......
GKHTRBC16P.Model/GKHTRBC16P.Model.csproj
浏览文件 @ 5a143667
......@@ -56,6 +56,7 @@
<Compile Include="Dev_Communication.cs" />
<Compile Include="Dev_Config.cs" />
<Compile Include="Dev_Correspondence.cs" />
<Compile Include="Dev_DevDir.cs" />
<Compile Include="Dev_Device.cs" />
<Compile Include="Dev_Main.cs" />
<Compile Include="Dev_Protocol.cs" />
......
GKHTRBC16P.Model/StationTbrido_Data.cs
浏览文件 @ 5a143667
......@@ -14,6 +14,8 @@ namespace GKHTRBC16P.Model
public double RunTime { get; set; }
public double VR { get; set; }
public double _VR { get; set; }
public double VR2 { get; set; }
public double _VR2 { get; set; }
public double TemA { get; set; }
public double TemB { get; set; }
public double TemC { get; set; }
......@@ -116,6 +118,8 @@ namespace GKHTRBC16P.Model
public double RunTime { get; set; }
public double VR { get; set; }
public double _VR { get; set; }
public double VR2 { get; set; }
public double _VR2 { get; set; }
public double TemA { get; set; }
public double Humi { get; set; }
public double VgsP { get; set; }
......
GKHTRBC16P.Model/bin/Release/Newtonsoft.Json.xml 0 → 100644
浏览文件 @ 5a143667
This source diff could not be displayed because it is too large. You can view the blob instead.
GKHTRBC16P.Toolbox/bin/Release/DLL/MQTTnet.dll 0 → 100644
浏览文件 @ 5a143667
差异被折叠。
GKHTRBC16P.Toolbox/bin/Release/MQTTnet.dll 0 → 100644
浏览文件 @ 5a143667
差异被折叠。
GKHTRBC16P/FrmLogin.cs
浏览文件 @ 5a143667
差异被折叠。
GKHTRBC16P/FrmMain.cs
浏览文件 @ 5a143667
差异被折叠。
GKHTRBC16P/bin/Debug/mbp.db
浏览文件 @ 5a143667
差异被折叠。
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论