印度下拉框

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

@@ -51,7 +51,8 @@ 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/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;
             }