Skip to content

张东亮 / NS100

转到一个项目
切换导航栏
切换导航栏固定状态
Commit cfa214df 由 王海洋
选项

增加check功能

1 个父辈 73b660e4
内嵌 并排
正在显示 14 个修改的文件 包含 355 行增加 和 105 行删除
BLL/BLL.csproj
...@@ -69,6 +69,7 @@ ...@@ -69,6 +69,7 @@
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL"> <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath> <HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference> </Reference>
<Reference Include="PresentationFramework" />
<Reference Include="RestSharp, Version=106.11.7.0, Culture=neutral, PublicKeyToken=598062e77f915f75, processorArchitecture=MSIL"> <Reference Include="RestSharp, Version=106.11.7.0, Culture=neutral, PublicKeyToken=598062e77f915f75, processorArchitecture=MSIL">
<HintPath>..\packages\RestSharp.106.11.7\lib\net452\RestSharp.dll</HintPath> <HintPath>..\packages\RestSharp.106.11.7\lib\net452\RestSharp.dll</HintPath>
</Reference> </Reference>
......
BLL/Config.cs
...@@ -109,6 +109,14 @@ namespace BLL ...@@ -109,6 +109,14 @@ namespace BLL
get => config.Read<bool>(PRINT_COMPLETED_CLEAR); get => config.Read<bool>(PRINT_COMPLETED_CLEAR);
set => config.Write(PRINT_COMPLETED_CLEAR, value); set => config.Write(PRINT_COMPLETED_CLEAR, value);
} }
/// <summary>
/// check功能
/// </summary>
public bool CheckFunction
{
get => config.Read<bool>(Check_Function);
set => config.Write(Check_Function, value);
}
/// <summary> /// <summary>
/// 打开软件后开启工作模式 /// 打开软件后开启工作模式
...@@ -361,7 +369,8 @@ namespace BLL ...@@ -361,7 +369,8 @@ namespace BLL
private const string HISTORY_IMAGE = "HistoryImage"; private const string HISTORY_IMAGE = "HistoryImage";
private const string SELECT_HTTP_PN = "SelectHttpPN"; private const string SELECT_HTTP_PN = "SelectHttpPN";
private const string LABEL_EMPTY_CHECK = "LabelEmptyCheck"; private const string LABEL_EMPTY_CHECK = "LabelEmptyCheck";
private const string PRINT_COMPLETED_CLEAR = "PrintCompletedClear"; private const string PRINT_COMPLETED_CLEAR = "PrintCompletedClear";
private const string Check_Function = "CheckFunction";
private const string OPEN_START_WORK = "OpenStartWork"; private const string OPEN_START_WORK = "OpenStartWork";
private const string OPEN_MAXIMIZE = "OpenMaximize"; private const string OPEN_MAXIMIZE = "OpenMaximize";
private const string DEFAULT_PRINT_LABEL = "DefaultPrintLabel"; private const string DEFAULT_PRINT_LABEL = "DefaultPrintLabel";
......
BLL/Extension.cs
...@@ -9,6 +9,8 @@ using Model; ...@@ -9,6 +9,8 @@ using Model;
using System.Windows.Forms; using System.Windows.Forms;
using DocumentFormat.OpenXml.Drawing; using DocumentFormat.OpenXml.Drawing;
using DocumentFormat.OpenXml.Spreadsheet; using DocumentFormat.OpenXml.Spreadsheet;
using TcpKPIO;
using DocumentFormat.OpenXml.Wordprocessing;
namespace BLL namespace BLL
{ {
...@@ -90,12 +92,14 @@ namespace BLL ...@@ -90,12 +92,14 @@ namespace BLL
}; };
currentExtension = dicExtension[config.ExtensionName]; currentExtension = dicExtension[config.ExtensionName];
} }
public void Dispose() public void Dispose()
{ {
currentExtension.Dispose(); currentExtension.Dispose();
} }
public string labelText = "等待中";
public void LoadPanel(FacePanel pnl,List<string> keywords) public void LoadPanel(FacePanel pnl,List<string> keywords)
{ {
...@@ -130,7 +134,7 @@ namespace BLL ...@@ -130,7 +134,7 @@ namespace BLL
if (key == Config.DataSource_DataTitle && Config.DataSource_ShowBox) if (key == Config.DataSource_DataTitle && Config.DataSource_ShowBox)
{ {
type = "ComboBox"; type = "ComboBox";
} }
R = new() { R = new() {
{ "Type", type }, { "Type", type },
{ "Key", key }, { "Key", key },
...@@ -208,6 +212,9 @@ namespace BLL ...@@ -208,6 +212,9 @@ namespace BLL
} }
} }
}; };
if (!string.IsNullOrEmpty(config.HttpReelID)) if (!string.IsNullOrEmpty(config.HttpReelID))
listrow.Add(new object[] { A }); listrow.Add(new object[] { A });
#region 显示替换数据按钮 #region 显示替换数据按钮
...@@ -261,6 +268,39 @@ namespace BLL ...@@ -261,6 +268,39 @@ namespace BLL
} }
#endregion #endregion
listrow.Add(new object[] { B }); listrow.Add(new object[] { B });
if (BLLCommon.config.CheckFunction)
{
Dictionary<string, object> newLabel = CreateNewLabel(labelText);
Dictionary<string, object> D = new()
{
{ "Type", "Button" },
{
"Attribute",
new Dictionary<string, object>()
{
{ "Name", "BtnSkip"},
{ "Font", "Arial,12,B,"},
//{"BorderWidth", 0},
{"Width", -1},
{"Height", 40},
{"Text", "跳过"},//"Print Label"
}
},
{
"Event",
new Dictionary<string, object>()
{
{ "Click", "BtnSkip_Click"},
}
}
};
listrow.Add(new object[] {newLabel, D });
}
rows = listrow.ToArray(); rows = listrow.ToArray();
} }
else else
...@@ -279,7 +319,56 @@ namespace BLL ...@@ -279,7 +319,56 @@ namespace BLL
currentExtension.Load(ctlGroup); currentExtension.Load(ctlGroup);
} }
// 封装一个方法来创建带有指定文本的 newLabel
private Dictionary<string, object> CreateNewLabel(string text)
{
if (text=="OK")
{
return new Dictionary<string, object>
{
{ "Type", "Label" },
{ "LinkName", "ischeckresult"},
{
"Attribute",
new Dictionary<string, object>()
{
{ "Name", "labresult" },
{ "Font", "Arial,18,B,"},
{ "BorderWidth", 0 }, // 边框宽度
{ "Width", 100 }, // 宽度
{ "Height", 40 },
{ "Text", text }, // 显示的文本
{ "TextAlign", "MiddleCenter" }, // 文本对齐方式
{ "Foreground", "Green" } // 添加字体颜色为绿色
}
}
};
}
else
{
return new Dictionary<string, object>
{
{ "Type", "Label" },
{ "LinkName", "ischeckresult"},
{
"Attribute",
new Dictionary<string, object>()
{
{ "Name", "labresult" },
{ "Font", "Arial,18,B,"},
{ "BorderWidth", 0 }, // 边框宽度
{ "Width", 100 },
{ "Height", 40 }, // 高度
{ "Text", text }, // 显示的文本
{ "TextAlign", "MiddleCenter" }, // 文本对齐方式
{ "Foreground", "Red" } // 添加字体颜色为绿色
}
}
};
}
}
public void Clear() public void Clear()
{ {
currentExtension.Clear(); currentExtension.Clear();
......
BLL/Extension/Item_General.cs
...@@ -21,6 +21,7 @@ using System.Drawing; ...@@ -21,6 +21,7 @@ using System.Drawing;
using DocumentFormat.OpenXml.Spreadsheet; using DocumentFormat.OpenXml.Spreadsheet;
using static System.Windows.Forms.VisualStyles.VisualStyleElement.ToolTip; using static System.Windows.Forms.VisualStyles.VisualStyleElement.ToolTip;
using DocumentFormat.OpenXml.Wordprocessing; using DocumentFormat.OpenXml.Wordprocessing;
using DocumentFormat.OpenXml.Presentation;
namespace BLL namespace BLL
{ {
...@@ -91,14 +92,21 @@ namespace BLL ...@@ -91,14 +92,21 @@ namespace BLL
} }
static bool mesResult = false; static bool mesResult = false;
bool islast=false;
Dictionary<string, string> lastkey = null; Dictionary<string, string> lastkey = null;
// 用于存储上一次的 key
private Dictionary<string, string> lastKeys;
//读码后第一步 //读码后第一步
public bool SetKey(string[] originalCode, Dictionary<string, string> key, bool hasMatch, out string errmsg) public bool SetKey(string[] originalCode, Dictionary<string, string> key, bool hasMatch, out string errmsg)
{ {
errmsg = ""; errmsg = "";
mesResult = false; mesResult = false;
var now = DateTime.Now; var now = DateTime.Now;
// 比较当前 key 和上次的 key
bool isSame = false;
if (extensions != null && !extensions[0].Control.InvokeRequired) if (extensions != null && !extensions[0].Control.InvokeRequired)
{ {
//第一次刷新界面 //第一次刷新界面
...@@ -107,6 +115,21 @@ namespace BLL ...@@ -107,6 +115,21 @@ namespace BLL
extensions[i].Control.ForeColor = System.Drawing.Color.White; extensions[i].Control.ForeColor = System.Drawing.Color.White;
if (key.ContainsKey(extensions[i].Key)) if (key.ContainsKey(extensions[i].Key))
extensions[i].Control.Text = key[extensions[i].Key].Replace("<OCR>", ""); extensions[i].Control.Text = key[extensions[i].Key].Replace("<OCR>", "");
if (extensions[i].LinkName== "ischeckresult" && lastKeys != null)
{
//if (BLLCommon.extension.labelText=="NG")
//{
// extensions[i].Control.Text = BLLCommon.extension.labelText;
// extensions[i].Control.ForeColor = System.Drawing.Color.Red;
//}
//else
//{
// extensions[i].Control.Text = BLLCommon.extension.labelText;
// extensions[i].Control.ForeColor = System.Drawing.Color.Green;
//}
}
} }
} }
Application.DoEvents(); Application.DoEvents();
...@@ -171,6 +194,43 @@ namespace BLL ...@@ -171,6 +194,43 @@ namespace BLL
} }
} }
} }
if (lastKeys != null)
{
isSame = key.Count == lastKeys.Count && !key.Except(lastKeys).Any();
}
lastkey = key;
islast = false;
if (isSame)
{
BLLCommon.extension.labelText = "OK";
lastKeys = null;
islast=true;
// 两次的 key 相同，可添加相应逻辑
}
else if (lastKeys != null && !isSame)
{ // 两次的 key 不同，可添加相应逻辑
BLLCommon.extension.labelText = "NG";
}else
{
if (BLLCommon.config.Language.Equals("English"))
{
BLLCommon.extension.labelText = "Waiting";
}
else
{
BLLCommon.extension.labelText = "等待中";
}
}
if (lastKeys == null &&!islast)
{
lastKeys = new Dictionary<string, string>(key); // 更新 lastKey
}
else
{
islast=false;
}
//第二次刷新界面 //第二次刷新界面
for (int i = 0; i < extensions.Count; i++) for (int i = 0; i < extensions.Count; i++)
...@@ -195,11 +255,34 @@ namespace BLL ...@@ -195,11 +255,34 @@ namespace BLL
if (key.ContainsKey(extensions[i].Key)) if (key.ContainsKey(extensions[i].Key))
{ {
extensions[i].Control.Text = key[extensions[i].Key].Replace("<OCR>", ""); extensions[i].Control.Text = key[extensions[i].Key].Replace("<OCR>", "");
} }
if (extensions[i].LinkName == "ischeckresult")
{
extensions[i].Control.Text = BLLCommon.extension.labelText;
}
//if (extensions[i].LinkName == "ischeckresult" && lastKeys != null)
//{
// if (BLLCommon.extension.labelText == "NG")
// {
// extensions[i].Control.Text = BLLCommon.extension.labelText;
// extensions[i].Control.ForeColor = System.Drawing.Color.Red;
// }
// else if (BLLCommon.extension.labelText == "OK")
// {
// extensions[i].Control.Text = BLLCommon.extension.labelText;
// extensions[i].Control.ForeColor = System.Drawing.Color.Green;
// }
//}
} }
} }
lastkey = key;
if (!updatereelid(key, out errmsg)) if (!updatereelid(key, out errmsg))
return false; return false;
...@@ -232,6 +315,7 @@ namespace BLL ...@@ -232,6 +315,7 @@ namespace BLL
// //PrintLabel(null, EventArgs.Empty); // //PrintLabel(null, EventArgs.Empty);
//} //}
//SaveRetrospect?.Invoke(key); //SaveRetrospect?.Invoke(key);
return true; return true;
} }
bool updatereelid(Dictionary<string, string> key, out string errmsg) bool updatereelid(Dictionary<string, string> key, out string errmsg)
...@@ -362,6 +446,34 @@ namespace BLL ...@@ -362,6 +446,34 @@ namespace BLL
{ {
updatereelid(lastkey, out _); updatereelid(lastkey, out _);
} }
private void BtnSkip_Click(object sender, EventArgs e)
{
if (BLLCommon.config.Language.Equals("English"))
{
System.Windows.MessageBoxResult result = System.Windows.MessageBox.Show("Whether to skip this operation？", "verify", System.Windows.MessageBoxButton.YesNo, System.Windows.MessageBoxImage.Question);
if (result == System.Windows.MessageBoxResult.Yes)
{
lastKeys = null;
BLLCommon.extension.labelText = "Waiting";
}
}
else
{
System.Windows.MessageBoxResult result = System.Windows.MessageBox.Show("是否跳过此操作？", "确认", System.Windows.MessageBoxButton.YesNo, System.Windows.MessageBoxImage.Question);
if (result == System.Windows.MessageBoxResult.Yes)
{
lastKeys = null;
BLLCommon.extension.labelText = "等待中";
}
}
}
private void ComboBoxTextChanged(object sender, EventArgs e) private void ComboBoxTextChanged(object sender, EventArgs e)
{ {
var txt = ((FaceComboBox)sender).Text; var txt = ((FaceComboBox)sender).Text;
......
SmartScan/Common.cs
...@@ -4,5 +4,6 @@ ...@@ -4,5 +4,6 @@
{ {
public static FrmMain frmMain; public static FrmMain frmMain;
public static FrmWaitting frmWaitting; public static FrmWaitting frmWaitting;
} }
} }
SmartScan/Form/FrmMain.cs
...@@ -205,15 +205,44 @@ namespace SmartScan ...@@ -205,15 +205,44 @@ namespace SmartScan
////sb.AppendLine(string.Join(",", content.Values.ToArray())); ////sb.AppendLine(string.Join(",", content.Values.ToArray()));
//System.IO.File.WriteAllText(filename, sb.ToString(), Encoding.UTF8); //System.IO.File.WriteAllText(filename, sb.ToString(), Encoding.UTF8);
} }
public delegate void CheckResultEventHandler(object sender, bool value);
public static event CheckResultEventHandler Checkresult;
public Dictionary<string, string> lastContent;
private bool CompareContent(Dictionary<string, string> content)
{
if (lastContent != null)
{
return content.Count == lastContent.Count && !content.Except(lastContent).Any();
}
return false;
}
private void Extension_Printing(Dictionary<string, string> content) private void Extension_Printing(Dictionary<string, string> content)
{ {
string str = "打印内容："; string str = "打印内容：";
//if (lastContent!=null)
//{
// bool isSame = CompareContent(content);
// if (isSame)
// {
// BLLCommon.extension.labelText = "OK";
// lastContent.Clear();
// }
// else
// {
// BLLCommon.extension.labelText = "NG";
// }
//}
try try
{ {
foreach (string key in content.Keys) foreach (string key in content.Keys)
{ {
str += string.Format("({0}:{1})", key, content[key]); str += string.Format("({0}:{1})", key, content[key]);
} }
LogNet.log.Info(str); LogNet.log.Info(str);
...@@ -237,12 +266,14 @@ namespace SmartScan ...@@ -237,12 +266,14 @@ namespace SmartScan
//SaveRetrospect(labelBmp, barcode); //SaveRetrospect(labelBmp, barcode);
UnifiedDataHandler.RecordPrintNg(false, true, out string[] strarrys); UnifiedDataHandler.RecordPrintNg(false, true, out string[] strarrys);
if (BLLCommon.config.PrintCompletedClear) if (BLLCommon.config.PrintCompletedClear)
BLLCommon.extension.Clear(); BLLCommon.extension.Clear();
lastContent = new Dictionary<string, string>(content);
} }
catch (Exception ex) catch (Exception ex)
{ {
LogNet.log.Error($"Extension_Printing", ex); LogNet.log.Error($"Extension_Printing", ex);
} }
} }
private void FrmMain_Load(object sender, EventArgs e) private void FrmMain_Load(object sender, EventArgs e)
...@@ -361,7 +392,8 @@ namespace SmartScan ...@@ -361,7 +392,8 @@ namespace SmartScan
{ {
if(BLLCommon.config.Language.Equals("English")) if(BLLCommon.config.Language.Equals("English"))
{ {
BtnStart.Font = new Font("Arial",14,FontStyle.Bold); BtnStart.Font = new Font("Arial",14,FontStyle.Bold);
} }
else else
{ {
......
SmartScan/Form/FrmSet.cs
...@@ -8,6 +8,7 @@ using System.Text; ...@@ -8,6 +8,7 @@ using System.Text;
using Asa.FaceControl; using Asa.FaceControl;
using System.Windows.Forms; using System.Windows.Forms;
using BLL; using BLL;
using DocumentFormat.OpenXml.Drawing;
namespace SmartScan namespace SmartScan
{ {
...@@ -66,6 +67,7 @@ namespace SmartScan ...@@ -66,6 +67,7 @@ namespace SmartScan
new FaceMessageBox("", text, MessageBoxButtons.OK).ShowDialog(); new FaceMessageBox("", text, MessageBoxButtons.OK).ShowDialog();
BLLCommon.extension.Update(); BLLCommon.extension.Update();
DialogResult = DialogResult.OK; DialogResult = DialogResult.OK;
} }
private void BtnCancel_Click(object sender, EventArgs e) private void BtnCancel_Click(object sender, EventArgs e)
......
SmartScan/Language/en-US.lngres
...@@ -61,6 +61,8 @@ FrmMain_LblCameraExist 识别设备连接 Camera Arial,9,, ...@@ -61,6 +61,8 @@ FrmMain_LblCameraExist 识别设备连接 Camera Arial,9,,
FrmMain_LblIOExist IO模块连接 Machine Arial,9,, FrmMain_LblIOExist IO模块连接 Machine Arial,9,,
FrmMain_PnlExtension 功能 Print Info. Arial,14,, FrmMain_PnlExtension 功能 Print Info. Arial,14,,
FrmMain_BtnPrint 打印标签 Print Label Arial,12,, FrmMain_BtnPrint 打印标签 Print Label Arial,12,,
FrmMain_BtnSkip 跳过 Skip Arial,12,,
FrmMain_labresult 等待中 Waiting Arial,12,,
FrmMain_DynamicButton 替换数据 Replacedata 微软雅黑,12,, FrmMain_DynamicButton 替换数据 Replacedata 微软雅黑,12,,
FrmSet_FrmSet 设置 Setting Arial,20,B, FrmSet_FrmSet 设置 Setting Arial,20,B,
FrmSet_BtnGenneralSetting 通用设置 General Setting Arial,12,B, FrmSet_BtnGenneralSetting 通用设置 General Setting Arial,12,B,
...@@ -96,6 +98,7 @@ UsrWorkMode_RdoNoImage 不保存 Skip Saving Arial,12,, ...@@ -96,6 +98,7 @@ UsrWorkMode_RdoNoImage 不保存 Skip Saving Arial,12,,
UsrWorkMode_ChkSelectPN 从服务器上查询PN Query PN From The Server Arial,12,, UsrWorkMode_ChkSelectPN 从服务器上查询PN Query PN From The Server Arial,12,,
UsrWorkMode_ChkLabelEmptyCheck 打印标签空内容提醒 Empty Label Alert Arial,12,, UsrWorkMode_ChkLabelEmptyCheck 打印标签空内容提醒 Empty Label Alert Arial,12,,
UsrWorkMode_ChkPrintCompletedClear 打印标签后清除内容 Print&Clear Arial,12,, UsrWorkMode_ChkPrintCompletedClear 打印标签后清除内容 Print&Clear Arial,12,,
UsrWorkMode_ChkCheckFunction Check功能 CheckFunction Arial,12,,
UsrWorkMode_ChkOpenEnterWork 打开软件自动进入工作模式 Auto Start Mode Arial,12,, UsrWorkMode_ChkOpenEnterWork 打开软件自动进入工作模式 Auto Start Mode Arial,12,,
UsrWorkMode_ChkOpenMaximize 打开软件最大化窗口 Always Open Maximized Arial,12,, UsrWorkMode_ChkOpenMaximize 打开软件最大化窗口 Always Open Maximized Arial,12,,
UsrWorkMode_ChkTriggerOpenLight 触发信号后在打开光源 Turn On Light After Triggering Device Arial,12,, UsrWorkMode_ChkTriggerOpenLight 触发信号后在打开光源 Turn On Light After Triggering Device Arial,12,,
......
SmartScan/Language/zh-CN.lngres
...@@ -61,6 +61,8 @@ FrmMain_LblIOExist IO模块连接 IO模块连接 微软雅黑,9,, ...@@ -61,6 +61,8 @@ FrmMain_LblIOExist IO模块连接 IO模块连接 微软雅黑,9,,
FrmMain_PnlExtension 功能 功能 微软雅黑,14,, FrmMain_PnlExtension 功能 功能 微软雅黑,14,,
FrmMain_BtnPrint 打印标签 打印标签 微软雅黑,12,, FrmMain_BtnPrint 打印标签 打印标签 微软雅黑,12,,
FrmMain_DynamicButton 替换数据 替换数据 微软雅黑,12,, FrmMain_DynamicButton 替换数据 替换数据 微软雅黑,12,,
FrmMain_BtnSkip 跳过 跳过 Arial,12,,
FrmMain_labresult 等待中 等待中 Arial,12,,
FrmSet_FrmSet 设置 设置 微软雅黑,20,B, FrmSet_FrmSet 设置 设置 微软雅黑,20,B,
FrmSet_BtnGenneralSetting 通用设置 通用设置 微软雅黑,12,B, FrmSet_BtnGenneralSetting 通用设置 通用设置 微软雅黑,12,B,
FrmSet_BtnIdentify 识别条码 识别条码 微软雅黑,12,B, FrmSet_BtnIdentify 识别条码 识别条码 微软雅黑,12,B,
...@@ -88,6 +90,7 @@ UsrWorkMode_LblDefaultLabel 默认打印标签 默认打印标签 微软雅黑,1 ...@@ -88,6 +90,7 @@ UsrWorkMode_LblDefaultLabel 默认打印标签 默认打印标签 微软雅黑,1
UsrWorkMode_RdoLandscape 横向打印 横向打印 微软雅黑,12,, UsrWorkMode_RdoLandscape 横向打印 横向打印 微软雅黑,12,,
UsrWorkMode_RdoVertical 纵向打印 纵向打印 微软雅黑,12,, UsrWorkMode_RdoVertical 纵向打印 纵向打印 微软雅黑,12,,
UsrWorkMode_LblHistoryImage 追溯图像保存 追溯图像保存 微软雅黑,12,B, UsrWorkMode_LblHistoryImage 追溯图像保存 追溯图像保存 微软雅黑,12,B,
UsrWorkMode_ChkCheckFunction Check功能 Check功能 微软雅黑,12,,
UsrWorkMode_RdoOriginal 原图 原图 微软雅黑,12,, UsrWorkMode_RdoOriginal 原图 原图 微软雅黑,12,,
UsrWorkMode_RdoCondense 压缩图像 压缩图像 微软雅黑,12,, UsrWorkMode_RdoCondense 压缩图像 压缩图像 微软雅黑,12,,
UsrWorkMode_RdoNoImage 不保存 不保存 微软雅黑,12,, UsrWorkMode_RdoNoImage 不保存 不保存 微软雅黑,12,,
......
SmartScan/PlusSettingFrm/FrmSetPlus.cs
...@@ -22,7 +22,7 @@ namespace SmartScan ...@@ -22,7 +22,7 @@ namespace SmartScan
//this.Height = 738; //this.Height = 738;
this.Top = 15; this.Top = 15;
this.Left = 0; this.Left = 0;
WebService.Open(BLLCommon.config.WebService);//启动条码匹配服务
LogNet.log = log4net.LogManager.GetLogger("SmartScan"); LogNet.log = log4net.LogManager.GetLogger("SmartScan");
} }
......
SmartScan/Program.cs
...@@ -120,7 +120,7 @@ namespace SmartScan ...@@ -120,7 +120,7 @@ namespace SmartScan
Application.Run(new FrmLoading(back)); //预加载，完成后自动退出 Application.Run(new FrmLoading(back)); //预加载，完成后自动退出
Common.frmMain = new FrmMain(); Common.frmMain = new FrmMain();
Common.frmWaitting = new FrmWaitting(); Common.frmWaitting = new FrmWaitting();
WebService.Open();//启动条码匹配服务 WebService.Open(BLLCommon.config.WebService);//启动条码匹配服务
if (back) if (back)
{ {
var fsp = new FrmSetPlus(); var fsp = new FrmSetPlus();
......
SmartScan/SetControl/UsrWorkMode.Designer.cs
...@@ -52,6 +52,7 @@ namespace SmartScan ...@@ -52,6 +52,7 @@ namespace SmartScan
this.RdoCondense = new Asa.FaceControl.FaceRadioBox(); this.RdoCondense = new Asa.FaceControl.FaceRadioBox();
this.RdoOriginal = new Asa.FaceControl.FaceRadioBox(); this.RdoOriginal = new Asa.FaceControl.FaceRadioBox();
this.LblHistoryImage = new Asa.FaceControl.FaceLabel(); this.LblHistoryImage = new Asa.FaceControl.FaceLabel();
this.ChkCheckFunction = new Asa.FaceControl.FaceCheckBox();
this.facePanel1.SuspendLayout(); this.facePanel1.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
// //
...@@ -60,6 +61,7 @@ namespace SmartScan ...@@ -60,6 +61,7 @@ namespace SmartScan
this.facePanel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(20))))); 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.BorderStyle = Asa.FaceControl.ControlShape.Rectangle;
this.facePanel1.BorderWidth = 2; this.facePanel1.BorderWidth = 2;
this.facePanel1.Controls.Add(this.ChkCheckFunction);
this.facePanel1.Controls.Add(this.but_Readfileprint); this.facePanel1.Controls.Add(this.but_Readfileprint);
this.facePanel1.Controls.Add(this.ChkAllowModifyPrint); this.facePanel1.Controls.Add(this.ChkAllowModifyPrint);
this.facePanel1.Controls.Add(this.ChkAutoPrint); this.facePanel1.Controls.Add(this.ChkAutoPrint);
...@@ -83,12 +85,11 @@ namespace SmartScan ...@@ -83,12 +85,11 @@ namespace SmartScan
this.facePanel1.Controls.Add(this.RdoOriginal); this.facePanel1.Controls.Add(this.RdoOriginal);
this.facePanel1.Controls.Add(this.LblHistoryImage); this.facePanel1.Controls.Add(this.LblHistoryImage);
this.facePanel1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); 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.Location = new System.Drawing.Point(3, 3);
this.facePanel1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.facePanel1.Name = "facePanel1"; this.facePanel1.Name = "facePanel1";
this.facePanel1.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); this.facePanel1.Padding = new System.Windows.Forms.Padding(3);
this.facePanel1.ShowText = false; this.facePanel1.ShowText = false;
this.facePanel1.Size = new System.Drawing.Size(1191, 989); this.facePanel1.Size = new System.Drawing.Size(558, 710);
this.facePanel1.TabIndex = 0; this.facePanel1.TabIndex = 0;
this.facePanel1.Text = "facePanel1"; this.facePanel1.Text = "facePanel1";
this.facePanel1.TitleFont = new System.Drawing.Font("宋体", 12F); this.facePanel1.TitleFont = new System.Drawing.Font("宋体", 12F);
...@@ -102,10 +103,10 @@ namespace SmartScan ...@@ -102,10 +103,10 @@ namespace SmartScan
this.but_Readfileprint.FlatAppearance.MouseOverBackColor = 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.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.but_Readfileprint.ForeColor = System.Drawing.Color.WhiteSmoke; this.but_Readfileprint.ForeColor = System.Drawing.Color.WhiteSmoke;
this.but_Readfileprint.Location = new System.Drawing.Point(4, 5); this.but_Readfileprint.Location = new System.Drawing.Point(3, 3);
this.but_Readfileprint.Margin = new System.Windows.Forms.Padding(0); this.but_Readfileprint.Margin = new System.Windows.Forms.Padding(0);
this.but_Readfileprint.Name = "but_Readfileprint"; this.but_Readfileprint.Name = "but_Readfileprint";
this.but_Readfileprint.Size = new System.Drawing.Size(60, 37); this.but_Readfileprint.Size = new System.Drawing.Size(40, 25);
this.but_Readfileprint.TabIndex = 0; this.but_Readfileprint.TabIndex = 0;
this.but_Readfileprint.UseVisualStyleBackColor = false; this.but_Readfileprint.UseVisualStyleBackColor = false;
this.but_Readfileprint.Click += new System.EventHandler(this.but_Readfileprint_Click); this.but_Readfileprint.Click += new System.EventHandler(this.but_Readfileprint_Click);
...@@ -117,11 +118,10 @@ namespace SmartScan ...@@ -117,11 +118,10 @@ namespace SmartScan
this.ChkAllowModifyPrint.BorderWidth = 0; this.ChkAllowModifyPrint.BorderWidth = 0;
this.ChkAllowModifyPrint.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); 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.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.ChkAllowModifyPrint.Location = new System.Drawing.Point(392, 908); this.ChkAllowModifyPrint.Location = new System.Drawing.Point(261, 605);
this.ChkAllowModifyPrint.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.ChkAllowModifyPrint.Name = "ChkAllowModifyPrint"; this.ChkAllowModifyPrint.Name = "ChkAllowModifyPrint";
this.ChkAllowModifyPrint.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); this.ChkAllowModifyPrint.Padding = new System.Windows.Forms.Padding(3);
this.ChkAllowModifyPrint.Size = new System.Drawing.Size(680, 53); this.ChkAllowModifyPrint.Size = new System.Drawing.Size(453, 35);
this.ChkAllowModifyPrint.TabIndex = 19; this.ChkAllowModifyPrint.TabIndex = 19;
this.ChkAllowModifyPrint.Text = "允许修改打内容"; this.ChkAllowModifyPrint.Text = "允许修改打内容";
this.ChkAllowModifyPrint.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.ChkAllowModifyPrint.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
...@@ -133,11 +133,10 @@ namespace SmartScan ...@@ -133,11 +133,10 @@ namespace SmartScan
this.ChkAutoPrint.BorderWidth = 0; this.ChkAutoPrint.BorderWidth = 0;
this.ChkAutoPrint.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); 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.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.ChkAutoPrint.Location = new System.Drawing.Point(392, 850); this.ChkAutoPrint.Location = new System.Drawing.Point(261, 567);
this.ChkAutoPrint.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.ChkAutoPrint.Name = "ChkAutoPrint"; this.ChkAutoPrint.Name = "ChkAutoPrint";
this.ChkAutoPrint.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); this.ChkAutoPrint.Padding = new System.Windows.Forms.Padding(3);
this.ChkAutoPrint.Size = new System.Drawing.Size(680, 53); this.ChkAutoPrint.Size = new System.Drawing.Size(453, 35);
this.ChkAutoPrint.TabIndex = 18; this.ChkAutoPrint.TabIndex = 18;
this.ChkAutoPrint.Text = "自动打印"; this.ChkAutoPrint.Text = "自动打印";
this.ChkAutoPrint.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.ChkAutoPrint.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
...@@ -149,11 +148,10 @@ namespace SmartScan ...@@ -149,11 +148,10 @@ namespace SmartScan
this.ChkPromptAfterPrinting.BorderWidth = 0; this.ChkPromptAfterPrinting.BorderWidth = 0;
this.ChkPromptAfterPrinting.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); 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.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.ChkPromptAfterPrinting.Location = new System.Drawing.Point(392, 790); this.ChkPromptAfterPrinting.Location = new System.Drawing.Point(261, 527);
this.ChkPromptAfterPrinting.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.ChkPromptAfterPrinting.Name = "ChkPromptAfterPrinting"; this.ChkPromptAfterPrinting.Name = "ChkPromptAfterPrinting";
this.ChkPromptAfterPrinting.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); this.ChkPromptAfterPrinting.Padding = new System.Windows.Forms.Padding(3);
this.ChkPromptAfterPrinting.Size = new System.Drawing.Size(680, 53); this.ChkPromptAfterPrinting.Size = new System.Drawing.Size(453, 35);
this.ChkPromptAfterPrinting.TabIndex = 18; this.ChkPromptAfterPrinting.TabIndex = 18;
this.ChkPromptAfterPrinting.Text = "打印完成后提示"; this.ChkPromptAfterPrinting.Text = "打印完成后提示";
this.ChkPromptAfterPrinting.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.ChkPromptAfterPrinting.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
...@@ -165,11 +163,10 @@ namespace SmartScan ...@@ -165,11 +163,10 @@ namespace SmartScan
this.ChkTriggerOpenLight.BorderWidth = 0; this.ChkTriggerOpenLight.BorderWidth = 0;
this.ChkTriggerOpenLight.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); 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.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.ChkTriggerOpenLight.Location = new System.Drawing.Point(392, 730); this.ChkTriggerOpenLight.Location = new System.Drawing.Point(261, 487);
this.ChkTriggerOpenLight.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.ChkTriggerOpenLight.Name = "ChkTriggerOpenLight"; this.ChkTriggerOpenLight.Name = "ChkTriggerOpenLight";
this.ChkTriggerOpenLight.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); this.ChkTriggerOpenLight.Padding = new System.Windows.Forms.Padding(3);
this.ChkTriggerOpenLight.Size = new System.Drawing.Size(680, 53); this.ChkTriggerOpenLight.Size = new System.Drawing.Size(453, 35);
this.ChkTriggerOpenLight.TabIndex = 17; this.ChkTriggerOpenLight.TabIndex = 17;
this.ChkTriggerOpenLight.Text = "触发信号亮灯"; this.ChkTriggerOpenLight.Text = "触发信号亮灯";
this.ChkTriggerOpenLight.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.ChkTriggerOpenLight.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
...@@ -181,11 +178,10 @@ namespace SmartScan ...@@ -181,11 +178,10 @@ namespace SmartScan
this.LblDefaultMate.BorderWidth = 0; this.LblDefaultMate.BorderWidth = 0;
this.LblDefaultMate.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); 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.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.LblDefaultMate.Location = new System.Drawing.Point(852, 24); this.LblDefaultMate.Location = new System.Drawing.Point(568, 16);
this.LblDefaultMate.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.LblDefaultMate.Name = "LblDefaultMate"; this.LblDefaultMate.Name = "LblDefaultMate";
this.LblDefaultMate.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); this.LblDefaultMate.Padding = new System.Windows.Forms.Padding(3);
this.LblDefaultMate.Size = new System.Drawing.Size(300, 53); this.LblDefaultMate.Size = new System.Drawing.Size(200, 35);
this.LblDefaultMate.TabIndex = 16; this.LblDefaultMate.TabIndex = 16;
this.LblDefaultMate.Text = "优先匹配模板"; this.LblDefaultMate.Text = "优先匹配模板";
// //
...@@ -196,12 +192,11 @@ namespace SmartScan ...@@ -196,12 +192,11 @@ namespace SmartScan
this.LstMate.BorderWidth = 2; this.LstMate.BorderWidth = 2;
this.LstMate.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); 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.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.LstMate.Location = new System.Drawing.Point(852, 85); this.LstMate.Location = new System.Drawing.Point(568, 57);
this.LstMate.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.LstMate.Name = "LstMate"; this.LstMate.Name = "LstMate";
this.LstMate.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); this.LstMate.Padding = new System.Windows.Forms.Padding(3);
this.LstMate.SelectedIndex = -1; this.LstMate.SelectedIndex = -1;
this.LstMate.Size = new System.Drawing.Size(300, 301); this.LstMate.Size = new System.Drawing.Size(200, 201);
this.LstMate.TabIndex = 15; this.LstMate.TabIndex = 15;
// //
// ChkPrintCompletedClear // ChkPrintCompletedClear
...@@ -211,11 +206,10 @@ namespace SmartScan ...@@ -211,11 +206,10 @@ namespace SmartScan
this.ChkPrintCompletedClear.BorderWidth = 0; this.ChkPrintCompletedClear.BorderWidth = 0;
this.ChkPrintCompletedClear.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); 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.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.ChkPrintCompletedClear.Location = new System.Drawing.Point(392, 550); this.ChkPrintCompletedClear.Location = new System.Drawing.Point(261, 367);
this.ChkPrintCompletedClear.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.ChkPrintCompletedClear.Name = "ChkPrintCompletedClear"; this.ChkPrintCompletedClear.Name = "ChkPrintCompletedClear";
this.ChkPrintCompletedClear.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); this.ChkPrintCompletedClear.Padding = new System.Windows.Forms.Padding(3);
this.ChkPrintCompletedClear.Size = new System.Drawing.Size(680, 53); this.ChkPrintCompletedClear.Size = new System.Drawing.Size(453, 35);
this.ChkPrintCompletedClear.TabIndex = 14; this.ChkPrintCompletedClear.TabIndex = 14;
this.ChkPrintCompletedClear.Text = "标签打印完成后清除数据"; this.ChkPrintCompletedClear.Text = "标签打印完成后清除数据";
this.ChkPrintCompletedClear.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.ChkPrintCompletedClear.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
...@@ -227,11 +221,10 @@ namespace SmartScan ...@@ -227,11 +221,10 @@ namespace SmartScan
this.ChkOpenMaximize.BorderWidth = 0; this.ChkOpenMaximize.BorderWidth = 0;
this.ChkOpenMaximize.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); 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.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.ChkOpenMaximize.Location = new System.Drawing.Point(392, 670); this.ChkOpenMaximize.Location = new System.Drawing.Point(261, 447);
this.ChkOpenMaximize.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.ChkOpenMaximize.Name = "ChkOpenMaximize"; this.ChkOpenMaximize.Name = "ChkOpenMaximize";
this.ChkOpenMaximize.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); this.ChkOpenMaximize.Padding = new System.Windows.Forms.Padding(3);
this.ChkOpenMaximize.Size = new System.Drawing.Size(680, 53); this.ChkOpenMaximize.Size = new System.Drawing.Size(453, 35);
this.ChkOpenMaximize.TabIndex = 13; this.ChkOpenMaximize.TabIndex = 13;
this.ChkOpenMaximize.Text = "软件打开最大化"; this.ChkOpenMaximize.Text = "软件打开最大化";
this.ChkOpenMaximize.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.ChkOpenMaximize.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
...@@ -243,12 +236,11 @@ namespace SmartScan ...@@ -243,12 +236,11 @@ namespace SmartScan
this.LstPrinter.BorderWidth = 2; this.LstPrinter.BorderWidth = 2;
this.LstPrinter.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); 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.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.LstPrinter.Location = new System.Drawing.Point(9, 162); this.LstPrinter.Location = new System.Drawing.Point(6, 108);
this.LstPrinter.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.LstPrinter.Name = "LstPrinter"; this.LstPrinter.Name = "LstPrinter";
this.LstPrinter.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); this.LstPrinter.Padding = new System.Windows.Forms.Padding(3);
this.LstPrinter.SelectedIndex = -1; this.LstPrinter.SelectedIndex = -1;
this.LstPrinter.Size = new System.Drawing.Size(525, 226); this.LstPrinter.Size = new System.Drawing.Size(350, 151);
this.LstPrinter.TabIndex = 8; this.LstPrinter.TabIndex = 8;
// //
// ChkOpenEnterWork // ChkOpenEnterWork
...@@ -258,11 +250,10 @@ namespace SmartScan ...@@ -258,11 +250,10 @@ namespace SmartScan
this.ChkOpenEnterWork.BorderWidth = 0; this.ChkOpenEnterWork.BorderWidth = 0;
this.ChkOpenEnterWork.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); 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.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.ChkOpenEnterWork.Location = new System.Drawing.Point(392, 610); this.ChkOpenEnterWork.Location = new System.Drawing.Point(261, 407);
this.ChkOpenEnterWork.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.ChkOpenEnterWork.Name = "ChkOpenEnterWork"; this.ChkOpenEnterWork.Name = "ChkOpenEnterWork";
this.ChkOpenEnterWork.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); this.ChkOpenEnterWork.Padding = new System.Windows.Forms.Padding(3);
this.ChkOpenEnterWork.Size = new System.Drawing.Size(680, 53); this.ChkOpenEnterWork.Size = new System.Drawing.Size(453, 35);
this.ChkOpenEnterWork.TabIndex = 12; this.ChkOpenEnterWork.TabIndex = 12;
this.ChkOpenEnterWork.Text = "软件打开自动进入工作"; this.ChkOpenEnterWork.Text = "软件打开自动进入工作";
this.ChkOpenEnterWork.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.ChkOpenEnterWork.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
...@@ -274,11 +265,10 @@ namespace SmartScan ...@@ -274,11 +265,10 @@ namespace SmartScan
this.ChkLabelEmptyCheck.BorderWidth = 0; this.ChkLabelEmptyCheck.BorderWidth = 0;
this.ChkLabelEmptyCheck.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); 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.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.ChkLabelEmptyCheck.Location = new System.Drawing.Point(392, 490); this.ChkLabelEmptyCheck.Location = new System.Drawing.Point(261, 327);
this.ChkLabelEmptyCheck.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.ChkLabelEmptyCheck.Name = "ChkLabelEmptyCheck"; this.ChkLabelEmptyCheck.Name = "ChkLabelEmptyCheck";
this.ChkLabelEmptyCheck.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); this.ChkLabelEmptyCheck.Padding = new System.Windows.Forms.Padding(3);
this.ChkLabelEmptyCheck.Size = new System.Drawing.Size(680, 53); this.ChkLabelEmptyCheck.Size = new System.Drawing.Size(453, 35);
this.ChkLabelEmptyCheck.TabIndex = 11; this.ChkLabelEmptyCheck.TabIndex = 11;
this.ChkLabelEmptyCheck.Text = "标签空内容校验"; this.ChkLabelEmptyCheck.Text = "标签空内容校验";
this.ChkLabelEmptyCheck.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.ChkLabelEmptyCheck.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
...@@ -290,11 +280,10 @@ namespace SmartScan ...@@ -290,11 +280,10 @@ namespace SmartScan
this.ChkSelectPN.BorderWidth = 0; this.ChkSelectPN.BorderWidth = 0;
this.ChkSelectPN.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); 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.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.ChkSelectPN.Location = new System.Drawing.Point(392, 430); this.ChkSelectPN.Location = new System.Drawing.Point(261, 287);
this.ChkSelectPN.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.ChkSelectPN.Name = "ChkSelectPN"; this.ChkSelectPN.Name = "ChkSelectPN";
this.ChkSelectPN.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); this.ChkSelectPN.Padding = new System.Windows.Forms.Padding(3);
this.ChkSelectPN.Size = new System.Drawing.Size(680, 53); this.ChkSelectPN.Size = new System.Drawing.Size(453, 35);
this.ChkSelectPN.TabIndex = 10; this.ChkSelectPN.TabIndex = 10;
this.ChkSelectPN.Text = "通过服务器查询PN"; this.ChkSelectPN.Text = "通过服务器查询PN";
this.ChkSelectPN.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.ChkSelectPN.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
...@@ -306,11 +295,10 @@ namespace SmartScan ...@@ -306,11 +295,10 @@ namespace SmartScan
this.LblDefaultLabel.BorderWidth = 0; this.LblDefaultLabel.BorderWidth = 0;
this.LblDefaultLabel.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); 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.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.LblDefaultLabel.Location = new System.Drawing.Point(543, 24); this.LblDefaultLabel.Location = new System.Drawing.Point(362, 16);
this.LblDefaultLabel.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.LblDefaultLabel.Name = "LblDefaultLabel"; this.LblDefaultLabel.Name = "LblDefaultLabel";
this.LblDefaultLabel.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); this.LblDefaultLabel.Padding = new System.Windows.Forms.Padding(3);
this.LblDefaultLabel.Size = new System.Drawing.Size(300, 53); this.LblDefaultLabel.Size = new System.Drawing.Size(200, 35);
this.LblDefaultLabel.TabIndex = 9; this.LblDefaultLabel.TabIndex = 9;
this.LblDefaultLabel.Text = "默认打印标签"; this.LblDefaultLabel.Text = "默认打印标签";
// //
...@@ -322,11 +310,10 @@ namespace SmartScan ...@@ -322,11 +310,10 @@ namespace SmartScan
this.RdoVertical.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); 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.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.RdoVertical.Group = "1"; this.RdoVertical.Group = "1";
this.RdoVertical.Location = new System.Drawing.Point(276, 85); this.RdoVertical.Location = new System.Drawing.Point(184, 57);
this.RdoVertical.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.RdoVertical.Name = "RdoVertical"; this.RdoVertical.Name = "RdoVertical";
this.RdoVertical.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); this.RdoVertical.Padding = new System.Windows.Forms.Padding(3);
this.RdoVertical.Size = new System.Drawing.Size(258, 67); this.RdoVertical.Size = new System.Drawing.Size(172, 45);
this.RdoVertical.TabIndex = 7; this.RdoVertical.TabIndex = 7;
this.RdoVertical.Text = "纵向打印"; this.RdoVertical.Text = "纵向打印";
// //
...@@ -338,11 +325,10 @@ namespace SmartScan ...@@ -338,11 +325,10 @@ namespace SmartScan
this.RdoLandscape.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); 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.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.RdoLandscape.Group = "1"; this.RdoLandscape.Group = "1";
this.RdoLandscape.Location = new System.Drawing.Point(9, 85); this.RdoLandscape.Location = new System.Drawing.Point(6, 57);
this.RdoLandscape.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.RdoLandscape.Name = "RdoLandscape"; this.RdoLandscape.Name = "RdoLandscape";
this.RdoLandscape.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); this.RdoLandscape.Padding = new System.Windows.Forms.Padding(3);
this.RdoLandscape.Size = new System.Drawing.Size(258, 67); this.RdoLandscape.Size = new System.Drawing.Size(172, 45);
this.RdoLandscape.TabIndex = 6; this.RdoLandscape.TabIndex = 6;
this.RdoLandscape.Text = "横向打印"; this.RdoLandscape.Text = "横向打印";
// //
...@@ -353,12 +339,11 @@ namespace SmartScan ...@@ -353,12 +339,11 @@ namespace SmartScan
this.LstLabel.BorderWidth = 2; this.LstLabel.BorderWidth = 2;
this.LstLabel.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); 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.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.LstLabel.Location = new System.Drawing.Point(543, 85); this.LstLabel.Location = new System.Drawing.Point(362, 57);
this.LstLabel.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.LstLabel.Name = "LstLabel"; this.LstLabel.Name = "LstLabel";
this.LstLabel.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); this.LstLabel.Padding = new System.Windows.Forms.Padding(3);
this.LstLabel.SelectedIndex = -1; this.LstLabel.SelectedIndex = -1;
this.LstLabel.Size = new System.Drawing.Size(300, 301); this.LstLabel.Size = new System.Drawing.Size(200, 201);
this.LstLabel.TabIndex = 5; this.LstLabel.TabIndex = 5;
// //
// LblPrint // LblPrint
...@@ -368,11 +353,10 @@ namespace SmartScan ...@@ -368,11 +353,10 @@ namespace SmartScan
this.LblPrint.BorderWidth = 0; this.LblPrint.BorderWidth = 0;
this.LblPrint.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); 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.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.LblPrint.Location = new System.Drawing.Point(9, 24); this.LblPrint.Location = new System.Drawing.Point(6, 16);
this.LblPrint.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.LblPrint.Name = "LblPrint"; this.LblPrint.Name = "LblPrint";
this.LblPrint.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); this.LblPrint.Padding = new System.Windows.Forms.Padding(3);
this.LblPrint.Size = new System.Drawing.Size(525, 53); this.LblPrint.Size = new System.Drawing.Size(350, 35);
this.LblPrint.TabIndex = 4; this.LblPrint.TabIndex = 4;
this.LblPrint.Text = "打印机"; this.LblPrint.Text = "打印机";
// //
...@@ -384,11 +368,10 @@ namespace SmartScan ...@@ -384,11 +368,10 @@ namespace SmartScan
this.RdoNoImage.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); 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.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.RdoNoImage.Group = "2"; this.RdoNoImage.Group = "2";
this.RdoNoImage.Location = new System.Drawing.Point(30, 613); this.RdoNoImage.Location = new System.Drawing.Point(20, 409);
this.RdoNoImage.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.RdoNoImage.Name = "RdoNoImage"; this.RdoNoImage.Name = "RdoNoImage";
this.RdoNoImage.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); this.RdoNoImage.Padding = new System.Windows.Forms.Padding(3);
this.RdoNoImage.Size = new System.Drawing.Size(352, 53); this.RdoNoImage.Size = new System.Drawing.Size(235, 35);
this.RdoNoImage.TabIndex = 3; this.RdoNoImage.TabIndex = 3;
this.RdoNoImage.Text = "不保存"; this.RdoNoImage.Text = "不保存";
this.RdoNoImage.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.RdoNoImage.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
...@@ -401,11 +384,10 @@ namespace SmartScan ...@@ -401,11 +384,10 @@ namespace SmartScan
this.RdoCondense.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); 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.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.RdoCondense.Group = "2"; this.RdoCondense.Group = "2";
this.RdoCondense.Location = new System.Drawing.Point(30, 552); this.RdoCondense.Location = new System.Drawing.Point(20, 368);
this.RdoCondense.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.RdoCondense.Name = "RdoCondense"; this.RdoCondense.Name = "RdoCondense";
this.RdoCondense.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); this.RdoCondense.Padding = new System.Windows.Forms.Padding(3);
this.RdoCondense.Size = new System.Drawing.Size(352, 53); this.RdoCondense.Size = new System.Drawing.Size(235, 35);
this.RdoCondense.TabIndex = 2; this.RdoCondense.TabIndex = 2;
this.RdoCondense.Text = "压缩图"; this.RdoCondense.Text = "压缩图";
this.RdoCondense.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.RdoCondense.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
...@@ -418,11 +400,10 @@ namespace SmartScan ...@@ -418,11 +400,10 @@ namespace SmartScan
this.RdoOriginal.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); 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.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.RdoOriginal.Group = "2"; this.RdoOriginal.Group = "2";
this.RdoOriginal.Location = new System.Drawing.Point(30, 491); this.RdoOriginal.Location = new System.Drawing.Point(20, 327);
this.RdoOriginal.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.RdoOriginal.Name = "RdoOriginal"; this.RdoOriginal.Name = "RdoOriginal";
this.RdoOriginal.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); this.RdoOriginal.Padding = new System.Windows.Forms.Padding(3);
this.RdoOriginal.Size = new System.Drawing.Size(352, 53); this.RdoOriginal.Size = new System.Drawing.Size(235, 35);
this.RdoOriginal.TabIndex = 1; this.RdoOriginal.TabIndex = 1;
this.RdoOriginal.Text = "原始图"; this.RdoOriginal.Text = "原始图";
this.RdoOriginal.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.RdoOriginal.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
...@@ -434,23 +415,36 @@ namespace SmartScan ...@@ -434,23 +415,36 @@ namespace SmartScan
this.LblHistoryImage.BorderWidth = 0; this.LblHistoryImage.BorderWidth = 0;
this.LblHistoryImage.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); 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.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.LblHistoryImage.Location = new System.Drawing.Point(30, 430); this.LblHistoryImage.Location = new System.Drawing.Point(20, 287);
this.LblHistoryImage.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.LblHistoryImage.Name = "LblHistoryImage"; this.LblHistoryImage.Name = "LblHistoryImage";
this.LblHistoryImage.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); this.LblHistoryImage.Padding = new System.Windows.Forms.Padding(3);
this.LblHistoryImage.Size = new System.Drawing.Size(352, 53); this.LblHistoryImage.Size = new System.Drawing.Size(235, 35);
this.LblHistoryImage.TabIndex = 0; this.LblHistoryImage.TabIndex = 0;
this.LblHistoryImage.Text = "追溯图像保存"; this.LblHistoryImage.Text = "追溯图像保存";
this.LblHistoryImage.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.LblHistoryImage.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
// //
// ChkCheckFunction
//
this.ChkCheckFunction.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(20)))));
this.ChkCheckFunction.BorderStyle = Asa.FaceControl.ControlShape.Rectangle;
this.ChkCheckFunction.BorderWidth = 0;
this.ChkCheckFunction.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.ChkCheckFunction.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.ChkCheckFunction.Location = new System.Drawing.Point(261, 646);
this.ChkCheckFunction.Name = "ChkCheckFunction";
this.ChkCheckFunction.Padding = new System.Windows.Forms.Padding(3);
this.ChkCheckFunction.Size = new System.Drawing.Size(453, 35);
this.ChkCheckFunction.TabIndex = 20;
this.ChkCheckFunction.Text = "Check功能";
this.ChkCheckFunction.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// UsrWorkMode // UsrWorkMode
// //
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.Controls.Add(this.facePanel1); this.Controls.Add(this.facePanel1);
this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.Name = "UsrWorkMode"; this.Name = "UsrWorkMode";
this.Size = new System.Drawing.Size(842, 665); this.Size = new System.Drawing.Size(561, 743);
this.facePanel1.ResumeLayout(false); this.facePanel1.ResumeLayout(false);
this.ResumeLayout(false); this.ResumeLayout(false);
...@@ -481,5 +475,6 @@ namespace SmartScan ...@@ -481,5 +475,6 @@ namespace SmartScan
private Asa.FaceControl.FaceCheckBox ChkPromptAfterPrinting; private Asa.FaceControl.FaceCheckBox ChkPromptAfterPrinting;
private Asa.FaceControl.FaceCheckBox ChkAllowModifyPrint; private Asa.FaceControl.FaceCheckBox ChkAllowModifyPrint;
private System.Windows.Forms.Button but_Readfileprint; private System.Windows.Forms.Button but_Readfileprint;
private Asa.FaceControl.FaceCheckBox ChkCheckFunction;
} }
} }
SmartScan/SetControl/UsrWorkMode.cs
...@@ -38,6 +38,7 @@ namespace SmartScan ...@@ -38,6 +38,7 @@ namespace SmartScan
ChkPromptAfterPrinting.Checked = BLLCommon.config.PromptAfterPrinting; ChkPromptAfterPrinting.Checked = BLLCommon.config.PromptAfterPrinting;
ChkAutoPrint.Checked = BLLCommon.config.AutoPrint; ChkAutoPrint.Checked = BLLCommon.config.AutoPrint;
ChkAllowModifyPrint.Checked = Config.AllowModifyPrintInfo; ChkAllowModifyPrint.Checked = Config.AllowModifyPrintInfo;
ChkCheckFunction.Checked = BLLCommon.config.CheckFunction; ;
//默认标签 //默认标签
LstLabel.Items.AddRange(BLLCommon.labelEdit.Name); LstLabel.Items.AddRange(BLLCommon.labelEdit.Name);
LstLabel.Text = BLLCommon.config.DefaultPrintLabel; LstLabel.Text = BLLCommon.config.DefaultPrintLabel;
...@@ -107,6 +108,7 @@ namespace SmartScan ...@@ -107,6 +108,7 @@ namespace SmartScan
BLLCommon.config.TriggerOpenLight = ChkTriggerOpenLight.Checked; BLLCommon.config.TriggerOpenLight = ChkTriggerOpenLight.Checked;
BLLCommon.config.PromptAfterPrinting = ChkPromptAfterPrinting.Checked; BLLCommon.config.PromptAfterPrinting = ChkPromptAfterPrinting.Checked;
BLLCommon.config.AutoPrint = ChkAutoPrint.Checked; BLLCommon.config.AutoPrint = ChkAutoPrint.Checked;
BLLCommon.config.CheckFunction = ChkCheckFunction.Checked;
BLLCommon.config.Save(); BLLCommon.config.Save();
} }
......
SmartScan/SetControl/UsrWorkMode2.cs
...@@ -29,6 +29,7 @@ namespace SmartScan ...@@ -29,6 +29,7 @@ namespace SmartScan
ChkLabelEmptyCheck.Checked = BLLCommon.config.LabelEmptyCheck; ChkLabelEmptyCheck.Checked = BLLCommon.config.LabelEmptyCheck;
ChkOpenEnterWork.Checked = BLLCommon.config.OpenStartWork; ChkOpenEnterWork.Checked = BLLCommon.config.OpenStartWork;
ChkPrintCompletedClear.Checked = BLLCommon.config.PrintCompletedClear; ChkPrintCompletedClear.Checked = BLLCommon.config.PrintCompletedClear;
ChkPrintCompletedClear.Checked = BLLCommon.config.PrintCompletedClear;
ChkOpenMaximize.Checked = BLLCommon.config.OpenMaximize; ChkOpenMaximize.Checked = BLLCommon.config.OpenMaximize;
ChkTriggerOpenLight.Checked = BLLCommon.config.TriggerOpenLight; ChkTriggerOpenLight.Checked = BLLCommon.config.TriggerOpenLight;
ChkPromptAfterPrinting.Checked = BLLCommon.config.PromptAfterPrinting; ChkPromptAfterPrinting.Checked = BLLCommon.config.PromptAfterPrinting;
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!