Skip to content

顾剑亮 / SmartScan

转到一个项目
切换导航栏
切换导航栏固定状态
Commit e52d5ace 由 张东亮
选项

创建模板时，名字相同不允许创建

1 个父辈 5bd32f6f
内嵌 并排
正在显示 26 个修改的文件 包含 54 行增加 和 5 行删除
SmartScan/Form/FrmLoading.cs
...@@ -22,8 +22,8 @@ namespace SmartScan ...@@ -22,8 +22,8 @@ namespace SmartScan
{ {
Process current = Process.GetCurrentProcess(); Process current = Process.GetCurrentProcess();
FileInfo fileInfo = new FileInfo(current.MainModule.FileName); FileInfo fileInfo = new FileInfo(current.MainModule.FileName);
DateTime dateTime = fileInfo.CreationTime; DateTime dateTime = fileInfo.LastWriteTime;
string version = $"{dateTime.Year%10}.{dateTime.Month}.{dateTime.Day}{dateTime.Hour}"; string version = $"{dateTime.Year%10}.{dateTime.Month}.{dateTime.Day.ToString("00")}{dateTime.Hour.ToString("00")}";
LogNet.log = log4net.LogManager.GetLogger("SmartScan"); LogNet.log = log4net.LogManager.GetLogger("SmartScan");
LogNet.log.Info($"===== 程序开始 {version} ====="); LogNet.log.Info($"===== 程序开始 {version} =====");
......
SmartScan/SetControl/UsrMaterialTemplate.cs
...@@ -117,7 +117,13 @@ namespace SmartScan ...@@ -117,7 +117,13 @@ namespace SmartScan
DialogResult dr = input.ShowDialog(); DialogResult dr = input.ShowDialog();
if (dr != DialogResult.OK) return; if (dr != DialogResult.OK) return;
if (string.IsNullOrWhiteSpace(input.InputValue)) return; if (string.IsNullOrWhiteSpace(input.InputValue)) return;
//检查是否有已存在的名称
var find= mateCopy.Find(s => s.Name.Equals(input.InputValue));
if(find !=null)
{
MessageBox.Show($"A template named {input.InputValue} already exists.");
return;
}
mateCopy.Add(new() { Name = input.InputValue }); mateCopy.Add(new() { Name = input.InputValue });
mateCopy[mateCopy.Count - 1].State = TemplateState.Unsaved; mateCopy[mateCopy.Count - 1].State = TemplateState.Unsaved;
......
SmartScan/bin/Debug/Logs/SmartScan.log
...@@ -1082,3 +1082,18 @@ ...@@ -1082,3 +1082,18 @@
[2023-03-20 15:24:45,035][SmartScan.WebService:0]INFO Web服务已关闭 [2023-03-20 15:24:45,035][SmartScan.WebService:0]INFO Web服务已关闭
[2023-03-20 15:24:45,035][SmartScan.Program:0]INFO =====程序结束===== [2023-03-20 15:24:45,035][SmartScan.Program:0]INFO =====程序结束=====
[2023-03-21 11:52:02,520][SmartScan.FrmLoading:28]INFO ===== 程序开始 3.03.2111 =====
[2023-03-21 11:52:02,559][DAL.ConfigRW:17]INFO 读取配置文件
[2023-03-21 11:52:02,568][BLL.ExtraFileData:32]INFO 数据源:C:\download\sample.csv
[2023-03-21 11:52:02,569][BLL.ExtraFileData:55]INFO 数据源加载文件:C:\download\sample.csv
[2023-03-21 11:52:05,100][SmartScan.FrmLoading:40]INFO 加载相机，数量：0
[2023-03-21 11:52:05,100][SmartScan.FrmLoading:53]INFO 加载OCR模块
[2023-03-21 11:52:05,102][BLL.Extension:38]INFO 加载扩展：General
[2023-03-21 11:52:05,105][BLL.PrintLabelEdit:49]INFO 读取打印标签
[2023-03-21 11:52:05,118][BLL.MaterialEdit:23]INFO 读取物料模板
[2023-03-21 11:52:06,279][SmartScan.WebService:19]INFO WebService没有配置，不开启
[2023-03-21 11:52:06,280][SmartScan.FrmLoading:69]INFO 读取关键字文件
[2023-03-21 11:52:06,985][SmartScan.FrmMain:48]INFO 相机已禁用
[2023-03-21 11:52:06,989][SmartScan.FrmMain:74]INFO IO模块已禁用
[2023-03-21 11:52:06,991][SmartScan.ScanWork:38]INFO Work Start
[2023-03-21 11:52:08,627][SmartScan.ScanWork:56]INFO Work Stop
SmartScan/bin/Debug/Logs/VisionLib.log

\ No newline at end of file \ No newline at end of file
[2023-03-21 11:52:02,520][SmartScan.FrmLoading:28]INFO ===== 程序开始 3.03.2111 =====
[2023-03-21 11:52:02,559][DAL.ConfigRW:17]INFO 读取配置文件
[2023-03-21 11:52:02,568][BLL.ExtraFileData:32]INFO 数据源:C:\download\sample.csv
[2023-03-21 11:52:02,569][BLL.ExtraFileData:55]INFO 数据源加载文件:C:\download\sample.csv
[2023-03-21 11:52:02,589][Asa.Camera.VisionLib:11]DEBUG GetConfig Path=E:\Codes\Neotel\SmartScan\SmartScan\bin\Debug\Config\Camera.json
[2023-03-21 11:52:02,640][Asa.Camera.VisionLib:35]DEBUG GetConfig_CodeOrder
[2023-03-21 11:52:02,640][Asa.Camera.VisionLib:41]DEBUG GetConfig_Halcon
[2023-03-21 11:52:02,641][Asa.Camera.VisionLib:53]DEBUG GetConfig_EyemLib
[2023-03-21 11:52:02,643][Asa.Camera.VisionLib:69]DEBUG GetConfig_Region
[2023-03-21 11:52:04,989][Asa.Region.Feature:51]INFO Feature init 0
[2023-03-21 11:52:05,026][Asa.Region.Feature:51]INFO Feature init 0
[2023-03-21 11:52:05,061][Asa.Region.Feature:51]INFO Feature init 0
[2023-03-21 11:52:05,098][Asa.Region.Feature:51]INFO Feature init 0
[2023-03-21 11:52:05,099][Asa.Camera.VisionLib:107]DEBUG GetConfig_HIKIPCamera
[2023-03-21 11:52:05,100][SmartScan.FrmLoading:40]INFO 加载相机，数量：0
[2023-03-21 11:52:05,100][SmartScan.FrmLoading:53]INFO 加载OCR模块
[2023-03-21 11:52:05,102][BLL.Extension:38]INFO 加载扩展：General
[2023-03-21 11:52:05,105][BLL.PrintLabelEdit:49]INFO 读取打印标签
[2023-03-21 11:52:05,118][BLL.MaterialEdit:23]INFO 读取物料模板
[2023-03-21 11:52:06,279][SmartScan.WebService:19]INFO WebService没有配置，不开启
[2023-03-21 11:52:06,280][SmartScan.FrmLoading:69]INFO 读取关键字文件
[2023-03-21 11:52:06,985][SmartScan.FrmMain:48]INFO 相机已禁用
[2023-03-21 11:52:06,989][SmartScan.FrmMain:74]INFO IO模块已禁用
[2023-03-21 11:52:06,991][SmartScan.ScanWork:38]INFO Work Start
[2023-03-21 11:52:08,627][SmartScan.ScanWork:56]INFO Work Stop
SmartScan/bin/Debug/log4net.config
...@@ -5,10 +5,14 @@ ...@@ -5,10 +5,14 @@
<level value="Info"/> <level value="Info"/>
<appender-ref ref="SmartScan"/> <appender-ref ref="SmartScan"/>
</logger> </logger>
<logger name="VisionLib" > <logger name="VisionLib">
<level value="Debug"/> <level value="Debug"/>
<appender-ref ref="VisionLib"/> <appender-ref ref="VisionLib"/>
</logger> </logger>
<root>
<level value="Debug"/>
<appender-ref ref="VisionLib"/>
</root>
<appender name="SmartScan" type="log4net.Appender.RollingFileAppender"> <appender name="SmartScan" type="log4net.Appender.RollingFileAppender">
<param name="File" value="Logs\\SmartScan.log" /> <param name="File" value="Logs\\SmartScan.log" />
<param name="Encoding" value="UTF-8"/> <param name="Encoding" value="UTF-8"/>
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!