Skip to content

顾剑亮 / SmartScan

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 73681466 由 刘韬
选项

1

1 个父辈 9942838e
全部展开
内嵌 并排
正在显示 58 个修改的文件 包含 57 行增加 和 35 行删除
BLL/BLL.csproj
...@@ -34,9 +34,9 @@ ...@@ -34,9 +34,9 @@
<LangVersion>preview</LangVersion> <LangVersion>preview</LangVersion>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="Asa.Face.Control, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Asa.Face.Control, Version=1.0.7916.18557, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\DLL\FaceControl\Asa.Face.Control.dll</HintPath> <HintPath>..\..\FaceControl\FaceControl\bin\Debug\Asa.Face.Control.dll</HintPath>
</Reference> </Reference>
<Reference Include="log4net, Version=2.0.12.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL"> <Reference Include="log4net, Version=2.0.12.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<HintPath>..\packages\log4net.2.0.12\lib\net45\log4net.dll</HintPath> <HintPath>..\packages\log4net.2.0.12\lib\net45\log4net.dll</HintPath>
......
BLL/Extension/Item_Alcoelectro.cs
...@@ -151,7 +151,7 @@ namespace BLL ...@@ -151,7 +151,7 @@ namespace BLL
if (obj == null || obj.Length == 0) if (obj == null || obj.Length == 0)
{ {
ClearHttpContent(); ClearHttpContent();
new FaceMessageBox("", Language.Dialog("ServerJson"), System.Windows.Forms.MessageBoxButtons.OK).ShowDialog(); new FaceMessageBox("", Language.Dialog("ServerJson"), System.Windows.Forms.MessageBoxButtons.OK, true).ShowDialog();
return; return;
} }
...@@ -239,7 +239,7 @@ namespace BLL ...@@ -239,7 +239,7 @@ namespace BLL
if (string.IsNullOrWhiteSpace(json)) if (string.IsNullOrWhiteSpace(json))
{ {
ClearHttpContent(); ClearHttpContent();
new FaceMessageBox("", Language.Dialog("ServerReturn"), System.Windows.Forms.MessageBoxButtons.OK).ShowDialog(); new FaceMessageBox("", Language.Dialog("ServerReturn"), System.Windows.Forms.MessageBoxButtons.OK, true).ShowDialog();
} }
else else
{ {
...@@ -352,7 +352,7 @@ namespace BLL ...@@ -352,7 +352,7 @@ namespace BLL
if (find) if (find)
{ {
string text = Language.Dialog("LabelEmpty"); string text = Language.Dialog("LabelEmpty");
FaceMessageBox dlg = new("", text, System.Windows.Forms.MessageBoxButtons.YesNo); FaceMessageBox dlg = new("", text, System.Windows.Forms.MessageBoxButtons.YesNo, true);
System.Windows.Forms.DialogResult dr = dlg.ShowDialog(); System.Windows.Forms.DialogResult dr = dlg.ShowDialog();
if (dr == System.Windows.Forms.DialogResult.No) if (dr == System.Windows.Forms.DialogResult.No)
return; return;
......
BLL/Extension/Item_Inventec.cs
...@@ -73,6 +73,8 @@ namespace BLL ...@@ -73,6 +73,8 @@ namespace BLL
//int index = extensions.FindIndex(match => match.Control.Name == "TxtSupplierPN"); //int index = extensions.FindIndex(match => match.Control.Name == "TxtSupplierPN");
//if (index == -1) return; //if (index == -1) return;
//PNPress(extensions[index].Control, EventArgs.Empty); //PNPress(extensions[index].Control, EventArgs.Empty);
GetReelid(null, EventArgs.Empty);
PrintLabel(null, EventArgs.Empty);
} }
...@@ -122,7 +124,7 @@ namespace BLL ...@@ -122,7 +124,7 @@ namespace BLL
if (!Convert.ToBoolean(value)) if (!Convert.ToBoolean(value))
{ {
new FaceMessageBox("BoxReelIDInfoMaintain", dic["message"].ToString(), System.Windows.Forms.MessageBoxButtons.OK).ShowDialog(); new FaceMessageBox("BoxReelIDInfoMaintain", dic["message"].ToString(), System.Windows.Forms.MessageBoxButtons.OK,true).ShowDialog();
return id; return id;
} }
...@@ -149,7 +151,7 @@ namespace BLL ...@@ -149,7 +151,7 @@ namespace BLL
//} //}
if (string.IsNullOrWhiteSpace(json)) if (string.IsNullOrWhiteSpace(json))
new FaceMessageBox("", Language.Dialog("ServerReturn"), System.Windows.Forms.MessageBoxButtons.OK).ShowDialog(); new FaceMessageBox("", Language.Dialog("ServerReturn"), System.Windows.Forms.MessageBoxButtons.OK, true).ShowDialog();
} }
...@@ -162,7 +164,7 @@ namespace BLL ...@@ -162,7 +164,7 @@ namespace BLL
object[] obj = (object[])serializer.DeserializeObject(json); object[] obj = (object[])serializer.DeserializeObject(json);
if (obj == null || obj.Length == 0) if (obj == null || obj.Length == 0)
{ {
new FaceMessageBox("", Language.Dialog("ServerJson"), System.Windows.Forms.MessageBoxButtons.OK).ShowDialog(); new FaceMessageBox("", Language.Dialog("ServerJson"), System.Windows.Forms.MessageBoxButtons.OK, true).ShowDialog();
return; return;
} }
...@@ -307,7 +309,7 @@ namespace BLL ...@@ -307,7 +309,7 @@ namespace BLL
if (newText == text) if (newText == text)
{ {
needPrint = true; needPrint = true;
new FaceMessageBox("", Language.Dialog("RepeatPrint"), System.Windows.Forms.MessageBoxButtons.OK).ShowDialog(); new FaceMessageBox("", Language.Dialog("RepeatPrint"), System.Windows.Forms.MessageBoxButtons.OK, true).ShowDialog();
} }
else else
{ {
...@@ -330,8 +332,8 @@ namespace BLL ...@@ -330,8 +332,8 @@ namespace BLL
if (needPrint) if (needPrint)
{ {
new FaceMessageBox("", Language.Dialog("RepeatPrint"), System.Windows.Forms.MessageBoxButtons.OK).ShowDialog(); //new FaceMessageBox("", Language.Dialog("RepeatPrint"), System.Windows.Forms.MessageBoxButtons.OK, true).ShowDialog();
return; //return;
} }
...@@ -350,7 +352,7 @@ namespace BLL ...@@ -350,7 +352,7 @@ namespace BLL
if (find) if (find)
{ {
string text = Language.Dialog("LabelEmpty"); string text = Language.Dialog("LabelEmpty");
FaceMessageBox dlg = new("", text, System.Windows.Forms.MessageBoxButtons.YesNo); FaceMessageBox dlg = new("", text, System.Windows.Forms.MessageBoxButtons.YesNo, true);
System.Windows.Forms.DialogResult dr = dlg.ShowDialog(); System.Windows.Forms.DialogResult dr = dlg.ShowDialog();
if (dr == System.Windows.Forms.DialogResult.No) if (dr == System.Windows.Forms.DialogResult.No)
return; return;
......
BLL/Extension/Item_NanRui.cs
...@@ -89,7 +89,7 @@ namespace BLL ...@@ -89,7 +89,7 @@ namespace BLL
{ {
mesConn = Http.Ping(mesIP); mesConn = Http.Ping(mesIP);
string text = mesIP + (mesConn ? " OK" : " Timeout"); string text = mesIP + (mesConn ? " OK" : " Timeout");
new FaceMessageBox("", text, System.Windows.Forms.MessageBoxButtons.OK).ShowDialog(); new FaceMessageBox("", text, System.Windows.Forms.MessageBoxButtons.OK, true).ShowDialog();
} }
/// <summary> /// <summary>
......
BLL/Extension/Item_PanaCIM.cs
...@@ -131,7 +131,7 @@ namespace BLL ...@@ -131,7 +131,7 @@ namespace BLL
//} //}
if (string.IsNullOrWhiteSpace(json)) if (string.IsNullOrWhiteSpace(json))
new FaceMessageBox("", Language.Dialog("ServerReturn"), System.Windows.Forms.MessageBoxButtons.OK).ShowDialog(); new FaceMessageBox("", Language.Dialog("ServerReturn"), System.Windows.Forms.MessageBoxButtons.OK, true).ShowDialog();
} }
...@@ -144,7 +144,7 @@ namespace BLL ...@@ -144,7 +144,7 @@ namespace BLL
object[] obj = (object[])serializer.DeserializeObject(json); object[] obj = (object[])serializer.DeserializeObject(json);
if (obj == null || obj.Length == 0) if (obj == null || obj.Length == 0)
{ {
new FaceMessageBox("", Language.Dialog("ServerJson"), System.Windows.Forms.MessageBoxButtons.OK).ShowDialog(); new FaceMessageBox("", Language.Dialog("ServerJson"), System.Windows.Forms.MessageBoxButtons.OK, true).ShowDialog();
return; return;
} }
...@@ -308,7 +308,7 @@ namespace BLL ...@@ -308,7 +308,7 @@ namespace BLL
if (find) if (find)
{ {
string text = Language.Dialog("LabelEmpty"); string text = Language.Dialog("LabelEmpty");
FaceMessageBox dlg = new("", text, System.Windows.Forms.MessageBoxButtons.YesNo); FaceMessageBox dlg = new("", text, System.Windows.Forms.MessageBoxButtons.YesNo, true);
System.Windows.Forms.DialogResult dr = dlg.ShowDialog(); System.Windows.Forms.DialogResult dr = dlg.ShowDialog();
if (dr == System.Windows.Forms.DialogResult.No) if (dr == System.Windows.Forms.DialogResult.No)
return; return;
......
BLL/obj/Debug/BLL.csproj.CoreCompileInputs.cache
7a7459e108b1f685b584e00f941a261d25ef6603 2ae66913ab37ff0c70bea941d4191eb40b957b11
BLL/obj/Debug/BLL.csproj.FileListAbsolute.txt
...@@ -85,3 +85,4 @@ D:\rick\vs\SmartScan\BLL\obj\Debug\BLL.pdb ...@@ -85,3 +85,4 @@ D:\rick\vs\SmartScan\BLL\obj\Debug\BLL.pdb
D:\rick\vs\SmartScan\BLL\obj\Debug\BLL.csproj.CopyComplete D:\rick\vs\SmartScan\BLL\obj\Debug\BLL.csproj.CopyComplete
D:\rick\vs\SmartScan\BLL\bin\Debug\Newtonsoft.Json.dll D:\rick\vs\SmartScan\BLL\bin\Debug\Newtonsoft.Json.dll
D:\rick\vs\SmartScan\BLL\bin\Debug\Newtonsoft.Json.xml D:\rick\vs\SmartScan\BLL\bin\Debug\Newtonsoft.Json.xml
D:\rick\vs\SmartScan\BLL\bin\Debug\Asa.Face.Control.dll
Model/Model.csproj
...@@ -38,8 +38,9 @@ ...@@ -38,8 +38,9 @@
<LangVersion>preview</LangVersion> <LangVersion>preview</LangVersion>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="Asa.Face.Control"> <Reference Include="Asa.Face.Control, Version=1.0.7916.18557, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\DLL\FaceControl\Asa.Face.Control.dll</HintPath> <SpecificVersion>False</SpecificVersion>
<HintPath>..\..\FaceControl\FaceControl\bin\Debug\Asa.Face.Control.dll</HintPath>
</Reference> </Reference>
<Reference Include="log4net, Version=2.0.12.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL"> <Reference Include="log4net, Version=2.0.12.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<HintPath>..\packages\log4net.2.0.12\lib\net45\log4net.dll</HintPath> <HintPath>..\packages\log4net.2.0.12\lib\net45\log4net.dll</HintPath>
......
Model/obj/Debug/Model.csproj.CoreCompileInputs.cache
62de25fe54404d10d847d59a6490be198ab56c6e 624c5de82cba8586709a860569c97dce6c9a28b4
Model/obj/Debug/Model.csproj.FileListAbsolute.txt
...@@ -52,3 +52,4 @@ D:\rick\vs\SmartScan\Model\obj\Debug\Model.csproj.CoreCompileInputs.cache ...@@ -52,3 +52,4 @@ D:\rick\vs\SmartScan\Model\obj\Debug\Model.csproj.CoreCompileInputs.cache
D:\rick\vs\SmartScan\Model\obj\Debug\Model.csproj.CopyComplete D:\rick\vs\SmartScan\Model\obj\Debug\Model.csproj.CopyComplete
D:\rick\vs\SmartScan\Model\obj\Debug\Model.dll D:\rick\vs\SmartScan\Model\obj\Debug\Model.dll
D:\rick\vs\SmartScan\Model\obj\Debug\Model.pdb D:\rick\vs\SmartScan\Model\obj\Debug\Model.pdb
D:\rick\vs\SmartScan\Model\bin\Debug\Asa.Face.Control.dll
SmartScan/Form/FrmWaitting.cs
using System; using Asa.FaceControl;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel; using System.ComponentModel;
using System.Data; using System.Data;
...@@ -35,6 +36,7 @@ namespace SmartScan ...@@ -35,6 +36,7 @@ namespace SmartScan
private void FrmWaitting_Load(object sender, EventArgs e) private void FrmWaitting_Load(object sender, EventArgs e)
{ {
this.Text = Language.Dialog("PleaseWaiting");//请稍后
faceLoading1.Start(); faceLoading1.Start();
} }
} }
......
SmartScan/ScanWork.cs
...@@ -79,7 +79,8 @@ namespace SmartScan ...@@ -79,7 +79,8 @@ namespace SmartScan
workCodeKeyword = new(); workCodeKeyword = new();
originalCodeText = null; originalCodeText = null;
originalCodeIsUsed = null; originalCodeIsUsed = null;
Common.frmMain.SetWaittingMsg("拍照识别...");
Common.frmMain.SetWaittingMsg(Language.Dialog("MaterialScanning"));//拍照识别...
if (!GetCodeInfo()) if (!GetCodeInfo())
{ {
isTouch = false; isTouch = false;
...@@ -90,9 +91,9 @@ namespace SmartScan ...@@ -90,9 +91,9 @@ namespace SmartScan
{ {
AddCodeCenter(); AddCodeCenter();
}); });
Common.frmMain.SetWaittingMsg("模版匹配..."); Common.frmMain.SetWaittingMsg(Language.Dialog("MaterialTemplateMatching"));//模版匹配...
MatchingTemplate(); MatchingTemplate();
Common.frmMain.SetWaittingMsg("计算结果..."); Common.frmMain.SetWaittingMsg(Language.Dialog("MaterialProcessing"));//计算结果...
Common.frmMain.Invoke(delegate () Common.frmMain.Invoke(delegate ()
{ {
SetKey(); SetKey();
......
SmartScan/SmartScan.csproj
...@@ -40,11 +40,13 @@ ...@@ -40,11 +40,13 @@
<ApplicationIcon>App.ico</ApplicationIcon> <ApplicationIcon>App.ico</ApplicationIcon>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="Asa.Camera.VisionLib"> <Reference Include="Asa.Camera.VisionLib, Version=1.3.7940.26720, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\DLL\Camera\Asa.Camera.VisionLib.dll</HintPath> <SpecificVersion>False</SpecificVersion>
<HintPath>..\..\Camera\CameraVisionLib\bin\Debug\Asa.Camera.VisionLib.dll</HintPath>
</Reference> </Reference>
<Reference Include="Asa.Face.Control"> <Reference Include="Asa.Face.Control, Version=1.0.7916.18557, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\DLL\FaceControl\Asa.Face.Control.dll</HintPath> <SpecificVersion>False</SpecificVersion>
<HintPath>..\..\FaceControl\FaceControl\bin\Debug\Asa.Face.Control.dll</HintPath>
</Reference> </Reference>
<Reference Include="log4net, Version=2.0.12.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL"> <Reference Include="log4net, Version=2.0.12.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<HintPath>..\packages\log4net.2.0.12\lib\net45\log4net.dll</HintPath> <HintPath>..\packages\log4net.2.0.12\lib\net45\log4net.dll</HintPath>
......
SmartScan/bin/Debug/Config/ReelID
67
\ No newline at end of file \ No newline at end of file
69
\ No newline at end of file \ No newline at end of file
SmartScan/bin/Debug/Language/en-US.xml
...@@ -20,6 +20,10 @@ ...@@ -20,6 +20,10 @@
<KeyRepeat>Repeat keyword</KeyRepeat> <KeyRepeat>Repeat keyword</KeyRepeat>
<UnlockWrong>Wrong unlock password</UnlockWrong> <UnlockWrong>Wrong unlock password</UnlockWrong>
<RepeatPrint>The tray label has been printed</RepeatPrint> <RepeatPrint>The tray label has been printed</RepeatPrint>
<MaterialScanning>In recognition...</MaterialScanning>
<MaterialTemplateMatching>Template matching...</MaterialTemplateMatching>
<MaterialProcessing>Processing results...</MaterialProcessing>
<PleaseWaiting>Please Waiting...</PleaseWaiting>
</Dialog> </Dialog>
<FrmUsersLogin Text="Login" Font="Arial,24,B,"> <FrmUsersLogin Text="Login" Font="Arial,24,B,">
<LblUser Text="User name" Font="Arial,11,," /> <LblUser Text="User name" Font="Arial,11,," />
......
SmartScan/bin/Debug/Language/zh-CN.xml
...@@ -20,6 +20,10 @@ ...@@ -20,6 +20,10 @@
<KeyRepeat>重复关键字</KeyRepeat> <KeyRepeat>重复关键字</KeyRepeat>
<UnlockWrong>解锁密码错误</UnlockWrong> <UnlockWrong>解锁密码错误</UnlockWrong>
<RepeatPrint>该料盘标签已打印</RepeatPrint> <RepeatPrint>该料盘标签已打印</RepeatPrint>
<MaterialScanning>拍照识别...</MaterialScanning>
<MaterialTemplateMatching>模版匹配...</MaterialTemplateMatching>
<MaterialProcessing>计算结果...</MaterialProcessing>
<PleaseWaiting>请稍后...</PleaseWaiting>
</Dialog> </Dialog>
<FrmUsersLogin Text="登录" Font="微软雅黑,24,B,"> <FrmUsersLogin Text="登录" Font="微软雅黑,24,B,">
<LblUser Text="用户名：" Font="微软雅黑,11,," /> <LblUser Text="用户名：" Font="微软雅黑,11,," />
......
SmartScan/bin/Debug/Logs/SmartScan.log
此文件的差异太大，无法显示。
SmartScan/bin/Debug/Logs/VisionLib.log2021-12-27.log 0 → 100644

\ No newline at end of file \ No newline at end of file
SmartScan/obj/Debug/SmartScan.csproj.CoreCompileInputs.cache
4333af2adfbc3adc2dfa3ba00bf8d03383a71223 a0e03d0d2ba6d87d76ccae0a1e72703b1564a0a5
SmartScan/obj/Debug/SmartScan.csproj.FileListAbsolute.txt
...@@ -119,14 +119,9 @@ D:\rick\vs\SmartScan\SmartScan\bin\Debug\DAL.dll ...@@ -119,14 +119,9 @@ D:\rick\vs\SmartScan\SmartScan\bin\Debug\DAL.dll
D:\rick\vs\SmartScan\SmartScan\bin\Debug\zxing.dll D:\rick\vs\SmartScan\SmartScan\bin\Debug\zxing.dll
D:\rick\vs\SmartScan\SmartScan\bin\Debug\RestSharp.dll D:\rick\vs\SmartScan\SmartScan\bin\Debug\RestSharp.dll
D:\rick\vs\SmartScan\SmartScan\bin\Debug\Tesseract.dll D:\rick\vs\SmartScan\SmartScan\bin\Debug\Tesseract.dll
D:\rick\vs\SmartScan\SmartScan\bin\Debug\Basler.Pylon.dll
D:\rick\vs\SmartScan\SmartScan\bin\Debug\MvCameraControl.Net.dll
D:\rick\vs\SmartScan\SmartScan\bin\Debug\halcondotnet.dll
D:\rick\vs\SmartScan\SmartScan\bin\Debug\System.Data.SQLite.dll D:\rick\vs\SmartScan\SmartScan\bin\Debug\System.Data.SQLite.dll
D:\rick\vs\SmartScan\SmartScan\bin\Debug\BLL.pdb D:\rick\vs\SmartScan\SmartScan\bin\Debug\BLL.pdb
D:\rick\vs\SmartScan\SmartScan\bin\Debug\Model.pdb D:\rick\vs\SmartScan\SmartScan\bin\Debug\Model.pdb
D:\rick\vs\SmartScan\SmartScan\bin\Debug\Asa.Camera.VisionLib.pdb
D:\rick\vs\SmartScan\SmartScan\bin\Debug\Asa.Camera.VisionLib.xml
D:\rick\vs\SmartScan\SmartScan\bin\Debug\Asa.Face.Control.pdb D:\rick\vs\SmartScan\SmartScan\bin\Debug\Asa.Face.Control.pdb
D:\rick\vs\SmartScan\SmartScan\bin\Debug\log4net.xml D:\rick\vs\SmartScan\SmartScan\bin\Debug\log4net.xml
D:\rick\vs\SmartScan\SmartScan\bin\Debug\DAL.pdb D:\rick\vs\SmartScan\SmartScan\bin\Debug\DAL.pdb
...@@ -159,3 +154,11 @@ D:\rick\vs\SmartScan\SmartScan\obj\Debug\SmartScan.csproj.CopyComplete ...@@ -159,3 +154,11 @@ D:\rick\vs\SmartScan\SmartScan\obj\Debug\SmartScan.csproj.CopyComplete
D:\rick\vs\SmartScan\SmartScan\bin\Debug\Newtonsoft.Json.dll D:\rick\vs\SmartScan\SmartScan\bin\Debug\Newtonsoft.Json.dll
D:\rick\vs\SmartScan\SmartScan\bin\Debug\Newtonsoft.Json.xml D:\rick\vs\SmartScan\SmartScan\bin\Debug\Newtonsoft.Json.xml
D:\rick\vs\SmartScan\SmartScan\obj\Debug\SmartScan.FrmWaitting.resources D:\rick\vs\SmartScan\SmartScan\obj\Debug\SmartScan.FrmWaitting.resources
D:\rick\vs\SmartScan\SmartScan\bin\Debug\Asa.Face.Control.dll
D:\rick\vs\SmartScan\SmartScan\bin\Debug\Asa.Camera.VisionLib.dll
D:\rick\vs\SmartScan\SmartScan\bin\Debug\Basler.Pylon.dll
D:\rick\vs\SmartScan\SmartScan\bin\Debug\MvCameraControl.Net.dll
D:\rick\vs\SmartScan\SmartScan\bin\Debug\halcondotnet.dll
D:\rick\vs\SmartScan\SmartScan\bin\Debug\Asa.Camera.VisionLib.pdb
D:\rick\vs\SmartScan\SmartScan\bin\Debug\Asa.Camera.VisionLib.xml
D:\rick\vs\SmartScan\SmartScan\bin\Debug\MvCameraControl.Net.xml
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!