Skip to content

张东亮 / NS100

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

印度下拉框

1 个父辈 fadb622a
全部展开
内嵌 并排
正在显示 6 个修改的文件 包含 20 行增加 和 12 行删除
BLL/Camera.cs
...@@ -61,8 +61,6 @@ namespace BLL ...@@ -61,8 +61,6 @@ namespace BLL
switch (libLogEventArg.Level) switch (libLogEventArg.Level)
{ {
case LibLogLevel.Debug: case LibLogLevel.Debug:
LogNet.log.Debug(libLogEventArg.Msg);
break;
case LibLogLevel.Info: case LibLogLevel.Info:
LogNet.log.Info(libLogEventArg.Msg); LogNet.log.Info(libLogEventArg.Msg);
break; break;
...@@ -205,7 +203,6 @@ namespace BLL ...@@ -205,7 +203,6 @@ namespace BLL
CodeType = c.CodeType, CodeType = c.CodeType,
Text = c.CodeStr Text = c.CodeStr
}); });
}); });
} }
if (bitmap == null) if (bitmap == null)
......
BLL/Extension/Item_General.cs
...@@ -112,6 +112,7 @@ namespace BLL ...@@ -112,6 +112,7 @@ namespace BLL
} }
} }
#endregion #endregion
if (!string.IsNullOrEmpty(config.ReelIDKeyWord)&&isdisplay) if (!string.IsNullOrEmpty(config.ReelIDKeyWord)&&isdisplay)
{ {
var Reelidstr = GetReelid(); var Reelidstr = GetReelid();
...@@ -141,6 +142,7 @@ namespace BLL ...@@ -141,6 +142,7 @@ namespace BLL
if (extensions != null && !extensions[0].Control.InvokeRequired) if (extensions != null && !extensions[0].Control.InvokeRequired)
{ {
//使用key填充时，请处理字段开头的<OCR>字段 //使用key填充时，请处理字段开头的<OCR>字段
//查询excel数据填充
if(key.ContainsKey(Config.DataSource_DataKey)) if(key.ContainsKey(Config.DataSource_DataKey))
{ {
string CleanData = key[Config.DataSource_DataKey].Replace("<OCR>", ""); string CleanData = key[Config.DataSource_DataKey].Replace("<OCR>", "");
...@@ -162,7 +164,12 @@ namespace BLL ...@@ -162,7 +164,12 @@ namespace BLL
{ {
var s = extensions[i].Control as Asa.FaceControl.FaceComboBox; var s = extensions[i].Control as Asa.FaceControl.FaceComboBox;
s.Items.Clear(); 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.Text = "";
s.SelectedIndex = -1; s.SelectedIndex = -1;
s.Enabled = true; s.Enabled = true;
...@@ -182,6 +189,7 @@ namespace BLL ...@@ -182,6 +189,7 @@ namespace BLL
Application.DoEvents(); Application.DoEvents();
//禁用打印按钮
bool close = ConfigHelper.Config.Get("isprinclose", false); bool close = ConfigHelper.Config.Get("isprinclose", false);
if (close) if (close)
{ {
......
BLL/ExtraFileData.cs
...@@ -50,8 +50,9 @@ namespace BLL ...@@ -50,8 +50,9 @@ namespace BLL
{ {
files = new string[] { Config.DataSource_FilePath }; files = new string[] { Config.DataSource_FilePath };
} }
DataTitle.Clear();
AllData.Clear();
foreach (var file in files) foreach (var file in files)
{ {
LogNet.log.Info("数据源加载文件:"+file); LogNet.log.Info("数据源加载文件:"+file);
...@@ -121,8 +122,8 @@ namespace BLL ...@@ -121,8 +122,8 @@ namespace BLL
{ {
files = new string[] { Config.DataSource_FilePath }; files = new string[] { Config.DataSource_FilePath };
} }
DataTitle.Clear();
AllData.Clear();
foreach (var file in files) foreach (var file in files)
{ {
LogNet.log.Info("数据源加载文件:" + file); LogNet.log.Info("数据源加载文件:" + file);
......
BLL/MaterialEdit.cs
...@@ -383,6 +383,7 @@ namespace BLL ...@@ -383,6 +383,7 @@ namespace BLL
string val = destination[j].Name; string val = destination[j].Name;
element.SetAttribute(val, destination[j].GetValue(temp.Match[i]).ToString()); element.SetAttribute(val, destination[j].GetValue(temp.Match[i]).ToString());
} }
} }
if (temp.ImagePath == "") if (temp.ImagePath == "")
...@@ -509,7 +510,7 @@ namespace BLL ...@@ -509,7 +510,7 @@ namespace BLL
code = code2.ToList(); code = code2.ToList();
#endregion #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.IsCodeUsed[0] = true;
aMatch.Points = new Point((int)code[0].Center.X, (int)code[0].Center.Y); aMatch.Points = new Point((int)code[0].Center.X, (int)code[0].Center.Y);
...@@ -1160,7 +1161,7 @@ namespace BLL ...@@ -1160,7 +1161,7 @@ namespace BLL
{ {
type = type.Replace(" ",""); type = type.Replace(" ","");
codetype = codetype.Replace(" ", ""); codetype = codetype.Replace(" ", "");
LogNet.log.Info($"type={type},codetype={codetype}"); //LogNet.log.Info($"type={type},codetype={codetype}");
try try
{ {
string Correspondence = ConfigHelper.Config.Get("Template_CodeCorrespondences"); string Correspondence = ConfigHelper.Config.Get("Template_CodeCorrespondences");
...@@ -1183,12 +1184,12 @@ namespace BLL ...@@ -1183,12 +1184,12 @@ namespace BLL
dic = JsonConvert.DeserializeObject<Dictionary<string, string>>(Correspondence); dic = JsonConvert.DeserializeObject<Dictionary<string, string>>(Correspondence);
if (dic.TryGetValue(type, out string typeValue) && typeValue == codetype) if (dic.TryGetValue(type, out string typeValue) && typeValue == codetype)
{ {
LogNet.log.Info($"匹配结果为true"); //LogNet.log.Info($"匹配结果为true");
return true; return true;
} }
if (dic.TryGetValue(codetype, out string codetypeValue) && codetypeValue == type) if (dic.TryGetValue(codetype, out string codetypeValue) && codetypeValue == type)
{ {
LogNet.log.Info($"匹配结果为true"); //LogNet.log.Info($"匹配结果为true");
return true; return true;
} }
return false; return false;
......
SmartScan/SetControl/UsrMaterialTemplate.cs
...@@ -371,6 +371,7 @@ namespace SmartScan ...@@ -371,6 +371,7 @@ namespace SmartScan
Height = info[i].Size.Height, Height = info[i].Size.Height,
Distance = info[i].Distance Distance = info[i].Distance
}; };
LogNet.log.Info($"{code.Text}获取到的条码类型={code.CodeType}");
mateCopy[mateIndex].Code.Add(code); mateCopy[mateIndex].Code.Add(code);
lst[i] = info[i].Center; lst[i] = info[i].Center;
} }
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!