提交 a225eaac authored 作者: yangbinjay's avatar yangbinjay

日志消息

上级 4c8a21e7
...@@ -39,13 +39,15 @@ ...@@ -39,13 +39,15 @@
this.uiCheckBox1 = new Sunny.UI.UICheckBox(); this.uiCheckBox1 = new Sunny.UI.UICheckBox();
this.uiCheckBox2 = new Sunny.UI.UICheckBox(); this.uiCheckBox2 = new Sunny.UI.UICheckBox();
this.uiCheckBox3 = new Sunny.UI.UICheckBox(); this.uiCheckBox3 = new Sunny.UI.UICheckBox();
this.uiCheckBox4 = new Sunny.UI.UICheckBox();
this.SuspendLayout(); this.SuspendLayout();
// //
// uiProcessBar1 // uiProcessBar1
// //
this.uiProcessBar1.DecimalCount = 0;
this.uiProcessBar1.DecimalPlaces = 0; this.uiProcessBar1.DecimalPlaces = 0;
this.uiProcessBar1.Font = new System.Drawing.Font("微软雅黑", 12F); this.uiProcessBar1.Font = new System.Drawing.Font("微软雅黑", 12F);
this.uiProcessBar1.Location = new System.Drawing.Point(216, 190); this.uiProcessBar1.Location = new System.Drawing.Point(216, 220);
this.uiProcessBar1.MinimumSize = new System.Drawing.Size(70, 1); this.uiProcessBar1.MinimumSize = new System.Drawing.Size(70, 1);
this.uiProcessBar1.Name = "uiProcessBar1"; this.uiProcessBar1.Name = "uiProcessBar1";
this.uiProcessBar1.Size = new System.Drawing.Size(602, 29); this.uiProcessBar1.Size = new System.Drawing.Size(602, 29);
...@@ -55,7 +57,7 @@ ...@@ -55,7 +57,7 @@
// uiLabel1 // uiLabel1
// //
this.uiLabel1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.uiLabel1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.uiLabel1.Location = new System.Drawing.Point(62, 198); this.uiLabel1.Location = new System.Drawing.Point(62, 228);
this.uiLabel1.Name = "uiLabel1"; this.uiLabel1.Name = "uiLabel1";
this.uiLabel1.Size = new System.Drawing.Size(137, 21); this.uiLabel1.Size = new System.Drawing.Size(137, 21);
this.uiLabel1.TabIndex = 84; this.uiLabel1.TabIndex = 84;
...@@ -66,7 +68,7 @@ ...@@ -66,7 +68,7 @@
// uiLabel2 // uiLabel2
// //
this.uiLabel2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.uiLabel2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.uiLabel2.Location = new System.Drawing.Point(62, 237); this.uiLabel2.Location = new System.Drawing.Point(62, 267);
this.uiLabel2.Name = "uiLabel2"; this.uiLabel2.Name = "uiLabel2";
this.uiLabel2.Size = new System.Drawing.Size(137, 21); this.uiLabel2.Size = new System.Drawing.Size(137, 21);
this.uiLabel2.TabIndex = 85; this.uiLabel2.TabIndex = 85;
...@@ -78,7 +80,7 @@ ...@@ -78,7 +80,7 @@
// //
this.uiListBox1.FillColor = System.Drawing.Color.White; this.uiListBox1.FillColor = System.Drawing.Color.White;
this.uiListBox1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.uiListBox1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.uiListBox1.Location = new System.Drawing.Point(216, 237); this.uiListBox1.Location = new System.Drawing.Point(216, 267);
this.uiListBox1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.uiListBox1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.uiListBox1.MinimumSize = new System.Drawing.Size(1, 1); this.uiListBox1.MinimumSize = new System.Drawing.Size(1, 1);
this.uiListBox1.Name = "uiListBox1"; this.uiListBox1.Name = "uiListBox1";
...@@ -176,10 +178,25 @@ ...@@ -176,10 +178,25 @@
this.uiCheckBox3.Text = "Database Upgrade"; this.uiCheckBox3.Text = "Database Upgrade";
this.uiCheckBox3.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0); this.uiCheckBox3.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
// //
// uiCheckBox4
//
this.uiCheckBox4.Checked = true;
this.uiCheckBox4.Cursor = System.Windows.Forms.Cursors.Hand;
this.uiCheckBox4.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.uiCheckBox4.Location = new System.Drawing.Point(351, 189);
this.uiCheckBox4.MinimumSize = new System.Drawing.Size(1, 1);
this.uiCheckBox4.Name = "uiCheckBox4";
this.uiCheckBox4.Padding = new System.Windows.Forms.Padding(22, 0, 0, 0);
this.uiCheckBox4.Size = new System.Drawing.Size(171, 25);
this.uiCheckBox4.TabIndex = 93;
this.uiCheckBox4.Text = "Data File";
this.uiCheckBox4.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
//
// FrmUpgradation // FrmUpgradation
// //
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.ClientSize = new System.Drawing.Size(882, 450); this.ClientSize = new System.Drawing.Size(882, 510);
this.Controls.Add(this.uiCheckBox4);
this.Controls.Add(this.uiCheckBox3); this.Controls.Add(this.uiCheckBox3);
this.Controls.Add(this.uiCheckBox2); this.Controls.Add(this.uiCheckBox2);
this.Controls.Add(this.uiCheckBox1); this.Controls.Add(this.uiCheckBox1);
...@@ -215,6 +232,7 @@ ...@@ -215,6 +232,7 @@
private Sunny.UI.UICheckBox uiCheckBox1; private Sunny.UI.UICheckBox uiCheckBox1;
private Sunny.UI.UICheckBox uiCheckBox2; private Sunny.UI.UICheckBox uiCheckBox2;
private Sunny.UI.UICheckBox uiCheckBox3; private Sunny.UI.UICheckBox uiCheckBox3;
private Sunny.UI.UICheckBox uiCheckBox4;
} }
} }
...@@ -39,6 +39,7 @@ namespace GK_HTRB_C16P.Upgradation ...@@ -39,6 +39,7 @@ namespace GK_HTRB_C16P.Upgradation
public string ThisPath = ""; public string ThisPath = "";
public string NewPathDb = ""; public string NewPathDb = "";
public string OldPathDb = ""; public string OldPathDb = "";
public bool DataFile = false;
public string[] log = { "log" }; public string[] log = { "log" };
public string[] fexclude = { "mbp", "GK-HTRB-C16P.Upgradation", "InElement" }; public string[] fexclude = { "mbp", "GK-HTRB-C16P.Upgradation", "InElement" };
private void FrmUpgradation_Load(object sender, EventArgs e) private void FrmUpgradation_Load(object sender, EventArgs e)
...@@ -51,6 +52,7 @@ namespace GK_HTRB_C16P.Upgradation ...@@ -51,6 +52,7 @@ namespace GK_HTRB_C16P.Upgradation
uiCheckBox1.Text = "备份"; uiCheckBox1.Text = "备份";
uiCheckBox2.Text = "软件升级"; uiCheckBox2.Text = "软件升级";
uiCheckBox3.Text = "数据库升级"; uiCheckBox3.Text = "数据库升级";
uiCheckBox4.Text = "生成数据文件";
uiLabel1.Text = "总进度:"; uiLabel1.Text = "总进度:";
uiLabel2.Text = "详情:"; uiLabel2.Text = "详情:";
} }
...@@ -62,6 +64,7 @@ namespace GK_HTRB_C16P.Upgradation ...@@ -62,6 +64,7 @@ namespace GK_HTRB_C16P.Upgradation
uiCheckBox1.Text = "Backup"; uiCheckBox1.Text = "Backup";
uiCheckBox2.Text = "Software Upgrade"; uiCheckBox2.Text = "Software Upgrade";
uiCheckBox3.Text = "Database Upgrade"; uiCheckBox3.Text = "Database Upgrade";
uiCheckBox4.Text = "Data File";
uiLabel1.Text = "Overall Schedule:"; uiLabel1.Text = "Overall Schedule:";
uiLabel2.Text = "Details:"; uiLabel2.Text = "Details:";
} }
...@@ -70,8 +73,8 @@ namespace GK_HTRB_C16P.Upgradation ...@@ -70,8 +73,8 @@ namespace GK_HTRB_C16P.Upgradation
{ {
try try
{ {
//if (!KillPro())//杀死进程 if (!KillPro())//杀死进程
// return; return;
uiListBox1.Items.Clear(); uiListBox1.Items.Clear();
Task t = new Task(() => Task t = new Task(() =>
{ {
...@@ -133,6 +136,7 @@ namespace GK_HTRB_C16P.Upgradation ...@@ -133,6 +136,7 @@ namespace GK_HTRB_C16P.Upgradation
ListboxLog("Software upgrade complete!...................."); ListboxLog("Software upgrade complete!....................");
uiCheckBox2.Checked = false; uiCheckBox2.Checked = false;
} }
DataFile = uiCheckBox4.Checked;
if (uiCheckBox3.Checked) if (uiCheckBox3.Checked)
{ {
if (Config == "ChineseSimplified") if (Config == "ChineseSimplified")
...@@ -395,7 +399,7 @@ namespace GK_HTRB_C16P.Upgradation ...@@ -395,7 +399,7 @@ namespace GK_HTRB_C16P.Upgradation
ListboxLog("table:" + name + " 开始检查数据文件" + jp + @"\" + newParmdata.Rows.Count); ListboxLog("table:" + name + " 开始检查数据文件" + jp + @"\" + newParmdata.Rows.Count);
else else
ListboxLog("table:" + name + " Start checking data files" + jp + @"\" + newParmdata.Rows.Count); ListboxLog("table:" + name + " Start checking data files" + jp + @"\" + newParmdata.Rows.Count);
if (!filexit) if (!filexit && DataFile)//data up
{ {
if (isqb.Contains("Batch")) if (isqb.Contains("Batch"))
{ {
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<configuration> <configuration>
<appSettings> <appSettings>
<add key="Style" value="0" /> <add key="Style" value="1" />
<add key="SqlDB" value="data source=D:\Data\mbp.db;New=False;Compress=True;Synchronous=FULL;UTF8Encoding=True;Version=3;" /> <add key="SqlDB" value="data source=D:\Data\mbp.db;New=False;Compress=True;Synchronous=FULL;UTF8Encoding=True;Version=3;" />
<add key="ClientSettingsProvider.ServiceUri" value="" /> <add key="ClientSettingsProvider.ServiceUri" value="" />
</appSettings> </appSettings>
......
...@@ -901,7 +901,7 @@ ...@@ -901,7 +901,7 @@
<Tips3>暂停</Tips3> <Tips3>暂停</Tips3>
</FrmMain> </FrmMain>
<RunSetting> <RunSetting>
<Tips1>通道</Tips1> <Tips1></Tips1>
<Tips2>板块未选中,请先选择板块</Tips2> <Tips2>板块未选中,请先选择板块</Tips2>
<Tips3>已选中</Tips3> <Tips3>已选中</Tips3>
<Tips4>是否执行开始命令</Tips4> <Tips4>是否执行开始命令</Tips4>
...@@ -912,7 +912,7 @@ ...@@ -912,7 +912,7 @@
<Tips9>是否执行继续命令!</Tips9> <Tips9>是否执行继续命令!</Tips9>
<Tips10>该板暂停,是否执行继续命令!</Tips10> <Tips10>该板暂停,是否执行继续命令!</Tips10>
<Tips11>继续运行设置完成!</Tips11> <Tips11>继续运行设置完成!</Tips11>
<Tips12>是否执行暂停命令!</Tips12> <Tips12>是否执行停止命令!</Tips12>
<Tips13>未建立批次,请先建立批次!</Tips13> <Tips13>未建立批次,请先建立批次!</Tips13>
<Tips14>请先在参数设置里建立批次!</Tips14> <Tips14>请先在参数设置里建立批次!</Tips14>
<Tips15>对电源进行换向操作!</Tips15> <Tips15>对电源进行换向操作!</Tips15>
...@@ -976,6 +976,7 @@ ...@@ -976,6 +976,7 @@
<Tips10>实验参数设置成功</Tips10> <Tips10>实验参数设置成功</Tips10>
<Tips11>批次与选中的通道号不匹配</Tips11> <Tips11>批次与选中的通道号不匹配</Tips11>
<Tips12>批次名称不能重复,历史批次已存在</Tips12> <Tips12>批次名称不能重复,历史批次已存在</Tips12>
<Tips13>同一组电源对应的批次,只能用单个器件库</Tips13>
</BatchManagement> </BatchManagement>
<Devicelibrary> <Devicelibrary>
<Tips1>器件库新建</Tips1> <Tips1>器件库新建</Tips1>
...@@ -989,6 +990,8 @@ ...@@ -989,6 +990,8 @@
<Tips9>老化板图</Tips9> <Tips9>老化板图</Tips9>
<Tips10>器件图</Tips10> <Tips10>器件图</Tips10>
<Tips11>Vg和Vgs不能同时存在</Tips11> <Tips11>Vg和Vgs不能同时存在</Tips11>
<Tips12>器件正在使用不允许删除</Tips12>
<Tips13>器件库正在使用不允许删除</Tips13>
</Devicelibrary> </Devicelibrary>
<UserManager> <UserManager>
<Tips1>已启用</Tips1> <Tips1>已启用</Tips1>
......
...@@ -887,7 +887,7 @@ ...@@ -887,7 +887,7 @@
<Tips3>Pause</Tips3> <Tips3>Pause</Tips3>
</FrmMain> </FrmMain>
<RunSetting> <RunSetting>
<Tips1>Slot </Tips1> <Tips1></Tips1>
<Tips2>The board is not selected, please select the board first</Tips2> <Tips2>The board is not selected, please select the board first</Tips2>
<Tips3>Selected </Tips3> <Tips3>Selected </Tips3>
<Tips4>Whether to execute the start command?</Tips4> <Tips4>Whether to execute the start command?</Tips4>
...@@ -969,6 +969,10 @@ ...@@ -969,6 +969,10 @@
<Tips9>BIB Image</Tips9> <Tips9>BIB Image</Tips9>
<Tips10>Device Image</Tips10> <Tips10>Device Image</Tips10>
<Tips11>Vg and Vgs cannot exist simultaneously</Tips11> <Tips11>Vg and Vgs cannot exist simultaneously</Tips11>
<Tips12>Batch names cannot be duplicated, historical batches already exist</Tips12>
<Tips13>Only a single component library can be used for batches corresponding to the same set of power supplies</Tips13>
<Tips12>Device is in use and cannot be deleted</Tips12>
<Tips13>The device library is currently in use and cannot be deleted</Tips13>
</Devicelibrary> </Devicelibrary>
<UserManager> <UserManager>
<Tips1>Activated</Tips1> <Tips1>Activated</Tips1>
......
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 BoardAutoBll
{
public List<Board_Auto> GetList()
{
List<Board_Auto> dev_Devices = null;
using (IDbConnection cnn = new SQLiteConnection(DapperConntionData.Conectionvoidstring()))
{
cnn.Open();
dev_Devices = cnn.Query<Board_Auto>("select * from Board_Auto where Status = @Status;", new
{
Status = 0
}).ToList();
}
return dev_Devices;
}
public List<Board_Auto> GetListNotStatus()
{
List<Board_Auto> board_Autos = null;
using (IDbConnection cnn = new SQLiteConnection(DapperConntionData.Conectionvoidstring()))
{
cnn.Open();
board_Autos = cnn.Query<Board_Auto>("select * from Board_Auto where 1=1 order by Id desc;").ToList();
}
return board_Autos;
}
public int Add(Board_Auto board_Auto)
{
int result = 0;
using (IDbConnection cnn = new SQLiteConnection(DapperConntionData.Conectionvoidstring()))
{
result = cnn.Execute("insert into Board_Auto(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)", board_Auto);
}
return result;
}
public int Update(Board_Auto board_Auto)
{
int result = 0;
using (IDbConnection cnn = new SQLiteConnection(DapperConntionData.Conectionvoidstring()))
{
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,SupplyRGPW=@SupplyRGPW,AgeingImage=@AgeingImage,Devimage=@Devimage,Status=@Status,UserId=@UserId,Createtime=@Createtime " +
"where Id=" + board_Auto.Id, board_Auto);
}
return result;
}
public Board_Auto GetInfo(int Id)
{
Board_Auto board_Auto = null;
using (IDbConnection cnn = new SQLiteConnection(DapperConntionData.Conectionvoidstring()))
{
cnn.Open();
board_Auto = cnn.Query<Board_Auto>("select * from Board_Auto where Id=@Id;", new
{
Id = Id
}).FirstOrDefault();
}
return board_Auto;
}
}
}
...@@ -18,8 +18,8 @@ namespace GKHTRBC16P.Bll ...@@ -18,8 +18,8 @@ namespace GKHTRBC16P.Bll
Station=@Station,JunTemp=@JunTemp,ReadTemp=@ReadTemp,TestBoxId=@TestBoxId,BoxNum=@BoxNum,ProControl=@ProControl,SerialNumber=@SerialNumber,TestBoxNo=@TestBoxNo,PowerId=@PowerId,SaveVoltage=@SaveVoltage, Station=@Station,JunTemp=@JunTemp,ReadTemp=@ReadTemp,TestBoxId=@TestBoxId,BoxNum=@BoxNum,ProControl=@ProControl,SerialNumber=@SerialNumber,TestBoxNo=@TestBoxNo,PowerId=@PowerId,SaveVoltage=@SaveVoltage,
ComPowerNum=@ComPowerNum,PowerUnit=@PowerUnit,BrImage=@BrImage,CommpanyName=@CommpanyName,CommpanyCode=@CommpanyCode,DeviceType=@DeviceType,DeviceCode=@DeviceCode,Editions=@Editions,EditionsDateTime=@EditionsDateTime, ComPowerNum=@ComPowerNum,PowerUnit=@PowerUnit,BrImage=@BrImage,CommpanyName=@CommpanyName,CommpanyCode=@CommpanyCode,DeviceType=@DeviceType,DeviceCode=@DeviceCode,Editions=@Editions,EditionsDateTime=@EditionsDateTime,
Language=@Language,TimeInterVal=@TimeInterVal,AutoSave=@AutoSave,StateSave=@StateSave,AutoEndTest=@AutoEndTest,AutoSavePath=@AutoSavePath,Isbridge=@Isbridge,ReportDisTemp=@ReportDisTemp,Ishtrb=@Ishtrb,LampPanel=@LampPanel, Language=@Language,TimeInterVal=@TimeInterVal,AutoSave=@AutoSave,StateSave=@StateSave,AutoEndTest=@AutoEndTest,AutoSavePath=@AutoSavePath,Isbridge=@Isbridge,ReportDisTemp=@ReportDisTemp,Ishtrb=@Ishtrb,LampPanel=@LampPanel,
TempValue=@TempValue,InterMap=@InterMap,InterOpen=@InterOpen,DataLength=@DataLength,AutoControl=@AutoControl,IsBackup=@IsBackup,IsVgs=@IsVgs,Remarks=@Remarks,Status=@Status,UserId=@UserId,Createtime=@Createtime TempValue=@TempValue,InterMap=@InterMap,InterOpen=@InterOpen,DataLength=@DataLength,AutoControl=@AutoControl,IsBackup=@IsBackup,IsVgs=@IsVgs,PowerOnHeating=@PowerOnHeating,PowerOffCooling=@PowerOffCooling,
where Id={0};", dev_Config.Id), dev_Config); Remarks=@Remarks,Status=@Status,UserId=@UserId,Createtime=@Createtime where Id={0};", dev_Config.Id), dev_Config);
} }
return result; return result;
} }
...@@ -32,7 +32,8 @@ namespace GKHTRBC16P.Bll ...@@ -32,7 +32,8 @@ namespace GKHTRBC16P.Bll
Station=@Station,JunTemp=@JunTemp,ReadTemp=@ReadTemp,TestBoxId=@TestBoxId,BoxNum=@BoxNum,ProControl=@ProControl,SerialNumber=@SerialNumber,TestBoxNo=@TestBoxNo,PowerId=@PowerId,SaveVoltage=@SaveVoltage, Station=@Station,JunTemp=@JunTemp,ReadTemp=@ReadTemp,TestBoxId=@TestBoxId,BoxNum=@BoxNum,ProControl=@ProControl,SerialNumber=@SerialNumber,TestBoxNo=@TestBoxNo,PowerId=@PowerId,SaveVoltage=@SaveVoltage,
ComPowerNum=@ComPowerNum,PowerUnit=@PowerUnit,BrImage=@BrImage,CommpanyName=@CommpanyName,CommpanyCode=@CommpanyCode,DeviceType=@DeviceType,DeviceCode=@DeviceCode,Editions=@Editions,EditionsDateTime=@EditionsDateTime, ComPowerNum=@ComPowerNum,PowerUnit=@PowerUnit,BrImage=@BrImage,CommpanyName=@CommpanyName,CommpanyCode=@CommpanyCode,DeviceType=@DeviceType,DeviceCode=@DeviceCode,Editions=@Editions,EditionsDateTime=@EditionsDateTime,
Language=@Language,TimeInterVal=@TimeInterVal,AutoSave=@AutoSave,StateSave=@StateSave,AutoEndTest=@AutoEndTest,AutoSavePath=@AutoSavePath,Isbridge=@Isbridge,ReportDisTemp=@ReportDisTemp,Ishtrb=@Ishtrb,LampPanel=@LampPanel, Language=@Language,TimeInterVal=@TimeInterVal,AutoSave=@AutoSave,StateSave=@StateSave,AutoEndTest=@AutoEndTest,AutoSavePath=@AutoSavePath,Isbridge=@Isbridge,ReportDisTemp=@ReportDisTemp,Ishtrb=@Ishtrb,LampPanel=@LampPanel,
TempValue=@TempValue,InterMap=@InterMap,InterOpen=@InterOpen,DataLength=@DataLength,AutoControl=@AutoControl,IsBackup=@IsBackup,IsVgs=@IsVgs,Remarks=@Remarks,Status=@Status,UserId=@UserId,Createtime=@Createtime TempValue=@TempValue,InterMap=@InterMap,InterOpen=@InterOpen,DataLength=@DataLength,AutoControl=@AutoControl,IsBackup=@IsBackup,IsVgs=@IsVgs,PowerOnHeating=@PowerOnHeating,PowerOffCooling=@PowerOffCooling,
Remarks=@Remarks,Status=@Status,UserId=@UserId,Createtime=@Createtime
where Id={0};", dev_Config.Id), dev_Config); where Id={0};", dev_Config.Id), dev_Config);
} }
return result; return result;
......
...@@ -50,6 +50,7 @@ ...@@ -50,6 +50,7 @@
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="BoardAutoBll.cs" />
<Compile Include="CoefSetkbBll.cs" /> <Compile Include="CoefSetkbBll.cs" />
<Compile Include="ComInfoBll.cs" /> <Compile Include="ComInfoBll.cs" />
<Compile Include="ComSetBll.cs" /> <Compile Include="ComSetBll.cs" />
......
...@@ -47,7 +47,7 @@ namespace GKHTRBC16P.Bll ...@@ -47,7 +47,7 @@ namespace GKHTRBC16P.Bll
public List<Power_Oven_Auto> GetPageList(int pageIndex, int pageSize, out int total) public List<Power_Oven_Auto> GetPageList(int pageIndex, int pageSize, out int total)
{ {
total = 0; total = 0;
string where = "1=1 and status = 0"; string where = "1=1";
try try
{ {
CreateTbBll createTbBll = new CreateTbBll(); CreateTbBll createTbBll = new CreateTbBll();
......
80d8ada0bd08f8ba8ac3cba332a418d46f12a6306ce3cf9008005623b1b0fcb8 bda2183c81c2626439e95e9e0f52bb1b41f905c0888d006387c707fd92d002ae
...@@ -20,6 +20,8 @@ E:\Customer\GK-HTRB-C16P-gk\GKHTRBC16P\GKHTRBC16P.Bll\obj\Debug\GKHTRBC16P.Bll.d ...@@ -20,6 +20,8 @@ E:\Customer\GK-HTRB-C16P-gk\GKHTRBC16P\GKHTRBC16P.Bll\obj\Debug\GKHTRBC16P.Bll.d
E:\Customer\GK-HTRB-C16P-gk\GKHTRBC16P\GKHTRBC16P.Bll\obj\Debug\GKHTRBC16P.Bll.pdb E:\Customer\GK-HTRB-C16P-gk\GKHTRBC16P\GKHTRBC16P.Bll\obj\Debug\GKHTRBC16P.Bll.pdb
E:\Customer\GK-HTRB-C16P-gk\GKHTRBC16P\GKHTRBC16P.Bll\bin\Debug\DLL\MQTTnet.dll E:\Customer\GK-HTRB-C16P-gk\GKHTRBC16P\GKHTRBC16P.Bll\bin\Debug\DLL\MQTTnet.dll
E:\Customer\GK-HTRB-C16P-gk\GKHTRBC16P\GKHTRBC16P.Bll\bin\Debug\MQTTnet.dll E:\Customer\GK-HTRB-C16P-gk\GKHTRBC16P\GKHTRBC16P.Bll\bin\Debug\MQTTnet.dll
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\bin\Debug\DLL\HTICOLClient.dll E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Bll\bin\Debug\DLL\HTICOLClient.dll
E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Bll\bin\Debug\x64\SQLite.Interop.dll E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Bll\bin\Debug\x64\SQLite.Interop.dll
E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Bll\bin\Debug\x86\SQLite.Interop.dll E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Bll\bin\Debug\x86\SQLite.Interop.dll
...@@ -38,8 +40,6 @@ E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Bll\bin\Debug\GKHTRBC1 ...@@ -38,8 +40,6 @@ E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Bll\bin\Debug\GKHTRBC1
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\GKHTRBC16P.Toolbox.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\Newtonsoft.Json.xml
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\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\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.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\obj\Debug\GKHTRBC16P.Bll.pdb
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace GKHTRBC16P.Model
{
public class Board_Auto
{
public int Id { get; set; }
public int Td { get; set; }
public int RunStatus { get; set; }
public int IsAuto { get; set; }
public int Status { get; set; }
public string CreateTime { get; set; }
}
}
...@@ -85,6 +85,8 @@ namespace GKHTRBC16P.Model ...@@ -85,6 +85,8 @@ namespace GKHTRBC16P.Model
public int IsVgs { get; set; } public int IsVgs { get; set; }
public string InterMap { get; set; } public string InterMap { get; set; }
public string DataLength { get; set; } public string DataLength { get; set; }
public int PowerOnHeating { get; set; }
public int PowerOffCooling { get; set; }
public string Remarks { get; set; } public string Remarks { get; set; }
public int UserId { get; set; } public int UserId { get; set; }
public int Status { get; set; } public int Status { get; set; }
......
...@@ -46,6 +46,7 @@ ...@@ -46,6 +46,7 @@
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="Board_Auto.cs" />
<Compile Include="Coef_Setkb.cs" /> <Compile Include="Coef_Setkb.cs" />
<Compile Include="Com_Bobox.cs" /> <Compile Include="Com_Bobox.cs" />
<Compile Include="Com_Info.cs" /> <Compile Include="Com_Info.cs" />
......
a6967f7297a1e7a32b3fa89c4ac4beb50dee8820eb4b8df4a8a02b2a2e689723 d69445c4b8a573fb6ac3607dea237051a000efe6905a987a4e5a42a1cb194762
...@@ -91,7 +91,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -91,7 +91,7 @@ namespace GKHTRBC16P.Protocol.Driboard
if (DateTime.Now.Subtract(dt).TotalMilliseconds > MaxWatingTime) //如果2秒后仍然无数据返回,则视为超时 if (DateTime.Now.Subtract(dt).TotalMilliseconds > MaxWatingTime) //如果2秒后仍然无数据返回,则视为超时
{ {
LogisTrac.WriteLog(from.GetType(), "设备未响应" + SerialCom.SerialPort_Drive[Com].PortName); LogisTrac.WriteLog(from.GetType(), "设备未响应" + SerialCom.SerialPort_Drive[Com].PortName);
SerialCom.OpenSerial_Drive_Close(Com,false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com,false);//关闭
return 4; return 4;
} }
} }
...@@ -101,7 +101,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -101,7 +101,7 @@ namespace GKHTRBC16P.Protocol.Driboard
if (senchr[0] != senchr[1] || senchr[0] != 166 || senchr[206] != 11 || senchr[207] != 19) if (senchr[0] != senchr[1] || senchr[0] != 166 || senchr[206] != 11 || senchr[207] != 19)
{ {
LogisTrac.WriteLog(from.GetType(), "接收数据异常" + SerialCom.SerialPort_Drive[Com].PortName); LogisTrac.WriteLog(from.GetType(), "接收数据异常" + SerialCom.SerialPort_Drive[Com].PortName);
SerialCom.OpenSerial_Drive_Close(Com, false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com, false);//关闭
return 2; return 2;
} }
int[] comdata = new int[511]; int[] comdata = new int[511];
...@@ -115,7 +115,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -115,7 +115,7 @@ namespace GKHTRBC16P.Protocol.Driboard
} }
catch (Exception ex) catch (Exception ex)
{ {
SerialCom.OpenSerial_Drive_Close(Com,false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com,false);//关闭
LogisTrac.WriteLog(from.GetType(), ex); LogisTrac.WriteLog(from.GetType(), ex);
return 1; return 1;
} }
...@@ -193,7 +193,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -193,7 +193,7 @@ namespace GKHTRBC16P.Protocol.Driboard
if (DateTime.Now.Subtract(dt).TotalMilliseconds > MaxWatingTime) //如果2秒后仍然无数据返回,则视为超时 if (DateTime.Now.Subtract(dt).TotalMilliseconds > MaxWatingTime) //如果2秒后仍然无数据返回,则视为超时
{ {
LogisTrac.WriteLog(from.GetType(), "设备未响应" + SerialCom.SerialPort_Drive[Com].PortName); LogisTrac.WriteLog(from.GetType(), "设备未响应" + SerialCom.SerialPort_Drive[Com].PortName);
SerialCom.OpenSerial_Drive_Close(Com, false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com, false);//关闭
return 4; return 4;
} }
} }
...@@ -210,7 +210,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -210,7 +210,7 @@ namespace GKHTRBC16P.Protocol.Driboard
} }
catch (Exception ex) catch (Exception ex)
{ {
SerialCom.OpenSerial_Drive_Close(Com, false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com, false);//关闭
//from.ShowErrorTip(ex.Message); //from.ShowErrorTip(ex.Message);
LogisTrac.WriteLog(from.GetType(), ex); LogisTrac.WriteLog(from.GetType(), ex);
return 1; return 1;
...@@ -292,7 +292,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -292,7 +292,7 @@ namespace GKHTRBC16P.Protocol.Driboard
if (DateTime.Now.Subtract(dt).TotalMilliseconds > MaxWatingTime) //如果2秒后仍然无数据返回,则视为超时 if (DateTime.Now.Subtract(dt).TotalMilliseconds > MaxWatingTime) //如果2秒后仍然无数据返回,则视为超时
{ {
LogisTrac.WriteLog(from.GetType(), "设备未响应" + SerialCom.SerialPort_Drive[Com].PortName); LogisTrac.WriteLog(from.GetType(), "设备未响应" + SerialCom.SerialPort_Drive[Com].PortName);
SerialCom.OpenSerial_Drive_Close(Com, false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com, false);//关闭
return 4; return 4;
} }
} }
...@@ -309,7 +309,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -309,7 +309,7 @@ namespace GKHTRBC16P.Protocol.Driboard
} }
catch (Exception ex) catch (Exception ex)
{ {
SerialCom.OpenSerial_Drive_Close(Com, false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com, false);//关闭
//from.ShowErrorTip(ex.Message); //from.ShowErrorTip(ex.Message);
LogisTrac.WriteLog(from.GetType(), ex); LogisTrac.WriteLog(from.GetType(), ex);
return 1; return 1;
...@@ -378,7 +378,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -378,7 +378,7 @@ namespace GKHTRBC16P.Protocol.Driboard
{ {
LogisTrac.WriteLog(from.GetType(), "设备未响应" + SerialCom.SerialPort_Drive[Com].PortName); LogisTrac.WriteLog(from.GetType(), "设备未响应" + SerialCom.SerialPort_Drive[Com].PortName);
//from.ShowErrorTip("设备未响应" + SerialCom.Communication_Drive.ComName); //from.ShowErrorTip("设备未响应" + SerialCom.Communication_Drive.ComName);
SerialCom.OpenSerial_Drive_Close(Com, false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com, false);//关闭
return 4; return 4;
} }
} }
...@@ -395,7 +395,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -395,7 +395,7 @@ namespace GKHTRBC16P.Protocol.Driboard
} }
catch (Exception ex) catch (Exception ex)
{ {
SerialCom.OpenSerial_Drive_Close(Com, false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com, false);//关闭
//from.ShowErrorTip(ex.Message); //from.ShowErrorTip(ex.Message);
LogisTrac.WriteLog(from.GetType(), ex); LogisTrac.WriteLog(from.GetType(), ex);
return 1; return 1;
...@@ -466,7 +466,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -466,7 +466,7 @@ namespace GKHTRBC16P.Protocol.Driboard
if (DateTime.Now.Subtract(dt).TotalMilliseconds > MaxWatingTime) //如果2秒后仍然无数据返回,则视为超时 if (DateTime.Now.Subtract(dt).TotalMilliseconds > MaxWatingTime) //如果2秒后仍然无数据返回,则视为超时
{ {
LogisTrac.WriteLog(from.GetType(), "设备未响应" + SerialCom.SerialPort_Drive[Com].PortName); LogisTrac.WriteLog(from.GetType(), "设备未响应" + SerialCom.SerialPort_Drive[Com].PortName);
SerialCom.OpenSerial_Drive_Close(Com, false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com, false);//关闭
return 4; return 4;
} }
} }
...@@ -483,7 +483,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -483,7 +483,7 @@ namespace GKHTRBC16P.Protocol.Driboard
} }
catch (Exception ex) catch (Exception ex)
{ {
SerialCom.OpenSerial_Drive_Close(Com, false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com, false);//关闭
//from.ShowErrorTip(ex.Message); //from.ShowErrorTip(ex.Message);
LogisTrac.WriteLog(from.GetType(), ex); LogisTrac.WriteLog(from.GetType(), ex);
return 1; return 1;
...@@ -548,7 +548,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -548,7 +548,7 @@ namespace GKHTRBC16P.Protocol.Driboard
if (DateTime.Now.Subtract(dt).TotalMilliseconds > MaxWatingTime) //如果2秒后仍然无数据返回,则视为超时 if (DateTime.Now.Subtract(dt).TotalMilliseconds > MaxWatingTime) //如果2秒后仍然无数据返回,则视为超时
{ {
LogisTrac.WriteLog(from.GetType(), "设备未响应" + SerialCom.SerialPort_Drive[Com].PortName); LogisTrac.WriteLog(from.GetType(), "设备未响应" + SerialCom.SerialPort_Drive[Com].PortName);
SerialCom.OpenSerial_Drive_Close(Com, false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com, false);//关闭
return 4; return 4;
} }
} }
...@@ -566,7 +566,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -566,7 +566,7 @@ namespace GKHTRBC16P.Protocol.Driboard
} }
catch (Exception ex) catch (Exception ex)
{ {
SerialCom.OpenSerial_Drive_Close(Com, false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com, false);//关闭
//from.ShowErrorTip(ex.Message); //from.ShowErrorTip(ex.Message);
LogisTrac.WriteLog(from.GetType(), ex); LogisTrac.WriteLog(from.GetType(), ex);
return 1; return 1;
......
...@@ -92,7 +92,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -92,7 +92,7 @@ namespace GKHTRBC16P.Protocol.Driboard
if (DateTime.Now.Subtract(dt).TotalMilliseconds > MaxWatingTime) //如果300秒后仍然无数据返回,则视为超时 if (DateTime.Now.Subtract(dt).TotalMilliseconds > MaxWatingTime) //如果300秒后仍然无数据返回,则视为超时
{ {
LogisTrac.WriteLog(from.GetType(), "设备未响应" + SerialCom.SerialPort_Drive[Com].PortName); LogisTrac.WriteLog(from.GetType(), "设备未响应" + SerialCom.SerialPort_Drive[Com].PortName);
SerialCom.OpenSerial_Drive_Close(Com, false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com, false);//关闭
return 4; return 4;
} }
} }
...@@ -103,7 +103,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -103,7 +103,7 @@ namespace GKHTRBC16P.Protocol.Driboard
if (senchr[0] != senchr[1] || senchr[0] != 166 || senchr[120] != 11 || senchr[119] != 19) if (senchr[0] != senchr[1] || senchr[0] != 166 || senchr[120] != 11 || senchr[119] != 19)
{ {
LogisTrac.WriteLog(from.GetType(), "接收数据异常" + SerialCom.SerialPort_Drive[Com].PortName); LogisTrac.WriteLog(from.GetType(), "接收数据异常" + SerialCom.SerialPort_Drive[Com].PortName);
SerialCom.OpenSerial_Drive_Close(Com, false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com, false);//关闭
return 2; return 2;
} }
for (int t = 0; t <= 123; t++) for (int t = 0; t <= 123; t++)
...@@ -114,7 +114,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -114,7 +114,7 @@ namespace GKHTRBC16P.Protocol.Driboard
} }
catch (Exception ex) catch (Exception ex)
{ {
SerialCom.OpenSerial_Drive_Close(Com, false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com, false);//关闭
//from.ShowErrorTip(ex.Message); //from.ShowErrorTip(ex.Message);
LogisTrac.WriteLog(from.GetType(), ex); LogisTrac.WriteLog(from.GetType(), ex);
return 1; return 1;
...@@ -193,7 +193,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -193,7 +193,7 @@ namespace GKHTRBC16P.Protocol.Driboard
if (DateTime.Now.Subtract(dt).TotalMilliseconds > MaxWatingTime) //如果2秒后仍然无数据返回,则视为超时 if (DateTime.Now.Subtract(dt).TotalMilliseconds > MaxWatingTime) //如果2秒后仍然无数据返回,则视为超时
{ {
LogisTrac.WriteLog(from.GetType(), "设备未响应" + SerialCom.SerialPort_Drive[Com].PortName); LogisTrac.WriteLog(from.GetType(), "设备未响应" + SerialCom.SerialPort_Drive[Com].PortName);
SerialCom.OpenSerial_Drive_Close(Com, false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com, false);//关闭
return 0; return 0;
} }
} }
...@@ -203,7 +203,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -203,7 +203,7 @@ namespace GKHTRBC16P.Protocol.Driboard
if (senchr[0] != senchr[1] || senchr[0] != 166 || senchr[16] != 11 || senchr[15] != 19) if (senchr[0] != senchr[1] || senchr[0] != 166 || senchr[16] != 11 || senchr[15] != 19)
{ {
LogisTrac.WriteLog(from.GetType(), "接收数据异常" + SerialCom.SerialPort_Drive[Com].PortName); LogisTrac.WriteLog(from.GetType(), "接收数据异常" + SerialCom.SerialPort_Drive[Com].PortName);
SerialCom.OpenSerial_Drive_Close(Com, false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com, false);//关闭
return 0; return 0;
} }
int[] comdata = new int[511]; int[] comdata = new int[511];
...@@ -214,7 +214,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -214,7 +214,7 @@ namespace GKHTRBC16P.Protocol.Driboard
} }
catch (Exception ex) catch (Exception ex)
{ {
SerialCom.OpenSerial_Drive_Close(Com, false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com, false);//关闭
LogisTrac.WriteLog(from.GetType(), ex); LogisTrac.WriteLog(from.GetType(), ex);
return 1; return 1;
} }
...@@ -295,7 +295,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -295,7 +295,7 @@ namespace GKHTRBC16P.Protocol.Driboard
if (DateTime.Now.Subtract(dt).TotalMilliseconds > MaxWatingTime*4) //如果1秒后仍然无数据返回,则视为超时 if (DateTime.Now.Subtract(dt).TotalMilliseconds > MaxWatingTime*4) //如果1秒后仍然无数据返回,则视为超时
{ {
LogisTrac.WriteLog(from.GetType(), "设备未响应" + SerialCom.SerialPort_Drive[Com].PortName); LogisTrac.WriteLog(from.GetType(), "设备未响应" + SerialCom.SerialPort_Drive[Com].PortName);
SerialCom.OpenSerial_Drive_Close(Com, false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com, false);//关闭
return 4; return 4;
} }
} }
...@@ -305,7 +305,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -305,7 +305,7 @@ namespace GKHTRBC16P.Protocol.Driboard
if (senchr[0] != senchr[1] || senchr[0] != 166 || senchr[16] != 11 || senchr[15] != 19) if (senchr[0] != senchr[1] || senchr[0] != 166 || senchr[16] != 11 || senchr[15] != 19)
{ {
LogisTrac.WriteLog(from.GetType(), "接收数据异常" + SerialCom.SerialPort_Drive[Com].PortName); LogisTrac.WriteLog(from.GetType(), "接收数据异常" + SerialCom.SerialPort_Drive[Com].PortName);
SerialCom.OpenSerial_Drive_Close(Com, false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com, false);//关闭
return 2; return 2;
} }
Goby = senchr[10]; Goby = senchr[10];
...@@ -314,7 +314,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -314,7 +314,7 @@ namespace GKHTRBC16P.Protocol.Driboard
} }
catch (Exception ex) catch (Exception ex)
{ {
SerialCom.OpenSerial_Drive_Close(Com, false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com, false);//关闭
//from.ShowErrorTip(ex.Message); //from.ShowErrorTip(ex.Message);
LogisTrac.WriteLog(from.GetType(), ex); LogisTrac.WriteLog(from.GetType(), ex);
return 1; return 1;
......
...@@ -79,7 +79,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -79,7 +79,7 @@ namespace GKHTRBC16P.Protocol.Driboard
if (DateTime.Now.Subtract(dt).TotalMilliseconds > MaxWatingTime) //如果2秒后仍然无数据返回,则视为超时 if (DateTime.Now.Subtract(dt).TotalMilliseconds > MaxWatingTime) //如果2秒后仍然无数据返回,则视为超时
{ {
LogisTrac.WriteLog(from.GetType(), "设备未响应" + SerialCom.SerialPort_Drive[Com].PortName); LogisTrac.WriteLog(from.GetType(), "设备未响应" + SerialCom.SerialPort_Drive[Com].PortName);
SerialCom.OpenSerial_Drive_Close(Com, false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com, false);//关闭
return 4; return 4;
} }
} }
...@@ -90,7 +90,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -90,7 +90,7 @@ namespace GKHTRBC16P.Protocol.Driboard
if (senchr[0] != senchr[1] || senchr[0] != 166 || senchr[202] != 11 || senchr[203] != 19) if (senchr[0] != senchr[1] || senchr[0] != 166 || senchr[202] != 11 || senchr[203] != 19)
{ {
LogisTrac.WriteLog(from.GetType(), "接收数据异常" + SerialCom.SerialPort_Drive[Com].PortName); LogisTrac.WriteLog(from.GetType(), "接收数据异常" + SerialCom.SerialPort_Drive[Com].PortName);
SerialCom.OpenSerial_Drive_Close(Com, false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com, false);//关闭
return 2; return 2;
} }
for (int t = 0; t <= 229; t++) for (int t = 0; t <= 229; t++)
...@@ -103,7 +103,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -103,7 +103,7 @@ namespace GKHTRBC16P.Protocol.Driboard
} }
catch (Exception ex) catch (Exception ex)
{ {
SerialCom.OpenSerial_Drive_Close(Com, false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com, false);//关闭
//from.ShowErrorTip(ex.Message); //from.ShowErrorTip(ex.Message);
LogisTrac.WriteLog(from.GetType(), ex); LogisTrac.WriteLog(from.GetType(), ex);
return 1; return 1;
...@@ -182,7 +182,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -182,7 +182,7 @@ namespace GKHTRBC16P.Protocol.Driboard
if (DateTime.Now.Subtract(dt).TotalMilliseconds > MaxWatingTime) //如果2秒后仍然无数据返回,则视为超时 if (DateTime.Now.Subtract(dt).TotalMilliseconds > MaxWatingTime) //如果2秒后仍然无数据返回,则视为超时
{ {
LogisTrac.WriteLog(from.GetType(), "设备未响应" + SerialCom.SerialPort_Drive[Com].PortName); LogisTrac.WriteLog(from.GetType(), "设备未响应" + SerialCom.SerialPort_Drive[Com].PortName);
SerialCom.OpenSerial_Drive_Close(Com, false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com, false);//关闭
return 4; return 4;
} }
} }
...@@ -193,7 +193,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -193,7 +193,7 @@ namespace GKHTRBC16P.Protocol.Driboard
if (senchr[0] != senchr[1] || senchr[0] != 166 || senchr[15] != 11 || senchr[16] != 19) if (senchr[0] != senchr[1] || senchr[0] != 166 || senchr[15] != 11 || senchr[16] != 19)
{ {
LogisTrac.WriteLog(from.GetType(), "接收数据异常" + SerialCom.SerialPort_Drive[Com].PortName); LogisTrac.WriteLog(from.GetType(), "接收数据异常" + SerialCom.SerialPort_Drive[Com].PortName);
SerialCom.OpenSerial_Drive_Close(Com, false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com, false);//关闭
return 2; return 2;
} }
for (int t = 0; t <= 299; t++) for (int t = 0; t <= 299; t++)
...@@ -205,7 +205,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -205,7 +205,7 @@ namespace GKHTRBC16P.Protocol.Driboard
} }
catch (Exception ex) catch (Exception ex)
{ {
SerialCom.OpenSerial_Drive_Close(Com, false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com, false);//关闭
//from.ShowErrorTip(ex.Message); //from.ShowErrorTip(ex.Message);
LogisTrac.WriteLog(from.GetType(), ex); LogisTrac.WriteLog(from.GetType(), ex);
return 1; return 1;
...@@ -305,7 +305,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -305,7 +305,7 @@ namespace GKHTRBC16P.Protocol.Driboard
if (DateTime.Now.Subtract(dt).TotalMilliseconds > MaxWatingTime) //如果2秒后仍然无数据返回,则视为超时 if (DateTime.Now.Subtract(dt).TotalMilliseconds > MaxWatingTime) //如果2秒后仍然无数据返回,则视为超时
{ {
LogisTrac.WriteLog(from.GetType(), "设备未响应" + SerialCom.SerialPort_Drive[Com].PortName); LogisTrac.WriteLog(from.GetType(), "设备未响应" + SerialCom.SerialPort_Drive[Com].PortName);
SerialCom.OpenSerial_Drive_Close(Com, false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com, false);//关闭
return 4; return 4;
} }
} }
...@@ -316,7 +316,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -316,7 +316,7 @@ namespace GKHTRBC16P.Protocol.Driboard
if (senchr[0] != senchr[1] || senchr[0] != 166 || senchr[15] != 11 || senchr[16] != 19) if (senchr[0] != senchr[1] || senchr[0] != 166 || senchr[15] != 11 || senchr[16] != 19)
{ {
LogisTrac.WriteLog(from.GetType(), "接收数据异常" + SerialCom.SerialPort_Drive[Com].PortName); LogisTrac.WriteLog(from.GetType(), "接收数据异常" + SerialCom.SerialPort_Drive[Com].PortName);
SerialCom.OpenSerial_Drive_Close(Com, false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com, false);//关闭
return 2; return 2;
} }
for (int t = 0; t <= 299; t++) for (int t = 0; t <= 299; t++)
...@@ -328,7 +328,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -328,7 +328,7 @@ namespace GKHTRBC16P.Protocol.Driboard
} }
catch (Exception ex) catch (Exception ex)
{ {
SerialCom.OpenSerial_Drive_Close(Com, false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com, false);//关闭
LogisTrac.WriteLog(from.GetType(), ex); LogisTrac.WriteLog(from.GetType(), ex);
return 1; return 1;
} }
...@@ -395,7 +395,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -395,7 +395,7 @@ namespace GKHTRBC16P.Protocol.Driboard
if (DateTime.Now.Subtract(dt).TotalMilliseconds > MaxWatingTime) //如果2秒后仍然无数据返回,则视为超时 if (DateTime.Now.Subtract(dt).TotalMilliseconds > MaxWatingTime) //如果2秒后仍然无数据返回,则视为超时
{ {
LogisTrac.WriteLog(from.GetType(), "设备未响应" + SerialCom.SerialPort_Drive[Com].PortName); LogisTrac.WriteLog(from.GetType(), "设备未响应" + SerialCom.SerialPort_Drive[Com].PortName);
SerialCom.OpenSerial_Drive_Close(Com, false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com, false);//关闭
return 4; return 4;
} }
} }
...@@ -412,7 +412,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -412,7 +412,7 @@ namespace GKHTRBC16P.Protocol.Driboard
} }
catch (Exception ex) catch (Exception ex)
{ {
SerialCom.OpenSerial_Drive_Close(Com, false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com, false);//关闭
//from.ShowErrorTip(ex.Message); //from.ShowErrorTip(ex.Message);
LogisTrac.WriteLog(from.GetType(), ex); LogisTrac.WriteLog(from.GetType(), ex);
return 1; return 1;
...@@ -483,7 +483,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -483,7 +483,7 @@ namespace GKHTRBC16P.Protocol.Driboard
if (DateTime.Now.Subtract(dt).TotalMilliseconds > MaxWatingTime) //如果2秒后仍然无数据返回,则视为超时 if (DateTime.Now.Subtract(dt).TotalMilliseconds > MaxWatingTime) //如果2秒后仍然无数据返回,则视为超时
{ {
LogisTrac.WriteLog(from.GetType(), "设备未响应" + SerialCom.SerialPort_Drive[Com].PortName); LogisTrac.WriteLog(from.GetType(), "设备未响应" + SerialCom.SerialPort_Drive[Com].PortName);
SerialCom.OpenSerial_Drive_Close(Com, false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com, false);//关闭
return 4; return 4;
} }
} }
...@@ -500,7 +500,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -500,7 +500,7 @@ namespace GKHTRBC16P.Protocol.Driboard
} }
catch (Exception ex) catch (Exception ex)
{ {
SerialCom.OpenSerial_Drive_Close(Com, false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com, false);//关闭
//from.ShowErrorTip(ex.Message); //from.ShowErrorTip(ex.Message);
LogisTrac.WriteLog(from.GetType(), ex); LogisTrac.WriteLog(from.GetType(), ex);
return 1; return 1;
...@@ -568,7 +568,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -568,7 +568,7 @@ namespace GKHTRBC16P.Protocol.Driboard
if (DateTime.Now.Subtract(dt).TotalMilliseconds > MaxWatingTime) //如果2秒后仍然无数据返回,则视为超时 if (DateTime.Now.Subtract(dt).TotalMilliseconds > MaxWatingTime) //如果2秒后仍然无数据返回,则视为超时
{ {
LogisTrac.WriteLog(from.GetType(), "设备未响应" + SerialCom.SerialPort_Drive[Com].PortName); LogisTrac.WriteLog(from.GetType(), "设备未响应" + SerialCom.SerialPort_Drive[Com].PortName);
SerialCom.OpenSerial_Drive_Close(Com, false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com, false);//关闭
return 4; return 4;
} }
} }
...@@ -585,7 +585,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -585,7 +585,7 @@ namespace GKHTRBC16P.Protocol.Driboard
} }
catch (Exception ex) catch (Exception ex)
{ {
SerialCom.OpenSerial_Drive_Close(Com, false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com, false);//关闭
//from.ShowErrorTip(ex.Message); //from.ShowErrorTip(ex.Message);
LogisTrac.WriteLog(from.GetType(), ex); LogisTrac.WriteLog(from.GetType(), ex);
return 1; return 1;
...@@ -650,7 +650,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -650,7 +650,7 @@ namespace GKHTRBC16P.Protocol.Driboard
if (DateTime.Now.Subtract(dt).TotalMilliseconds > MaxWatingTime) //如果2秒后仍然无数据返回,则视为超时 if (DateTime.Now.Subtract(dt).TotalMilliseconds > MaxWatingTime) //如果2秒后仍然无数据返回,则视为超时
{ {
LogisTrac.WriteLog(from.GetType(), "设备未响应" + SerialCom.SerialPort_Drive[Com].PortName); LogisTrac.WriteLog(from.GetType(), "设备未响应" + SerialCom.SerialPort_Drive[Com].PortName);
SerialCom.OpenSerial_Drive_Close(Com, false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com, false);//关闭
return 4; return 4;
} }
} }
...@@ -668,7 +668,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -668,7 +668,7 @@ namespace GKHTRBC16P.Protocol.Driboard
} }
catch (Exception ex) catch (Exception ex)
{ {
SerialCom.OpenSerial_Drive_Close(Com, false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com, false);//关闭
LogisTrac.WriteLog(from.GetType(), ex); LogisTrac.WriteLog(from.GetType(), ex);
return 1; return 1;
} }
......
...@@ -94,7 +94,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -94,7 +94,7 @@ namespace GKHTRBC16P.Protocol.Driboard
if (DateTime.Now.Subtract(dt).TotalMilliseconds > MaxWatingTime) //如果2秒后仍然无数据返回,则视为超时 if (DateTime.Now.Subtract(dt).TotalMilliseconds > MaxWatingTime) //如果2秒后仍然无数据返回,则视为超时
{ {
LogisTrac.WriteLog(from.GetType(), "设备未响应" + SerialCom.SerialPort_Drive[Com].PortName); LogisTrac.WriteLog(from.GetType(), "设备未响应" + SerialCom.SerialPort_Drive[Com].PortName);
SerialCom.OpenSerial_Drive_Close(Com, false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com, false);//关闭
return 4; return 4;
} }
} }
...@@ -105,7 +105,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -105,7 +105,7 @@ namespace GKHTRBC16P.Protocol.Driboard
if (senchr[0] != senchr[1] || senchr[0] != 166 || senchr[373] != 11 || senchr[372] != 19) if (senchr[0] != senchr[1] || senchr[0] != 166 || senchr[373] != 11 || senchr[372] != 19)
{ {
LogisTrac.WriteLog(from.GetType(), "接收数据异常" + SerialCom.SerialPort_Drive[Com].PortName); LogisTrac.WriteLog(from.GetType(), "接收数据异常" + SerialCom.SerialPort_Drive[Com].PortName);
SerialCom.OpenSerial_Drive_Close(Com, false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com, false);//关闭
return 2; return 2;
} }
for (int t = 0; t <= 380; t++) for (int t = 0; t <= 380; t++)
...@@ -118,7 +118,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -118,7 +118,7 @@ namespace GKHTRBC16P.Protocol.Driboard
} }
catch (Exception ex) catch (Exception ex)
{ {
SerialCom.OpenSerial_Drive_Close(Com, false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com, false);//关闭
LogisTrac.WriteLog(from.GetType(), ex); LogisTrac.WriteLog(from.GetType(), ex);
return 1; return 1;
} }
...@@ -197,7 +197,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -197,7 +197,7 @@ namespace GKHTRBC16P.Protocol.Driboard
if (DateTime.Now.Subtract(dt).TotalMilliseconds > MaxWatingTime) //如果2秒后仍然无数据返回,则视为超时 if (DateTime.Now.Subtract(dt).TotalMilliseconds > MaxWatingTime) //如果2秒后仍然无数据返回,则视为超时
{ {
LogisTrac.WriteLog(from.GetType(), "设备未响应" + SerialCom.SerialPort_Drive[Com].PortName); LogisTrac.WriteLog(from.GetType(), "设备未响应" + SerialCom.SerialPort_Drive[Com].PortName);
SerialCom.OpenSerial_Drive_Close(Com, false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com, false);//关闭
return 4; return 4;
} }
} }
...@@ -207,7 +207,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -207,7 +207,7 @@ namespace GKHTRBC16P.Protocol.Driboard
if (senchr[0] != senchr[1] || senchr[0] != 166 || senchr[16] != 11 || senchr[15] != 19) if (senchr[0] != senchr[1] || senchr[0] != 166 || senchr[16] != 11 || senchr[15] != 19)
{ {
LogisTrac.WriteLog(from.GetType(), "接收数据异常" + SerialCom.SerialPort_Drive[Com].PortName); LogisTrac.WriteLog(from.GetType(), "接收数据异常" + SerialCom.SerialPort_Drive[Com].PortName);
SerialCom.OpenSerial_Drive_Close(Com, false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com, false);//关闭
return 2; return 2;
} }
int[] comdata = new int[511]; int[] comdata = new int[511];
...@@ -220,7 +220,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -220,7 +220,7 @@ namespace GKHTRBC16P.Protocol.Driboard
} }
catch (Exception ex) catch (Exception ex)
{ {
SerialCom.OpenSerial_Drive_Close(Com, false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com, false);//关闭
//from.ShowErrorTip(ex.Message); //from.ShowErrorTip(ex.Message);
LogisTrac.WriteLog(from.GetType(), ex); LogisTrac.WriteLog(from.GetType(), ex);
return 1; return 1;
...@@ -316,7 +316,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -316,7 +316,7 @@ namespace GKHTRBC16P.Protocol.Driboard
if (DateTime.Now.Subtract(dt).TotalMilliseconds > MaxWatingTime) //如果2秒后仍然无数据返回,则视为超时 if (DateTime.Now.Subtract(dt).TotalMilliseconds > MaxWatingTime) //如果2秒后仍然无数据返回,则视为超时
{ {
LogisTrac.WriteLog(from.GetType(), "设备未响应" + SerialCom.SerialPort_Drive[Com].PortName); LogisTrac.WriteLog(from.GetType(), "设备未响应" + SerialCom.SerialPort_Drive[Com].PortName);
SerialCom.OpenSerial_Drive_Close(Com, false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com, false);//关闭
return 4; return 4;
} }
} }
...@@ -326,7 +326,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -326,7 +326,7 @@ namespace GKHTRBC16P.Protocol.Driboard
if (senchr[0] != senchr[1] || senchr[0] != 166 || senchr[16] != 11 || senchr[15] != 19) if (senchr[0] != senchr[1] || senchr[0] != 166 || senchr[16] != 11 || senchr[15] != 19)
{ {
LogisTrac.WriteLog(from.GetType(), "接收数据异常" + SerialCom.SerialPort_Drive[Com].PortName); LogisTrac.WriteLog(from.GetType(), "接收数据异常" + SerialCom.SerialPort_Drive[Com].PortName);
SerialCom.OpenSerial_Drive_Close(Com, false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com, false);//关闭
return 2; return 2;
} }
int[] comdata = new int[511]; int[] comdata = new int[511];
...@@ -339,7 +339,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -339,7 +339,7 @@ namespace GKHTRBC16P.Protocol.Driboard
} }
catch (Exception ex) catch (Exception ex)
{ {
SerialCom.OpenSerial_Drive_Close(Com, false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com, false);//关闭
//from.ShowErrorTip(ex.Message); //from.ShowErrorTip(ex.Message);
LogisTrac.WriteLog(from.GetType(), ex); LogisTrac.WriteLog(from.GetType(), ex);
return 1; return 1;
...@@ -411,7 +411,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -411,7 +411,7 @@ namespace GKHTRBC16P.Protocol.Driboard
if (DateTime.Now.Subtract(dt).TotalMilliseconds > MaxWatingTime) //如果2秒后仍然无数据返回,则视为超时 if (DateTime.Now.Subtract(dt).TotalMilliseconds > MaxWatingTime) //如果2秒后仍然无数据返回,则视为超时
{ {
LogisTrac.WriteLog(from.GetType(), "设备未响应" + SerialCom.SerialPort_Drive[Com].PortName); LogisTrac.WriteLog(from.GetType(), "设备未响应" + SerialCom.SerialPort_Drive[Com].PortName);
SerialCom.OpenSerial_Drive_Close(Com, false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com, false);//关闭
return 4; return 4;
} }
} }
...@@ -421,7 +421,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -421,7 +421,7 @@ namespace GKHTRBC16P.Protocol.Driboard
if (senchr[0] != senchr[1] || senchr[0] != 166 || senchr[16] != 11 || senchr[15] != 19) if (senchr[0] != senchr[1] || senchr[0] != 166 || senchr[16] != 11 || senchr[15] != 19)
{ {
LogisTrac.WriteLog(from.GetType(), "接收数据异常" + SerialCom.SerialPort_Drive[Com].PortName); LogisTrac.WriteLog(from.GetType(), "接收数据异常" + SerialCom.SerialPort_Drive[Com].PortName);
SerialCom.OpenSerial_Drive_Close(Com, false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com, false);//关闭
return 2; return 2;
} }
SerialCom.OpenSerial_Drive_Close(Com, true);//关闭 SerialCom.OpenSerial_Drive_Close(Com, true);//关闭
...@@ -429,7 +429,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -429,7 +429,7 @@ namespace GKHTRBC16P.Protocol.Driboard
} }
catch (Exception ex) catch (Exception ex)
{ {
SerialCom.OpenSerial_Drive_Close(Com, false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com, false);//关闭
//from.ShowErrorTip(ex.Message); //from.ShowErrorTip(ex.Message);
LogisTrac.WriteLog(from.GetType(), ex); LogisTrac.WriteLog(from.GetType(), ex);
return 1; return 1;
...@@ -498,7 +498,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -498,7 +498,7 @@ namespace GKHTRBC16P.Protocol.Driboard
if (DateTime.Now.Subtract(dt).TotalMilliseconds > MaxWatingTime) //如果2秒后仍然无数据返回,则视为超时 if (DateTime.Now.Subtract(dt).TotalMilliseconds > MaxWatingTime) //如果2秒后仍然无数据返回,则视为超时
{ {
LogisTrac.WriteLog(from.GetType(), "设备未响应" + SerialCom.SerialPort_Drive[Com].PortName); LogisTrac.WriteLog(from.GetType(), "设备未响应" + SerialCom.SerialPort_Drive[Com].PortName);
SerialCom.OpenSerial_Drive_Close(Com, false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com, false);//关闭
return 4; return 4;
} }
} }
...@@ -508,7 +508,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -508,7 +508,7 @@ namespace GKHTRBC16P.Protocol.Driboard
if (senchr[0] != senchr[1] || senchr[0] != 166 || senchr[16] != 11 || senchr[15] != 19) if (senchr[0] != senchr[1] || senchr[0] != 166 || senchr[16] != 11 || senchr[15] != 19)
{ {
LogisTrac.WriteLog(from.GetType(), "接收数据异常" + SerialCom.SerialPort_Drive[Com].PortName); LogisTrac.WriteLog(from.GetType(), "接收数据异常" + SerialCom.SerialPort_Drive[Com].PortName);
SerialCom.OpenSerial_Drive_Close(Com, false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com, false);//关闭
return 2; return 2;
} }
SerialCom.OpenSerial_Drive_Close(Com, true);//关闭 SerialCom.OpenSerial_Drive_Close(Com, true);//关闭
...@@ -516,7 +516,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -516,7 +516,7 @@ namespace GKHTRBC16P.Protocol.Driboard
} }
catch (Exception ex) catch (Exception ex)
{ {
SerialCom.OpenSerial_Drive_Close(Com, false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com, false);//关闭
//from.ShowErrorTip(ex.Message); //from.ShowErrorTip(ex.Message);
LogisTrac.WriteLog(from.GetType(), ex); LogisTrac.WriteLog(from.GetType(), ex);
return 1; return 1;
...@@ -582,7 +582,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -582,7 +582,7 @@ namespace GKHTRBC16P.Protocol.Driboard
if (DateTime.Now.Subtract(dt).TotalMilliseconds > MaxWatingTime) //如果2秒后仍然无数据返回,则视为超时 if (DateTime.Now.Subtract(dt).TotalMilliseconds > MaxWatingTime) //如果2秒后仍然无数据返回,则视为超时
{ {
LogisTrac.WriteLog(from.GetType(), "设备未响应" + SerialCom.SerialPort_Drive[Com].PortName); LogisTrac.WriteLog(from.GetType(), "设备未响应" + SerialCom.SerialPort_Drive[Com].PortName);
SerialCom.OpenSerial_Drive_Close(Com, false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com, false);//关闭
return 4; return 4;
} }
} }
...@@ -592,7 +592,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -592,7 +592,7 @@ namespace GKHTRBC16P.Protocol.Driboard
if (senchr[0] != senchr[1] || senchr[0] != 166 || senchr[22] != 11 || senchr[21] != 19) if (senchr[0] != senchr[1] || senchr[0] != 166 || senchr[22] != 11 || senchr[21] != 19)
{ {
LogisTrac.WriteLog(from.GetType(), "接收数据异常" + SerialCom.SerialPort_Drive[Com].PortName); LogisTrac.WriteLog(from.GetType(), "接收数据异常" + SerialCom.SerialPort_Drive[Com].PortName);
SerialCom.OpenSerial_Drive_Close(Com, false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com, false);//关闭
return 2; return 2;
} }
int[] comdata = new int[511]; int[] comdata = new int[511];
...@@ -606,7 +606,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -606,7 +606,7 @@ namespace GKHTRBC16P.Protocol.Driboard
} }
catch (Exception ex) catch (Exception ex)
{ {
SerialCom.OpenSerial_Drive_Close(Com, false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com, false);//关闭
//from.ShowErrorTip(ex.Message); //from.ShowErrorTip(ex.Message);
LogisTrac.WriteLog(from.GetType(), ex); LogisTrac.WriteLog(from.GetType(), ex);
return 1; return 1;
......
...@@ -100,7 +100,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -100,7 +100,7 @@ namespace GKHTRBC16P.Protocol.Driboard
//if (a < 3) goto nex; //if (a < 3) goto nex;
LogisTrac.WriteLog(from.GetType(), "设备未响应" + SerialCom.SerialPort_Drive[Com].PortName); LogisTrac.WriteLog(from.GetType(), "设备未响应" + SerialCom.SerialPort_Drive[Com].PortName);
//SerialCom.SerialPort_Drive[Com].Read(senchr, 0, 200); //SerialCom.SerialPort_Drive[Com].Read(senchr, 0, 200);
SerialCom.OpenSerial_Drive_Close(Com, false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com, false);//关闭
return 4; return 4;
} }
} }
...@@ -111,7 +111,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -111,7 +111,7 @@ namespace GKHTRBC16P.Protocol.Driboard
if (senchr[0] != senchr[1] || senchr[0] != 166 || senchr[430] != 11 || senchr[431] != 19) if (senchr[0] != senchr[1] || senchr[0] != 166 || senchr[430] != 11 || senchr[431] != 19)
{ {
LogisTrac.WriteLog(from.GetType(), "接收数据异常" + SerialCom.SerialPort_Drive[Com].PortName); LogisTrac.WriteLog(from.GetType(), "接收数据异常" + SerialCom.SerialPort_Drive[Com].PortName);
SerialCom.OpenSerial_Drive_Close(Com, false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com, false);//关闭
return 2; return 2;
} }
for (int t = 0; t <= 434; t++) for (int t = 0; t <= 434; t++)
...@@ -124,7 +124,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -124,7 +124,7 @@ namespace GKHTRBC16P.Protocol.Driboard
} }
catch (Exception ex) catch (Exception ex)
{ {
SerialCom.OpenSerial_Drive_Close(Com, false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com, false);//关闭
LogisTrac.WriteLog(from.GetType(), ex); LogisTrac.WriteLog(from.GetType(), ex);
return 1; return 1;
} }
...@@ -203,7 +203,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -203,7 +203,7 @@ namespace GKHTRBC16P.Protocol.Driboard
if (DateTime.Now.Subtract(dt).TotalMilliseconds > MaxWatingTime) //如果2秒后仍然无数据返回,则视为超时 if (DateTime.Now.Subtract(dt).TotalMilliseconds > MaxWatingTime) //如果2秒后仍然无数据返回,则视为超时
{ {
LogisTrac.WriteLog(from.GetType(), "设备未响应" + SerialCom.SerialPort_Drive[Com].PortName); LogisTrac.WriteLog(from.GetType(), "设备未响应" + SerialCom.SerialPort_Drive[Com].PortName);
SerialCom.OpenSerial_Drive_Close(Com, false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com, false);//关闭
return 4; return 4;
} }
} }
...@@ -213,7 +213,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -213,7 +213,7 @@ namespace GKHTRBC16P.Protocol.Driboard
if (senchr[0] != senchr[1] || senchr[0] != 166 || senchr[15] != 11 || senchr[16] != 19) if (senchr[0] != senchr[1] || senchr[0] != 166 || senchr[15] != 11 || senchr[16] != 19)
{ {
LogisTrac.WriteLog(from.GetType(), "接收数据异常" + SerialCom.SerialPort_Drive[Com].PortName); LogisTrac.WriteLog(from.GetType(), "接收数据异常" + SerialCom.SerialPort_Drive[Com].PortName);
SerialCom.OpenSerial_Drive_Close(Com, false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com, false);//关闭
return 2; return 2;
} }
SerialCom.OpenSerial_Drive_Close(Com, true);//关闭 SerialCom.OpenSerial_Drive_Close(Com, true);//关闭
...@@ -221,7 +221,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -221,7 +221,7 @@ namespace GKHTRBC16P.Protocol.Driboard
} }
catch (Exception ex) catch (Exception ex)
{ {
SerialCom.OpenSerial_Drive_Close(Com, false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com, false);//关闭
//from.ShowErrorTip(ex.Message); //from.ShowErrorTip(ex.Message);
LogisTrac.WriteLog(from.GetType(), ex); LogisTrac.WriteLog(from.GetType(), ex);
return 1; return 1;
...@@ -316,7 +316,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -316,7 +316,7 @@ namespace GKHTRBC16P.Protocol.Driboard
if (DateTime.Now.Subtract(dt).TotalMilliseconds > MaxWatingTime) //如果2秒后仍然无数据返回,则视为超时 if (DateTime.Now.Subtract(dt).TotalMilliseconds > MaxWatingTime) //如果2秒后仍然无数据返回,则视为超时
{ {
LogisTrac.WriteLog(from.GetType(), "设备未响应" + SerialCom.SerialPort_Drive[Com].PortName); LogisTrac.WriteLog(from.GetType(), "设备未响应" + SerialCom.SerialPort_Drive[Com].PortName);
SerialCom.OpenSerial_Drive_Close(Com, false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com, false);//关闭
return 4; return 4;
} }
} }
...@@ -326,7 +326,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -326,7 +326,7 @@ namespace GKHTRBC16P.Protocol.Driboard
if (senchr[0] != senchr[1] || senchr[0] != 166 || senchr[15] != 11 || senchr[16] != 19) if (senchr[0] != senchr[1] || senchr[0] != 166 || senchr[15] != 11 || senchr[16] != 19)
{ {
LogisTrac.WriteLog(from.GetType(), "接收数据异常" + SerialCom.SerialPort_Drive[Com].PortName); LogisTrac.WriteLog(from.GetType(), "接收数据异常" + SerialCom.SerialPort_Drive[Com].PortName);
SerialCom.OpenSerial_Drive_Close(Com, false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com, false);//关闭
return 2; return 2;
} }
...@@ -335,7 +335,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -335,7 +335,7 @@ namespace GKHTRBC16P.Protocol.Driboard
} }
catch (Exception ex) catch (Exception ex)
{ {
SerialCom.OpenSerial_Drive_Close(Com, false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com, false);//关闭
//from.ShowErrorTip(ex.Message); //from.ShowErrorTip(ex.Message);
LogisTrac.WriteLog(from.GetType(), ex); LogisTrac.WriteLog(from.GetType(), ex);
return 1; return 1;
...@@ -404,7 +404,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -404,7 +404,7 @@ namespace GKHTRBC16P.Protocol.Driboard
if (DateTime.Now.Subtract(dt).TotalMilliseconds > MaxWatingTime) //如果2秒后仍然无数据返回,则视为超时 if (DateTime.Now.Subtract(dt).TotalMilliseconds > MaxWatingTime) //如果2秒后仍然无数据返回,则视为超时
{ {
LogisTrac.WriteLog(from.GetType(), "设备未响应" + SerialCom.SerialPort_Drive[Com].PortName); LogisTrac.WriteLog(from.GetType(), "设备未响应" + SerialCom.SerialPort_Drive[Com].PortName);
SerialCom.OpenSerial_Drive_Close(Com, false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com, false);//关闭
return 4; return 4;
} }
} }
...@@ -421,7 +421,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -421,7 +421,7 @@ namespace GKHTRBC16P.Protocol.Driboard
} }
catch (Exception ex) catch (Exception ex)
{ {
SerialCom.OpenSerial_Drive_Close(Com, false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com, false);//关闭
//from.ShowErrorTip(ex.Message); //from.ShowErrorTip(ex.Message);
LogisTrac.WriteLog(from.GetType(), ex); LogisTrac.WriteLog(from.GetType(), ex);
return 1; return 1;
...@@ -478,7 +478,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -478,7 +478,7 @@ namespace GKHTRBC16P.Protocol.Driboard
if (DateTime.Now.Subtract(dt).TotalMilliseconds > MaxWatingTime) //如果2秒后仍然无数据返回,则视为超时 if (DateTime.Now.Subtract(dt).TotalMilliseconds > MaxWatingTime) //如果2秒后仍然无数据返回,则视为超时
{ {
LogisTrac.WriteLog(from.GetType(), "设备未响应" + SerialCom.SerialPort_Drive[Com].PortName); LogisTrac.WriteLog(from.GetType(), "设备未响应" + SerialCom.SerialPort_Drive[Com].PortName);
SerialCom.OpenSerial_Drive_Close(Com, false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com, false);//关闭
return 4; return 4;
} }
} }
...@@ -495,7 +495,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -495,7 +495,7 @@ namespace GKHTRBC16P.Protocol.Driboard
} }
catch (Exception ex) catch (Exception ex)
{ {
SerialCom.OpenSerial_Drive_Close(Com, false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com, false);//关闭
//from.ShowErrorTip(ex.Message); //from.ShowErrorTip(ex.Message);
LogisTrac.WriteLog(from.GetType(), ex); LogisTrac.WriteLog(from.GetType(), ex);
return 1; return 1;
...@@ -566,7 +566,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -566,7 +566,7 @@ namespace GKHTRBC16P.Protocol.Driboard
if (DateTime.Now.Subtract(dt).TotalMilliseconds > MaxWatingTime) //如果2秒后仍然无数据返回,则视为超时 if (DateTime.Now.Subtract(dt).TotalMilliseconds > MaxWatingTime) //如果2秒后仍然无数据返回,则视为超时
{ {
LogisTrac.WriteLog(from.GetType(), "设备未响应" + SerialCom.SerialPort_Drive[Com].PortName); LogisTrac.WriteLog(from.GetType(), "设备未响应" + SerialCom.SerialPort_Drive[Com].PortName);
SerialCom.OpenSerial_Drive_Close(Com, false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com, false);//关闭
return 4; return 4;
} }
} }
...@@ -583,7 +583,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -583,7 +583,7 @@ namespace GKHTRBC16P.Protocol.Driboard
} }
catch (Exception ex) catch (Exception ex)
{ {
SerialCom.OpenSerial_Drive_Close(Com, false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com, false);//关闭
//from.ShowErrorTip(ex.Message); //from.ShowErrorTip(ex.Message);
LogisTrac.WriteLog(from.GetType(), ex); LogisTrac.WriteLog(from.GetType(), ex);
return 1; return 1;
...@@ -649,7 +649,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -649,7 +649,7 @@ namespace GKHTRBC16P.Protocol.Driboard
if (DateTime.Now.Subtract(dt).TotalMilliseconds > MaxWatingTime) //如果2秒后仍然无数据返回,则视为超时 if (DateTime.Now.Subtract(dt).TotalMilliseconds > MaxWatingTime) //如果2秒后仍然无数据返回,则视为超时
{ {
LogisTrac.WriteLog(from.GetType(), "设备未响应" + SerialCom.SerialPort_Drive[Com].PortName); LogisTrac.WriteLog(from.GetType(), "设备未响应" + SerialCom.SerialPort_Drive[Com].PortName);
SerialCom.OpenSerial_Drive_Close(Com, false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com, false);//关闭
return 4; return 4;
} }
} }
...@@ -659,7 +659,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -659,7 +659,7 @@ namespace GKHTRBC16P.Protocol.Driboard
if (senchr[0] != senchr[1] || senchr[0] != 166 || senchr[21] != 11 || senchr[22] != 19) if (senchr[0] != senchr[1] || senchr[0] != 166 || senchr[21] != 11 || senchr[22] != 19)
{ {
LogisTrac.WriteLog(from.GetType(), "接收数据异常" + SerialCom.SerialPort_Drive[Com].PortName); LogisTrac.WriteLog(from.GetType(), "接收数据异常" + SerialCom.SerialPort_Drive[Com].PortName);
SerialCom.OpenSerial_Drive_Close(Com, false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com, false);//关闭
return 2; return 2;
} }
int[] comdata = new int[511]; int[] comdata = new int[511];
...@@ -673,7 +673,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -673,7 +673,7 @@ namespace GKHTRBC16P.Protocol.Driboard
} }
catch (Exception ex) catch (Exception ex)
{ {
SerialCom.OpenSerial_Drive_Close(Com, false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com, false);//关闭
//from.ShowErrorTip(ex.Message); //from.ShowErrorTip(ex.Message);
LogisTrac.WriteLog(from.GetType(), ex); LogisTrac.WriteLog(from.GetType(), ex);
return 1; return 1;
......
...@@ -45,7 +45,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -45,7 +45,7 @@ namespace GKHTRBC16P.Protocol.Driboard
if (DateTime.Now.Subtract(dt).TotalMilliseconds > 80) //如果秒后仍然无数据返回,则视为超时 if (DateTime.Now.Subtract(dt).TotalMilliseconds > 80) //如果秒后仍然无数据返回,则视为超时
{ {
LogisTrac.WriteLog(from.GetType(), "设备未响应" + SerialCom.SerialPort_Drive[com].PortName); LogisTrac.WriteLog(from.GetType(), "设备未响应" + SerialCom.SerialPort_Drive[com].PortName);
SerialCom.OpenSerial_Drive_Close(com,false);//关闭 //SerialCom.OpenSerial_Drive_Close(com,false);//关闭
return ""; return "";
} }
} }
...@@ -61,7 +61,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -61,7 +61,7 @@ namespace GKHTRBC16P.Protocol.Driboard
if (Convert.ToInt16(SenAdr[0]) + 0X80 != Convert.ToInt16(Rcv[1])) if (Convert.ToInt16(SenAdr[0]) + 0X80 != Convert.ToInt16(Rcv[1]))
{ {
LogisTrac.WriteLog(from.GetType(), "地址较验错误" + Rcv[1]); LogisTrac.WriteLog(from.GetType(), "地址较验错误" + Rcv[1]);
SerialCom.OpenSerial_Drive_Close(com,false);//关闭 //SerialCom.OpenSerial_Drive_Close(com,false);//关闭
return ""; return "";
} }
} }
...@@ -69,7 +69,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -69,7 +69,7 @@ namespace GKHTRBC16P.Protocol.Driboard
} }
catch (Exception ex) catch (Exception ex)
{ {
SerialCom.OpenSerial_Drive_Close(com,false);//关闭 //SerialCom.OpenSerial_Drive_Close(com,false);//关闭
LogisTrac.WriteLog(from.GetType(), ex); LogisTrac.WriteLog(from.GetType(), ex);
return ""; return "";
} }
...@@ -189,7 +189,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -189,7 +189,7 @@ namespace GKHTRBC16P.Protocol.Driboard
if (DateTime.Now.Subtract(dt).TotalMilliseconds > MaxWatingTime) //如果2秒后仍然无数据返回,则视为超时 if (DateTime.Now.Subtract(dt).TotalMilliseconds > MaxWatingTime) //如果2秒后仍然无数据返回,则视为超时
{ {
LogisTrac.WriteLog(from.GetType(), "设备未响应" + SerialCom.SerialPort_Drive[com0].PortName); LogisTrac.WriteLog(from.GetType(), "设备未响应" + SerialCom.SerialPort_Drive[com0].PortName);
SerialCom.OpenSerial_Drive_Close(com0, false);//关闭 //SerialCom.OpenSerial_Drive_Close(com0, false);//关闭
return 4; return 4;
} }
} }
...@@ -201,7 +201,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -201,7 +201,7 @@ namespace GKHTRBC16P.Protocol.Driboard
if (senchr[1] != adsen || senchr[2] != xorsen) if (senchr[1] != adsen || senchr[2] != xorsen)
{ {
LogisTrac.WriteLog(from.GetType(), "发送数据异常" + SerialCom.SerialPort_Drive[com0].PortName); LogisTrac.WriteLog(from.GetType(), "发送数据异常" + SerialCom.SerialPort_Drive[com0].PortName);
SerialCom.OpenSerial_Drive_Close(com0, false);//关闭 //SerialCom.OpenSerial_Drive_Close(com0, false);//关闭
return 3; return 3;
} }
if (byted > 2) if (byted > 2)
...@@ -219,7 +219,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -219,7 +219,7 @@ namespace GKHTRBC16P.Protocol.Driboard
{ {
LogisTrac.WriteLog(from.GetType(), "接收数据异常" + SerialCom.SerialPort_Drive[com0].PortName); LogisTrac.WriteLog(from.GetType(), "接收数据异常" + SerialCom.SerialPort_Drive[com0].PortName);
//from.ShowErrorTip("接收数据异常" + SerialCom.Communication_Drive.ComName); //from.ShowErrorTip("接收数据异常" + SerialCom.Communication_Drive.ComName);
SerialCom.OpenSerial_Drive_Close(com0, false);//关闭 //SerialCom.OpenSerial_Drive_Close(com0, false);//关闭
return 2; return 2;
} }
} }
...@@ -235,7 +235,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -235,7 +235,7 @@ namespace GKHTRBC16P.Protocol.Driboard
} }
catch (Exception ex) catch (Exception ex)
{ {
SerialCom.OpenSerial_Drive_Close(com0, false);//关闭 //SerialCom.OpenSerial_Drive_Close(com0, false);//关闭
//from.ShowErrorTip(ex.Message); //from.ShowErrorTip(ex.Message);
LogisTrac.WriteLog(from.GetType(), ex); LogisTrac.WriteLog(from.GetType(), ex);
return 1; return 1;
...@@ -322,7 +322,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -322,7 +322,7 @@ namespace GKHTRBC16P.Protocol.Driboard
{ {
LogisTrac.WriteLog(from.GetType(), "设备未响应" + SerialCom.SerialPort_Drive[Com0].PortName); LogisTrac.WriteLog(from.GetType(), "设备未响应" + SerialCom.SerialPort_Drive[Com0].PortName);
//from.ShowErrorTip("设备未响应" + SerialCom.Communication_Drive.ComName); //from.ShowErrorTip("设备未响应" + SerialCom.Communication_Drive.ComName);
SerialCom.OpenSerial_Drive_Close(Com0, false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com0, false);//关闭
return 4; return 4;
} }
} }
...@@ -334,7 +334,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -334,7 +334,7 @@ namespace GKHTRBC16P.Protocol.Driboard
{ {
LogisTrac.WriteLog(from.GetType(), "发送数据异常" + SerialCom.SerialPort_Drive[Com0].PortName); LogisTrac.WriteLog(from.GetType(), "发送数据异常" + SerialCom.SerialPort_Drive[Com0].PortName);
//from.ShowErrorTip("发送数据异常" + SerialCom.Communication_Drive.ComName); //from.ShowErrorTip("发送数据异常" + SerialCom.Communication_Drive.ComName);
SerialCom.OpenSerial_Drive_Close(Com0, false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com0, false);//关闭
return 3; return 3;
} }
adsen = 0; adsen = 0;
...@@ -350,7 +350,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -350,7 +350,7 @@ namespace GKHTRBC16P.Protocol.Driboard
{ {
LogisTrac.WriteLog(from.GetType(), "接收数据异常" + SerialCom.SerialPort_Drive[Com0].PortName); LogisTrac.WriteLog(from.GetType(), "接收数据异常" + SerialCom.SerialPort_Drive[Com0].PortName);
//from.ShowErrorTip("接收数据异常" + SerialCom.Communication_Drive.ComName); //from.ShowErrorTip("接收数据异常" + SerialCom.Communication_Drive.ComName);
SerialCom.OpenSerial_Drive_Close(Com0, false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com0, false);//关闭
return 2; return 2;
} }
for (int t = 1; t <= Lens; t++) for (int t = 1; t <= Lens; t++)
...@@ -362,7 +362,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -362,7 +362,7 @@ namespace GKHTRBC16P.Protocol.Driboard
} }
catch (Exception ex) catch (Exception ex)
{ {
SerialCom.OpenSerial_Drive_Close(Com0, false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com0, false);//关闭
//from.ShowErrorTip(ex.Message); //from.ShowErrorTip(ex.Message);
LogisTrac.WriteLog(from.GetType(), ex); LogisTrac.WriteLog(from.GetType(), ex);
return 1; return 1;
......
...@@ -44,7 +44,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -44,7 +44,7 @@ namespace GKHTRBC16P.Protocol.Driboard
{ {
LogisTrac.WriteLog(from.GetType(), "设备未响应" + SerialCom.Communication_Drive.ComName); LogisTrac.WriteLog(from.GetType(), "设备未响应" + SerialCom.Communication_Drive.ComName);
//from.ShowErrorTip("设备未响应"); //from.ShowErrorTip("设备未响应");
SerialCom.OpenSerial_Drive_Close(Com, false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com, false);//关闭
return ""; return "";
} }
} }
...@@ -62,7 +62,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -62,7 +62,7 @@ namespace GKHTRBC16P.Protocol.Driboard
{ {
LogisTrac.WriteLog(from.GetType(), "地址较验错误" + Rcv[1]); LogisTrac.WriteLog(from.GetType(), "地址较验错误" + Rcv[1]);
//from.ShowErrorTip("地址较验错误" + Rcv[1]); //from.ShowErrorTip("地址较验错误" + Rcv[1]);
SerialCom.OpenSerial_Drive_Close(Com, false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com, false);//关闭
return ""; return "";
} }
} }
...@@ -70,7 +70,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -70,7 +70,7 @@ namespace GKHTRBC16P.Protocol.Driboard
} }
catch (Exception ex) catch (Exception ex)
{ {
SerialCom.OpenSerial_Drive_Close(Com, false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com, false);//关闭
//from.ShowErrorTip(ex.Message); //from.ShowErrorTip(ex.Message);
LogisTrac.WriteLog(from.GetType(), ex); LogisTrac.WriteLog(from.GetType(), ex);
return ""; return "";
...@@ -210,7 +210,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -210,7 +210,7 @@ namespace GKHTRBC16P.Protocol.Driboard
} }
catch (Exception ex) catch (Exception ex)
{ {
SerialCom.OpenSerial_Drive_Close(Com, false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com, false);//关闭
//from.ShowErrorTip(ex.Message); //from.ShowErrorTip(ex.Message);
LogisTrac.WriteLog(from.GetType(), ex); LogisTrac.WriteLog(from.GetType(), ex);
return 1; return 1;
......
...@@ -154,7 +154,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -154,7 +154,7 @@ namespace GKHTRBC16P.Protocol.Driboard
if (DateTime.Now.Subtract(dt).TotalMilliseconds > 400) //如果2秒后仍然无数据返回,则视为超时 if (DateTime.Now.Subtract(dt).TotalMilliseconds > 400) //如果2秒后仍然无数据返回,则视为超时
{ {
LogisTrac.WriteLog(t, "设备未响应" + SerialCom.SerialPort_Drive[Com].PortName); LogisTrac.WriteLog(t, "设备未响应" + SerialCom.SerialPort_Drive[Com].PortName);
SerialCom.OpenSerial_Drive_Close(Com, false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com, false);//关闭
return 4; return 4;
} }
} }
...@@ -170,7 +170,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -170,7 +170,7 @@ namespace GKHTRBC16P.Protocol.Driboard
if (senchr[0] != senchr[1] || senchr[0] != 166) if (senchr[0] != senchr[1] || senchr[0] != 166)
{ {
LogisTrac.WriteLog(t, "接收数据异常" + SerialCom.SerialPort_Drive[Com].PortName); LogisTrac.WriteLog(t, "接收数据异常" + SerialCom.SerialPort_Drive[Com].PortName);
SerialCom.OpenSerial_Drive_Close(Com, false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com, false);//关闭
return 2; return 2;
} }
SerialCom.OpenSerial_Drive_Close(Com, true);//关闭 SerialCom.OpenSerial_Drive_Close(Com, true);//关闭
...@@ -179,7 +179,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -179,7 +179,7 @@ namespace GKHTRBC16P.Protocol.Driboard
catch (Exception ex) catch (Exception ex)
{ {
uPublic.WritelogVgs("VgsBoarddata error with message" + ex.StackTrace); uPublic.WritelogVgs("VgsBoarddata error with message" + ex.StackTrace);
SerialCom.OpenSerial_Drive_Close(Com, false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com, false);//关闭
comdata[10] = 1; comdata[10] = 1;
LogisTrac.WriteLog(t, ex); LogisTrac.WriteLog(t, ex);
return 1; return 1;
...@@ -233,7 +233,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -233,7 +233,7 @@ namespace GKHTRBC16P.Protocol.Driboard
if (DateTime.Now.Subtract(dt).TotalMilliseconds > 400) //如果2秒后仍然无数据返回,则视为超时 if (DateTime.Now.Subtract(dt).TotalMilliseconds > 400) //如果2秒后仍然无数据返回,则视为超时
{ {
LogisTrac.WriteLog(from.GetType(), "设备未响应" + SerialCom.SerialPort_Drive[Com].PortName); LogisTrac.WriteLog(from.GetType(), "设备未响应" + SerialCom.SerialPort_Drive[Com].PortName);
SerialCom.OpenSerial_Drive_Close(Com, false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com, false);//关闭
return 4; return 4;
} }
} }
...@@ -249,7 +249,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -249,7 +249,7 @@ namespace GKHTRBC16P.Protocol.Driboard
if (senchr[0] != senchr[1] || senchr[0] != 166) if (senchr[0] != senchr[1] || senchr[0] != 166)
{ {
LogisTrac.WriteLog(from.GetType(), "接收数据异常" + SerialCom.SerialPort_Drive[Com].PortName); LogisTrac.WriteLog(from.GetType(), "接收数据异常" + SerialCom.SerialPort_Drive[Com].PortName);
SerialCom.OpenSerial_Drive_Close(Com, false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com, false);//关闭
return 2; return 2;
} }
SerialCom.OpenSerial_Drive_Close(Com, true);//关闭 SerialCom.OpenSerial_Drive_Close(Com, true);//关闭
...@@ -257,7 +257,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -257,7 +257,7 @@ namespace GKHTRBC16P.Protocol.Driboard
} }
catch (Exception ex) catch (Exception ex)
{ {
SerialCom.OpenSerial_Drive_Close(Com, false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com, false);//关闭
LogisTrac.WriteLog(from.GetType(), ex); LogisTrac.WriteLog(from.GetType(), ex);
return 200; return 200;
} }
......
...@@ -148,7 +148,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -148,7 +148,7 @@ namespace GKHTRBC16P.Protocol.Driboard
if (DateTime.Now.Subtract(dt).TotalMilliseconds > 400) //如果2秒后仍然无数据返回,则视为超时 if (DateTime.Now.Subtract(dt).TotalMilliseconds > 400) //如果2秒后仍然无数据返回,则视为超时
{ {
LogisTrac.WriteLog(t, "设备未响应" + SerialCom.SerialPort_Drive[Com].PortName); LogisTrac.WriteLog(t, "设备未响应" + SerialCom.SerialPort_Drive[Com].PortName);
SerialCom.OpenSerial_Drive_Close(Com, false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com, false);//关闭
return 4; return 4;
} }
} }
...@@ -159,7 +159,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -159,7 +159,7 @@ namespace GKHTRBC16P.Protocol.Driboard
if (senchr[0] != senchr[1] || senchr[0] != 166 || senchr[68] != 11 || senchr[67] != 19) if (senchr[0] != senchr[1] || senchr[0] != 166 || senchr[68] != 11 || senchr[67] != 19)
{ {
LogisTrac.WriteLog(t, "接收数据异常" + SerialCom.SerialPort_Drive[Com].PortName); LogisTrac.WriteLog(t, "接收数据异常" + SerialCom.SerialPort_Drive[Com].PortName);
SerialCom.OpenSerial_Drive_Close(Com, false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com, false);//关闭
return 2; return 2;
} }
for (int m = 0; m <= 75; m++) for (int m = 0; m <= 75; m++)
...@@ -173,7 +173,7 @@ namespace GKHTRBC16P.Protocol.Driboard ...@@ -173,7 +173,7 @@ namespace GKHTRBC16P.Protocol.Driboard
catch (Exception ex) catch (Exception ex)
{ {
uPublic.WritelogVgs("VgsBoarddata error with message" + ex.StackTrace); uPublic.WritelogVgs("VgsBoarddata error with message" + ex.StackTrace);
SerialCom.OpenSerial_Drive_Close(Com, false);//关闭 //SerialCom.OpenSerial_Drive_Close(Com, false);//关闭
comdata[10] = 1; comdata[10] = 1;
LogisTrac.WriteLog(t, ex); LogisTrac.WriteLog(t, ex);
return 1; return 1;
......
差异被折叠。
差异被折叠。
差异被折叠。
差异被折叠。
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论