Skip to content

张东亮 / NS100

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

获取最新数据

1 个父辈 b2199b45
内嵌 并排
正在显示 10 个修改的文件 包含 748 行增加 和 100 行删除
BLL/Config.cs
......@@ -328,7 +328,13 @@ namespace BLL
public static MyConfig<bool> Func_EnabledOCR;
[MyConfigComment("允许修改打内容")]
public static MyConfig<bool> AllowModifyPrintInfo;
/// <summary>
/// 0，不重置
/// 1，按天
/// 2，按月
/// </summary>
[MyConfigComment("唯一码后缀编号重置策略")]
public static MyConfig<int> REEL_ID_AutoResetStrategy;
public void Save()
{
config.Save();
......
BLL/Extension/Item_General.cs
......@@ -247,13 +247,17 @@ namespace BLL
int reelID = 1;
try
{
var reelidfile = FilePath.CONFIG_REELID;
if (config.ReelIDAutoResetByDate)
var reelidfile = FilePath.CONFIG_REELID;
if (Config.REEL_ID_AutoResetStrategy==1)
{
Directory.CreateDirectory(reelidfile + "_dir");
reelidfile = Path.Combine(FilePath.CONFIG_REELID + "_dir", DateTime.Now.ToString("yyyyMMdd"));
}
else if (Config.REEL_ID_AutoResetStrategy == 2)
{
Directory.CreateDirectory(reelidfile + "_dir");
reelidfile = Path.Combine(FilePath.CONFIG_REELID + "_dir", DateTime.Now.ToString("yyyyMM"));
}
if (File.Exists(reelidfile))
{
string text = File.ReadAllText(reelidfile);
......
BLL/Replacekeywords.cs
using DAL;
using DocumentFormat.OpenXml.Office2016.Drawing.Command;
using DocumentFormat.OpenXml.Wordprocessing;
using Model;
using Model;
using Newtonsoft.Json.Linq;
using RestSharp;
using System;
using System.Collections.Generic;
using System.Configuration;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Security.Policy;
using System.Text;
using System.Web;
using ZXing.Aztec.Internal;
using Http = Model.Http;
namespace BLL
......
SmartScan/Form/FrmCodeExtract.cs
......@@ -252,13 +252,13 @@ namespace SmartScan
emptyMatch = true;
}
}
else if (match.MatchSplit)
{
if(string.IsNullOrEmpty(match.MiddleText))
{
emptyMatch = true;
}
}
//else if (match.MatchSplit)
//{
// if(string.IsNullOrEmpty(match.MiddleText))
// {
// emptyMatch = true;
// }
//}
else if (match.MatchStart)
{
if(string.IsNullOrEmpty(match.StartText))
......
SmartScan/Language/en-US.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<Language Name="English">
<Dialog>
<LoginWrong>The login password is incorrect.</LoginWrong>
<SaveSucceed>Save Successfully</SaveSucceed>
<Error>Error</Error>
<CodeCount>The code number is 0</CodeCount>
<SelectPrintContent>Recognition complete, select print content</SelectPrintContent>
<PrintTemplateAdd>Name of print template</PrintTemplateAdd>
<PrintTemplateDel>Delete print label template [name] ?</PrintTemplateDel>
<PrintTemplateRename>Rename print label template [name] to</PrintTemplateRename>
<MaterialTemplateAdd>Name of new material template</MaterialTemplateAdd>
<MaterialTemplateDel>Delete material template [name] ?</MaterialTemplateDel>
<MaterialTemplateRename>Rename material template [name] to</MaterialTemplateRename>
<MaterialTemplateNoMatch>The material template does not match</MaterialTemplateNoMatch>
<ServerReturn>The server returned data is error</ServerReturn>
<ServerJson>The server returned data is empty</ServerJson>
<LabelEmpty>Print label content is empty, do you want to continue printing?</LabelEmpty>
<KeyExists>Dupicated field found:[name]</KeyExists>
<KeyRepeat>Repeat keyword</KeyRepeat>
<KeyEmpty>Keyword can't be empty</KeyEmpty>
<NoMatchSelect>A matching pattern must be selected</NoMatchSelect>
<UnlockWrong>Wrong unlock password</UnlockWrong>
<RepeatPrint>The tray label has been printed</RepeatPrint>
<MaterialScanning>In recognition...</MaterialScanning>
<MaterialTemplateMatching>Template matching...</MaterialTemplateMatching>
<MaterialProcessing>Processing results...</MaterialProcessing>
<PleaseWaiting>Please Waiting...</PleaseWaiting>
<MatchType_max>Match at most</MatchType_max>
<MatchType_equals>Occurrence</MatchType_equals>
<MatchType_min>Match at least</MatchType_min>
<OcrNeedCodeSetKey>Ocr's based barcode must first match the keyword</OcrNeedCodeSetKey>
<ThisMatchHasOcrCantdelete>There are Ocr rules under this matching rule, and all keywords cannot be deleted</ThisMatchHasOcrCantdelete>
<!--原文:请选择数据文件-->
<selectdatasource>Please select data source</selectdatasource>
<!--原文:文件状态:改文件不存在-->
<filenotexists>File status:The file doesn't exit</filenotexists>
<!--原文:文件内容解析失败-->
<filepatseerror>File read fails</filepatseerror>
<!--原文:文件格式不正确-->
<fileformaterror>Incorrect file format</fileformaterror>
<!--原文:二维码不能用于OCR定位基准-->
<OcrNotSupport2DCode>2D barcode cannot be used as OCR positioning benchmarks</OcrNotSupport2DCode>
<RemindClearTemplate>Recognition will reset the template.Are you sure to perform the action?</RemindClearTemplate>
<PrintLabel>Print</PrintLabel>
<!--原文:请选择一个条码！-->
<RemindSelectCode>Please select a barcode!</RemindSelectCode>
<!--原文:[name] 与以下的模板匹配冲突-->
<TemplateMatchingConflict>[name] conflicts with the following template</TemplateMatchingConflict>
<!--原文:[name] 以下关键字重复匹配-->
<TemplateKeyMatchingDul>The following keywords of [name] are duplicates</TemplateKeyMatchingDul>
<!--原文:[name] 以下关键字匹配失败-->
<TemplateKeyUnMatching>The following keywords of [name] match failed</TemplateKeyUnMatching>
<!--原文:[name] 模板不匹配，请检查以下关键字的匹配规则-->
<TemplateUnSetMatching> [name] do not match, and no matching rules are set.</TemplateUnSetMatching>
<Start>Start</Start>
<Exit>Exit</Exit>
<MatchEmpty>Rule can't be empty</MatchEmpty>
<ResetidByNone>No-Reset UID</ResetidByNone>
<ResetidByDay>Auto-Reset UID Daily</ResetidByDay>
<ResetidByMonth>Auto-Reset UID Monthly</ResetidByMonth>
</Dialog>
<FrmUsersLogin Text="Login" Font="Arial,20,B,">
<LblUser Text="User name" Font="Arial,11,," />
<TxtUser Text="" Font="Arial,12,," />
<BtnCancel Text="Cancel" Font="Arial,12,," />
<BtnLogin Text="Login" Font="Arial,15,B," />
</FrmUsersLogin>
<FrmMain Text="Material Registration System" Font="Arial,20,B,">
<BtnRetrospect Text="Traceability" Font="Arial,14,B," />
<BtnSet Text="Setting" Font="Arial,14,B," />
<BtnAbout Text="About" Font="Arial,14,B," />
<BtnTriggerIO Text="Manual Scan" Font="Arial,9,," />
<LblCameraExist Text="Camera" Font="Arial,9,," />
<LblIOExist Text="Machine" Font="Arial,9,," />
<PnlExtension Text="Print Info." Font="Arial,14,," />
<!--原文:打印标签-->
<BtnPrint Text="Print" Font="Arial,12,," />
</FrmMain>
<FrmSet Text="Setting" Font="Arial,20,B,">
<BtnGenneralSetting Text="General" Font="Arial,12,B," />
<BtnIdentify Text="Debug" Font="Arial,12,B," />
<BtnLabel Text="Print" Font="Arial,12,B," />
<BtnMaterial Text="Material" Font="Arial,12,B," />
<BtnKeyword Text="Field" Font="Arial,12,B," />
<BtnOK Text="Save" Font="Arial,12,," />
<BtnCancel Text="Cancel" Font="Arial,12,," />
<BtnApply Text="Apply" Font="Arial,12,," />
<!--原文:Data Source-->
<BtnDataSource Text="Source" Font="微软雅黑,12,B," />
</FrmSet>
<FrmSetPlus Text="BarCode Rule Setting" Font="Arial,20,B,">
<BtnWorkMode Text="Config" Font="Arial,12,B," />
<BtnIdentify Text="Debug" Font="Arial,12,B," />
<BtnLabel Text="Label" Font="Arial,12,B," />
<BtnMaterial Text="Material Template" Font="Arial,12,B," />
<BtnKeyword Text="Field" Font="Arial,12,B," />
<BtnOK Text="Save" Font="Arial,12,," />
<BtnCancel Text="Cancel" Font="Arial,12,," />
<BtnApply Text="Apply" Font="Arial,12,," />
</FrmSetPlus>
<UsrWorkMode>
<LblPrint Text="Printer" Font="Arial,12,B," />
<LblDefaultLabel Text="Default Print Template" Font="Arial,12,B," />
<RdoLandscape Text="Landscape" Font="Arial,12,," />
<RdoVertical Text="Portrait" Font="Arial,12,," />
<LblHistoryImage Text="Image" Font="Arial,12,B," />
<RdoOriginal Text="Original" Font="Arial,12,," />
<RdoCondense Text="Compressed" Font="Arial,12,," />
<RdoNoImage Text="Skip Image" Font="Arial,12,," />
<ChkSelectPN Text="Query PN from the server" Font="Arial,12,," />
<ChkLabelEmptyCheck Text="Empty label alert" Font="Arial,12,," />
<ChkPrintCompletedClear Text="Print&amp;Clear" Font="Arial,12,," />
<ChkOpenEnterWork Text="Auto Start Mode" Font="Arial,12,," />
<ChkOpenMaximize Text="Always Open Maximized" Font="Arial,12,," />
<ChkTriggerOpenLight Text="Turn on light after triggering device" Font="Arial,12,," />
<ChkPromptAfterPrinting Text="Prompt after recognition is complete" Font="Arial,12,," />
<ChkAutoPrint Text="Auto Print" Font="Arial,12,," />
<LstPrinter Text="" Font="Arial,12,," />
<LstLabel Text="" Font="Arial,12,," />
<LblDefaultMate Text="Preferred template" Font="Arial,12,B," />
<LstMate Text="" Font="Arial,12,," />
<!--原文:允许修改打内容-->
<ChkAllowModifyPrint Text="Modification of hit content is allowed" Font="Arial,12,," />
</UsrWorkMode>
<UsrCamera>
<BtnOpenLight Text="Turn on light" Font="Arial,12,," />
<BtnCloseLight Text="Turn off light" Font="Arial,12,," />
<BtnCameraImage Text="Gain device image" Font="Arial,12,," />
<BtnLocalImage Text="Open local image" Font="Arial,12,," />
<BtnScanCode Text="Recognition" Font="Arial,12,," />
<BtnSaveImage Text="Save image" Font="Arial,12,," />
<LstCode Text="" Font="Arial,12,," />
</UsrCamera>
<UsrPrintTemplate>
<BtnAddLabel Text="New" Font="Arial,12,," />
<BtnDelLabel Text="Delete" Font="Arial,12,," />
<BtnCopyLabel Text="Duplicate" Font="Arial,12,," />
<BtnRenameLabel Text="Rename" Font="Arial,12,," />
<BtnPrintTest Text="Print Test" Font="Arial,12,," />
<BtnAddField Text="Add Block" Font="Arial,12,," />
<BtnDelField Text="Delete Block" Font="Arial,12,," />
<BtnFieldFont Text="Block Font" Font="Arial,12,," />
<BtnSetField Text="Set BLock Content" Font="Arial,12,," />
<LblFieldType Text="Type" Font="Arial,12,B," />
<ChkFieldShowKey Text="Display key" Font="Arial,12,," />
<LblFieldX Text="X(mm)" Font="Arial,12,B," />
<LblFieldY Text="Y(mm)" Font="Arial,12,B," />
<LblFieldW Text="W(mm)" Font="Arial,12,B," />
<LblFieldH Text="L(mm)" Font="Arial,12,B," />
<!--原文:标签模板-->
<pnlPrintTmpLst Text="Label Template" Font="微软雅黑,12,," />
<!--原文:标签模板操作-->
<pnlPrintTmpLstOp Text="Label Template Operation" Font="微软雅黑,12,," />
<!--原文:标签样式-->
<pnLabelStyle Text="Label" Font="微软雅黑,12,," />
<!--原文:标签的所有字段-->
<pnAllFieldsOfLabel Text="Fields" Font="微软雅黑,12,," />
<!--原文:字段操作-->
<facePanel7 Text="Field Operation" Font="微软雅黑,12,," />
<!--原文:字段位置-->
<pnLabelFieldPos Text="Field Location" Font="微软雅黑,12,," />
</UsrPrintTemplate>
<UsrMaterialTemplate>
<BtnAddMate Text="New" Font="Arial,12,," />
<BtnDelMate Text="Delete" Font="Arial,12,," />
<BtnRenameMate Text="Rename" Font="Arial,12,," />
<BtnOpenLight Text="Turn on light" Font="Arial,12,," />
<BtnCloseLight Text="Turn off light" Font="Arial,12,," />
<BtnCameraImage Text="Gain device image" Font="Arial,12,," />
<BtnLocalImage Text="Open Local image" Font="Arial,12,," />
<BtnScanCode Text="Recognition" Font="Arial,12,," />
<BtnExtractCode Text="Extract" Font="Arial,12,," />
<BtnOcrCode Text="OCR" Font="Arial,12,," />
<BtnPrimaryCode Text="Set Primary code" Font="Arial,12,," />
<!--原文:图片另存-->
<BtnSaveImage Text="Save As" Font="Arial,12,," />
<!--原文:模板验证-->
<BtnTemplateValite Text="Template validation" Font="Arial,12,," />
<!--原文:模板-->
<pnlMaterial Text="Template" Font="Arial,12,," />
<!--原文:模板操作-->
<pnlMaterialOp Text="Template Operation" Font="Arial,12,," />
<!--原文:条码-->
<pnlCode Text="Barcode" Font="Arial,12,," />
<!--原文:条码操作-->
<pnlCodeOp Text="Barcode Operation" Font="Arial,12,," />
<!--原文:图片-->
<pnlImg Text="Image" Font="Arial,12,," />
<!--原文:图片操作-->
<pnlImgOp Text="Image Operation" Font="Arial,12,," />
</UsrMaterialTemplate>
<UsrDataSource>
<!--原文:遍历同目录-->
<ChkRecursive Text="Search files in the same directory" Font="Arial,12,," />
<!--原文:标签可用字段-->
<groupBox_lblkey Text="Label Available Fields" Font="Arial,12,," />
<!--原文:选择文件-->
<BtnSelectFile Text="Select File" Font="Arial,12,," />
<!--原文:关键字匹配数据标题-->
<faceLabel2 Text="Keyword matches the data title" Font="Arial,12,," />
<!--原文:识别关键词-->
<faceLabel1 Text="Identify Key Words" Font="Arial,12,," />
<!--原文:文件状态:-->
<LblFilestatus Text="File Status:" Font="Arial,12,," />
<!--原文:Label Data Source-->
<LblContent Text="Label Data Source" Font="Arial,12,," />
</UsrDataSource>
<UsrMacro>
<BtnAddKey Text="Add" Font="Arial,12,," />
<BtnDelKey Text="Delete" Font="Arial,12,," />
<BtnUpdateKey Text="Update" Font="Arial,12,," />
<BtnAppendKey Text="Append conditions" Font="Arial,12,," />
<btn_setriid Text="Toggle Auto RI" Font="Arial,12,," />
<PnlReelid Text="Reel ID" Font="Arial,12,," />
<LblContent Text="Build conditions" Font="Arial,12,B," />
<LblPrefix Text="Prefix" Font="Arial,10,," />
<LblPostfix Text="Suffix" Font="Arial,10,," />
<LblPlaces Text="Field length" Font="Arial,10,," />
<ChkReelIDFillZero Text="Add leading zero" Font="Arial,12,," />
<!--原文:添加日期时间-->
<btn_adddatetime Text="Add Date" Font="Arial,12,," />
</UsrMacro>
<UsrCodeExtractList>
<ChkMatchingStart Text="Starting Character" Font="Arial,12,," />
<ChkMatchingEnd Text="Ending Character" Font="Arial,12,," />
<ChkMatchingMiddle Text="Contain" Font="Arial,12,," />
<ChkMatchisnumber Text="Detect and convert to number" Font="Arial,12,," />
<ChkMatchingSplit Text="Delimiter" Font="Arial,12,," />
<LblSplitPart Text="Left Most" Font="Arial,12,," />
<ChkCaseSensitivity Text="Case Sensitive" Font="Arial,12,," />
<ChkMinLength Text="Min length" Font="Arial,12,," />
<ChkMaxLength Text="Max length" Font="Arial,12,," />
<LblKeyword Text="Field" Font="Arial,12,," />
<LblStart Text="Part code start" Font="Arial,12,," />
<LblLength Text="Part code length" Font="Arial,12,," />
<ChkLengthEnd Text="Code ending" Font="Arial,12,," />
<ChkCheckCodeType Text="Match barcode encode type" Font="Arial,12,," />
<BtnDel Text="Delete" Font="Arial,12,," />
<BtnAdd Text="Add" Font="Arial,12,," />
<!--原文:提取-->
<pnlExtractRule Text="Code Extraction" Font="微软雅黑,12,," />
<!--原文:解析结果-->
<pnlParseResult Text="Analysis" Font="微软雅黑,12,," />
</UsrCodeExtractList>
<FrmAbout Text="About" Font="Arial,24,B,">
<LblName Text="Material Registration System" Font="Arial,20,," />
</FrmAbout>
<FrmFieldContent Text="Set Field Content" Font="Arial,24,B,">
<LblContent Text="Field Content" Font="Arial,12,," />
<BtnInsert Text="Insert" Font="Arial,12,," />
<BtnOK Text="OK" Font="Arial,12,," />
<BtnCancel Text="Cancel" Font="Arial,12,," />
</FrmFieldContent>
<FrmCodeExtract Text="Code Extract" Font="Arial,24,B,">
<BtnAddMatch Text="+" Font="Arial,12,," />
<BtnOK Text="OK" Font="Arial,12,," />
<BtnCancel Text="Cancel" Font="Arial,12,," />
<ChkMatchingStart Text="Starting Character" Font="Arial,12,," />
<ChkMatchingEnd Text="Ending Character" Font="Arial,12,," />
<ChkMatchingMiddle Text="Contain" Font="Arial,12,," />
<ChkMatchisnumber Text="Detect and convert to number" Font="Arial,12,," />
<ChkCaseSensitivity Text="Case Sensitive" Font="Arial,12,," />
<ChkCheckCodeType Text="Match barcode encode type" Font="Arial,12,," />
<BtnDel Text="Delete" Font="Arial,12,," />
<BtnAdd Text="Add" Font="Arial,12,," />
<LblStart Text="Part code start" Font="Arial,12,," />
<LblLength Text="Part code length" Font="Arial,12,," />
<!--原文:关键字-->
<pnlKeywords Text="Field" Font="微软雅黑,12,," />
<!--原文:原始条码信息-->
<pnlRawCode Text="Original Barcode Info." Font="微软雅黑,12,," />
<!--原文:匹配-->
<pnlMatch Text="Matching" Font="微软雅黑,12,," />
<!--原文:提取-->
<pnlExtractRule Text="Code Extraction" Font="微软雅黑,12,," />
<!--原文:解析结果-->
<pnlParseResult Text="Analysis" Font="微软雅黑,12,," />
</FrmCodeExtract>
<FrmCodeOCR Text="OCR" Font="Arial,24,B,">
<BtnSelect Text="Select" Font="Arial,12,," />
<BtnMove Text="Moving images" Font="Arial,12,," />
<BtnDel Text="Delete" Font="Arial,12,," />
<BtnKey Text="Set field" Font="Arial,12,," />
<BtnOK Text="OK" Font="Arial,12,," />
<BtnCancel Text="Cancel" Font="Arial,12,," />
</FrmCodeOCR>
<FrmRetrospect Text="Traceability" Font="Arial,24,B,">
<LblDateRange Text="Date range" Font="Arial,12,," />
<LblCode Text="Material ID" Font="Arial,12,," />
<BtnSelect Text="Search" Font="Arial,12,," />
<BtnExport Text="Export" Font="Arial,12,," />
<BtnExportAll Text="Export All" Font="Arial,12,," />
<LblAllCode Text="Original" Font="Arial,12,," />
<LblAllLabel Text="Extracted Info." Font="Arial,12,," />
</FrmRetrospect>
</Language>
\ No newline at end of file
SmartScan/Language/zh-CN.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<Language Name="简体中文">
<Dialog>
<LoginWrong>登录密码错误。</LoginWrong>
<SaveSucceed>保存成功</SaveSucceed>
<Error>错误</Error>
<CodeCount>条码数量为0</CodeCount>
<SelectPrintContent>识别完成，选择打印内容</SelectPrintContent>
<PrintTemplateAdd>输入新的打印标签模板名称</PrintTemplateAdd>
<PrintTemplateDel>确定要删除打印标签模板 [name] 吗？</PrintTemplateDel>
<PrintTemplateRename>把模板 [name] 重命名为</PrintTemplateRename>
<MaterialTemplateAdd>输入新的物料模板名称</MaterialTemplateAdd>
<MaterialTemplateDel>确定要删除物料模板 [name] 吗？</MaterialTemplateDel>
<MaterialTemplateRename>把模板 [name] 重命名为</MaterialTemplateRename>
<MaterialTemplateNoMatch>没有匹配到物料模板</MaterialTemplateNoMatch>
<ServerReturn>服务端返回数据错误</ServerReturn>
<ServerJson>服务端数据为空</ServerJson>
<LabelEmpty>打印标签内容有空内容，是否继续打印？</LabelEmpty>
<KeyExists>[name]，关键字已存在</KeyExists>
<KeyRepeat>重复关键字</KeyRepeat>
<NoMatchSelect>必须选择一个匹配模式</NoMatchSelect>
<KeyEmpty>关键字为空</KeyEmpty>
<UnlockWrong>解锁密码错误</UnlockWrong>
<RepeatPrint>该料盘标签已打印</RepeatPrint>
<MaterialScanning>拍照识别...</MaterialScanning>
<MaterialTemplateMatching>模版匹配...</MaterialTemplateMatching>
<MaterialProcessing>计算结果...</MaterialProcessing>
<PleaseWaiting>请稍后...</PleaseWaiting>
<MatchType_max>匹配数量至多</MatchType_max>
<MatchType_equals>匹配数量等于</MatchType_equals>
<MatchType_min>匹配数量至少</MatchType_min>
<OcrNeedCodeSetKey>Ocr的基准条码必须先匹配关键字</OcrNeedCodeSetKey>
<ThisMatchHasOcrCantdelete>该匹配规则下有Ocr规则,不能删除全部关键字</ThisMatchHasOcrCantdelete>
<!--原文:请选择数据文件-->
<selectdatasource>请选择数据文件</selectdatasource>
<!--原文:文件状态:改文件不存在-->
<filenotexists>文件状态:该文件不存在</filenotexists>
<!--原文:文件格式不正确-->
<fileformaterror>文件格式不正确</fileformaterror>
<!--原文:-->
<OcrNotSupport2DCode>二维码不能用于OCR定位基准</OcrNotSupport2DCode>
<RemindClearTemplate>识别将重置模板。您确定要执行该操作吗?</RemindClearTemplate>
<PrintLabel>打印标签</PrintLabel>
<!--原文:请选择一个条码！-->
<RemindSelectCode>请选择一个条码！</RemindSelectCode>
<!--原文:[name] 与以下的模板匹配冲突-->
<TemplateMatchingConflict>[name] 与以下的模板匹配冲突</TemplateMatchingConflict>
<!--原文:[name] 以下关键字重复匹配-->
<TemplateKeyMatchingDul>[name] 以下关键字重复匹配</TemplateKeyMatchingDul>
<!--原文:[name] 以下关键字匹配失败-->
<TemplateKeyUnMatching>[name] 以下关键字匹配失败</TemplateKeyUnMatching>
<!--原文:[name] 模板不匹配，未设置匹配规则-->
<TemplateUnSetMatching>[name] 模板不匹配，未设置匹配规则</TemplateUnSetMatching>
<Start>开始</Start>
<Exit>退出</Exit>
<MatchEmpty>匹配条件为空</MatchEmpty>
<ConflictLength>最大长度必须大于最小长度</ConflictLength>
<ResetidByNone>序号不重置</ResetidByNone>
<ResetidByDay>序号每日重置</ResetidByDay>
<ResetidByMonth>序号每月重置</ResetidByMonth>
</Dialog>
<FrmUsersLogin Text="登录" Font="微软雅黑,20,B,">
<LblUser Text="用户名：" Font="微软雅黑,11,," />
<TxtUser Text="" Font="微软雅黑,12,," />
<BtnCancel Text="取消" Font="微软雅黑,12,," />
<BtnLogin Text="登录" Font="微软雅黑,15,B," />
</FrmUsersLogin>
<FrmMain Text="物料注册系统" Font="微软雅黑,20,B,">
<BtnRetrospect Text="追溯" Font="微软雅黑,14,B," />
<BtnSet Text="设置" Font="微软雅黑,14,B," />
<BtnAbout Text="关于" Font="微软雅黑,14,B," />
<BtnTriggerIO Text="触发识别设备" Font="微软雅黑,9,," />
<LblCameraExist Text="识别设备连接" Font="微软雅黑,9,," />
<LblIOExist Text="IO模块连接" Font="微软雅黑,9,," />
<PnlExtension Text="功能" Font="微软雅黑,14,B," />
<!--原文:简体中文-->
<CboLanguage Text="简体中文" Font="微软雅黑,12,," />
<BtnPrint Text="打印标签" Font="Arial,12,," />
</FrmMain>
<FrmSet Text="设置" Font="微软雅黑,20,B,">
<BtnGenneralSetting Text="通用设置" Font="微软雅黑,12,B," />
<BtnIdentify Text="识别设备" Font="微软雅黑,12,B," />
<BtnLabel Text="打印模版" Font="微软雅黑,12,B," />
<BtnMaterial Text="物料模版" Font="微软雅黑,12,B," />
<BtnKeyword Text="关键字" Font="微软雅黑,12,B," />
<BtnOK Text="保存" Font="微软雅黑,12,," />
<BtnCancel Text="取消" Font="微软雅黑,12,," />
<BtnApply Text="应用" Font="微软雅黑,12,," />
<!--原文:数据源-->
<BtnDataSource Text="数据源" Font="微软雅黑,12,B," />
</FrmSet>
<FrmSetPlus Text="条码规则设置" Font="微软雅黑,20,B,">
<BtnWorkMode Text="工作模式" Font="微软雅黑,12,B," />
<BtnIdentify Text="识别设备" Font="微软雅黑,12,B," />
<BtnLabel Text="打印模版" Font="微软雅黑,12,B," />
<BtnMaterial Text="物料模版" Font="微软雅黑,12,B," />
<BtnKeyword Text="关键字" Font="微软雅黑,12,B," />
<BtnOK Text="保存" Font="微软雅黑,12,," />
<BtnCancel Text="取消" Font="微软雅黑,12,," />
<BtnApply Text="应用" Font="微软雅黑,12,," />
</FrmSetPlus>
<UsrWorkMode>
<LblPrint Text="打印机" Font="微软雅黑,12,B," />
<LblDefaultLabel Text="默认打印标签" Font="微软雅黑,12,B," />
<RdoLandscape Text="横向打印" Font="微软雅黑,12,," />
<RdoVertical Text="纵向打印" Font="微软雅黑,12,," />
<LblHistoryImage Text="追溯图像保存" Font="微软雅黑,12,B," />
<RdoOriginal Text="原图" Font="微软雅黑,12,," />
<RdoCondense Text="压缩图像" Font="微软雅黑,12,," />
<RdoNoImage Text="不保存" Font="微软雅黑,12,," />
<ChkSelectPN Text="从服务器上查询PN" Font="微软雅黑,12,," />
<ChkLabelEmptyCheck Text="打印标签空内容提醒" Font="微软雅黑,12,," />
<ChkPrintCompletedClear Text="打印标签后清除内容" Font="微软雅黑,12,," />
<ChkOpenEnterWork Text="打开软件自动进入工作模式" Font="微软雅黑,12,," />
<ChkOpenMaximize Text="打开软件最大化窗口" Font="微软雅黑,12,," />
<ChkTriggerOpenLight Text="触发信号后在打开光源" Font="微软雅黑,12,," />
<ChkPromptAfterPrinting Text="识别完成后提示" Font="微软雅黑,12,," />
<ChkAutoPrint Text="自动打印" Font="微软雅黑,12,," />
<LstPrinter Text="" Font="微软雅黑,12,," />
<LstLabel Text="" Font="微软雅黑,12,," />
<LblDefaultMate Text="优先匹配模板" Font="微软雅黑,12,B," />
<LstMate Text="" Font="微软雅黑,12,," />
<!--原文:允许修改打内容-->
<ChkAllowModifyPrint Text="允许修改打印内容" Font="微软雅黑,12,," />
</UsrWorkMode>
<UsrCamera>
<BtnOpenLight Text="打开光源" Font="微软雅黑,12,," />
<BtnCloseLight Text="关闭光源" Font="微软雅黑,12,," />
<BtnCameraImage Text="获取设备图像" Font="微软雅黑,12,," />
<BtnLocalImage Text="打开本地图片" Font="微软雅黑,12,," />
<BtnScanCode Text="识别" Font="微软雅黑,12,," />
<BtnSaveImage Text="保存图像" Font="微软雅黑,12,," />
<LstCode Text="" Font="微软雅黑,12,," />
</UsrCamera>
<UsrPrintTemplate>
<BtnAddLabel Text="新建标签" Font="微软雅黑,12,," />
<BtnDelLabel Text="删除标签" Font="微软雅黑,12,," />
<BtnCopyLabel Text="复制标签" Font="微软雅黑,12,," />
<BtnRenameLabel Text="重命名" Font="微软雅黑,12,," />
<BtnPrintTest Text="打印测试" Font="微软雅黑,12,," />
<BtnAddField Text="添加字段" Font="微软雅黑,12,," />
<BtnDelField Text="删除字段" Font="微软雅黑,12,," />
<BtnFieldFont Text="字段字体" Font="微软雅黑,12,," />
<BtnSetField Text="设置字段内容" Font="微软雅黑,12,," />
<LblFieldType Text="码制" Font="微软雅黑,12,B," />
<ChkFieldShowKey Text="显示关键字" Font="微软雅黑,12,," />
<LblFieldX Text="X(mm)" Font="微软雅黑,12,B," />
<LblFieldY Text="Y(mm)" Font="微软雅黑,12,B," />
<LblFieldW Text="W(mm)" Font="微软雅黑,12,B," />
<LblFieldH Text="L(mm)" Font="微软雅黑,12,B," />
<!--原文:标签模板-->
<pnlPrintTmpLst Text="标签模板" Font="微软雅黑,12,," />
<!--原文:标签模板操作-->
<pnlPrintTmpLstOp Text="标签模板操作" Font="微软雅黑,12,," />
<!--原文:标签样式-->
<pnLabelStyle Text="标签样式" Font="微软雅黑,12,," />
<!--原文:标签的所有字段-->
<pnAllFieldsOfLabel Text="标签的所有字段" Font="微软雅黑,12,," />
<!--原文:字段操作-->
<facePanel7 Text="字段操作" Font="微软雅黑,12,," />
<!--原文:字段位置-->
<pnLabelFieldPos Text="字段位置" Font="微软雅黑,12,," />
</UsrPrintTemplate>
<UsrMaterialTemplate>
<BtnAddMate Text="新建模板" Font="微软雅黑,12,," />
<BtnDelMate Text="删除模板" Font="微软雅黑,12,," />
<BtnRenameMate Text="重命名" Font="微软雅黑,12,," />
<BtnOpenLight Text="打开光源" Font="微软雅黑,12,," />
<BtnCloseLight Text="关闭光源" Font="微软雅黑,12,," />
<BtnCameraImage Text="获取设备图像" Font="微软雅黑,12,," />
<BtnLocalImage Text="打开本地图片" Font="微软雅黑,12,," />
<BtnScanCode Text="识别" Font="微软雅黑,12,," />
<BtnExtractCode Text="提取" Font="微软雅黑,12,," />
<BtnOcrCode Text="OCR" Font="微软雅黑,12,," />
<BtnPrimaryCode Text="特征码" Font="微软雅黑,12,," />
<!--原文:图片另存-->
<BtnSaveImage Text="图片另存" Font="微软雅黑,12,," />
<!--原文:模板验证-->
<BtnTemplateValite Text="模板验证" Font="微软雅黑,12,," />
<!--原文:模板-->
<pnlMaterial Text="模板" Font="微软雅黑,12,," />
<!--原文:模板操作-->
<pnlMaterialOp Text="模板操作" Font="微软雅黑,12,," />
<!--原文:条码-->
<pnlCode Text="条码" Font="微软雅黑,12,," />
<!--原文:条码操作-->
<pnlCodeOp Text="条码操作" Font="微软雅黑,12,," />
<!--原文:图片-->
<pnlImg Text="图片" Font="微软雅黑,12,," />
<!--原文:图片操作-->
<pnlImgOp Text="图片操作" Font="微软雅黑,12,," />
</UsrMaterialTemplate>
<UsrMacro>
<BtnAddKey Text="添加" Font="微软雅黑,12,," />
<BtnDelKey Text="删除" Font="微软雅黑,12,," />
<BtnUpdateKey Text="更新" Font="微软雅黑,12,," />
<BtnAppendKey Text="添加到生成条件" Font="微软雅黑,12,," />
<btn_setriid Text="切换自动RI" Font="微软雅黑,12,," />
<PnlReelid Text="Reel ID" Font="微软雅黑,12,," />
<LblContent Text="生成条件" Font="微软雅黑,12,B," />
<LblPrefix Text="开头字符串" Font="微软雅黑,12,," />
<LblPostfix Text="结尾字符串" Font="微软雅黑,12,," />
<LblPlaces Text="数字位数" Font="微软雅黑,12,," />
<ChkReelIDFillZero Text="位数不足前面补0" Font="微软雅黑,12,," />
<!--原文:添加日期时间-->
<btn_adddatetime Text="添加日期时间" Font="微软雅黑,12,," />
<!--原文:序号不重置-->
<CmbResetidBy Text="序号不重置" Font="微软雅黑,12,," />
</UsrMacro>
<UsrCodeExtractList>
<ChkMatchingStart Text="匹配开头字符" Font="微软雅黑,12,," />
<ChkMatchingEnd Text="匹配结尾字符" Font="微软雅黑,12,," />
<ChkMatchingMiddle Text="匹配任意位置字符" Font="微软雅黑,12,," />
<ChkMatchisnumber Text="检测并转换为数字" Font="微软雅黑,12,," />
<ChkMatchingSplit Text="条码分割字符" Font="微软雅黑,12,," />
<LblSplitPart Text="获取分割部分" Font="微软雅黑,12,," />
<ChkCaseSensitivity Text="区分大小写" Font="微软雅黑,12,," />
<ChkMinLength Text="最小长度" Font="微软雅黑,12,," />
<ChkMaxLength Text="最大长度" Font="微软雅黑,12,," />
<LblKeyword Text="设置关键字" Font="微软雅黑,12,," />
<LblStart Text="内容截取起始位" Font="微软雅黑,12,," />
<LblLength Text="内容截取长度" Font="微软雅黑,12,," />
<ChkLengthEnd Text="截取至结尾" Font="微软雅黑,12,," />
<ChkCheckCodeType Text="匹配条码编码类型" Font="微软雅黑,12,," />
<BtnDel Text="删除" Font="微软雅黑,12,," />
<BtnAdd Text="添加" Font="微软雅黑,12,," />
<!--原文:提取-->
<pnlExtract Text="提取" Font="微软雅黑,12,," />
<!--原文:解析结果-->
<facePanel2 Text="解析结果" Font="微软雅黑,12,," />
<!--原文:提取-->
<pnlExtractRule Text="提取" Font="微软雅黑,12,," />
<!--原文:解析结果-->
<pnlParseResult Text="解析结果" Font="微软雅黑,12,," />
</UsrCodeExtractList>
<FrmAbout Text="关于" Font="微软雅黑,24,B,">
<LblName Text="物料注册系统" Font="微软雅黑,20,," />
</FrmAbout>
<FrmFieldContent Text="字段内容设置" Font="微软雅黑,24,B,">
<LblContent Text="字段内容" Font="微软雅黑,12,," />
<BtnInsert Text="插入" Font="微软雅黑,12,," />
<BtnOK Text="确定" Font="微软雅黑,12,," />
<BtnCancel Text="取消" Font="微软雅黑,12,," />
<!--原文:数量：[QTY]-->
<faceTextBox1 Text="数量：[QTY]" Font="微软雅黑,12,," />
</FrmFieldContent>
<FrmCodeExtract Text="提取条码" Font="微软雅黑,24,B,">
<BtnAddMatch Text="+" Font="微软雅黑,12,," />
<BtnOK Text="确定" Font="微软雅黑,12,," />
<BtnCancel Text="取消" Font="微软雅黑,12,," />
<!--原文:匹配数量至多-->
<ChoMatchMiddleType Text="匹配数量至多" Font="微软雅黑,12,," />
<!--原文:必须为数字-->
<ChkMatchisnumber Text="必须为数字" Font="微软雅黑,12,," />
<!--原文:匹配条码编码类型-->
<ChkCheckCodeType Text="匹配条码编码类型" Font="微软雅黑,12,," />
<!--原文:获取分割部分-->
<LblSplitPart Text="获取分割部分" Font="微软雅黑,12,," />
<!--原文:条码分割字符-->
<ChkMatchingSplit Text="条码分割字符" Font="微软雅黑,12,," />
<!--原文:匹配开头字符-->
<ChkMatchingStart Text="匹配开头字符" Font="微软雅黑,12,," />
<!--原文:截取至结尾-->
<ChkLengthEnd Text="截取至结尾" Font="微软雅黑,12,," />
<!--原文:匹配结尾字符-->
<ChkMatchingEnd Text="匹配结尾字符" Font="微软雅黑,12,," />
<!--原文:匹配任意位置字符-->
<ChkMatchingMiddle Text="匹配任意位置字符" Font="微软雅黑,12,," />
<!--原文:内容截取长度-->
<LblLength Text="内容截取长度" Font="微软雅黑,12,," />
<!--原文:内容截取起始位-->
<LblStart Text="内容截取起始位" Font="微软雅黑,12,," />
<!--原文:设置关键字-->
<LblKeyword Text="设置关键字" Font="微软雅黑,12,," />
<!--原文:区分大小写-->
<ChkCaseSensitivity Text="区分大小写" Font="微软雅黑,12,," />
<!--原文:最小长度-->
<ChkMinLength Text="最小长度" Font="微软雅黑,12,," />
<!--原文:最大长度-->
<ChkMaxLength Text="最大长度" Font="微软雅黑,12,," />
<!--原文:删除-->
<BtnDel Text="删除" Font="微软雅黑,12,," />
<!--原文:添加-->
<BtnAdd Text="添加" Font="微软雅黑,12,," />
<!--原文:关键字-->
<pnlKeywords Text="关键字" Font="微软雅黑,12,," />
<!--原文:原始条码信息-->
<pnlRawCode Text="原始条码信息" Font="微软雅黑,12,," />
<!--原文:匹配-->
<pnlMatch Text="匹配" Font="微软雅黑,12,," />
<!--原文:提取-->
<pnlExtractRule Text="提取" Font="微软雅黑,12,," />
<!--原文:解析结果-->
<pnlParseResult Text="解析结果" Font="微软雅黑,12,," />
</FrmCodeExtract>
<FrmCodeOCR Text="OCR" Font="微软雅黑,24,B,">
<BtnSelect Text="矩形选择框" Font="微软雅黑,12,," />
<BtnMove Text="移动图像" Font="微软雅黑,12,," />
<BtnDel Text="删除" Font="微软雅黑,12,," />
<BtnKey Text="设置关键字" Font="微软雅黑,12,," />
<BtnOK Text="确定" Font="微软雅黑,12,," />
<BtnCancel Text="取消" Font="微软雅黑,12,," />
</FrmCodeOCR>
<FrmRetrospect Text="追溯" Font="微软雅黑,24,B,">
<LblDateRange Text="日期范围" Font="微软雅黑,12,," />
<LblCode Text="条码" Font="微软雅黑,12,," />
<BtnSelect Text="查询" Font="微软雅黑,12,," />
<BtnExport Text="导出" Font="微软雅黑,12,," />
<BtnExportAll Text="导出所有" Font="微软雅黑,12,," />
<LblAllCode Text="物料条码" Font="微软雅黑,12,," />
<LblAllLabel Text="标签内容" Font="微软雅黑,12,," />
</FrmRetrospect>
</Language>
\ No newline at end of file
SmartScan/SetControl/UsrMacro.Designer.cs
......@@ -32,11 +32,13 @@ namespace SmartScan
this.facePanel1 = new Asa.FaceControl.FacePanel();
this.PnlReelid = new Asa.FaceControl.FacePanel();
this.btn_adddatetime = new Asa.FaceControl.FaceButton();
this.CmbResetidBy = new Asa.FaceControl.FaceComboBox();
this.btn_adddatetime = new Asa.FaceControl.FaceButton();
this.LblContent = new Asa.FaceControl.FaceLabel();
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.ChkResetidbydate = new Asa.FaceControl.FaceCheckBox();
this.ChkReelIDFillZero = new Asa.FaceControl.FaceCheckBox();
this.TxtPostfix = new Asa.FaceControl.FaceTextBox();
this.LblPrefix = new Asa.FaceControl.FaceLabel();
......@@ -72,9 +74,9 @@ namespace SmartScan
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, 4, 4, 4);
this.facePanel1.Margin = new System.Windows.Forms.Padding(4);
this.facePanel1.Name = "facePanel1";
this.facePanel1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.facePanel1.Padding = new System.Windows.Forms.Padding(4);
this.facePanel1.ShowText = false;
this.facePanel1.Size = new System.Drawing.Size(963, 620);
this.facePanel1.TabIndex = 1;
......@@ -86,12 +88,12 @@ namespace SmartScan
this.PnlReelid.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(20)))));
this.PnlReelid.BorderStyle = Asa.FaceControl.ControlShape.Rectangle;
this.PnlReelid.BorderWidth = 2;
this.PnlReelid.Controls.Add(this.CmbResetidBy);
this.PnlReelid.Controls.Add(this.btn_adddatetime);
this.PnlReelid.Controls.Add(this.LblContent);
this.PnlReelid.Controls.Add(this.TxtReelIDMatch);
this.PnlReelid.Controls.Add(this.LblPlaces);
this.PnlReelid.Controls.Add(this.NumReelIDPlaces);
this.PnlReelid.Controls.Add(this.ChkResetidbydate);
this.PnlReelid.Controls.Add(this.ChkReelIDFillZero);
this.PnlReelid.Controls.Add(this.TxtPostfix);
this.PnlReelid.Controls.Add(this.LblPrefix);
......@@ -99,14 +101,33 @@ namespace SmartScan
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, 4, 4, 4);
this.PnlReelid.Margin = new System.Windows.Forms.Padding(4);
this.PnlReelid.Name = "PnlReelid";
this.PnlReelid.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.PnlReelid.Size = new System.Drawing.Size(307, 520);
this.PnlReelid.Padding = new System.Windows.Forms.Padding(4);
this.PnlReelid.Size = new System.Drawing.Size(307, 564);
this.PnlReelid.TabIndex = 35;
this.PnlReelid.Text = "ReelID";
this.PnlReelid.TitleFont = new System.Drawing.Font("宋体", 12F);
//
// CmbResetidBy
//
this.CmbResetidBy.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.CmbResetidBy.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(20)))));
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.Name = "CmbResetidBy";
this.CmbResetidBy.Padding = new System.Windows.Forms.Padding(4);
this.CmbResetidBy.SelectedIndex = -1;
this.CmbResetidBy.SelectedText = "";
this.CmbResetidBy.Size = new System.Drawing.Size(291, 44);
this.CmbResetidBy.TabIndex = 37;
this.CmbResetidBy.Text = "序号重置";
this.CmbResetidBy.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// btn_adddatetime
//
this.btn_adddatetime.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(20)))));
......@@ -114,10 +135,10 @@ 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, 447);
this.btn_adddatetime.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btn_adddatetime.Location = new System.Drawing.Point(8, 467);
this.btn_adddatetime.Margin = new System.Windows.Forms.Padding(4);
this.btn_adddatetime.Name = "btn_adddatetime";
this.btn_adddatetime.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btn_adddatetime.Padding = new System.Windows.Forms.Padding(4);
this.btn_adddatetime.Size = new System.Drawing.Size(291, 56);
this.btn_adddatetime.TabIndex = 36;
this.btn_adddatetime.Text = "添加日期时间";
......@@ -132,9 +153,9 @@ namespace SmartScan
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, 4, 4, 4);
this.LblContent.Margin = new System.Windows.Forms.Padding(4);
this.LblContent.Name = "LblContent";
this.LblContent.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.LblContent.Padding = new System.Windows.Forms.Padding(4);
this.LblContent.Size = new System.Drawing.Size(291, 44);
this.LblContent.TabIndex = 20;
this.LblContent.Text = "条件";
......@@ -148,10 +169,10 @@ namespace SmartScan
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, 4, 4, 4);
this.TxtReelIDMatch.Margin = new System.Windows.Forms.Padding(4);
this.TxtReelIDMatch.MaxLength = 32767;
this.TxtReelIDMatch.Name = "TxtReelIDMatch";
this.TxtReelIDMatch.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.TxtReelIDMatch.Padding = new System.Windows.Forms.Padding(4);
this.TxtReelIDMatch.SelectedText = "";
this.TxtReelIDMatch.SelectionLength = 0;
this.TxtReelIDMatch.SelectionStart = 0;
......@@ -168,9 +189,9 @@ namespace SmartScan
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, 4, 4, 4);
this.LblPlaces.Margin = new System.Windows.Forms.Padding(4);
this.LblPlaces.Name = "LblPlaces";
this.LblPlaces.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.LblPlaces.Padding = new System.Windows.Forms.Padding(4);
this.LblPlaces.Size = new System.Drawing.Size(120, 56);
this.LblPlaces.TabIndex = 23;
this.LblPlaces.Text = "数字位数";
......@@ -187,11 +208,11 @@ namespace SmartScan
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, 4, 4, 4);
this.NumReelIDPlaces.Margin = new System.Windows.Forms.Padding(4);
this.NumReelIDPlaces.Maximum = 9999F;
this.NumReelIDPlaces.Minimum = 1F;
this.NumReelIDPlaces.Name = "NumReelIDPlaces";
this.NumReelIDPlaces.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.NumReelIDPlaces.Padding = new System.Windows.Forms.Padding(4);
this.NumReelIDPlaces.Size = new System.Drawing.Size(163, 56);
this.NumReelIDPlaces.TabIndex = 24;
this.NumReelIDPlaces.Text = "1";
......@@ -200,19 +221,19 @@ namespace SmartScan
//
// 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 = "序号每日重置";
//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
//
......@@ -223,9 +244,9 @@ namespace SmartScan
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, 4, 4, 4);
this.ChkReelIDFillZero.Margin = new System.Windows.Forms.Padding(4);
this.ChkReelIDFillZero.Name = "ChkReelIDFillZero";
this.ChkReelIDFillZero.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.ChkReelIDFillZero.Padding = new System.Windows.Forms.Padding(4);
this.ChkReelIDFillZero.Size = new System.Drawing.Size(291, 44);
this.ChkReelIDFillZero.TabIndex = 25;
this.ChkReelIDFillZero.Text = "前面补0";
......@@ -238,10 +259,10 @@ namespace SmartScan
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, 4, 4, 4);
this.TxtPostfix.Margin = new System.Windows.Forms.Padding(4);
this.TxtPostfix.MaxLength = 32767;
this.TxtPostfix.Name = "TxtPostfix";
this.TxtPostfix.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.TxtPostfix.Padding = new System.Windows.Forms.Padding(4);
this.TxtPostfix.SelectedText = "";
this.TxtPostfix.SelectionLength = 0;
this.TxtPostfix.SelectionStart = 0;
......@@ -258,9 +279,9 @@ namespace SmartScan
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, 4, 4, 4);
this.LblPrefix.Margin = new System.Windows.Forms.Padding(4);
this.LblPrefix.Name = "LblPrefix";
this.LblPrefix.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.LblPrefix.Padding = new System.Windows.Forms.Padding(4);
this.LblPrefix.Size = new System.Drawing.Size(120, 56);
this.LblPrefix.TabIndex = 26;
this.LblPrefix.Text = "前缀";
......@@ -273,9 +294,9 @@ namespace SmartScan
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, 4, 4, 4);
this.LblPostfix.Margin = new System.Windows.Forms.Padding(4);
this.LblPostfix.Name = "LblPostfix";
this.LblPostfix.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.LblPostfix.Padding = new System.Windows.Forms.Padding(4);
this.LblPostfix.Size = new System.Drawing.Size(120, 56);
this.LblPostfix.TabIndex = 28;
this.LblPostfix.Text = "后缀";
......@@ -289,10 +310,10 @@ namespace SmartScan
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, 4, 4, 4);
this.TxtPrefix.Margin = new System.Windows.Forms.Padding(4);
this.TxtPrefix.MaxLength = 32767;
this.TxtPrefix.Name = "TxtPrefix";
this.TxtPrefix.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.TxtPrefix.Padding = new System.Windows.Forms.Padding(4);
this.TxtPrefix.SelectedText = "";
this.TxtPrefix.SelectionLength = 0;
this.TxtPrefix.SelectionStart = 0;
......@@ -310,9 +331,9 @@ namespace SmartScan
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, 4, 4, 4);
this.btn_down.Margin = new System.Windows.Forms.Padding(4);
this.btn_down.Name = "btn_down";
this.btn_down.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btn_down.Padding = new System.Windows.Forms.Padding(4);
this.btn_down.Size = new System.Drawing.Size(112, 56);
this.btn_down.TabIndex = 34;
this.btn_down.Text = "▼";
......@@ -326,9 +347,9 @@ namespace SmartScan
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, 4, 4, 4);
this.btn_up.Margin = new System.Windows.Forms.Padding(4);
this.btn_up.Name = "btn_up";
this.btn_up.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btn_up.Padding = new System.Windows.Forms.Padding(4);
this.btn_up.Size = new System.Drawing.Size(107, 56);
this.btn_up.TabIndex = 34;
this.btn_up.Text = "▲";
......@@ -342,9 +363,9 @@ namespace SmartScan
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, 4, 4, 4);
this.btn_setriid.Margin = new System.Windows.Forms.Padding(4);
this.btn_setriid.Name = "btn_setriid";
this.btn_setriid.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btn_setriid.Padding = new System.Windows.Forms.Padding(4);
this.btn_setriid.Size = new System.Drawing.Size(224, 56);
this.btn_setriid.TabIndex = 34;
this.btn_setriid.Text = "Toggle Auto ReelID";
......@@ -358,9 +379,9 @@ namespace SmartScan
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, 4, 4, 4);
this.BtnAppendKey.Margin = new System.Windows.Forms.Padding(4);
this.BtnAppendKey.Name = "BtnAppendKey";
this.BtnAppendKey.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.BtnAppendKey.Padding = new System.Windows.Forms.Padding(4);
this.BtnAppendKey.Size = new System.Drawing.Size(224, 56);
this.BtnAppendKey.TabIndex = 34;
this.BtnAppendKey.Text = "append";
......@@ -374,9 +395,9 @@ namespace SmartScan
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, 4, 4, 4);
this.BtnUpdateKey.Margin = new System.Windows.Forms.Padding(4);
this.BtnUpdateKey.Name = "BtnUpdateKey";
this.BtnUpdateKey.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.BtnUpdateKey.Padding = new System.Windows.Forms.Padding(4);
this.BtnUpdateKey.Size = new System.Drawing.Size(224, 56);
this.BtnUpdateKey.TabIndex = 33;
this.BtnUpdateKey.Text = "update";
......@@ -390,9 +411,9 @@ namespace SmartScan
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, 4, 4, 4);
this.BtnDelKey.Margin = new System.Windows.Forms.Padding(4);
this.BtnDelKey.Name = "BtnDelKey";
this.BtnDelKey.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.BtnDelKey.Padding = new System.Windows.Forms.Padding(4);
this.BtnDelKey.Size = new System.Drawing.Size(224, 56);
this.BtnDelKey.TabIndex = 32;
this.BtnDelKey.Text = "del";
......@@ -406,9 +427,9 @@ namespace SmartScan
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, 4, 4, 4);
this.BtnAddKey.Margin = new System.Windows.Forms.Padding(4);
this.BtnAddKey.Name = "BtnAddKey";
this.BtnAddKey.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.BtnAddKey.Padding = new System.Windows.Forms.Padding(4);
this.BtnAddKey.Size = new System.Drawing.Size(224, 56);
this.BtnAddKey.TabIndex = 31;
this.BtnAddKey.Text = "add";
......@@ -420,10 +441,10 @@ namespace SmartScan
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, 4, 4, 4);
this.TxtKey.Margin = new System.Windows.Forms.Padding(4);
this.TxtKey.MaxLength = 32767;
this.TxtKey.Name = "TxtKey";
this.TxtKey.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.TxtKey.Padding = new System.Windows.Forms.Padding(4);
this.TxtKey.SelectedText = "";
this.TxtKey.SelectionLength = 0;
this.TxtKey.SelectionStart = 0;
......@@ -439,9 +460,9 @@ namespace SmartScan
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, 4, 4, 4);
this.LstKey.Margin = new System.Windows.Forms.Padding(4);
this.LstKey.Name = "LstKey";
this.LstKey.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.LstKey.Padding = new System.Windows.Forms.Padding(4);
this.LstKey.SelectedIndex = -1;
this.LstKey.Size = new System.Drawing.Size(227, 375);
this.LstKey.TabIndex = 21;
......@@ -452,7 +473,7 @@ namespace SmartScan
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.facePanel1);
this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.Margin = new System.Windows.Forms.Padding(4);
this.Name = "UsrMacro";
this.Size = new System.Drawing.Size(1131, 666);
this.facePanel1.ResumeLayout(false);
......@@ -484,6 +505,6 @@ namespace SmartScan
private Asa.FaceControl.FaceButton btn_up;
private Asa.FaceControl.FaceButton btn_setriid;
private Asa.FaceControl.FaceButton btn_adddatetime;
private Asa.FaceControl.FaceCheckBox ChkResetidbydate;
private Asa.FaceControl.FaceComboBox CmbResetidBy;
}
}
SmartScan/SetControl/UsrMacro.cs
using System;
using System.Collections.Generic;
using System.Windows.Forms;
using Asa.FaceControl;
using BLL;
using Model;
......@@ -13,6 +14,8 @@ namespace SmartScan
public UsrMacro()
{
InitializeComponent();
//CmbResetidBy.Tag = "not";
CmbResetidBy.Items.AddRange(new string[] { Language.Dialog("ResetidByNone"), Language.Dialog("ResetidByDay"), Language.Dialog("ResetidByMonth") });
keyCopy = new(BLLCommon.macroKey);
LstKey.Items.AddRange(keyCopy.ToArray());
setRIkey();
......@@ -21,7 +24,13 @@ namespace SmartScan
TxtPostfix.Text = BLLCommon.config.ReelIDPostfix;
NumReelIDPlaces.Value = BLLCommon.config.ReelIDPlaces;
ChkReelIDFillZero.Checked = BLLCommon.config.ReelIDFillZero;
ChkResetidbydate.Checked = BLLCommon.config.ReelIDAutoResetByDate;
int sel = Config.REEL_ID_AutoResetStrategy;
if (sel < 0 || sel > CmbResetidBy.Items.Count - 1)
{
Config.REEL_ID_AutoResetStrategy = 0;
sel = 0;
}
CmbResetidBy.SelectedIndex = sel;
Asa.FaceControl.Language.SetLanguage(this);
}
......@@ -41,10 +50,10 @@ namespace SmartScan
BLLCommon.config.ReelIDPostfix = TxtPostfix.Text;
BLLCommon.config.ReelIDPlaces = (int)NumReelIDPlaces.Value;
BLLCommon.config.ReelIDFillZero = ChkReelIDFillZero.Checked;
BLLCommon.config.ReelIDAutoResetByDate = ChkResetidbydate.Checked;
BLLCommon.config.Save();
}
void setRIkey() {
void setRIkey()
{
LstKey.Items.Clear();
LstKey.Items.AddRange(keyCopy.ToArray());
for (int i = 0; i < LstKey.Items.Count; i++)
......@@ -57,7 +66,7 @@ namespace SmartScan
private void LstKey_SelectedIndexChanged(object sender, EventArgs e)
{
if(LstKey.SelectedIndex>=0)
if (LstKey.SelectedIndex >= 0)
TxtKey.Text = keyCopy[LstKey.SelectedIndex];
}
......@@ -102,7 +111,7 @@ namespace SmartScan
hint = hint.Replace("[name]", text);
new Asa.FaceControl.FaceMessageBox("", hint, MessageBoxButtons.OK).ShowDialog();
}
}
private void BtnAppendKey_Click(object sender, EventArgs e)
......@@ -114,9 +123,9 @@ namespace SmartScan
private void btn_up_Click(object sender, EventArgs e)
{
if (LstKey.SelectedIndex == -1 || LstKey.SelectedIndex ==0) return;
if (LstKey.SelectedIndex == -1 || LstKey.SelectedIndex == 0) return;
keyCopy.Insert(LstKey.SelectedIndex - 1, keyCopy[LstKey.SelectedIndex]);
keyCopy.RemoveAt(LstKey.SelectedIndex+1);
keyCopy.RemoveAt(LstKey.SelectedIndex + 1);
LstKey.Items.Clear();
LstKey.Items.AddRange(keyCopy.ToArray());
LstKey.SelectedIndex = LstKey.SelectedIndex - 1;
......@@ -125,8 +134,8 @@ namespace SmartScan
private void btn_down_Click(object sender, EventArgs e)
{
if (LstKey.SelectedIndex == -1 || LstKey.SelectedIndex == keyCopy.Count-1) return;
keyCopy.Insert(LstKey.SelectedIndex+2, keyCopy[LstKey.SelectedIndex]);
if (LstKey.SelectedIndex == -1 || LstKey.SelectedIndex == keyCopy.Count - 1) return;
keyCopy.Insert(LstKey.SelectedIndex + 2, keyCopy[LstKey.SelectedIndex]);
keyCopy.RemoveAt(LstKey.SelectedIndex);
LstKey.Items.Clear();
LstKey.Items.AddRange(keyCopy.ToArray());
......
SmartScan/SetControl/UsrMaterialTemplate.cs
......@@ -232,6 +232,7 @@ namespace SmartScan
private void BtnLocalImage_Click(object sender, EventArgs e)
{
if (mateIndex < 0) return;
using OpenFileDialog dlg = new() { Filter = "Image Files|*.jpg;*.jpeg;*.png;*.bmp;*.gif|All Files|*.*" };
if (dlg.ShowDialog() != DialogResult.OK) return;
......@@ -473,7 +474,7 @@ namespace SmartScan
var curMatch = mateCopy[mateIndex];
List<BarcodeInfo> code = new List<BarcodeInfo>();
curMatch.Code.ForEach(s => { code.Add(new BarcodeInfo() { Text = s.Text, CodeType = s.CodeType }); });
ismatch = TemplateExtract(curMatch,code, out Dictionary<string, string> keyword, out List<string> allkeys);
ismatch = TemplateExtract(curMatch, code, out Dictionary<string, string> keyword, out List<string> allkeys);
var codeMatch = curMatch.Match.FindAll(s => !string.IsNullOrEmpty(s.Keyword));
if (codeMatch != null)
{
......@@ -482,8 +483,8 @@ namespace SmartScan
StringBuilder sb = new StringBuilder();
foreach (var key in keyword.Keys)
{
var dul = allkeys.FindAll(s=>s.Equals(key));
if (dul!=null&& dul.Count>1)
var dul = allkeys.FindAll(s => s.Equals(key));
if (dul != null && dul.Count > 1)
{
sb.AppendLine(key);
}
......@@ -511,7 +512,7 @@ namespace SmartScan
}
if (!ismatch)
{
if(codeMatch.Count==0)
if (codeMatch.Count == 0)
{
string text = Language.Dialog(LanguageDialogKey.TEMPLATE_UN_SET_MATCHING, "[name] 模板不匹配，未设置匹配规则");
text = text.Replace("[name]", curMatch.Name);
......@@ -537,17 +538,17 @@ namespace SmartScan
StringBuilder sb = new StringBuilder();
for (int i = 0; i < mateCopy.Count; i++)
{
if(mateIndex == i) continue;
if (mateIndex == i) continue;
var othMatch = mateCopy[i];
bool ismatch = TemplateExtract(othMatch, code, out Dictionary<string, string> keyword, out List<string> allkeys);
if(ismatch)
if (ismatch)
{
sb.AppendLine(othMatch.Name);
LogNet.log.Info($"【{othMatch.Name}】模板与当前模板【{curMatch.Name}】匹配冲突");
}
}
string templates= sb.ToString();
if(templates.Length > 0)
string templates = sb.ToString();
if (templates.Length > 0)
{
string text = Language.Dialog(LanguageDialogKey.TEMPLATE_MATCHING_CONFLICT, "[name] 与以下的模板匹配冲突");
text = text.Replace("[name]", curMatch.Name);
......@@ -560,7 +561,7 @@ namespace SmartScan
}
return true;
}
private bool TemplateExtract(MaterialTemplate materialTemplate,List<BarcodeInfo> code, out Dictionary<string, string> keyword, out List<string> allKeywords)
private bool TemplateExtract(MaterialTemplate materialTemplate, List<BarcodeInfo> code, out Dictionary<string, string> keyword, out List<string> allKeywords)
{
keyword = new(StringComparer.OrdinalIgnoreCase);
allKeywords = new List<string>();
......
SmartScan/SmartScan.csproj
......@@ -401,6 +401,12 @@
</ItemGroup>
<ItemGroup>
<Content Include="App.ico" />
<Content Include="Language\en-US.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Language\zh-CN.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<None Include="Resources\copy.png" />
<None Include="Resources\validate.png" />
<None Include="Resources\filter.png" />
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!