Skip to content

张东亮 / NS100

转到一个项目
切换导航栏
切换导航栏固定状态
Commit c2637e2c 由 夏萍
选项

Merge branch 'master' of http://106.15.194.121:8083/zdl/NS100

2 个父辈 6f414e01 d3c3df2d
内嵌 并排
正在显示 8 个修改的文件 包含 81 行增加 和 84 行删除
BLL/Camera.cs
...@@ -232,7 +232,7 @@ namespace BLL ...@@ -232,7 +232,7 @@ namespace BLL
LogNet.log.Error($"{cameraName}取图失败：", e); LogNet.log.Error($"{cameraName}取图失败：", e);
} }
finally { finally {
Close(); //Close();
} }
return barcodeInfos; return barcodeInfos;
} }
......
BLL/Config.cs
...@@ -337,6 +337,8 @@ namespace BLL ...@@ -337,6 +337,8 @@ namespace BLL
public static MyConfig<int> REEL_ID_AutoResetStrategy; public static MyConfig<int> REEL_ID_AutoResetStrategy;
[MyConfigComment("使用扫码相机")] [MyConfigComment("使用扫码相机")]
public static MyConfig<bool> Func_UseIDCamera=false; public static MyConfig<bool> Func_UseIDCamera=false;
[MyConfigComment("隐藏软件logo")]
public static MyConfig<bool> AppUI_HideLogo=false;
public void Save() public void Save()
{ {
config.Save(); config.Save();
......
IDHIKCamera/IDHIK.cs
...@@ -426,20 +426,24 @@ namespace IDHIKCamera ...@@ -426,20 +426,24 @@ namespace IDHIKCamera
try try
{ {
int nRet = MvCodeReader.MV_CODEREADER_OK; int nRet = MvCodeReader.MV_CODEREADER_OK;
pData = IntPtr.Zero; Thread.Sleep(50);
MvCodeReader.MV_CODEREADER_IMAGE_OUT_INFO_EX2 stFrameInfoEx2 = new MvCodeReader.MV_CODEREADER_IMAGE_OUT_INFO_EX2(); MvCodeReader.MV_CODEREADER_IMAGE_OUT_INFO_EX2 stFrameInfoEx2 = new MvCodeReader.MV_CODEREADER_IMAGE_OUT_INFO_EX2();
pstFrameInfoEx2 = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(MvCodeReader.MV_CODEREADER_IMAGE_OUT_INFO_EX2))); pstFrameInfoEx2 = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(MvCodeReader.MV_CODEREADER_IMAGE_OUT_INFO_EX2)));
Marshal.StructureToPtr(stFrameInfoEx2, pstFrameInfoEx2, false); Marshal.StructureToPtr(stFrameInfoEx2, pstFrameInfoEx2, false);
//Thread.Sleep(500); for (int i = 0; i < 4; i++)
nRet = cameraCurr[index].MV_CODEREADER_GetOneFrameTimeoutEx2_NET(ref pData, pstFrameInfoEx2, 3000); {
LibLogUtil.Info($"获取结果{nRet}"); nRet = cameraCurr[index].MV_CODEREADER_GetOneFrameTimeoutEx2_NET(ref pData, pstFrameInfoEx2, 1000);
if (nRet == MvCodeReader.MV_CODEREADER_OK) if (nRet == MvCodeReader.MV_CODEREADER_OK)
{ {
stFrameInfoEx2 = (MvCodeReader.MV_CODEREADER_IMAGE_OUT_INFO_EX2)Marshal.PtrToStructure(pstFrameInfoEx2, typeof(MvCodeReader.MV_CODEREADER_IMAGE_OUT_INFO_EX2)); stFrameInfoEx2 = (MvCodeReader.MV_CODEREADER_IMAGE_OUT_INFO_EX2)Marshal.PtrToStructure(pstFrameInfoEx2, typeof(MvCodeReader.MV_CODEREADER_IMAGE_OUT_INFO_EX2));
break;
} }
else else
{ {
LibLogUtil.Error($"结果不等于0，出错{nRet}"); LibLogUtil.Error(" Can not grab one : "+ nRet);
Thread.Sleep(50);
}
} }
List<Point[]> pts=new List<Point[]>(); List<Point[]> pts=new List<Point[]>();
if (nRet == MvCodeReader.MV_CODEREADER_OK) if (nRet == MvCodeReader.MV_CODEREADER_OK)
......
SmartScan/Form/FrmMain.Designer.cs
...@@ -275,7 +275,7 @@ namespace SmartScan ...@@ -275,7 +275,7 @@ namespace SmartScan
this.Controls.Add(this.BtnSet); this.Controls.Add(this.BtnSet);
this.Controls.Add(this.BtnRetrospect); this.Controls.Add(this.BtnRetrospect);
this.Controls.Add(this.BtnStart); this.Controls.Add(this.BtnStart);
this.Icon = global::SmartScan.Properties.Resources.App;
this.Name = "FrmMain"; this.Name = "FrmMain";
this.Text = "Form1"; this.Text = "Form1";
this.TitleFont = new System.Drawing.Font("宋体", 16.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.TitleFont = new System.Drawing.Font("宋体", 16.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
......
SmartScan/Form/FrmMain.cs
...@@ -25,6 +25,11 @@ namespace SmartScan ...@@ -25,6 +25,11 @@ namespace SmartScan
{ {
InitializeComponent(); InitializeComponent();
BtnStart.Tag = "not"; BtnStart.Tag = "not";
if (Config.AppUI_HideLogo)
this.Icon = null;
else
this.Icon = global::SmartScan.Properties.Resources.App;
} }
private bool CheckCamera() private bool CheckCamera()
......
SmartScan/Form/FrmRetrospect.Designer.cs
...@@ -76,8 +76,7 @@ namespace SmartScan ...@@ -76,8 +76,7 @@ namespace SmartScan
this.tableLayoutPanel1.Controls.Add(this.faceBut_prin, 2, 4); this.tableLayoutPanel1.Controls.Add(this.faceBut_prin, 2, 4);
this.tableLayoutPanel1.Controls.Add(this.LstRecord, 0, 10); this.tableLayoutPanel1.Controls.Add(this.LstRecord, 0, 10);
this.tableLayoutPanel1.Controls.Add(this.faceLabel1, 0, 9); this.tableLayoutPanel1.Controls.Add(this.faceLabel1, 0, 9);
this.tableLayoutPanel1.Location = new System.Drawing.Point(16, 50); this.tableLayoutPanel1.Location = new System.Drawing.Point(11, 33);
this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(4);
this.tableLayoutPanel1.Name = "tableLayoutPanel1"; this.tableLayoutPanel1.Name = "tableLayoutPanel1";
this.tableLayoutPanel1.RowCount = 10; this.tableLayoutPanel1.RowCount = 10;
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 5F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 5F));
...@@ -91,8 +90,8 @@ namespace SmartScan ...@@ -91,8 +90,8 @@ namespace SmartScan
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 8F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 8F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 5F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 5F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 35F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 35F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 24F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 16F));
this.tableLayoutPanel1.Size = new System.Drawing.Size(1524, 970); this.tableLayoutPanel1.Size = new System.Drawing.Size(1016, 647);
this.tableLayoutPanel1.TabIndex = 19; this.tableLayoutPanel1.TabIndex = 19;
// //
// butt_startserver // butt_startserver
...@@ -103,11 +102,11 @@ namespace SmartScan ...@@ -103,11 +102,11 @@ namespace SmartScan
this.butt_startserver.Dock = System.Windows.Forms.DockStyle.Fill; this.butt_startserver.Dock = System.Windows.Forms.DockStyle.Fill;
this.butt_startserver.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); this.butt_startserver.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.butt_startserver.HoldPress = false; this.butt_startserver.HoldPress = false;
this.butt_startserver.Location = new System.Drawing.Point(3, 504); this.butt_startserver.Location = new System.Drawing.Point(2, 335);
this.butt_startserver.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.butt_startserver.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.butt_startserver.Name = "butt_startserver"; this.butt_startserver.Name = "butt_startserver";
this.butt_startserver.Padding = new System.Windows.Forms.Padding(3, 4, 3, 4); this.butt_startserver.Padding = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.butt_startserver.Size = new System.Drawing.Size(298, 69); this.butt_startserver.Size = new System.Drawing.Size(199, 45);
this.butt_startserver.TabIndex = 22; this.butt_startserver.TabIndex = 22;
this.butt_startserver.Text = "启动服务"; this.butt_startserver.Text = "启动服务";
this.butt_startserver.Visible = false; this.butt_startserver.Visible = false;
...@@ -119,11 +118,10 @@ namespace SmartScan ...@@ -119,11 +118,10 @@ namespace SmartScan
this.DtpUpper.Dock = System.Windows.Forms.DockStyle.Fill; this.DtpUpper.Dock = System.Windows.Forms.DockStyle.Fill;
this.DtpUpper.Font = new System.Drawing.Font("宋体", 12F); this.DtpUpper.Font = new System.Drawing.Font("宋体", 12F);
this.DtpUpper.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.DtpUpper.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
this.DtpUpper.Location = new System.Drawing.Point(4, 52); this.DtpUpper.Location = new System.Drawing.Point(3, 35);
this.DtpUpper.Margin = new System.Windows.Forms.Padding(4);
this.DtpUpper.Name = "DtpUpper"; this.DtpUpper.Name = "DtpUpper";
this.DtpUpper.ShowCheckBox = true; this.DtpUpper.ShowCheckBox = true;
this.DtpUpper.Size = new System.Drawing.Size(296, 35); this.DtpUpper.Size = new System.Drawing.Size(197, 26);
this.DtpUpper.TabIndex = 6; this.DtpUpper.TabIndex = 6;
// //
// LstLabel // LstLabel
...@@ -135,12 +133,11 @@ namespace SmartScan ...@@ -135,12 +133,11 @@ namespace SmartScan
this.LstLabel.Font = new System.Drawing.Font("宋体", 9F); this.LstLabel.Font = new System.Drawing.Font("宋体", 9F);
this.LstLabel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); this.LstLabel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.LstLabel.ItemHeight = 40; this.LstLabel.ItemHeight = 40;
this.LstLabel.Location = new System.Drawing.Point(1070, 629); this.LstLabel.Location = new System.Drawing.Point(714, 418);
this.LstLabel.Margin = new System.Windows.Forms.Padding(4);
this.LstLabel.Name = "LstLabel"; this.LstLabel.Name = "LstLabel";
this.LstLabel.Padding = new System.Windows.Forms.Padding(4); this.LstLabel.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
this.LstLabel.SelectedIndex = -1; this.LstLabel.SelectedIndex = -1;
this.LstLabel.Size = new System.Drawing.Size(450, 337); this.LstLabel.Size = new System.Drawing.Size(299, 226);
this.LstLabel.TabIndex = 18; this.LstLabel.TabIndex = 18;
this.LstLabel.TextAlign = System.Windows.Forms.HorizontalAlignment.Left; this.LstLabel.TextAlign = System.Windows.Forms.HorizontalAlignment.Left;
// //
...@@ -152,11 +149,10 @@ namespace SmartScan ...@@ -152,11 +149,10 @@ namespace SmartScan
this.BtnExport.Dock = System.Windows.Forms.DockStyle.Fill; this.BtnExport.Dock = System.Windows.Forms.DockStyle.Fill;
this.BtnExport.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); this.BtnExport.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.BtnExport.HoldPress = false; this.BtnExport.HoldPress = false;
this.BtnExport.Location = new System.Drawing.Point(4, 350); this.BtnExport.Location = new System.Drawing.Point(3, 233);
this.BtnExport.Margin = new System.Windows.Forms.Padding(4);
this.BtnExport.Name = "BtnExport"; this.BtnExport.Name = "BtnExport";
this.BtnExport.Padding = new System.Windows.Forms.Padding(4); this.BtnExport.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
this.BtnExport.Size = new System.Drawing.Size(296, 69); this.BtnExport.Size = new System.Drawing.Size(197, 45);
this.BtnExport.TabIndex = 10; this.BtnExport.TabIndex = 10;
this.BtnExport.Text = "导出"; this.BtnExport.Text = "导出";
this.BtnExport.Click += new System.EventHandler(this.BtnExport_Click); this.BtnExport.Click += new System.EventHandler(this.BtnExport_Click);
...@@ -168,11 +164,10 @@ namespace SmartScan ...@@ -168,11 +164,10 @@ namespace SmartScan
this.LblDateRange.BorderWidth = 0; this.LblDateRange.BorderWidth = 0;
this.LblDateRange.Dock = System.Windows.Forms.DockStyle.Fill; this.LblDateRange.Dock = System.Windows.Forms.DockStyle.Fill;
this.LblDateRange.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); this.LblDateRange.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.LblDateRange.Location = new System.Drawing.Point(4, 4); this.LblDateRange.Location = new System.Drawing.Point(3, 3);
this.LblDateRange.Margin = new System.Windows.Forms.Padding(4);
this.LblDateRange.Name = "LblDateRange"; this.LblDateRange.Name = "LblDateRange";
this.LblDateRange.Padding = new System.Windows.Forms.Padding(4); this.LblDateRange.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
this.LblDateRange.Size = new System.Drawing.Size(296, 40); this.LblDateRange.Size = new System.Drawing.Size(197, 26);
this.LblDateRange.TabIndex = 21; this.LblDateRange.TabIndex = 21;
this.LblDateRange.Text = "日期"; this.LblDateRange.Text = "日期";
this.LblDateRange.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.LblDateRange.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
...@@ -183,17 +178,16 @@ namespace SmartScan ...@@ -183,17 +178,16 @@ namespace SmartScan
this.TxtCode.BorderStyle = Asa.FaceControl.ControlShape.Rectangle; this.TxtCode.BorderStyle = Asa.FaceControl.ControlShape.Rectangle;
this.TxtCode.BorderWidth = 2; this.TxtCode.BorderWidth = 2;
this.TxtCode.Dock = System.Windows.Forms.DockStyle.Fill; this.TxtCode.Dock = System.Windows.Forms.DockStyle.Fill;
this.TxtCode.Location = new System.Drawing.Point(4, 196); this.TxtCode.Location = new System.Drawing.Point(3, 131);
this.TxtCode.Margin = new System.Windows.Forms.Padding(4);
this.TxtCode.MaxLength = 32767; this.TxtCode.MaxLength = 32767;
this.TxtCode.Name = "TxtCode"; this.TxtCode.Name = "TxtCode";
this.TxtCode.Padding = new System.Windows.Forms.Padding(4); this.TxtCode.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
this.TxtCode.SelectedText = ""; this.TxtCode.SelectedText = "";
this.TxtCode.SelectionLength = 0; this.TxtCode.SelectionLength = 0;
this.TxtCode.SelectionStart = 0; this.TxtCode.SelectionStart = 0;
this.TxtCode.ShowDel = true; this.TxtCode.ShowDel = true;
this.TxtCode.ShowQuery = false; this.TxtCode.ShowQuery = false;
this.TxtCode.Size = new System.Drawing.Size(296, 69); this.TxtCode.Size = new System.Drawing.Size(197, 45);
this.TxtCode.TabIndex = 8; this.TxtCode.TabIndex = 8;
// //
// BtnSelect // BtnSelect
...@@ -204,11 +198,10 @@ namespace SmartScan ...@@ -204,11 +198,10 @@ namespace SmartScan
this.BtnSelect.Dock = System.Windows.Forms.DockStyle.Fill; this.BtnSelect.Dock = System.Windows.Forms.DockStyle.Fill;
this.BtnSelect.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); this.BtnSelect.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.BtnSelect.HoldPress = false; this.BtnSelect.HoldPress = false;
this.BtnSelect.Location = new System.Drawing.Point(4, 273); this.BtnSelect.Location = new System.Drawing.Point(3, 182);
this.BtnSelect.Margin = new System.Windows.Forms.Padding(4);
this.BtnSelect.Name = "BtnSelect"; this.BtnSelect.Name = "BtnSelect";
this.BtnSelect.Padding = new System.Windows.Forms.Padding(4); this.BtnSelect.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
this.BtnSelect.Size = new System.Drawing.Size(296, 69); this.BtnSelect.Size = new System.Drawing.Size(197, 45);
this.BtnSelect.TabIndex = 9; this.BtnSelect.TabIndex = 9;
this.BtnSelect.Text = "查询"; this.BtnSelect.Text = "查询";
this.BtnSelect.Click += new System.EventHandler(this.BtnSelect_Click); this.BtnSelect.Click += new System.EventHandler(this.BtnSelect_Click);
...@@ -220,11 +213,10 @@ namespace SmartScan ...@@ -220,11 +213,10 @@ namespace SmartScan
this.LblCode.BorderWidth = 0; this.LblCode.BorderWidth = 0;
this.LblCode.Dock = System.Windows.Forms.DockStyle.Fill; this.LblCode.Dock = System.Windows.Forms.DockStyle.Fill;
this.LblCode.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); this.LblCode.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.LblCode.Location = new System.Drawing.Point(4, 148); this.LblCode.Location = new System.Drawing.Point(3, 99);
this.LblCode.Margin = new System.Windows.Forms.Padding(4);
this.LblCode.Name = "LblCode"; this.LblCode.Name = "LblCode";
this.LblCode.Padding = new System.Windows.Forms.Padding(4); this.LblCode.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
this.LblCode.Size = new System.Drawing.Size(296, 40); this.LblCode.Size = new System.Drawing.Size(197, 26);
this.LblCode.TabIndex = 20; this.LblCode.TabIndex = 20;
this.LblCode.Text = "条码"; this.LblCode.Text = "条码";
this.LblCode.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.LblCode.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
...@@ -235,22 +227,20 @@ namespace SmartScan ...@@ -235,22 +227,20 @@ namespace SmartScan
this.DtpLower.Dock = System.Windows.Forms.DockStyle.Fill; this.DtpLower.Dock = System.Windows.Forms.DockStyle.Fill;
this.DtpLower.Font = new System.Drawing.Font("宋体", 12F); this.DtpLower.Font = new System.Drawing.Font("宋体", 12F);
this.DtpLower.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.DtpLower.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
this.DtpLower.Location = new System.Drawing.Point(4, 100); this.DtpLower.Location = new System.Drawing.Point(3, 67);
this.DtpLower.Margin = new System.Windows.Forms.Padding(4);
this.DtpLower.Name = "DtpLower"; this.DtpLower.Name = "DtpLower";
this.DtpLower.ShowCheckBox = true; this.DtpLower.ShowCheckBox = true;
this.DtpLower.Size = new System.Drawing.Size(296, 35); this.DtpLower.Size = new System.Drawing.Size(197, 26);
this.DtpLower.TabIndex = 7; this.DtpLower.TabIndex = 7;
// //
// PicLabel // PicLabel
// //
this.PicLabel.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(40)))), ((int)(((byte)(40))))); this.PicLabel.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(40)))), ((int)(((byte)(40)))));
this.PicLabel.Dock = System.Windows.Forms.DockStyle.Fill; this.PicLabel.Dock = System.Windows.Forms.DockStyle.Fill;
this.PicLabel.Location = new System.Drawing.Point(1070, 4); this.PicLabel.Location = new System.Drawing.Point(714, 3);
this.PicLabel.Margin = new System.Windows.Forms.Padding(4);
this.PicLabel.Name = "PicLabel"; this.PicLabel.Name = "PicLabel";
this.tableLayoutPanel1.SetRowSpan(this.PicLabel, 4); this.tableLayoutPanel1.SetRowSpan(this.PicLabel, 4);
this.PicLabel.Size = new System.Drawing.Size(450, 184); this.PicLabel.Size = new System.Drawing.Size(299, 122);
this.PicLabel.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; this.PicLabel.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.PicLabel.TabIndex = 16; this.PicLabel.TabIndex = 16;
this.PicLabel.TabStop = false; this.PicLabel.TabStop = false;
...@@ -263,12 +253,11 @@ namespace SmartScan ...@@ -263,12 +253,11 @@ namespace SmartScan
this.PicShow.BorderWidth = 2; this.PicShow.BorderWidth = 2;
this.PicShow.Dock = System.Windows.Forms.DockStyle.Fill; this.PicShow.Dock = System.Windows.Forms.DockStyle.Fill;
this.PicShow.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); this.PicShow.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.PicShow.Location = new System.Drawing.Point(308, 4); this.PicShow.Location = new System.Drawing.Point(206, 3);
this.PicShow.Margin = new System.Windows.Forms.Padding(4);
this.PicShow.Name = "PicShow"; this.PicShow.Name = "PicShow";
this.PicShow.Padding = new System.Windows.Forms.Padding(4); this.PicShow.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
this.tableLayoutPanel1.SetRowSpan(this.PicShow, 11); this.tableLayoutPanel1.SetRowSpan(this.PicShow, 11);
this.PicShow.Size = new System.Drawing.Size(754, 962); this.PicShow.Size = new System.Drawing.Size(502, 641);
this.PicShow.TabIndex = 12; this.PicShow.TabIndex = 12;
this.PicShow.Text = "facePictureBox1"; this.PicShow.Text = "facePictureBox1";
// //
...@@ -281,13 +270,12 @@ namespace SmartScan ...@@ -281,13 +270,12 @@ namespace SmartScan
this.LstCode.Font = new System.Drawing.Font("宋体", 9F); this.LstCode.Font = new System.Drawing.Font("宋体", 9F);
this.LstCode.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); this.LstCode.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.LstCode.ItemHeight = 40; this.LstCode.ItemHeight = 40;
this.LstCode.Location = new System.Drawing.Point(1070, 350); this.LstCode.Location = new System.Drawing.Point(714, 233);
this.LstCode.Margin = new System.Windows.Forms.Padding(4);
this.LstCode.Name = "LstCode"; this.LstCode.Name = "LstCode";
this.LstCode.Padding = new System.Windows.Forms.Padding(4); this.LstCode.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
this.tableLayoutPanel1.SetRowSpan(this.LstCode, 3); this.tableLayoutPanel1.SetRowSpan(this.LstCode, 3);
this.LstCode.SelectedIndex = -1; this.LstCode.SelectedIndex = -1;
this.LstCode.Size = new System.Drawing.Size(450, 223); this.LstCode.Size = new System.Drawing.Size(299, 147);
this.LstCode.TabIndex = 17; this.LstCode.TabIndex = 17;
this.LstCode.TextAlign = System.Windows.Forms.HorizontalAlignment.Left; this.LstCode.TextAlign = System.Windows.Forms.HorizontalAlignment.Left;
// //
...@@ -298,11 +286,10 @@ namespace SmartScan ...@@ -298,11 +286,10 @@ namespace SmartScan
this.LblAllLabel.BorderWidth = 0; this.LblAllLabel.BorderWidth = 0;
this.LblAllLabel.Dock = System.Windows.Forms.DockStyle.Fill; this.LblAllLabel.Dock = System.Windows.Forms.DockStyle.Fill;
this.LblAllLabel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); this.LblAllLabel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.LblAllLabel.Location = new System.Drawing.Point(1070, 581); this.LblAllLabel.Location = new System.Drawing.Point(714, 386);
this.LblAllLabel.Margin = new System.Windows.Forms.Padding(4);
this.LblAllLabel.Name = "LblAllLabel"; this.LblAllLabel.Name = "LblAllLabel";
this.LblAllLabel.Padding = new System.Windows.Forms.Padding(4); this.LblAllLabel.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
this.LblAllLabel.Size = new System.Drawing.Size(450, 40); this.LblAllLabel.Size = new System.Drawing.Size(299, 26);
this.LblAllLabel.TabIndex = 20; this.LblAllLabel.TabIndex = 20;
this.LblAllLabel.Text = "faceLabel2"; this.LblAllLabel.Text = "faceLabel2";
this.LblAllLabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.LblAllLabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
...@@ -315,11 +302,10 @@ namespace SmartScan ...@@ -315,11 +302,10 @@ namespace SmartScan
this.BtnExportAll.Dock = System.Windows.Forms.DockStyle.Fill; this.BtnExportAll.Dock = System.Windows.Forms.DockStyle.Fill;
this.BtnExportAll.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); this.BtnExportAll.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.BtnExportAll.HoldPress = false; this.BtnExportAll.HoldPress = false;
this.BtnExportAll.Location = new System.Drawing.Point(4, 427); this.BtnExportAll.Location = new System.Drawing.Point(3, 284);
this.BtnExportAll.Margin = new System.Windows.Forms.Padding(4);
this.BtnExportAll.Name = "BtnExportAll"; this.BtnExportAll.Name = "BtnExportAll";
this.BtnExportAll.Padding = new System.Windows.Forms.Padding(4); this.BtnExportAll.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
this.BtnExportAll.Size = new System.Drawing.Size(296, 69); this.BtnExportAll.Size = new System.Drawing.Size(197, 45);
this.BtnExportAll.TabIndex = 11; this.BtnExportAll.TabIndex = 11;
this.BtnExportAll.Text = "导出所有"; this.BtnExportAll.Text = "导出所有";
this.BtnExportAll.Click += new System.EventHandler(this.BtnExportAll_Click); this.BtnExportAll.Click += new System.EventHandler(this.BtnExportAll_Click);
...@@ -331,11 +317,10 @@ namespace SmartScan ...@@ -331,11 +317,10 @@ namespace SmartScan
this.LblAllCode.BorderWidth = 0; this.LblAllCode.BorderWidth = 0;
this.LblAllCode.Dock = System.Windows.Forms.DockStyle.Fill; this.LblAllCode.Dock = System.Windows.Forms.DockStyle.Fill;
this.LblAllCode.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); this.LblAllCode.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.LblAllCode.Location = new System.Drawing.Point(1070, 273); this.LblAllCode.Location = new System.Drawing.Point(714, 182);
this.LblAllCode.Margin = new System.Windows.Forms.Padding(4);
this.LblAllCode.Name = "LblAllCode"; this.LblAllCode.Name = "LblAllCode";
this.LblAllCode.Padding = new System.Windows.Forms.Padding(4); this.LblAllCode.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
this.LblAllCode.Size = new System.Drawing.Size(450, 69); this.LblAllCode.Size = new System.Drawing.Size(299, 45);
this.LblAllCode.TabIndex = 19; this.LblAllCode.TabIndex = 19;
this.LblAllCode.Text = "faceLabel1"; this.LblAllCode.Text = "faceLabel1";
this.LblAllCode.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.LblAllCode.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
...@@ -348,10 +333,11 @@ namespace SmartScan ...@@ -348,10 +333,11 @@ namespace SmartScan
this.faceBut_prin.Dock = System.Windows.Forms.DockStyle.Fill; this.faceBut_prin.Dock = System.Windows.Forms.DockStyle.Fill;
this.faceBut_prin.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); this.faceBut_prin.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.faceBut_prin.HoldPress = false; this.faceBut_prin.HoldPress = false;
this.faceBut_prin.Location = new System.Drawing.Point(1069, 195); this.faceBut_prin.Location = new System.Drawing.Point(713, 130);
this.faceBut_prin.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.faceBut_prin.Name = "faceBut_prin"; this.faceBut_prin.Name = "faceBut_prin";
this.faceBut_prin.Padding = new System.Windows.Forms.Padding(3); this.faceBut_prin.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.faceBut_prin.Size = new System.Drawing.Size(452, 71); this.faceBut_prin.Size = new System.Drawing.Size(301, 47);
this.faceBut_prin.TabIndex = 23; this.faceBut_prin.TabIndex = 23;
this.faceBut_prin.Text = "打印"; this.faceBut_prin.Text = "打印";
this.faceBut_prin.Click += new System.EventHandler(this.faceBut_prin_Click); this.faceBut_prin.Click += new System.EventHandler(this.faceBut_prin_Click);
...@@ -363,12 +349,11 @@ namespace SmartScan ...@@ -363,12 +349,11 @@ namespace SmartScan
this.LstRecord.BorderWidth = 2; this.LstRecord.BorderWidth = 2;
this.LstRecord.Dock = System.Windows.Forms.DockStyle.Fill; this.LstRecord.Dock = System.Windows.Forms.DockStyle.Fill;
this.LstRecord.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); this.LstRecord.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.LstRecord.Location = new System.Drawing.Point(4, 629); this.LstRecord.Location = new System.Drawing.Point(3, 418);
this.LstRecord.Margin = new System.Windows.Forms.Padding(4);
this.LstRecord.Name = "LstRecord"; this.LstRecord.Name = "LstRecord";
this.LstRecord.Padding = new System.Windows.Forms.Padding(4); this.LstRecord.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
this.LstRecord.SelectedIndex = -1; this.LstRecord.SelectedIndex = -1;
this.LstRecord.Size = new System.Drawing.Size(296, 337); this.LstRecord.Size = new System.Drawing.Size(197, 226);
this.LstRecord.TabIndex = 19; this.LstRecord.TabIndex = 19;
this.LstRecord.SelectedIndexChanged += new System.EventHandler(this.LstRecord_SelectedIndexChanged); this.LstRecord.SelectedIndexChanged += new System.EventHandler(this.LstRecord_SelectedIndexChanged);
// //
...@@ -379,24 +364,21 @@ namespace SmartScan ...@@ -379,24 +364,21 @@ namespace SmartScan
this.faceLabel1.BorderWidth = 2; this.faceLabel1.BorderWidth = 2;
this.faceLabel1.Dock = System.Windows.Forms.DockStyle.Fill; this.faceLabel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.faceLabel1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); this.faceLabel1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.faceLabel1.Location = new System.Drawing.Point(4, 581); this.faceLabel1.Location = new System.Drawing.Point(3, 386);
this.faceLabel1.Margin = new System.Windows.Forms.Padding(4);
this.faceLabel1.Name = "faceLabel1"; this.faceLabel1.Name = "faceLabel1";
this.faceLabel1.Padding = new System.Windows.Forms.Padding(4); this.faceLabel1.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
this.faceLabel1.Size = new System.Drawing.Size(296, 40); this.faceLabel1.Size = new System.Drawing.Size(197, 26);
this.faceLabel1.TabIndex = 24; this.faceLabel1.TabIndex = 24;
this.faceLabel1.Text = "共查询到0条信息"; this.faceLabel1.Text = "共查询到0条信息";
// //
// FrmRetrospect // FrmRetrospect
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1558, 788); this.ClientSize = new System.Drawing.Size(1039, 525);
this.Controls.Add(this.tableLayoutPanel1); this.Controls.Add(this.tableLayoutPanel1);
this.Icon = global::SmartScan.Properties.Resources.App; this.Icon = global::SmartScan.Properties.Resources.App;
this.Margin = new System.Windows.Forms.Padding(4);
this.Name = "FrmRetrospect"; this.Name = "FrmRetrospect";
this.Padding = new System.Windows.Forms.Padding(12);
this.Text = "FrmRetrospect"; this.Text = "FrmRetrospect";
this.Load += new System.EventHandler(this.FrmRetrospect_Load); this.Load += new System.EventHandler(this.FrmRetrospect_Load);
this.Controls.SetChildIndex(this.tableLayoutPanel1, 0); this.Controls.SetChildIndex(this.tableLayoutPanel1, 0);
......
SmartScan/Form/FrmRetrospect.cs
...@@ -125,6 +125,8 @@ namespace SmartScan ...@@ -125,6 +125,8 @@ namespace SmartScan
private void FrmRetrospect_Load(object sender, EventArgs e) private void FrmRetrospect_Load(object sender, EventArgs e)
{ {
int SH = Screen.PrimaryScreen.Bounds.Height; //1080 int SH = Screen.PrimaryScreen.Bounds.Height; //1080
int SW = Screen.PrimaryScreen.Bounds.Width; //1920 int SW = Screen.PrimaryScreen.Bounds.Width; //1920
...@@ -137,11 +139,12 @@ namespace SmartScan ...@@ -137,11 +139,12 @@ namespace SmartScan
DtpUpper.Value = DateTime.Now.Date; DtpUpper.Value = DateTime.Now.Date;
tableLayoutPanel1.Width = this.Width-20; tableLayoutPanel1.Width = this.Width-20;
tableLayoutPanel1.Height = this.Height - 60; tableLayoutPanel1.Height = this.Height - 60;
if (ConfigHelper.Config.Get("Display_EnableGetData", "1181")=="1181") if (ConfigHelper.Config.Get("Display_EnableGetData", "1181") == "1181")
{ {
butt_startserver.Visible = true; butt_startserver.Visible = true;
} }
this.StartPosition = FormStartPosition.CenterScreen; this.StartPosition = FormStartPosition.CenterScreen;
} }
private void BtnSelect_Click(object sender, EventArgs e) private void BtnSelect_Click(object sender, EventArgs e)
......
SmartScan/ScanWork.cs
...@@ -339,6 +339,7 @@ namespace SmartScan ...@@ -339,6 +339,7 @@ namespace SmartScan
{ {
LogNet.log.Info("Work SetKey hasMatch:" + hasMatch); LogNet.log.Info("Work SetKey hasMatch:" + hasMatch);
//if (workCodeKeyword.Count == 0){ return;} //if (workCodeKeyword.Count == 0){ return;}
//if(hasMatch)
BLLCommon.extension.SetKey(originalCodeText, workCodeKeyword, hasMatch, out _); BLLCommon.extension.SetKey(originalCodeText, workCodeKeyword, hasMatch, out _);
if (workCodeKeyword.Any(a => a.Value.StartsWith("<OCR>"))) if (workCodeKeyword.Any(a => a.Value.StartsWith("<OCR>")))
{ {
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!