Skip to content

张东亮 / NS100

转到一个项目
切换导航栏
切换导航栏固定状态
Commit a64609c7 由 贾鹏旭
选项

印度下拉框

1 个父辈 fadb622a
内嵌 并排
正在显示 6 个修改的文件 包含 53 行增加 和 45 行删除
BLL/Camera.cs
......@@ -61,8 +61,6 @@ namespace BLL
switch (libLogEventArg.Level)
{
case LibLogLevel.Debug:
LogNet.log.Debug(libLogEventArg.Msg);
break;
case LibLogLevel.Info:
LogNet.log.Info(libLogEventArg.Msg);
break;
......@@ -205,7 +203,6 @@ namespace BLL
CodeType = c.CodeType,
Text = c.CodeStr
});
});
}
if (bitmap == null)
......
BLL/Extension/Item_General.cs
......@@ -112,6 +112,7 @@ namespace BLL
}
}
#endregion
if (!string.IsNullOrEmpty(config.ReelIDKeyWord)&&isdisplay)
{
var Reelidstr = GetReelid();
......@@ -141,6 +142,7 @@ namespace BLL
if (extensions != null && !extensions[0].Control.InvokeRequired)
{
//使用key填充时，请处理字段开头的<OCR>字段
//查询excel数据填充
if(key.ContainsKey(Config.DataSource_DataKey))
{
string CleanData = key[Config.DataSource_DataKey].Replace("<OCR>", "");
......@@ -162,7 +164,12 @@ namespace BLL
{
var s = extensions[i].Control as Asa.FaceControl.FaceComboBox;
s.Items.Clear();
s.Items.AddRange(ExtraFileData.DataTitle.OrderBy(tit=>tit).ToArray());
var data = ExtraFileData.DataTitle
.Where(a => a.Contains(extensions[i].Control.Text))
.Distinct()
.OrderBy(tit => tit)
.ToArray();
s.Items.AddRange(data);
s.Text = "";
s.SelectedIndex = -1;
s.Enabled = true;
......@@ -182,6 +189,7 @@ namespace BLL
Application.DoEvents();
//禁用打印按钮
bool close = ConfigHelper.Config.Get("isprinclose", false);
if (close)
{
......
BLL/ExtraFileData.cs
......@@ -50,8 +50,9 @@ namespace BLL
{
files = new string[] { Config.DataSource_FilePath };
}
DataTitle.Clear();
AllData.Clear();
foreach (var file in files)
{
LogNet.log.Info("数据源加载文件:"+file);
......@@ -121,8 +122,8 @@ namespace BLL
{
files = new string[] { Config.DataSource_FilePath };
}
DataTitle.Clear();
AllData.Clear();
foreach (var file in files)
{
LogNet.log.Info("数据源加载文件:" + file);
......
BLL/MaterialEdit.cs
......@@ -383,6 +383,7 @@ namespace BLL
string val = destination[j].Name;
element.SetAttribute(val, destination[j].GetValue(temp.Match[i]).ToString());
}
}
if (temp.ImagePath == "")
......@@ -509,7 +510,7 @@ namespace BLL
code = code2.ToList();
#endregion
if (aMatch.Points.X==-1||aMatch.Points.Y==-1)
if ((aMatch.Points.X==-1||aMatch.Points.Y==-1)&& code?.Count!=0)
{
//aMatch.IsCodeUsed[0] = true;
aMatch.Points = new Point((int)code[0].Center.X, (int)code[0].Center.Y);
......@@ -1160,7 +1161,7 @@ namespace BLL
{
type = type.Replace(" ","");
codetype = codetype.Replace(" ", "");
LogNet.log.Info($"type={type},codetype={codetype}");
//LogNet.log.Info($"type={type},codetype={codetype}");
try
{
string Correspondence = ConfigHelper.Config.Get("Template_CodeCorrespondences");
......@@ -1183,12 +1184,12 @@ namespace BLL
dic = JsonConvert.DeserializeObject<Dictionary<string, string>>(Correspondence);
if (dic.TryGetValue(type, out string typeValue) && typeValue == codetype)
{
LogNet.log.Info($"匹配结果为true");
//LogNet.log.Info($"匹配结果为true");
return true;
}
if (dic.TryGetValue(codetype, out string codetypeValue) && codetypeValue == type)
{
LogNet.log.Info($"匹配结果为true");
//LogNet.log.Info($"匹配结果为true");
return true;
}
return false;
......
SmartScan/Form/FrmRetrospect.Designer.cs
......@@ -77,7 +77,7 @@ namespace SmartScan
this.tableLayoutPanel1.Controls.Add(this.LstRecord, 0, 10);
this.tableLayoutPanel1.Controls.Add(this.faceLabel1, 0, 9);
this.tableLayoutPanel1.Location = new System.Drawing.Point(16, 50);
this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(4);
this.tableLayoutPanel1.Name = "tableLayoutPanel1";
this.tableLayoutPanel1.RowCount = 10;
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 5F));
......@@ -120,7 +120,7 @@ namespace SmartScan
this.DtpUpper.Font = new System.Drawing.Font("宋体", 12F);
this.DtpUpper.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
this.DtpUpper.Location = new System.Drawing.Point(4, 52);
this.DtpUpper.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.DtpUpper.Margin = new System.Windows.Forms.Padding(4);
this.DtpUpper.Name = "DtpUpper";
this.DtpUpper.ShowCheckBox = true;
this.DtpUpper.Size = new System.Drawing.Size(296, 35);
......@@ -136,9 +136,9 @@ namespace SmartScan
this.LstLabel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.LstLabel.ItemHeight = 40;
this.LstLabel.Location = new System.Drawing.Point(1070, 629);
this.LstLabel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.LstLabel.Margin = new System.Windows.Forms.Padding(4);
this.LstLabel.Name = "LstLabel";
this.LstLabel.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.LstLabel.Padding = new System.Windows.Forms.Padding(4);
this.LstLabel.SelectedIndex = -1;
this.LstLabel.Size = new System.Drawing.Size(450, 337);
this.LstLabel.TabIndex = 18;
......@@ -153,9 +153,9 @@ namespace SmartScan
this.BtnExport.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.BtnExport.HoldPress = false;
this.BtnExport.Location = new System.Drawing.Point(4, 350);
this.BtnExport.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.BtnExport.Margin = new System.Windows.Forms.Padding(4);
this.BtnExport.Name = "BtnExport";
this.BtnExport.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.BtnExport.Padding = new System.Windows.Forms.Padding(4);
this.BtnExport.Size = new System.Drawing.Size(296, 69);
this.BtnExport.TabIndex = 10;
this.BtnExport.Text = "导出";
......@@ -169,9 +169,9 @@ namespace SmartScan
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.Location = new System.Drawing.Point(4, 4);
this.LblDateRange.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.LblDateRange.Margin = new System.Windows.Forms.Padding(4);
this.LblDateRange.Name = "LblDateRange";
this.LblDateRange.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.LblDateRange.Padding = new System.Windows.Forms.Padding(4);
this.LblDateRange.Size = new System.Drawing.Size(296, 40);
this.LblDateRange.TabIndex = 21;
this.LblDateRange.Text = "日期";
......@@ -184,10 +184,10 @@ namespace SmartScan
this.TxtCode.BorderWidth = 2;
this.TxtCode.Dock = System.Windows.Forms.DockStyle.Fill;
this.TxtCode.Location = new System.Drawing.Point(4, 196);
this.TxtCode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.TxtCode.Margin = new System.Windows.Forms.Padding(4);
this.TxtCode.MaxLength = 32767;
this.TxtCode.Name = "TxtCode";
this.TxtCode.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.TxtCode.Padding = new System.Windows.Forms.Padding(4);
this.TxtCode.SelectedText = "";
this.TxtCode.SelectionLength = 0;
this.TxtCode.SelectionStart = 0;
......@@ -205,9 +205,9 @@ namespace SmartScan
this.BtnSelect.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.BtnSelect.HoldPress = false;
this.BtnSelect.Location = new System.Drawing.Point(4, 273);
this.BtnSelect.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.BtnSelect.Margin = new System.Windows.Forms.Padding(4);
this.BtnSelect.Name = "BtnSelect";
this.BtnSelect.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.BtnSelect.Padding = new System.Windows.Forms.Padding(4);
this.BtnSelect.Size = new System.Drawing.Size(296, 69);
this.BtnSelect.TabIndex = 9;
this.BtnSelect.Text = "查询";
......@@ -221,9 +221,9 @@ namespace SmartScan
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.Location = new System.Drawing.Point(4, 148);
this.LblCode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.LblCode.Margin = new System.Windows.Forms.Padding(4);
this.LblCode.Name = "LblCode";
this.LblCode.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.LblCode.Padding = new System.Windows.Forms.Padding(4);
this.LblCode.Size = new System.Drawing.Size(296, 40);
this.LblCode.TabIndex = 20;
this.LblCode.Text = "条码";
......@@ -236,7 +236,7 @@ namespace SmartScan
this.DtpLower.Font = new System.Drawing.Font("宋体", 12F);
this.DtpLower.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
this.DtpLower.Location = new System.Drawing.Point(4, 100);
this.DtpLower.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.DtpLower.Margin = new System.Windows.Forms.Padding(4);
this.DtpLower.Name = "DtpLower";
this.DtpLower.ShowCheckBox = true;
this.DtpLower.Size = new System.Drawing.Size(296, 35);
......@@ -247,7 +247,7 @@ namespace SmartScan
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.Location = new System.Drawing.Point(1070, 4);
this.PicLabel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.PicLabel.Margin = new System.Windows.Forms.Padding(4);
this.PicLabel.Name = "PicLabel";
this.tableLayoutPanel1.SetRowSpan(this.PicLabel, 4);
this.PicLabel.Size = new System.Drawing.Size(450, 184);
......@@ -264,9 +264,9 @@ namespace SmartScan
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.Location = new System.Drawing.Point(308, 4);
this.PicShow.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.PicShow.Margin = new System.Windows.Forms.Padding(4);
this.PicShow.Name = "PicShow";
this.PicShow.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.PicShow.Padding = new System.Windows.Forms.Padding(4);
this.tableLayoutPanel1.SetRowSpan(this.PicShow, 11);
this.PicShow.Size = new System.Drawing.Size(754, 962);
this.PicShow.TabIndex = 12;
......@@ -282,9 +282,9 @@ namespace SmartScan
this.LstCode.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.LstCode.ItemHeight = 40;
this.LstCode.Location = new System.Drawing.Point(1070, 350);
this.LstCode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.LstCode.Margin = new System.Windows.Forms.Padding(4);
this.LstCode.Name = "LstCode";
this.LstCode.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.LstCode.Padding = new System.Windows.Forms.Padding(4);
this.tableLayoutPanel1.SetRowSpan(this.LstCode, 3);
this.LstCode.SelectedIndex = -1;
this.LstCode.Size = new System.Drawing.Size(450, 223);
......@@ -299,9 +299,9 @@ namespace SmartScan
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.Location = new System.Drawing.Point(1070, 581);
this.LblAllLabel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.LblAllLabel.Margin = new System.Windows.Forms.Padding(4);
this.LblAllLabel.Name = "LblAllLabel";
this.LblAllLabel.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.LblAllLabel.Padding = new System.Windows.Forms.Padding(4);
this.LblAllLabel.Size = new System.Drawing.Size(450, 40);
this.LblAllLabel.TabIndex = 20;
this.LblAllLabel.Text = "faceLabel2";
......@@ -316,9 +316,9 @@ namespace SmartScan
this.BtnExportAll.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.BtnExportAll.HoldPress = false;
this.BtnExportAll.Location = new System.Drawing.Point(4, 427);
this.BtnExportAll.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.BtnExportAll.Margin = new System.Windows.Forms.Padding(4);
this.BtnExportAll.Name = "BtnExportAll";
this.BtnExportAll.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.BtnExportAll.Padding = new System.Windows.Forms.Padding(4);
this.BtnExportAll.Size = new System.Drawing.Size(296, 69);
this.BtnExportAll.TabIndex = 11;
this.BtnExportAll.Text = "导出所有";
......@@ -332,9 +332,9 @@ namespace SmartScan
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.Location = new System.Drawing.Point(1070, 273);
this.LblAllCode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.LblAllCode.Margin = new System.Windows.Forms.Padding(4);
this.LblAllCode.Name = "LblAllCode";
this.LblAllCode.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.LblAllCode.Padding = new System.Windows.Forms.Padding(4);
this.LblAllCode.Size = new System.Drawing.Size(450, 69);
this.LblAllCode.TabIndex = 19;
this.LblAllCode.Text = "faceLabel1";
......@@ -350,7 +350,7 @@ namespace SmartScan
this.faceBut_prin.HoldPress = false;
this.faceBut_prin.Location = new System.Drawing.Point(1069, 195);
this.faceBut_prin.Name = "faceBut_prin";
this.faceBut_prin.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
this.faceBut_prin.Padding = new System.Windows.Forms.Padding(3);
this.faceBut_prin.Size = new System.Drawing.Size(452, 71);
this.faceBut_prin.TabIndex = 23;
this.faceBut_prin.Text = "打印";
......@@ -364,9 +364,9 @@ namespace SmartScan
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.Location = new System.Drawing.Point(4, 629);
this.LstRecord.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.LstRecord.Margin = new System.Windows.Forms.Padding(4);
this.LstRecord.Name = "LstRecord";
this.LstRecord.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.LstRecord.Padding = new System.Windows.Forms.Padding(4);
this.LstRecord.SelectedIndex = -1;
this.LstRecord.Size = new System.Drawing.Size(296, 337);
this.LstRecord.TabIndex = 19;
......@@ -380,9 +380,9 @@ namespace SmartScan
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.Location = new System.Drawing.Point(4, 581);
this.faceLabel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.faceLabel1.Margin = new System.Windows.Forms.Padding(4);
this.faceLabel1.Name = "faceLabel1";
this.faceLabel1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.faceLabel1.Padding = new System.Windows.Forms.Padding(4);
this.faceLabel1.Size = new System.Drawing.Size(296, 40);
this.faceLabel1.TabIndex = 24;
this.faceLabel1.Text = "共查询到0条信息";
......@@ -394,9 +394,9 @@ namespace SmartScan
this.ClientSize = new System.Drawing.Size(1558, 788);
this.Controls.Add(this.tableLayoutPanel1);
this.Icon = global::SmartScan.Properties.Resources.App;
this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.Margin = new System.Windows.Forms.Padding(4);
this.Name = "FrmRetrospect";
this.Padding = new System.Windows.Forms.Padding(12, 12, 12, 12);
this.Padding = new System.Windows.Forms.Padding(12);
this.Text = "FrmRetrospect";
this.Load += new System.EventHandler(this.FrmRetrospect_Load);
this.Controls.SetChildIndex(this.tableLayoutPanel1, 0);
......
SmartScan/SetControl/UsrMaterialTemplate.cs
......@@ -371,6 +371,7 @@ namespace SmartScan
Height = info[i].Size.Height,
Distance = info[i].Distance
};
LogNet.log.Info($"{code.Text}获取到的条码类型={code.CodeType}");
mateCopy[mateIndex].Code.Add(code);
lst[i] = info[i].Center;
}
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!