Skip to content

张东亮 / NS100

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

1

1 个父辈 4426c22f
内嵌 并排
正在显示 16 个修改的文件 包含 422 行增加 和 230 行删除
BLL/Extension.cs
......@@ -8,6 +8,7 @@ using Asa.FaceControl;
using Model;
using System.Windows.Forms;
using DocumentFormat.OpenXml.Drawing;
using DocumentFormat.OpenXml.Spreadsheet;
namespace BLL
{
......@@ -124,8 +125,15 @@ namespace BLL
}
},
};
Dictionary<string, object> R = new() {
{ "Type", "TextBox" },
Dictionary<string, object> R;
bool isdis = ConfigHelper.Config.Get<bool>("DataSource_ShowBox",false);
string type = "TextBox";
if (key==Config.DataSource_DataTitle&&isdis)
{
type = "ComboBox";
}
R = new() {
{ "Type", type },
{ "Key", key },
{ "LinkName", key },
{ "CanClear", "True" },
......@@ -258,7 +266,10 @@ namespace BLL
}
ctlY = startPoint.Y;
for (int i = 0; i < rows.Length; i++)
{
LoadRow(rows[i]);
}
currentExtension.Load(ctlGroup);
}
......@@ -300,7 +311,7 @@ namespace BLL
{
Dictionary<string, object> dic = (Dictionary<string, object>)cols[i];
if (!dic.ContainsKey("Type")) continue;
ControlBase ctl = dicControls[dic["Type"].ToString()].Invoke();
ControlBase ctl = dicControls[dic["Type"].ToString()].Invoke();
ctl.Location = new System.Drawing.Point(ctlX, ctlY);
panel.Controls.Add(ctl);
......@@ -339,7 +350,7 @@ namespace BLL
PropertyInfo info = type.GetProperty(key);
if (info == null) continue;
dicControlAttribute[info.PropertyType].Invoke(info, ctl, att[key]);
}
}
}
private void LoadEvent(ControlBase ctl, Dictionary<string, object> att)
......
BLL/Extension/Item_General.cs
......@@ -71,7 +71,7 @@ namespace BLL
public void Load(List<ExtensionControl> extensions)
{
this.extensions = extensions;
this.extensions = extensions;
}
static bool mesResult = false;
......@@ -94,7 +94,25 @@ namespace BLL
}
}
Application.DoEvents();
if (!string.IsNullOrEmpty(config.ReelIDKeyWord))
#region 判断指定关键字是否存在内容
bool isdisplay = true;
string str = ConfigHelper.Config.Get("DataSource_ForceMatching", "");
if (!string.IsNullOrWhiteSpace(str))
{
string[] arr = str.Split(',');
foreach (var item in arr)
{
key.TryGetValue(item, out string value);
if (string.IsNullOrEmpty(value))
{
isdisplay = false;
break;
}
}
}
#endregion
if (!string.IsNullOrEmpty(config.ReelIDKeyWord)&&isdisplay)
{
var Reelidstr = GetReelid();
if (key.ContainsKey(config.ReelIDKeyWord))
......@@ -139,6 +157,16 @@ namespace BLL
//第二次刷新界面
for (int i = 0; i < extensions.Count; i++)
{
#region 如果是下拉框加载内容
if (extensions[i].Type == "ComboBox")
{
var s = extensions[i].Control as Asa.FaceControl.FaceComboBox;
s.Items.AddRange(ExtraFileData.DataTitle.OrderBy(tit=>tit).ToArray());
s.Text = "";
s.SelectedIndex = -1;
s.Enabled = true;
}
#endregion
extensions[i].Control.ForeColor = System.Drawing.Color.White;
if (key.ContainsKey(extensions[i].Key))
{
......@@ -243,13 +271,15 @@ namespace BLL
}
continue;
}
if (extensions!=null)
if (extensions != null)
{
int index = extensions.FindIndex(match => match.Key == keys[i]);
if (index == -1) continue;
string oldValue = string.Format("[{0}]", keys[i]);
matchID = matchID.Replace(oldValue, extensions[index].Control.Text);
}
//matchID = matchID.Replace(oldValue, extensions[index].Control.Text);
matchID = matchID.Replace(oldValue, "");
}
}
//SaveAddReelID();
var reelID = ReadReelID();
......@@ -311,16 +341,56 @@ namespace BLL
{
LogNet.log.Debug("Enter PrintLabel Method");
if (lastkey == null) return;
//Dictionary<string, string> key = new();
for (int i = 0; i < extensions.Count; i++)
{
{
if (extensions[i].Key == "") continue;
if (lastkey.ContainsKey(extensions[i].Key))
lastkey[extensions[i].Key] = extensions[i].Control.Text;
else
lastkey.Add(extensions[i].Key, extensions[i].Control.Text);
}
#region 判断指定关键字是否存在内容
List<string> strings = new List<string>();
string str = ConfigHelper.Config.Get("DataSource_ForceMatching", "");
if (!string.IsNullOrWhiteSpace(str))
{
string[] arr = str.Split(',');
foreach (var item in arr)
{
lastkey.TryGetValue(item, out string value);
if (string.IsNullOrEmpty(value))
{
strings.Add(item);
}
}
}
#endregion
for (int i = 0; i < extensions.Count; i++)
{
if (strings.Contains(extensions[i].Key))
{
extensions[i].Control.BackColor = System.Drawing.Color.Red;
return;
}
}
#region 点击打印按钮，rid内容为空时，生成rid
if (!string.IsNullOrEmpty(config.ReelIDKeyWord))
{
if (lastkey.ContainsKey(config.ReelIDKeyWord))
{
string rid = lastkey[config.ReelIDKeyWord];
if (string.IsNullOrWhiteSpace(rid))
{
var Reelidstr = GetReelid();
lastkey[config.ReelIDKeyWord] = Reelidstr;
}
}
}
#endregion
Printing?.Invoke(lastkey);
bool close = ConfigHelper.Config.Get("isprinclose", false);
if (close)
......@@ -334,6 +404,10 @@ namespace BLL
}
//进行追溯配置保存
SaveRetrospect?.Invoke(lastkey);
for (int i = 0; i < extensions.Count; i++)
{
extensions[i].Control.BackColor = System.Drawing.Color.FromArgb(255, 20, 20, 20);
}
}
/// <summary>
///
......
BLL/ExtraFileData.cs
......@@ -14,6 +14,8 @@ namespace BLL
{
public static Dictionary<string, Dictionary<string, string>> AllData = new Dictionary<string, Dictionary<string, string>>();
public static List<string> Titles = new List<string>();
public static List<string> DataTitle = new List<string>();
public static void Init() {
var ext = Path.GetExtension(Config.DataSource_FilePath);
if (string.IsNullOrEmpty(ext))
......@@ -75,7 +77,11 @@ namespace BLL
}
}
if (!string.IsNullOrEmpty(keydata) && !AllData.ContainsKey(keydata))
{
AllData.Add(keydata, rowdata);
DataTitle.Add(keydata);
}
}
}
catch(Exception ex) {
......@@ -142,7 +148,10 @@ namespace BLL
}
}
if (!string.IsNullOrEmpty(keydata) && !AllData.ContainsKey(keydata))
{
AllData.Add(keydata, rowdata);
DataTitle.Add(keydata);
}
if (string.IsNullOrEmpty(keydata))
emptyrow++;
......
BLL/MaterialEdit.cs
......@@ -151,13 +151,17 @@ namespace BLL
MatchAnalysis.StartNewAnalysis(code);
if (Config.Func_EnabledOCR)
{
Bitmap bitmaps =new Bitmap(CurrntBitmap);
//LogNet.log.Info($"开始加载图片");
//Bitmap bitmaps = new Bitmap(CurrntBitmap);
//LogNet.log.Info($"加载结束图片");
//保存需要识别ocr的区域
//CurrntBitmap?.Save(@"ocr.jpg", System.Drawing.Imaging.ImageFormat.Jpeg);
string currentDirectory = System.Windows.Forms.Application.StartupPath;
string filePath = System.IO.Path.Combine(currentDirectory, "ocr.jpg");
//CurrntBitmap?.Save(filePath, System.Drawing.Imaging.ImageFormat.Jpeg);
bitmaps?.Save(filePath);
LogNet.log.Info($"开始保存图片");
CurrntBitmap?.Save(filePath, System.Drawing.Imaging.ImageFormat.Jpeg);
LogNet.log.Info($"保存图片");
regOcrCodes = OcrRecognize($"{currentDirectory}\\ocr.jpg");
LogNet.log.Info($"保存地址：{filePath}；获取地址：{currentDirectory}\\ocr.jpg");
LogNet.log.Info($"OCR 识别结果：{regOcrCodes}");
......@@ -389,7 +393,7 @@ namespace BLL
xmlDoc.Save(temp.FilePath);
temp.State = TemplateState.Saved;
}
}
private bool TemplateExtract(int index, List<BarcodeInfo> code, out Dictionary<string, string> keyword, out AMatch aMatch)
{
......
BLL/PrintLabelEdit.cs
......@@ -330,7 +330,11 @@ namespace BLL
{
barCode = null;
int index = labelTemp.FindIndex(match => match.Name == labelName);
if (index == -1) return;
if (index == -1)
{
LogNet.log.Info("未找到标签！");
return;
}
SizeF sf;
barCode = new string[labelTemp[index].Field.Count];
......@@ -360,7 +364,6 @@ namespace BLL
print.PrintPage += PrintLast_PrintPage;
interimLabel = labelTemp[index];
print.Print();
}
//====================================
......
SmartScan/Form/FrmMain.Designer.cs
......@@ -308,12 +308,12 @@ namespace SmartScan
private Asa.FaceControl.FaceButton BtnTriggerIO;
private Asa.FaceControl.FaceLabel LblCameraExist;
private Asa.FaceControl.FaceLabel LblIOExist;
private Asa.FaceControl.FacePictureBox PicShow;
private Asa.FaceControl.FacePanel PnlExtension;
private Asa.FaceControl.FaceComboBox CboLanguage;
private Asa.FaceControl.FaceButton BtnMatchedName;
private Asa.FaceControl.FaceLabel LblVersion;
private Asa.FaceControl.FaceLabel LblUserName;
public Asa.FaceControl.FacePictureBox PicShow;
}
}
SmartScan/Form/FrmMain.cs
......@@ -250,6 +250,7 @@ namespace SmartScan
BtnSet.Enabled = BLLCommon.config.UserLevel == UserLevel.Admin;
FrmRetrospect.Print += Extension_Printing;
UsrWorkMode.Printing += Extension_Printing;
//扩展面板
PnlExtension.Width = BLLCommon.config.ExtensionWidth;
PnlExtension.Left = Width - PnlExtension.Width - 12;
......
SmartScan/PlusSettingFrm/FrmSetPlus.Designer.cs
......@@ -229,6 +229,7 @@ namespace SmartScan
// FrmSetPlus
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.AutoSize = true;
this.ClientSize = new System.Drawing.Size(1293, 788);
this.Controls.Add(this.but_Labeling);
this.Controls.Add(this.Keywordlabeling);
......
SmartScan/PlusSettingFrm/FrmSetPlus.cs
......@@ -17,8 +17,8 @@ namespace SmartScan
//Language.SetLanguage(this);
this.SizeChanged += FrmSetPlus_SizeChanged;
this.FormClosing += FrmSetPlus_FormClosing;
this.Width = 1024;
this.Height = 738;
//this.Width = 1024;
//this.Height = 738;
this.Top = 15;
this.Left = 0;
WebService.Open();//启动条码匹配服务
......
SmartScan/ScanWork.cs
......@@ -229,7 +229,7 @@ namespace SmartScan
if (BLLCommon.config.TriggerOpenLight)
{
BLLCommon.lightSource.TurnOn();
System.Threading.Thread.Sleep(2000); //光源打开有一个由暗变亮的过程
System.Threading.Thread.Sleep(100); //光源打开有一个由暗变亮的过程
}
List<Bitmap> image = new List<Bitmap>(Camera.CaptureAndGetCode(out workCodeInfo));
if (image.Count > 0 && !BLL.Config.Backgrounder) picShow.Image = image[0];
......@@ -332,9 +332,8 @@ namespace SmartScan
private void SetKey(bool hasMatch)
{
LogNet.log.Info("Work SetKey hasMatch:" + hasMatch);
if (workCodeKeyword.Count == 0) return;
//if (workCodeKeyword.Count == 0){ return;}
BLLCommon.extension.SetKey(originalCodeText, workCodeKeyword, hasMatch, out _);
//if (workCodeKeyword.Count == 0) return;放前面执行
if (workCodeKeyword.Any(a => a.Value.StartsWith("<OCR>")))
{
BLLCommon.extension.DrawTextBackground(workCodeKeyword);
......
SmartScan/SetControl/UsrMacro.Designer.cs
......@@ -37,7 +37,6 @@ namespace SmartScan
this.TxtReelIDMatch = new Asa.FaceControl.FaceTextBox();
this.LblPlaces = new Asa.FaceControl.FaceLabel();
this.NumReelIDPlaces = new Asa.FaceControl.FaceNumericUpDown();
//this.ChkResetidbydate = new Asa.FaceControl.FaceCheckBox();
this.ChkReelIDFillZero = new Asa.FaceControl.FaceCheckBox();
this.TxtPostfix = new Asa.FaceControl.FaceTextBox();
this.LblPrefix = new Asa.FaceControl.FaceLabel();
......@@ -72,12 +71,12 @@ namespace SmartScan
this.facePanel1.Controls.Add(this.TxtKey);
this.facePanel1.Controls.Add(this.LstKey);
this.facePanel1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.facePanel1.Location = new System.Drawing.Point(4, 4);
this.facePanel1.Margin = new System.Windows.Forms.Padding(4);
this.facePanel1.Location = new System.Drawing.Point(4, 5);
this.facePanel1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.facePanel1.Name = "facePanel1";
this.facePanel1.Padding = new System.Windows.Forms.Padding(4);
this.facePanel1.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.facePanel1.ShowText = false;
this.facePanel1.Size = new System.Drawing.Size(963, 620);
this.facePanel1.Size = new System.Drawing.Size(1083, 744);
this.facePanel1.TabIndex = 1;
this.facePanel1.Text = "facePanel1";
this.facePanel1.TitleFont = new System.Drawing.Font("宋体", 12F);
......@@ -99,11 +98,11 @@ namespace SmartScan
this.PnlReelid.Controls.Add(this.LblPostfix);
this.PnlReelid.Controls.Add(this.TxtPrefix);
this.PnlReelid.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.PnlReelid.Location = new System.Drawing.Point(475, 8);
this.PnlReelid.Margin = new System.Windows.Forms.Padding(4);
this.PnlReelid.Location = new System.Drawing.Point(534, 10);
this.PnlReelid.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.PnlReelid.Name = "PnlReelid";
this.PnlReelid.Padding = new System.Windows.Forms.Padding(4);
this.PnlReelid.Size = new System.Drawing.Size(307, 564);
this.PnlReelid.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.PnlReelid.Size = new System.Drawing.Size(345, 677);
this.PnlReelid.TabIndex = 35;
this.PnlReelid.Text = "ReelID";
this.PnlReelid.TitleFont = new System.Drawing.Font("宋体", 12F);
......@@ -116,13 +115,13 @@ namespace SmartScan
this.CmbResetidBy.BorderStyle = Asa.FaceControl.ControlShape.Rectangle;
this.CmbResetidBy.BorderWidth = 2;
this.CmbResetidBy.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.CmbResetidBy.Location = new System.Drawing.Point(8, 401);
this.CmbResetidBy.Margin = new System.Windows.Forms.Padding(4);
this.CmbResetidBy.Location = new System.Drawing.Point(9, 481);
this.CmbResetidBy.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.CmbResetidBy.Name = "CmbResetidBy";
this.CmbResetidBy.Padding = new System.Windows.Forms.Padding(4);
this.CmbResetidBy.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.CmbResetidBy.SelectedIndex = -1;
this.CmbResetidBy.SelectedText = "";
this.CmbResetidBy.Size = new System.Drawing.Size(291, 44);
this.CmbResetidBy.Size = new System.Drawing.Size(327, 53);
this.CmbResetidBy.TabIndex = 37;
this.CmbResetidBy.Text = "序号重置";
this.CmbResetidBy.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
......@@ -134,11 +133,11 @@ namespace SmartScan
this.btn_adddatetime.BorderWidth = 2;
this.btn_adddatetime.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.btn_adddatetime.HoldPress = false;
this.btn_adddatetime.Location = new System.Drawing.Point(8, 467);
this.btn_adddatetime.Margin = new System.Windows.Forms.Padding(4);
this.btn_adddatetime.Location = new System.Drawing.Point(9, 560);
this.btn_adddatetime.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.btn_adddatetime.Name = "btn_adddatetime";
this.btn_adddatetime.Padding = new System.Windows.Forms.Padding(4);
this.btn_adddatetime.Size = new System.Drawing.Size(291, 56);
this.btn_adddatetime.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.btn_adddatetime.Size = new System.Drawing.Size(327, 67);
this.btn_adddatetime.TabIndex = 36;
this.btn_adddatetime.Text = "添加日期时间";
this.btn_adddatetime.Click += new System.EventHandler(this.btn_adddatetime_Click);
......@@ -151,11 +150,11 @@ namespace SmartScan
this.LblContent.BorderStyle = Asa.FaceControl.ControlShape.Rectangle;
this.LblContent.BorderWidth = 0;
this.LblContent.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.LblContent.Location = new System.Drawing.Point(8, 42);
this.LblContent.Margin = new System.Windows.Forms.Padding(4);
this.LblContent.Location = new System.Drawing.Point(9, 50);
this.LblContent.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.LblContent.Name = "LblContent";
this.LblContent.Padding = new System.Windows.Forms.Padding(4);
this.LblContent.Size = new System.Drawing.Size(291, 44);
this.LblContent.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.LblContent.Size = new System.Drawing.Size(327, 53);
this.LblContent.TabIndex = 20;
this.LblContent.Text = "条件";
this.LblContent.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
......@@ -167,17 +166,17 @@ namespace SmartScan
this.TxtReelIDMatch.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(20)))));
this.TxtReelIDMatch.BorderStyle = Asa.FaceControl.ControlShape.Rectangle;
this.TxtReelIDMatch.BorderWidth = 2;
this.TxtReelIDMatch.Location = new System.Drawing.Point(8, 94);
this.TxtReelIDMatch.Margin = new System.Windows.Forms.Padding(4);
this.TxtReelIDMatch.Location = new System.Drawing.Point(9, 113);
this.TxtReelIDMatch.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.TxtReelIDMatch.MaxLength = 32767;
this.TxtReelIDMatch.Name = "TxtReelIDMatch";
this.TxtReelIDMatch.Padding = new System.Windows.Forms.Padding(4);
this.TxtReelIDMatch.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.TxtReelIDMatch.SelectedText = "";
this.TxtReelIDMatch.SelectionLength = 0;
this.TxtReelIDMatch.SelectionStart = 0;
this.TxtReelIDMatch.ShowDel = true;
this.TxtReelIDMatch.ShowQuery = false;
this.TxtReelIDMatch.Size = new System.Drawing.Size(291, 56);
this.TxtReelIDMatch.Size = new System.Drawing.Size(327, 67);
this.TxtReelIDMatch.TabIndex = 19;
this.TxtReelIDMatch.Text = "faceTextBox1";
//
......@@ -187,11 +186,11 @@ namespace SmartScan
this.LblPlaces.BorderStyle = Asa.FaceControl.ControlShape.Rectangle;
this.LblPlaces.BorderWidth = 0;
this.LblPlaces.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.LblPlaces.Location = new System.Drawing.Point(8, 285);
this.LblPlaces.Margin = new System.Windows.Forms.Padding(4);
this.LblPlaces.Location = new System.Drawing.Point(9, 342);
this.LblPlaces.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.LblPlaces.Name = "LblPlaces";
this.LblPlaces.Padding = new System.Windows.Forms.Padding(4);
this.LblPlaces.Size = new System.Drawing.Size(120, 56);
this.LblPlaces.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.LblPlaces.Size = new System.Drawing.Size(135, 67);
this.LblPlaces.TabIndex = 23;
this.LblPlaces.Text = "数字位数";
this.LblPlaces.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
......@@ -206,34 +205,18 @@ namespace SmartScan
this.NumReelIDPlaces.DecimalPlaces = 0;
this.NumReelIDPlaces.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.NumReelIDPlaces.Increment = 1F;
this.NumReelIDPlaces.Location = new System.Drawing.Point(136, 285);
this.NumReelIDPlaces.Margin = new System.Windows.Forms.Padding(4);
this.NumReelIDPlaces.Location = new System.Drawing.Point(153, 342);
this.NumReelIDPlaces.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.NumReelIDPlaces.Maximum = 9999F;
this.NumReelIDPlaces.Minimum = 1F;
this.NumReelIDPlaces.Name = "NumReelIDPlaces";
this.NumReelIDPlaces.Padding = new System.Windows.Forms.Padding(4);
this.NumReelIDPlaces.Size = new System.Drawing.Size(163, 56);
this.NumReelIDPlaces.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.NumReelIDPlaces.Size = new System.Drawing.Size(183, 67);
this.NumReelIDPlaces.TabIndex = 24;
this.NumReelIDPlaces.Text = "1";
this.NumReelIDPlaces.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
this.NumReelIDPlaces.Value = 1F;
//
// ChkResetidbydate
//
//this.ChkResetidbydate.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
//| System.Windows.Forms.AnchorStyles.Right)));
//this.ChkResetidbydate.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(20)))));
//this.ChkResetidbydate.BorderStyle = Asa.FaceControl.ControlShape.Rectangle;
//this.ChkResetidbydate.BorderWidth = 0;
//this.ChkResetidbydate.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
//this.ChkResetidbydate.Location = new System.Drawing.Point(8, 395);
//this.ChkResetidbydate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
//this.ChkResetidbydate.Name = "ChkResetidbydate";
//this.ChkResetidbydate.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
//this.ChkResetidbydate.Size = new System.Drawing.Size(291, 44);
//this.ChkResetidbydate.TabIndex = 25;
//this.ChkResetidbydate.Text = "序号每日重置";
//
// ChkReelIDFillZero
//
this.ChkReelIDFillZero.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
......@@ -242,11 +225,11 @@ namespace SmartScan
this.ChkReelIDFillZero.BorderStyle = Asa.FaceControl.ControlShape.Rectangle;
this.ChkReelIDFillZero.BorderWidth = 0;
this.ChkReelIDFillZero.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.ChkReelIDFillZero.Location = new System.Drawing.Point(8, 349);
this.ChkReelIDFillZero.Margin = new System.Windows.Forms.Padding(4);
this.ChkReelIDFillZero.Location = new System.Drawing.Point(9, 419);
this.ChkReelIDFillZero.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.ChkReelIDFillZero.Name = "ChkReelIDFillZero";
this.ChkReelIDFillZero.Padding = new System.Windows.Forms.Padding(4);
this.ChkReelIDFillZero.Size = new System.Drawing.Size(291, 44);
this.ChkReelIDFillZero.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.ChkReelIDFillZero.Size = new System.Drawing.Size(327, 53);
this.ChkReelIDFillZero.TabIndex = 25;
this.ChkReelIDFillZero.Text = "前面补0";
//
......@@ -257,17 +240,17 @@ namespace SmartScan
this.TxtPostfix.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(20)))));
this.TxtPostfix.BorderStyle = Asa.FaceControl.ControlShape.Rectangle;
this.TxtPostfix.BorderWidth = 2;
this.TxtPostfix.Location = new System.Drawing.Point(136, 221);
this.TxtPostfix.Margin = new System.Windows.Forms.Padding(4);
this.TxtPostfix.Location = new System.Drawing.Point(153, 265);
this.TxtPostfix.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.TxtPostfix.MaxLength = 32767;
this.TxtPostfix.Name = "TxtPostfix";
this.TxtPostfix.Padding = new System.Windows.Forms.Padding(4);
this.TxtPostfix.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.TxtPostfix.SelectedText = "";
this.TxtPostfix.SelectionLength = 0;
this.TxtPostfix.SelectionStart = 0;
this.TxtPostfix.ShowDel = true;
this.TxtPostfix.ShowQuery = false;
this.TxtPostfix.Size = new System.Drawing.Size(163, 56);
this.TxtPostfix.Size = new System.Drawing.Size(183, 67);
this.TxtPostfix.TabIndex = 29;
this.TxtPostfix.Text = "faceTextBox1";
//
......@@ -277,11 +260,11 @@ namespace SmartScan
this.LblPrefix.BorderStyle = Asa.FaceControl.ControlShape.Rectangle;
this.LblPrefix.BorderWidth = 0;
this.LblPrefix.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.LblPrefix.Location = new System.Drawing.Point(8, 158);
this.LblPrefix.Margin = new System.Windows.Forms.Padding(4);
this.LblPrefix.Location = new System.Drawing.Point(9, 190);
this.LblPrefix.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.LblPrefix.Name = "LblPrefix";
this.LblPrefix.Padding = new System.Windows.Forms.Padding(4);
this.LblPrefix.Size = new System.Drawing.Size(120, 56);
this.LblPrefix.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.LblPrefix.Size = new System.Drawing.Size(135, 67);
this.LblPrefix.TabIndex = 26;
this.LblPrefix.Text = "前缀";
this.LblPrefix.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
......@@ -292,11 +275,11 @@ namespace SmartScan
this.LblPostfix.BorderStyle = Asa.FaceControl.ControlShape.Rectangle;
this.LblPostfix.BorderWidth = 0;
this.LblPostfix.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.LblPostfix.Location = new System.Drawing.Point(8, 221);
this.LblPostfix.Margin = new System.Windows.Forms.Padding(4);
this.LblPostfix.Location = new System.Drawing.Point(9, 265);
this.LblPostfix.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.LblPostfix.Name = "LblPostfix";
this.LblPostfix.Padding = new System.Windows.Forms.Padding(4);
this.LblPostfix.Size = new System.Drawing.Size(120, 56);
this.LblPostfix.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.LblPostfix.Size = new System.Drawing.Size(135, 67);
this.LblPostfix.TabIndex = 28;
this.LblPostfix.Text = "后缀";
this.LblPostfix.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
......@@ -308,17 +291,17 @@ namespace SmartScan
this.TxtPrefix.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(20)))));
this.TxtPrefix.BorderStyle = Asa.FaceControl.ControlShape.Rectangle;
this.TxtPrefix.BorderWidth = 2;
this.TxtPrefix.Location = new System.Drawing.Point(136, 158);
this.TxtPrefix.Margin = new System.Windows.Forms.Padding(4);
this.TxtPrefix.Location = new System.Drawing.Point(153, 190);
this.TxtPrefix.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.TxtPrefix.MaxLength = 32767;
this.TxtPrefix.Name = "TxtPrefix";
this.TxtPrefix.Padding = new System.Windows.Forms.Padding(4);
this.TxtPrefix.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.TxtPrefix.SelectedText = "";
this.TxtPrefix.SelectionLength = 0;
this.TxtPrefix.SelectionStart = 0;
this.TxtPrefix.ShowDel = true;
this.TxtPrefix.ShowQuery = false;
this.TxtPrefix.Size = new System.Drawing.Size(163, 56);
this.TxtPrefix.Size = new System.Drawing.Size(183, 67);
this.TxtPrefix.TabIndex = 27;
this.TxtPrefix.Text = "faceTextBox1";
//
......@@ -329,11 +312,11 @@ namespace SmartScan
this.btn_down.BorderWidth = 2;
this.btn_down.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.btn_down.HoldPress = false;
this.btn_down.Location = new System.Drawing.Point(123, 390);
this.btn_down.Margin = new System.Windows.Forms.Padding(4);
this.btn_down.Location = new System.Drawing.Point(138, 468);
this.btn_down.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.btn_down.Name = "btn_down";
this.btn_down.Padding = new System.Windows.Forms.Padding(4);
this.btn_down.Size = new System.Drawing.Size(112, 56);
this.btn_down.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.btn_down.Size = new System.Drawing.Size(126, 67);
this.btn_down.TabIndex = 34;
this.btn_down.Text = "▼";
this.btn_down.Click += new System.EventHandler(this.btn_down_Click);
......@@ -345,11 +328,11 @@ namespace SmartScan
this.btn_up.BorderWidth = 2;
this.btn_up.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.btn_up.HoldPress = false;
this.btn_up.Location = new System.Drawing.Point(8, 390);
this.btn_up.Margin = new System.Windows.Forms.Padding(4);
this.btn_up.Location = new System.Drawing.Point(9, 468);
this.btn_up.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.btn_up.Name = "btn_up";
this.btn_up.Padding = new System.Windows.Forms.Padding(4);
this.btn_up.Size = new System.Drawing.Size(107, 56);
this.btn_up.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.btn_up.Size = new System.Drawing.Size(120, 67);
this.btn_up.TabIndex = 34;
this.btn_up.Text = "▲";
this.btn_up.Click += new System.EventHandler(this.btn_up_Click);
......@@ -361,11 +344,11 @@ namespace SmartScan
this.btn_setriid.BorderWidth = 2;
this.btn_setriid.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.btn_setriid.HoldPress = false;
this.btn_setriid.Location = new System.Drawing.Point(243, 326);
this.btn_setriid.Margin = new System.Windows.Forms.Padding(4);
this.btn_setriid.Location = new System.Drawing.Point(273, 391);
this.btn_setriid.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.btn_setriid.Name = "btn_setriid";
this.btn_setriid.Padding = new System.Windows.Forms.Padding(4);
this.btn_setriid.Size = new System.Drawing.Size(224, 56);
this.btn_setriid.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.btn_setriid.Size = new System.Drawing.Size(252, 67);
this.btn_setriid.TabIndex = 34;
this.btn_setriid.Text = "Toggle Auto ReelID";
this.btn_setriid.Click += new System.EventHandler(this.btn_setriid_Click);
......@@ -377,11 +360,11 @@ namespace SmartScan
this.BtnAppendKey.BorderWidth = 2;
this.BtnAppendKey.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.BtnAppendKey.HoldPress = false;
this.BtnAppendKey.Location = new System.Drawing.Point(243, 262);
this.BtnAppendKey.Margin = new System.Windows.Forms.Padding(4);
this.BtnAppendKey.Location = new System.Drawing.Point(273, 314);
this.BtnAppendKey.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.BtnAppendKey.Name = "BtnAppendKey";
this.BtnAppendKey.Padding = new System.Windows.Forms.Padding(4);
this.BtnAppendKey.Size = new System.Drawing.Size(224, 56);
this.BtnAppendKey.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.BtnAppendKey.Size = new System.Drawing.Size(252, 67);
this.BtnAppendKey.TabIndex = 34;
this.BtnAppendKey.Text = "append";
this.BtnAppendKey.Click += new System.EventHandler(this.BtnAppendKey_Click);
......@@ -393,11 +376,11 @@ namespace SmartScan
this.BtnUpdateKey.BorderWidth = 2;
this.BtnUpdateKey.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.BtnUpdateKey.HoldPress = false;
this.BtnUpdateKey.Location = new System.Drawing.Point(243, 199);
this.BtnUpdateKey.Margin = new System.Windows.Forms.Padding(4);
this.BtnUpdateKey.Location = new System.Drawing.Point(273, 239);
this.BtnUpdateKey.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.BtnUpdateKey.Name = "BtnUpdateKey";
this.BtnUpdateKey.Padding = new System.Windows.Forms.Padding(4);
this.BtnUpdateKey.Size = new System.Drawing.Size(224, 56);
this.BtnUpdateKey.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.BtnUpdateKey.Size = new System.Drawing.Size(252, 67);
this.BtnUpdateKey.TabIndex = 33;
this.BtnUpdateKey.Text = "update";
this.BtnUpdateKey.Click += new System.EventHandler(this.BtnUpdateKey_Click);
......@@ -409,11 +392,11 @@ namespace SmartScan
this.BtnDelKey.BorderWidth = 2;
this.BtnDelKey.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.BtnDelKey.HoldPress = false;
this.BtnDelKey.Location = new System.Drawing.Point(243, 135);
this.BtnDelKey.Margin = new System.Windows.Forms.Padding(4);
this.BtnDelKey.Location = new System.Drawing.Point(273, 162);
this.BtnDelKey.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.BtnDelKey.Name = "BtnDelKey";
this.BtnDelKey.Padding = new System.Windows.Forms.Padding(4);
this.BtnDelKey.Size = new System.Drawing.Size(224, 56);
this.BtnDelKey.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.BtnDelKey.Size = new System.Drawing.Size(252, 67);
this.BtnDelKey.TabIndex = 32;
this.BtnDelKey.Text = "del";
this.BtnDelKey.Click += new System.EventHandler(this.BtnDelKey_Click);
......@@ -425,11 +408,11 @@ namespace SmartScan
this.BtnAddKey.BorderWidth = 2;
this.BtnAddKey.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.BtnAddKey.HoldPress = false;
this.BtnAddKey.Location = new System.Drawing.Point(243, 71);
this.BtnAddKey.Margin = new System.Windows.Forms.Padding(4);
this.BtnAddKey.Location = new System.Drawing.Point(273, 85);
this.BtnAddKey.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.BtnAddKey.Name = "BtnAddKey";
this.BtnAddKey.Padding = new System.Windows.Forms.Padding(4);
this.BtnAddKey.Size = new System.Drawing.Size(224, 56);
this.BtnAddKey.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.BtnAddKey.Size = new System.Drawing.Size(252, 67);
this.BtnAddKey.TabIndex = 31;
this.BtnAddKey.Text = "add";
this.BtnAddKey.Click += new System.EventHandler(this.BtnAddKey_Click);
......@@ -439,17 +422,17 @@ namespace SmartScan
this.TxtKey.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(20)))));
this.TxtKey.BorderStyle = Asa.FaceControl.ControlShape.Rectangle;
this.TxtKey.BorderWidth = 2;
this.TxtKey.Location = new System.Drawing.Point(243, 8);
this.TxtKey.Margin = new System.Windows.Forms.Padding(4);
this.TxtKey.Location = new System.Drawing.Point(273, 10);
this.TxtKey.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.TxtKey.MaxLength = 32767;
this.TxtKey.Name = "TxtKey";
this.TxtKey.Padding = new System.Windows.Forms.Padding(4);
this.TxtKey.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.TxtKey.SelectedText = "";
this.TxtKey.SelectionLength = 0;
this.TxtKey.SelectionStart = 0;
this.TxtKey.ShowDel = true;
this.TxtKey.ShowQuery = false;
this.TxtKey.Size = new System.Drawing.Size(224, 56);
this.TxtKey.Size = new System.Drawing.Size(252, 67);
this.TxtKey.TabIndex = 30;
//
// LstKey
......@@ -458,23 +441,23 @@ namespace SmartScan
this.LstKey.BorderStyle = Asa.FaceControl.ControlShape.Rectangle;
this.LstKey.BorderWidth = 2;
this.LstKey.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.LstKey.Location = new System.Drawing.Point(8, 8);
this.LstKey.Margin = new System.Windows.Forms.Padding(4);
this.LstKey.Location = new System.Drawing.Point(9, 10);
this.LstKey.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.LstKey.Name = "LstKey";
this.LstKey.Padding = new System.Windows.Forms.Padding(4);
this.LstKey.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.LstKey.SelectedIndex = -1;
this.LstKey.Size = new System.Drawing.Size(227, 375);
this.LstKey.Size = new System.Drawing.Size(255, 450);
this.LstKey.TabIndex = 21;
this.LstKey.SelectedIndexChanged += new System.EventHandler(this.LstKey_SelectedIndexChanged);
//
// UsrMacro
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.facePanel1);
this.Margin = new System.Windows.Forms.Padding(4);
this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.Name = "UsrMacro";
this.Size = new System.Drawing.Size(1131, 666);
this.Size = new System.Drawing.Size(1272, 799);
this.facePanel1.ResumeLayout(false);
this.PnlReelid.ResumeLayout(false);
this.ResumeLayout(false);
......
SmartScan/SetControl/UsrMacro.cs
......@@ -176,6 +176,6 @@ namespace SmartScan
{
string key = "[datetime:yyyyMMddHHmmss]";
TxtReelIDMatch.AppendText(key);
}
}
}
}
SmartScan/SetControl/UsrMaterialTemplate.cs
......@@ -183,15 +183,28 @@ namespace SmartScan
if (System.IO.File.Exists(iamgepath))
{
ImgShow.Image = ObjConversion.ReadImageFile(iamgepath);
//ImgShow.Image = mateCopy[mateIndex].Image;
ImgShow.CodeCenterClear();
ImgShow.AddCodeCenter(LabelCenter());
LstCode.Items.Clear();
LstCode.Items.AddRange(FormatCode());
LstCode.SelectedIndex = -1;
bmp = ImgShow.Image;
}
else
{
ImgShow.Image = null;
ImgShow.CodeCenterClear();
LstCode.Items.Clear();
}
}
//ImgShow.Image = mateCopy[mateIndex].Image;
ImgShow.CodeCenterClear();
ImgShow.AddCodeCenter(LabelCenter());
LstCode.Items.Clear();
LstCode.Items.AddRange(FormatCode());
LstCode.SelectedIndex = -1;
bmp = ImgShow.Image;
else
{
ImgShow.Image = null;
ImgShow.CodeCenterClear();
LstCode.Items.Clear();
}
}
private void BtnAddMate_Click(object sender, EventArgs e)
......@@ -514,6 +527,7 @@ namespace SmartScan
}
private void BtnOcrCode_Click_1(object sender, EventArgs e)
{
if (bmp == null) return;
LstCode.Items.Clear();
//保存需要识别ocr的区域
......
SmartScan/SetControl/UsrWorkMode.Designer.cs
......@@ -30,6 +30,7 @@ namespace SmartScan
private void InitializeComponent()
{
this.facePanel1 = new Asa.FaceControl.FacePanel();
this.but_Readfileprint = new System.Windows.Forms.Button();
this.ChkAllowModifyPrint = new Asa.FaceControl.FaceCheckBox();
this.ChkAutoPrint = new Asa.FaceControl.FaceCheckBox();
this.ChkPromptAfterPrinting = new Asa.FaceControl.FaceCheckBox();
......@@ -59,6 +60,7 @@ namespace SmartScan
this.facePanel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(20)))));
this.facePanel1.BorderStyle = Asa.FaceControl.ControlShape.Rectangle;
this.facePanel1.BorderWidth = 2;
this.facePanel1.Controls.Add(this.but_Readfileprint);
this.facePanel1.Controls.Add(this.ChkAllowModifyPrint);
this.facePanel1.Controls.Add(this.ChkAutoPrint);
this.facePanel1.Controls.Add(this.ChkPromptAfterPrinting);
......@@ -82,15 +84,32 @@ namespace SmartScan
this.facePanel1.Controls.Add(this.LblHistoryImage);
this.facePanel1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.facePanel1.Location = new System.Drawing.Point(4, 4);
this.facePanel1.Margin = new System.Windows.Forms.Padding(4);
this.facePanel1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.facePanel1.Name = "facePanel1";
this.facePanel1.Padding = new System.Windows.Forms.Padding(4);
this.facePanel1.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.facePanel1.ShowText = false;
this.facePanel1.Size = new System.Drawing.Size(1059, 824);
this.facePanel1.Size = new System.Drawing.Size(1191, 989);
this.facePanel1.TabIndex = 0;
this.facePanel1.Text = "facePanel1";
this.facePanel1.TitleFont = new System.Drawing.Font("宋体", 12F);
//
// but_Readfileprint
//
this.but_Readfileprint.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(20)))));
this.but_Readfileprint.FlatAppearance.BorderColor = System.Drawing.Color.Black;
this.but_Readfileprint.FlatAppearance.BorderSize = 0;
this.but_Readfileprint.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Black;
this.but_Readfileprint.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Black;
this.but_Readfileprint.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.but_Readfileprint.ForeColor = System.Drawing.Color.WhiteSmoke;
this.but_Readfileprint.Location = new System.Drawing.Point(4, 5);
this.but_Readfileprint.Margin = new System.Windows.Forms.Padding(0);
this.but_Readfileprint.Name = "but_Readfileprint";
this.but_Readfileprint.Size = new System.Drawing.Size(60, 37);
this.but_Readfileprint.TabIndex = 0;
this.but_Readfileprint.UseVisualStyleBackColor = false;
this.but_Readfileprint.Click += new System.EventHandler(this.but_Readfileprint_Click);
//
// ChkAllowModifyPrint
//
this.ChkAllowModifyPrint.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(20)))));
......@@ -98,11 +117,11 @@ namespace SmartScan
this.ChkAllowModifyPrint.BorderWidth = 0;
this.ChkAllowModifyPrint.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.ChkAllowModifyPrint.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.ChkAllowModifyPrint.Location = new System.Drawing.Point(348, 757);
this.ChkAllowModifyPrint.Margin = new System.Windows.Forms.Padding(4);
this.ChkAllowModifyPrint.Location = new System.Drawing.Point(392, 908);
this.ChkAllowModifyPrint.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.ChkAllowModifyPrint.Name = "ChkAllowModifyPrint";
this.ChkAllowModifyPrint.Padding = new System.Windows.Forms.Padding(4);
this.ChkAllowModifyPrint.Size = new System.Drawing.Size(604, 44);
this.ChkAllowModifyPrint.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.ChkAllowModifyPrint.Size = new System.Drawing.Size(680, 53);
this.ChkAllowModifyPrint.TabIndex = 19;
this.ChkAllowModifyPrint.Text = "允许修改打内容";
this.ChkAllowModifyPrint.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
......@@ -114,11 +133,11 @@ namespace SmartScan
this.ChkAutoPrint.BorderWidth = 0;
this.ChkAutoPrint.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.ChkAutoPrint.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.ChkAutoPrint.Location = new System.Drawing.Point(348, 708);
this.ChkAutoPrint.Margin = new System.Windows.Forms.Padding(4);
this.ChkAutoPrint.Location = new System.Drawing.Point(392, 850);
this.ChkAutoPrint.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.ChkAutoPrint.Name = "ChkAutoPrint";
this.ChkAutoPrint.Padding = new System.Windows.Forms.Padding(4);
this.ChkAutoPrint.Size = new System.Drawing.Size(604, 44);
this.ChkAutoPrint.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.ChkAutoPrint.Size = new System.Drawing.Size(680, 53);
this.ChkAutoPrint.TabIndex = 18;
this.ChkAutoPrint.Text = "自动打印";
this.ChkAutoPrint.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
......@@ -130,11 +149,11 @@ namespace SmartScan
this.ChkPromptAfterPrinting.BorderWidth = 0;
this.ChkPromptAfterPrinting.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.ChkPromptAfterPrinting.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.ChkPromptAfterPrinting.Location = new System.Drawing.Point(348, 658);
this.ChkPromptAfterPrinting.Margin = new System.Windows.Forms.Padding(4);
this.ChkPromptAfterPrinting.Location = new System.Drawing.Point(392, 790);
this.ChkPromptAfterPrinting.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.ChkPromptAfterPrinting.Name = "ChkPromptAfterPrinting";
this.ChkPromptAfterPrinting.Padding = new System.Windows.Forms.Padding(4);
this.ChkPromptAfterPrinting.Size = new System.Drawing.Size(604, 44);
this.ChkPromptAfterPrinting.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.ChkPromptAfterPrinting.Size = new System.Drawing.Size(680, 53);
this.ChkPromptAfterPrinting.TabIndex = 18;
this.ChkPromptAfterPrinting.Text = "打印完成后提示";
this.ChkPromptAfterPrinting.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
......@@ -146,11 +165,11 @@ namespace SmartScan
this.ChkTriggerOpenLight.BorderWidth = 0;
this.ChkTriggerOpenLight.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.ChkTriggerOpenLight.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.ChkTriggerOpenLight.Location = new System.Drawing.Point(348, 608);
this.ChkTriggerOpenLight.Margin = new System.Windows.Forms.Padding(4);
this.ChkTriggerOpenLight.Location = new System.Drawing.Point(392, 730);
this.ChkTriggerOpenLight.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.ChkTriggerOpenLight.Name = "ChkTriggerOpenLight";
this.ChkTriggerOpenLight.Padding = new System.Windows.Forms.Padding(4);
this.ChkTriggerOpenLight.Size = new System.Drawing.Size(604, 44);
this.ChkTriggerOpenLight.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.ChkTriggerOpenLight.Size = new System.Drawing.Size(680, 53);
this.ChkTriggerOpenLight.TabIndex = 17;
this.ChkTriggerOpenLight.Text = "触发信号亮灯";
this.ChkTriggerOpenLight.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
......@@ -162,11 +181,11 @@ namespace SmartScan
this.LblDefaultMate.BorderWidth = 0;
this.LblDefaultMate.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.LblDefaultMate.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.LblDefaultMate.Location = new System.Drawing.Point(757, 20);
this.LblDefaultMate.Margin = new System.Windows.Forms.Padding(4);
this.LblDefaultMate.Location = new System.Drawing.Point(852, 24);
this.LblDefaultMate.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.LblDefaultMate.Name = "LblDefaultMate";
this.LblDefaultMate.Padding = new System.Windows.Forms.Padding(4);
this.LblDefaultMate.Size = new System.Drawing.Size(267, 44);
this.LblDefaultMate.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.LblDefaultMate.Size = new System.Drawing.Size(300, 53);
this.LblDefaultMate.TabIndex = 16;
this.LblDefaultMate.Text = "优先匹配模板";
//
......@@ -177,12 +196,12 @@ namespace SmartScan
this.LstMate.BorderWidth = 2;
this.LstMate.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.LstMate.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.LstMate.Location = new System.Drawing.Point(757, 71);
this.LstMate.Margin = new System.Windows.Forms.Padding(4);
this.LstMate.Location = new System.Drawing.Point(852, 85);
this.LstMate.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.LstMate.Name = "LstMate";
this.LstMate.Padding = new System.Windows.Forms.Padding(4);
this.LstMate.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.LstMate.SelectedIndex = -1;
this.LstMate.Size = new System.Drawing.Size(267, 251);
this.LstMate.Size = new System.Drawing.Size(300, 301);
this.LstMate.TabIndex = 15;
//
// ChkPrintCompletedClear
......@@ -192,11 +211,11 @@ namespace SmartScan
this.ChkPrintCompletedClear.BorderWidth = 0;
this.ChkPrintCompletedClear.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.ChkPrintCompletedClear.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.ChkPrintCompletedClear.Location = new System.Drawing.Point(348, 458);
this.ChkPrintCompletedClear.Margin = new System.Windows.Forms.Padding(4);
this.ChkPrintCompletedClear.Location = new System.Drawing.Point(392, 550);
this.ChkPrintCompletedClear.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.ChkPrintCompletedClear.Name = "ChkPrintCompletedClear";
this.ChkPrintCompletedClear.Padding = new System.Windows.Forms.Padding(4);
this.ChkPrintCompletedClear.Size = new System.Drawing.Size(604, 44);
this.ChkPrintCompletedClear.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.ChkPrintCompletedClear.Size = new System.Drawing.Size(680, 53);
this.ChkPrintCompletedClear.TabIndex = 14;
this.ChkPrintCompletedClear.Text = "标签打印完成后清除数据";
this.ChkPrintCompletedClear.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
......@@ -208,11 +227,11 @@ namespace SmartScan
this.ChkOpenMaximize.BorderWidth = 0;
this.ChkOpenMaximize.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.ChkOpenMaximize.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.ChkOpenMaximize.Location = new System.Drawing.Point(348, 558);
this.ChkOpenMaximize.Margin = new System.Windows.Forms.Padding(4);
this.ChkOpenMaximize.Location = new System.Drawing.Point(392, 670);
this.ChkOpenMaximize.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.ChkOpenMaximize.Name = "ChkOpenMaximize";
this.ChkOpenMaximize.Padding = new System.Windows.Forms.Padding(4);
this.ChkOpenMaximize.Size = new System.Drawing.Size(604, 44);
this.ChkOpenMaximize.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.ChkOpenMaximize.Size = new System.Drawing.Size(680, 53);
this.ChkOpenMaximize.TabIndex = 13;
this.ChkOpenMaximize.Text = "软件打开最大化";
this.ChkOpenMaximize.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
......@@ -224,12 +243,12 @@ namespace SmartScan
this.LstPrinter.BorderWidth = 2;
this.LstPrinter.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.LstPrinter.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.LstPrinter.Location = new System.Drawing.Point(8, 135);
this.LstPrinter.Margin = new System.Windows.Forms.Padding(4);
this.LstPrinter.Location = new System.Drawing.Point(9, 162);
this.LstPrinter.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.LstPrinter.Name = "LstPrinter";
this.LstPrinter.Padding = new System.Windows.Forms.Padding(4);
this.LstPrinter.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.LstPrinter.SelectedIndex = -1;
this.LstPrinter.Size = new System.Drawing.Size(467, 188);
this.LstPrinter.Size = new System.Drawing.Size(525, 226);
this.LstPrinter.TabIndex = 8;
//
// ChkOpenEnterWork
......@@ -239,11 +258,11 @@ namespace SmartScan
this.ChkOpenEnterWork.BorderWidth = 0;
this.ChkOpenEnterWork.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.ChkOpenEnterWork.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.ChkOpenEnterWork.Location = new System.Drawing.Point(348, 508);
this.ChkOpenEnterWork.Margin = new System.Windows.Forms.Padding(4);
this.ChkOpenEnterWork.Location = new System.Drawing.Point(392, 610);
this.ChkOpenEnterWork.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.ChkOpenEnterWork.Name = "ChkOpenEnterWork";
this.ChkOpenEnterWork.Padding = new System.Windows.Forms.Padding(4);
this.ChkOpenEnterWork.Size = new System.Drawing.Size(604, 44);
this.ChkOpenEnterWork.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.ChkOpenEnterWork.Size = new System.Drawing.Size(680, 53);
this.ChkOpenEnterWork.TabIndex = 12;
this.ChkOpenEnterWork.Text = "软件打开自动进入工作";
this.ChkOpenEnterWork.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
......@@ -255,11 +274,11 @@ namespace SmartScan
this.ChkLabelEmptyCheck.BorderWidth = 0;
this.ChkLabelEmptyCheck.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.ChkLabelEmptyCheck.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.ChkLabelEmptyCheck.Location = new System.Drawing.Point(348, 408);
this.ChkLabelEmptyCheck.Margin = new System.Windows.Forms.Padding(4);
this.ChkLabelEmptyCheck.Location = new System.Drawing.Point(392, 490);
this.ChkLabelEmptyCheck.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.ChkLabelEmptyCheck.Name = "ChkLabelEmptyCheck";
this.ChkLabelEmptyCheck.Padding = new System.Windows.Forms.Padding(4);
this.ChkLabelEmptyCheck.Size = new System.Drawing.Size(604, 44);
this.ChkLabelEmptyCheck.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.ChkLabelEmptyCheck.Size = new System.Drawing.Size(680, 53);
this.ChkLabelEmptyCheck.TabIndex = 11;
this.ChkLabelEmptyCheck.Text = "标签空内容校验";
this.ChkLabelEmptyCheck.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
......@@ -271,11 +290,11 @@ namespace SmartScan
this.ChkSelectPN.BorderWidth = 0;
this.ChkSelectPN.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.ChkSelectPN.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.ChkSelectPN.Location = new System.Drawing.Point(348, 358);
this.ChkSelectPN.Margin = new System.Windows.Forms.Padding(4);
this.ChkSelectPN.Location = new System.Drawing.Point(392, 430);
this.ChkSelectPN.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.ChkSelectPN.Name = "ChkSelectPN";
this.ChkSelectPN.Padding = new System.Windows.Forms.Padding(4);
this.ChkSelectPN.Size = new System.Drawing.Size(604, 44);
this.ChkSelectPN.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.ChkSelectPN.Size = new System.Drawing.Size(680, 53);
this.ChkSelectPN.TabIndex = 10;
this.ChkSelectPN.Text = "通过服务器查询PN";
this.ChkSelectPN.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
......@@ -287,11 +306,11 @@ namespace SmartScan
this.LblDefaultLabel.BorderWidth = 0;
this.LblDefaultLabel.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.LblDefaultLabel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.LblDefaultLabel.Location = new System.Drawing.Point(483, 20);
this.LblDefaultLabel.Margin = new System.Windows.Forms.Padding(4);
this.LblDefaultLabel.Location = new System.Drawing.Point(543, 24);
this.LblDefaultLabel.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.LblDefaultLabel.Name = "LblDefaultLabel";
this.LblDefaultLabel.Padding = new System.Windows.Forms.Padding(4);
this.LblDefaultLabel.Size = new System.Drawing.Size(267, 44);
this.LblDefaultLabel.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.LblDefaultLabel.Size = new System.Drawing.Size(300, 53);
this.LblDefaultLabel.TabIndex = 9;
this.LblDefaultLabel.Text = "默认打印标签";
//
......@@ -303,11 +322,11 @@ namespace SmartScan
this.RdoVertical.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.RdoVertical.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.RdoVertical.Group = "1";
this.RdoVertical.Location = new System.Drawing.Point(245, 71);
this.RdoVertical.Margin = new System.Windows.Forms.Padding(4);
this.RdoVertical.Location = new System.Drawing.Point(276, 85);
this.RdoVertical.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.RdoVertical.Name = "RdoVertical";
this.RdoVertical.Padding = new System.Windows.Forms.Padding(4);
this.RdoVertical.Size = new System.Drawing.Size(229, 56);
this.RdoVertical.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.RdoVertical.Size = new System.Drawing.Size(258, 67);
this.RdoVertical.TabIndex = 7;
this.RdoVertical.Text = "纵向打印";
//
......@@ -319,11 +338,11 @@ namespace SmartScan
this.RdoLandscape.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.RdoLandscape.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.RdoLandscape.Group = "1";
this.RdoLandscape.Location = new System.Drawing.Point(8, 71);
this.RdoLandscape.Margin = new System.Windows.Forms.Padding(4);
this.RdoLandscape.Location = new System.Drawing.Point(9, 85);
this.RdoLandscape.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.RdoLandscape.Name = "RdoLandscape";
this.RdoLandscape.Padding = new System.Windows.Forms.Padding(4);
this.RdoLandscape.Size = new System.Drawing.Size(229, 56);
this.RdoLandscape.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.RdoLandscape.Size = new System.Drawing.Size(258, 67);
this.RdoLandscape.TabIndex = 6;
this.RdoLandscape.Text = "横向打印";
//
......@@ -334,12 +353,12 @@ namespace SmartScan
this.LstLabel.BorderWidth = 2;
this.LstLabel.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.LstLabel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.LstLabel.Location = new System.Drawing.Point(483, 71);
this.LstLabel.Margin = new System.Windows.Forms.Padding(4);
this.LstLabel.Location = new System.Drawing.Point(543, 85);
this.LstLabel.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.LstLabel.Name = "LstLabel";
this.LstLabel.Padding = new System.Windows.Forms.Padding(4);
this.LstLabel.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.LstLabel.SelectedIndex = -1;
this.LstLabel.Size = new System.Drawing.Size(267, 251);
this.LstLabel.Size = new System.Drawing.Size(300, 301);
this.LstLabel.TabIndex = 5;
//
// LblPrint
......@@ -349,11 +368,11 @@ namespace SmartScan
this.LblPrint.BorderWidth = 0;
this.LblPrint.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.LblPrint.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.LblPrint.Location = new System.Drawing.Point(8, 20);
this.LblPrint.Margin = new System.Windows.Forms.Padding(4);
this.LblPrint.Location = new System.Drawing.Point(9, 24);
this.LblPrint.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.LblPrint.Name = "LblPrint";
this.LblPrint.Padding = new System.Windows.Forms.Padding(4);
this.LblPrint.Size = new System.Drawing.Size(467, 44);
this.LblPrint.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.LblPrint.Size = new System.Drawing.Size(525, 53);
this.LblPrint.TabIndex = 4;
this.LblPrint.Text = "打印机";
//
......@@ -365,11 +384,11 @@ namespace SmartScan
this.RdoNoImage.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.RdoNoImage.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.RdoNoImage.Group = "2";
this.RdoNoImage.Location = new System.Drawing.Point(27, 511);
this.RdoNoImage.Margin = new System.Windows.Forms.Padding(4);
this.RdoNoImage.Location = new System.Drawing.Point(30, 613);
this.RdoNoImage.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.RdoNoImage.Name = "RdoNoImage";
this.RdoNoImage.Padding = new System.Windows.Forms.Padding(4);
this.RdoNoImage.Size = new System.Drawing.Size(313, 44);
this.RdoNoImage.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.RdoNoImage.Size = new System.Drawing.Size(352, 53);
this.RdoNoImage.TabIndex = 3;
this.RdoNoImage.Text = "不保存";
this.RdoNoImage.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
......@@ -382,11 +401,11 @@ namespace SmartScan
this.RdoCondense.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.RdoCondense.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.RdoCondense.Group = "2";
this.RdoCondense.Location = new System.Drawing.Point(27, 460);
this.RdoCondense.Margin = new System.Windows.Forms.Padding(4);
this.RdoCondense.Location = new System.Drawing.Point(30, 552);
this.RdoCondense.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.RdoCondense.Name = "RdoCondense";
this.RdoCondense.Padding = new System.Windows.Forms.Padding(4);
this.RdoCondense.Size = new System.Drawing.Size(313, 44);
this.RdoCondense.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.RdoCondense.Size = new System.Drawing.Size(352, 53);
this.RdoCondense.TabIndex = 2;
this.RdoCondense.Text = "压缩图";
this.RdoCondense.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
......@@ -399,11 +418,11 @@ namespace SmartScan
this.RdoOriginal.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.RdoOriginal.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.RdoOriginal.Group = "2";
this.RdoOriginal.Location = new System.Drawing.Point(27, 409);
this.RdoOriginal.Margin = new System.Windows.Forms.Padding(4);
this.RdoOriginal.Location = new System.Drawing.Point(30, 491);
this.RdoOriginal.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.RdoOriginal.Name = "RdoOriginal";
this.RdoOriginal.Padding = new System.Windows.Forms.Padding(4);
this.RdoOriginal.Size = new System.Drawing.Size(313, 44);
this.RdoOriginal.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.RdoOriginal.Size = new System.Drawing.Size(352, 53);
this.RdoOriginal.TabIndex = 1;
this.RdoOriginal.Text = "原始图";
this.RdoOriginal.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
......@@ -415,23 +434,23 @@ namespace SmartScan
this.LblHistoryImage.BorderWidth = 0;
this.LblHistoryImage.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.LblHistoryImage.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.LblHistoryImage.Location = new System.Drawing.Point(27, 358);
this.LblHistoryImage.Margin = new System.Windows.Forms.Padding(4);
this.LblHistoryImage.Location = new System.Drawing.Point(30, 430);
this.LblHistoryImage.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.LblHistoryImage.Name = "LblHistoryImage";
this.LblHistoryImage.Padding = new System.Windows.Forms.Padding(4);
this.LblHistoryImage.Size = new System.Drawing.Size(313, 44);
this.LblHistoryImage.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.LblHistoryImage.Size = new System.Drawing.Size(352, 53);
this.LblHistoryImage.TabIndex = 0;
this.LblHistoryImage.Text = "追溯图像保存";
this.LblHistoryImage.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// UsrWorkMode
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.facePanel1);
this.Margin = new System.Windows.Forms.Padding(4);
this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.Name = "UsrWorkMode";
this.Size = new System.Drawing.Size(1124, 832);
this.Size = new System.Drawing.Size(842, 665);
this.facePanel1.ResumeLayout(false);
this.ResumeLayout(false);
......@@ -461,5 +480,6 @@ namespace SmartScan
private Asa.FaceControl.FaceCheckBox ChkAutoPrint;
private Asa.FaceControl.FaceCheckBox ChkPromptAfterPrinting;
private Asa.FaceControl.FaceCheckBox ChkAllowModifyPrint;
private System.Windows.Forms.Button but_Readfileprint;
}
}
SmartScan/SetControl/UsrWorkMode.cs
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text;
using System.Windows.Forms;
using Asa.FaceControl;
using BLL;
using ClosedXML.Excel;
using Model;
namespace SmartScan
......@@ -106,5 +110,73 @@ namespace SmartScan
BLLCommon.config.Save();
}
int i = 0;
private void but_Readfileprint_Click(object sender, EventArgs e)
{
Dictionary<int, Dictionary<string, string>> valuePairs = new Dictionary<int, Dictionary<string, string>>();
i++;
if (i==10)
{
OpenFileDialog openFileDialog = new OpenFileDialog();
openFileDialog.Multiselect =false;
openFileDialog.Title = "请选择文件";
openFileDialog.Filter = "所有文件(*.*)|*.*";
if (openFileDialog.ShowDialog() == DialogResult.OK)
{
string file=openFileDialog.FileName;
ContinuousPrinting(file);
}
i = 0;
}
}
public delegate void PrintDelegate(Dictionary<string, string> content);
public static event PrintDelegate Printing;
public void ContinuousPrinting(string filepath)
{
Dictionary<int, Dictionary<string, string>> valuePairs = new Dictionary<int, Dictionary<string, string>>();
if (!File.Exists(filepath))
{
MessageBox.Show("文件不存在");
return;
}
var Titles = ExtraFileData.ParseXLSFileTitle(filepath);
try
{
XLWorkbook wb = new XLWorkbook(filepath);
IXLWorksheet ws = wb.Worksheet(1);
int emptyrow = 0;
int currow = 1;
while (emptyrow < 3)
{
var rowdata = new Dictionary<string, string>();
for (int i = 0; i < Titles.Count; i++)
{
var v = ws.Row(currow + 1).Cell(i + 1).Value.ToString().Trim();
rowdata.Add(Titles[i], v);
}
currow++;
if (!valuePairs.ContainsKey(currow))
{
valuePairs.Add(currow, rowdata);
}
if (rowdata.Values.Contains(""))
{
emptyrow++;
}
}
}
catch (Exception ex)
{
LogNet.log.Info("数据源加载文件出错:" + ex.ToString());
}
foreach (var item in valuePairs)
{
Printing?.Invoke(item.Value);
}
}
}
}
SmartScan/WebCallWork.cs
......@@ -197,6 +197,7 @@ namespace SmartScan
bool rtn = BLLCommon.mateEdit.MatchingTemplate(workCodeInfo, BLLCommon.config.DefaultMaterialName, false, out string mateName, out workCodeKeyword, out AMatch aMatch);
var point=new Point(-1,-1);
int angle = 0;
LogNet.log.Info("模板匹配结果：" + rtn);
if (rtn)
{
string key = ConfigHelper.Config.Get("Label_Key", "");
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!