Skip to content

李娜 / SO908-XLRStore

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 4a5f2091 由 张东亮
选项

20221101

1 个父辈 47d45d7d
内嵌 并排
正在显示 4 个修改的文件 包含 182 行增加 和 93 行删除
source/DeviceLibrary/storeBean/boxBean/BoxEquip_Camera.cs
......@@ -62,23 +62,23 @@ namespace OnlineStore.DeviceLibrary
{
Bitmap bmp = AcqImage(name);
if (bmp != null)
{
if (IsRecord)
{
cnt++;
Task.Factory.StartNew(delegate
{
SaveImage("box_A", cnt);
});
Task.Factory.StartNew(delegate
{
SaveImage("box_B", cnt);
});
if ((DateTime.Now - dateTime).TotalMinutes > 2)
StopRecord();
}
//{
// if (IsRecord)
// {
// cnt++;
// Task.Factory.StartNew(delegate
// {
// SaveImage("box_A", cnt);
// });
// Task.Factory.StartNew(delegate
// {
// SaveImage("box_B", cnt);
// });
// if ((DateTime.Now - dateTime).TotalMinutes > 2)
// StopRecord();
// }
camera_event?.Invoke(new CameraArgs(name, bmp));
}
// }
Thread.Sleep(300);
}
}
......@@ -207,23 +207,23 @@ namespace OnlineStore.DeviceLibrary
/// </summary>
public void StartRecord(bool isTest = false)
{
if (isTest)
{
inOutPosInfo = new InOutPosInfo("code" + DateTime.Now.ToString("mmssfff"), DateTime.Now.ToString("yyyyMMddhh"));
}
else
{
inOutPosInfo = MoveInfo.MoveParam.PosInfo.ToCopy();
}
cnt = 0;
string inputfolderA = Application.StartupPath + imgPath + "box_A\\" + DateTime.Now.ToString("yyyyMMdd") + "\\" + inOutPosInfo.PosId;
string inputfolderB = Application.StartupPath + imgPath + "box_B\\" + DateTime.Now.ToString("yyyyMMdd") + "\\" + inOutPosInfo.PosId;
string outputfolderA = Application.StartupPath + "\\Videos\\box_A\\" + DateTime.Now.ToString("yyyyMMdd") + "\\" + inOutPosInfo.PosId;
string outputfolderB = Application.StartupPath + "\\Videos\\box_B\\" + DateTime.Now.ToString("yyyyMMdd") + "\\" + inOutPosInfo.PosId;
ffmpegA.SetParam(inputfolderA, outputfolderA, $"{DateTime.Now.ToString("hhmmss")}_{inOutPosInfo.barcode}.mp4");
ffmpegB.SetParam(inputfolderB, outputfolderB, $"{DateTime.Now.ToString("hhmmss")}_{inOutPosInfo.barcode}.mp4");
dateTime = DateTime.Now;
IsRecord = true;
//if (isTest)
//{
// inOutPosInfo = new InOutPosInfo("code" + DateTime.Now.ToString("mmssfff"), DateTime.Now.ToString("yyyyMMddhh"));
//}
//else
//{
// inOutPosInfo = MoveInfo.MoveParam.PosInfo.ToCopy();
//}
//cnt = 0;
//string inputfolderA = Application.StartupPath + imgPath + "box_A\\" + DateTime.Now.ToString("yyyyMMdd") + "\\" + inOutPosInfo.PosId;
//string inputfolderB = Application.StartupPath + imgPath + "box_B\\" + DateTime.Now.ToString("yyyyMMdd") + "\\" + inOutPosInfo.PosId;
//string outputfolderA = Application.StartupPath + "\\Videos\\box_A\\" + DateTime.Now.ToString("yyyyMMdd") + "\\" + inOutPosInfo.PosId;
//string outputfolderB = Application.StartupPath + "\\Videos\\box_B\\" + DateTime.Now.ToString("yyyyMMdd") + "\\" + inOutPosInfo.PosId;
//ffmpegA.SetParam(inputfolderA, outputfolderA, $"{DateTime.Now.ToString("hhmmss")}_{inOutPosInfo.barcode}.mp4");
//ffmpegB.SetParam(inputfolderB, outputfolderB, $"{DateTime.Now.ToString("hhmmss")}_{inOutPosInfo.barcode}.mp4");
//dateTime = DateTime.Now;
//IsRecord = true;
}
/// <summary>
/// 停止记录
......@@ -233,9 +233,9 @@ namespace OnlineStore.DeviceLibrary
if (!IsRecord)
return;
IsRecord = false;
LogUtil.info("监控视频开始转换");
Task task1 = ffmpegA.ConvertImgsToMp4();
Task task2 = ffmpegB.ConvertImgsToMp4();
//LogUtil.info("监控视频开始转换");
//Task task1 = ffmpegA.ConvertImgsToMp4();
//Task task2 = ffmpegB.ConvertImgsToMp4();
//Task.WaitAll(new Task[] { task1, task2 }, TimeSpan.FromMinutes(1));
//LogUtil.info("监控视频转换完成");
}
......
source/DeviceLibrary/storeBean/boxBean/BoxEquip_PosDebug.cs
......@@ -95,6 +95,8 @@ namespace OnlineStore.DeviceLibrary
{
return;
}
if (posDebugInfo.IsPause)
return;
switch (MoveInfo.MoveStep)
{
case StepEnum.SP_00_1_StartPosDebug:
......@@ -443,6 +445,7 @@ namespace OnlineStore.DeviceLibrary
/// 停止调试
/// </summary>
public bool IsBreak { get; set; } = false;
public bool IsPause { get; set; } = false;
/// <summary>
/// 是否是最后一个抽屉
/// </summary>
......@@ -481,13 +484,19 @@ namespace OnlineStore.DeviceLibrary
if (CurColInDrawer < config.Cols_In_Drawer)
{
PreColInDrawer = CurColInDrawer;
CurColInDrawer++;
if (CurColInDrawer == 2)
CurColInDrawer = 17;
else
CurColInDrawer++;
}
else
{
PreRowInDrawer = CurRowInDrawer;
PreColInDrawer = CurColInDrawer;
CurRowInDrawer++;
if (CurRowInDrawer == 1)
CurRowInDrawer = 3;
else
CurRowInDrawer++;
}
}
else//轴在目标层
......@@ -495,7 +504,10 @@ namespace OnlineStore.DeviceLibrary
if (CurColInDrawer < EndColInDrawer)
{
PreColInDrawer = CurColInDrawer;
CurColInDrawer++;
if (CurColInDrawer == 2)
CurColInDrawer = 17;
else
CurColInDrawer++;
}
}
}
......@@ -505,7 +517,10 @@ namespace OnlineStore.DeviceLibrary
if (CurColInDrawer == config.Cols_In_Drawer)
{
PreColInDrawer = CurColInDrawer;
CurColInDrawer--;
if (CurColInDrawer == 17)
CurColInDrawer = 2;
else
CurColInDrawer--;
}
else if (CurColInDrawer == 1)
{
......@@ -520,13 +535,19 @@ namespace OnlineStore.DeviceLibrary
if (CurColInDrawer > 1)
{
PreColInDrawer = CurColInDrawer;
CurColInDrawer--;
if (CurColInDrawer == 17)
CurColInDrawer = 2;
else
CurColInDrawer--;
}
else
{
PreRowInDrawer = CurRowInDrawer;
PreColInDrawer = CurColInDrawer;
CurRowInDrawer++;
if (CurRowInDrawer == 1)
CurRowInDrawer = 3;
else
CurRowInDrawer++;
}
}
else//轴在目标层
......@@ -534,7 +555,10 @@ namespace OnlineStore.DeviceLibrary
if (CurColInDrawer > EndColInDrawer)
{
PreColInDrawer = CurColInDrawer;
CurColInDrawer--;
if (CurColInDrawer == 17)
CurColInDrawer = 2;
else
CurColInDrawer--;
}
}
}
......
source/XLRStoreClient/boxForm/FrmPosDebug.Designer.cs
......@@ -53,6 +53,8 @@ namespace OnlineStore.XLRStore
this.btnStop = new System.Windows.Forms.Button();
this.btnPosResult = new System.Windows.Forms.Button();
this.button1 = new System.Windows.Forms.Button();
this.button2 = new System.Windows.Forms.Button();
this.button3 = new System.Windows.Forms.Button();
this.groupBox1.SuspendLayout();
this.groupBox2.SuspendLayout();
this.SuspendLayout();
......@@ -60,17 +62,19 @@ namespace OnlineStore.XLRStore
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(19, 36);
this.label1.Location = new System.Drawing.Point(25, 45);
this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(77, 12);
this.label1.Size = new System.Drawing.Size(97, 15);
this.label1.TabIndex = 0;
this.label1.Text = "抽屉开始层：";
//
// txtStartDrawerRow
//
this.txtStartDrawerRow.Location = new System.Drawing.Point(102, 33);
this.txtStartDrawerRow.Location = new System.Drawing.Point(136, 41);
this.txtStartDrawerRow.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtStartDrawerRow.Name = "txtStartDrawerRow";
this.txtStartDrawerRow.Size = new System.Drawing.Size(100, 21);
this.txtStartDrawerRow.Size = new System.Drawing.Size(132, 25);
this.txtStartDrawerRow.TabIndex = 1;
this.txtStartDrawerRow.Text = "1";
//
......@@ -92,129 +96,145 @@ namespace OnlineStore.XLRStore
this.groupBox1.Controls.Add(this.label2);
this.groupBox1.Controls.Add(this.txtStartDrawerRow);
this.groupBox1.Controls.Add(this.label1);
this.groupBox1.Location = new System.Drawing.Point(12, 12);
this.groupBox1.Location = new System.Drawing.Point(16, 15);
this.groupBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(228, 304);
this.groupBox1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox1.Size = new System.Drawing.Size(304, 380);
this.groupBox1.TabIndex = 2;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "参数设置";
//
// txtEndColInDrawer
//
this.txtEndColInDrawer.Location = new System.Drawing.Point(102, 268);
this.txtEndColInDrawer.Location = new System.Drawing.Point(136, 335);
this.txtEndColInDrawer.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtEndColInDrawer.Name = "txtEndColInDrawer";
this.txtEndColInDrawer.Size = new System.Drawing.Size(100, 21);
this.txtEndColInDrawer.Size = new System.Drawing.Size(132, 25);
this.txtEndColInDrawer.TabIndex = 15;
this.txtEndColInDrawer.Text = "1";
//
// label5
//
this.label5.AutoSize = true;
this.label5.Location = new System.Drawing.Point(19, 271);
this.label5.Location = new System.Drawing.Point(25, 339);
this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(77, 12);
this.label5.Size = new System.Drawing.Size(97, 15);
this.label5.TabIndex = 14;
this.label5.Text = "库位结束列：";
//
// txtEndRowInDrawer
//
this.txtEndRowInDrawer.Location = new System.Drawing.Point(102, 235);
this.txtEndRowInDrawer.Location = new System.Drawing.Point(136, 294);
this.txtEndRowInDrawer.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtEndRowInDrawer.Name = "txtEndRowInDrawer";
this.txtEndRowInDrawer.Size = new System.Drawing.Size(100, 21);
this.txtEndRowInDrawer.Size = new System.Drawing.Size(132, 25);
this.txtEndRowInDrawer.TabIndex = 13;
this.txtEndRowInDrawer.Text = "4";
//
// label6
//
this.label6.AutoSize = true;
this.label6.Location = new System.Drawing.Point(19, 238);
this.label6.Location = new System.Drawing.Point(25, 298);
this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(77, 12);
this.label6.Size = new System.Drawing.Size(97, 15);
this.label6.TabIndex = 12;
this.label6.Text = "库位结束行：";
//
// txtStartColInDrawer
//
this.txtStartColInDrawer.Location = new System.Drawing.Point(102, 199);
this.txtStartColInDrawer.Location = new System.Drawing.Point(136, 249);
this.txtStartColInDrawer.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtStartColInDrawer.Name = "txtStartColInDrawer";
this.txtStartColInDrawer.Size = new System.Drawing.Size(100, 21);
this.txtStartColInDrawer.Size = new System.Drawing.Size(132, 25);
this.txtStartColInDrawer.TabIndex = 11;
this.txtStartColInDrawer.Text = "1";
//
// label7
//
this.label7.AutoSize = true;
this.label7.Location = new System.Drawing.Point(19, 202);
this.label7.Location = new System.Drawing.Point(25, 252);
this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(77, 12);
this.label7.Size = new System.Drawing.Size(97, 15);
this.label7.TabIndex = 10;
this.label7.Text = "库位开始列：";
//
// txtStartRowInDrawer
//
this.txtStartRowInDrawer.Location = new System.Drawing.Point(102, 167);
this.txtStartRowInDrawer.Location = new System.Drawing.Point(136, 209);
this.txtStartRowInDrawer.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtStartRowInDrawer.Name = "txtStartRowInDrawer";
this.txtStartRowInDrawer.Size = new System.Drawing.Size(100, 21);
this.txtStartRowInDrawer.Size = new System.Drawing.Size(132, 25);
this.txtStartRowInDrawer.TabIndex = 9;
this.txtStartRowInDrawer.Text = "1";
//
// label8
//
this.label8.AutoSize = true;
this.label8.Location = new System.Drawing.Point(19, 170);
this.label8.Location = new System.Drawing.Point(25, 212);
this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label8.Name = "label8";
this.label8.Size = new System.Drawing.Size(77, 12);
this.label8.Size = new System.Drawing.Size(97, 15);
this.label8.TabIndex = 8;
this.label8.Text = "库位开始行：";
//
// txtEndDrawerCol
//
this.txtEndDrawerCol.Location = new System.Drawing.Point(102, 134);
this.txtEndDrawerCol.Location = new System.Drawing.Point(136, 168);
this.txtEndDrawerCol.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtEndDrawerCol.Name = "txtEndDrawerCol";
this.txtEndDrawerCol.Size = new System.Drawing.Size(100, 21);
this.txtEndDrawerCol.Size = new System.Drawing.Size(132, 25);
this.txtEndDrawerCol.TabIndex = 7;
this.txtEndDrawerCol.Text = "6";
//
// label4
//
this.label4.AutoSize = true;
this.label4.Location = new System.Drawing.Point(19, 137);
this.label4.Location = new System.Drawing.Point(25, 171);
this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(77, 12);
this.label4.Size = new System.Drawing.Size(97, 15);
this.label4.TabIndex = 6;
this.label4.Text = "抽屉结束列：";
//
// txtEndDrawerRow
//
this.txtEndDrawerRow.Location = new System.Drawing.Point(102, 101);
this.txtEndDrawerRow.Location = new System.Drawing.Point(136, 126);
this.txtEndDrawerRow.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtEndDrawerRow.Name = "txtEndDrawerRow";
this.txtEndDrawerRow.Size = new System.Drawing.Size(100, 21);
this.txtEndDrawerRow.Size = new System.Drawing.Size(132, 25);
this.txtEndDrawerRow.TabIndex = 5;
this.txtEndDrawerRow.Text = "15";
//
// label3
//
this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(19, 104);
this.label3.Location = new System.Drawing.Point(25, 130);
this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(77, 12);
this.label3.Size = new System.Drawing.Size(97, 15);
this.label3.TabIndex = 4;
this.label3.Text = "抽屉结束层：";
//
// txtStartDrawerCol
//
this.txtStartDrawerCol.Location = new System.Drawing.Point(102, 65);
this.txtStartDrawerCol.Location = new System.Drawing.Point(136, 81);
this.txtStartDrawerCol.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtStartDrawerCol.Name = "txtStartDrawerCol";
this.txtStartDrawerCol.Size = new System.Drawing.Size(100, 21);
this.txtStartDrawerCol.Size = new System.Drawing.Size(132, 25);
this.txtStartDrawerCol.TabIndex = 3;
this.txtStartDrawerCol.Text = "1";
//
// label2
//
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(19, 68);
this.label2.Location = new System.Drawing.Point(25, 85);
this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(77, 12);
this.label2.Size = new System.Drawing.Size(97, 15);
this.label2.TabIndex = 2;
this.label2.Text = "抽屉开始列：";
//
......@@ -222,9 +242,11 @@ namespace OnlineStore.XLRStore
//
this.groupBox2.Controls.Add(this.radioButton2);
this.groupBox2.Controls.Add(this.radioButton1);
this.groupBox2.Location = new System.Drawing.Point(271, 12);
this.groupBox2.Location = new System.Drawing.Point(361, 15);
this.groupBox2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(128, 100);
this.groupBox2.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox2.Size = new System.Drawing.Size(171, 125);
this.groupBox2.TabIndex = 3;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "AB面选择";
......@@ -232,9 +254,10 @@ namespace OnlineStore.XLRStore
// radioButton2
//
this.radioButton2.AutoSize = true;
this.radioButton2.Location = new System.Drawing.Point(24, 64);
this.radioButton2.Location = new System.Drawing.Point(32, 80);
this.radioButton2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.radioButton2.Name = "radioButton2";
this.radioButton2.Size = new System.Drawing.Size(41, 16);
this.radioButton2.Size = new System.Drawing.Size(51, 19);
this.radioButton2.TabIndex = 1;
this.radioButton2.Text = "B面";
this.radioButton2.UseVisualStyleBackColor = true;
......@@ -244,9 +267,10 @@ namespace OnlineStore.XLRStore
//
this.radioButton1.AutoSize = true;
this.radioButton1.Checked = true;
this.radioButton1.Location = new System.Drawing.Point(24, 32);
this.radioButton1.Location = new System.Drawing.Point(32, 40);
this.radioButton1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.radioButton1.Name = "radioButton1";
this.radioButton1.Size = new System.Drawing.Size(41, 16);
this.radioButton1.Size = new System.Drawing.Size(51, 19);
this.radioButton1.TabIndex = 0;
this.radioButton1.TabStop = true;
this.radioButton1.Text = "A面";
......@@ -255,9 +279,10 @@ namespace OnlineStore.XLRStore
//
// btnStart
//
this.btnStart.Location = new System.Drawing.Point(417, 24);
this.btnStart.Location = new System.Drawing.Point(556, 30);
this.btnStart.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnStart.Name = "btnStart";
this.btnStart.Size = new System.Drawing.Size(137, 60);
this.btnStart.Size = new System.Drawing.Size(183, 75);
this.btnStart.TabIndex = 4;
this.btnStart.Text = "开始";
this.btnStart.UseVisualStyleBackColor = true;
......@@ -265,9 +290,10 @@ namespace OnlineStore.XLRStore
//
// btnStop
//
this.btnStop.Location = new System.Drawing.Point(597, 24);
this.btnStop.Location = new System.Drawing.Point(796, 30);
this.btnStop.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnStop.Name = "btnStop";
this.btnStop.Size = new System.Drawing.Size(137, 60);
this.btnStop.Size = new System.Drawing.Size(183, 75);
this.btnStop.TabIndex = 5;
this.btnStop.Text = "结束";
this.btnStop.UseVisualStyleBackColor = true;
......@@ -275,9 +301,10 @@ namespace OnlineStore.XLRStore
//
// btnPosResult
//
this.btnPosResult.Location = new System.Drawing.Point(417, 140);
this.btnPosResult.Location = new System.Drawing.Point(556, 259);
this.btnPosResult.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnPosResult.Name = "btnPosResult";
this.btnPosResult.Size = new System.Drawing.Size(137, 60);
this.btnPosResult.Size = new System.Drawing.Size(183, 75);
this.btnPosResult.TabIndex = 6;
this.btnPosResult.Text = "库位状态";
this.btnPosResult.UseVisualStyleBackColor = true;
......@@ -285,25 +312,51 @@ namespace OnlineStore.XLRStore
//
// button1
//
this.button1.Location = new System.Drawing.Point(597, 140);
this.button1.Location = new System.Drawing.Point(796, 259);
this.button1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(137, 60);
this.button1.Size = new System.Drawing.Size(183, 75);
this.button1.TabIndex = 7;
this.button1.Text = "行走机构循环运行";
this.button1.UseVisualStyleBackColor = true;
this.button1.Click += new System.EventHandler(this.button1_Click);
//
// button2
//
this.button2.Location = new System.Drawing.Point(796, 145);
this.button2.Margin = new System.Windows.Forms.Padding(4);
this.button2.Name = "button2";
this.button2.Size = new System.Drawing.Size(183, 75);
this.button2.TabIndex = 8;
this.button2.Text = "暂停";
this.button2.UseVisualStyleBackColor = true;
this.button2.Click += new System.EventHandler(this.button2_Click);
//
// button3
//
this.button3.Location = new System.Drawing.Point(556, 145);
this.button3.Margin = new System.Windows.Forms.Padding(4);
this.button3.Name = "button3";
this.button3.Size = new System.Drawing.Size(183, 75);
this.button3.TabIndex = 9;
this.button3.Text = "继续";
this.button3.UseVisualStyleBackColor = true;
this.button3.Click += new System.EventHandler(this.button3_Click);
//
// FrmPosDebug
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(800, 354);
this.ClientSize = new System.Drawing.Size(1067, 442);
this.Controls.Add(this.button3);
this.Controls.Add(this.button2);
this.Controls.Add(this.button1);
this.Controls.Add(this.btnPosResult);
this.Controls.Add(this.btnStop);
this.Controls.Add(this.btnStart);
this.Controls.Add(this.groupBox2);
this.Controls.Add(this.groupBox1);
this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.Name = "FrmPosDebug";
this.Text = "FrmPosDebug";
this.groupBox1.ResumeLayout(false);
......@@ -340,5 +393,7 @@ namespace OnlineStore.XLRStore
private System.Windows.Forms.Button btnStop;
private System.Windows.Forms.Button btnPosResult;
private System.Windows.Forms.Button button1;
private System.Windows.Forms.Button button2;
private System.Windows.Forms.Button button3;
}
}
\ No newline at end of file
source/XLRStoreClient/boxForm/FrmPosDebug.cs
......@@ -114,5 +114,15 @@ namespace OnlineStore.XLRStore
LogUtil.error("打开行走机构循环测试时出错：", ex);
}
}
private void button3_Click(object sender, EventArgs e)
{
boxEquip.posDebugInfo.IsPause = false;
}
private void button2_Click(object sender, EventArgs e)
{
boxEquip.posDebugInfo.IsPause = true;
}
}
}
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!