Commit 2dca365c 张东亮

merge

2 个父辈 bc632dd6 d74613d1
正在显示 106 个修改的文件 包含 77 行增加394 行删除
此文件类型无法预览
......@@ -116,6 +116,9 @@
<Compile Include="UsersLogin.cs" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\DAL\DAL.csproj">
<Project>{e28de77a-fc70-4be4-96ec-d0c1a7215a15}</Project>
<Name>DAL</Name>
......@@ -125,8 +128,5 @@
<Name>Model</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
\ No newline at end of file
......@@ -32,6 +32,7 @@ namespace BLL
LogNet.log.Info("数据源:" + Config.DataSource_String);
if (!File.Exists(Config.DataSource_String))
{
return;
throw new FileNotFoundException(Config.DataSource_String);
}
Titles = ParseCSVFileTitle(Config.DataSource_String);
......@@ -85,6 +86,9 @@ namespace BLL
}
public static List<string> ParseCSVFileTitle(string filename)
{
if (!File.Exists(filename))
return new List<string>() ;
using var sm = new StreamReader(filename, Encoding.GetEncoding(Config.DataSource_Encoding.Val));
var titleline = sm.ReadLine();
var titles = new List<string>(titleline.Split(','));
......
......@@ -54,6 +54,8 @@ namespace BLL
}
public static void MatchResult(string matchKey, bool isMatch) {
if (!MatchTemplateList[CurrnetTemplateName].BarcodeMatchs[CurrnetBarcode.Text].MatchCollections.ContainsKey(matchKey))
return;
MatchTemplateList[CurrnetTemplateName].BarcodeMatchs[CurrnetBarcode.Text].MatchCollections[matchKey].isMatch = isMatch;
MatchTemplateList[CurrnetTemplateName].MatchCollections[matchKey]=MatchTemplateList[CurrnetTemplateName].BarcodeMatchs[CurrnetBarcode.Text].MatchCollections[matchKey];
MatchTemplateList[CurrnetTemplateName].MatchCollections[matchKey].barcodeInfo = CurrnetBarcode;
......
此文件类型无法预览
此文件类型无法预览
此文件类型无法预览
此文件类型无法预览
此文件类型无法预览
此文件的差异太大,无法显示。
此文件类型无法预览
此文件的差异太大,无法显示。
此文件的差异太大,无法显示。
此文件类型无法预览
此文件类型无法预览
此文件的差异太大,无法显示。
此文件类型无法预览
此文件的差异太大,无法显示。
// <autogenerated />
using System;
using System.Reflection;
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.6.1", FrameworkDisplayName = ".NET Framework 4.6.1")]
1c92e9c1a18f82621ee6c586b63427453996ef1a
C:\Neotel\Program_Beta\SmartScan\BLL\bin\Debug\BLL.dll
C:\Neotel\Program_Beta\SmartScan\BLL\bin\Debug\BLL.pdb
C:\Neotel\Program_Beta\SmartScan\BLL\obj\Debug\BLL.csprojAssemblyReference.cache
C:\Neotel\Program_Beta\SmartScan\BLL\obj\Debug\BLL.csproj.CoreCompileInputs.cache
C:\Neotel\Program_Beta\SmartScan\BLL\obj\Debug\BLL.dll
C:\Neotel\Program_Beta\SmartScan\BLL\obj\Debug\BLL.pdb
C:\Neotel\Program_Beta\SmartScan\BLL\bin\Debug\DAL.dll
C:\Neotel\Program_Beta\SmartScan\BLL\bin\Debug\Model.dll
C:\Neotel\Program_Beta\SmartScan\BLL\bin\Debug\Asa.Face.Control.dll
C:\Neotel\Program_Beta\SmartScan\BLL\bin\Debug\DAL.pdb
C:\Neotel\Program_Beta\SmartScan\BLL\bin\Debug\Model.pdb
C:\Neotel\Program_Beta\SmartScan\BLL\bin\Debug\Asa.Face.Control.pdb
C:\Neotel\Program_Beta\SmartScan\BLL\obj\Debug\BLL.csproj.CopyComplete
C:\Neotel\Program_Beta\SmartScan\BLL\bin\Debug\log4net.config
C:\Neotel\Program_Beta\SmartScan\BLL\bin\Debug\log4net.dll
C:\Neotel\Program_Beta\SmartScan\BLL\bin\Debug\log4net.xml
C:\Neotel\Program_Beta\SmartScan\BLL\bin\Debug\zxing.dll
C:\Neotel\Program_Beta\SmartScan\BLL\bin\Debug\zxing.xml
C:\Neotel\Program_Beta\SmartScan\BLL\bin\Debug\x86\liblept1753.dll
C:\Neotel\Program_Beta\SmartScan\BLL\bin\Debug\x86\libtesseract3052.dll
C:\Neotel\Program_Beta\SmartScan\BLL\bin\Debug\x64\liblept1753.dll
C:\Neotel\Program_Beta\SmartScan\BLL\bin\Debug\x64\libtesseract3052.dll
C:\Neotel\Program_Beta\SmartScan\BLL\bin\Debug\Tesseract.dll
C:\Neotel\Program_Beta\SmartScan\BLL\bin\Debug\zxing.presentation.dll
C:\Neotel\Program_Beta\SmartScan\BLL\bin\Debug\zxing.presentation.xml
C:\Neotel\Program_Beta\SmartScan\BLL\bin\Debug\ExtensionGroup.dll
C:\Neotel\Program_Beta\SmartScan\BLL\bin\Debug\ExtensionGroup.pdb
C:\Neotel\Program_Beta\SmartScan\BLL\bin\Debug\RestSharp.dll
C:\Neotel\Program_Beta\SmartScan\BLL\bin\Debug\RestSharp.xml
C:\Neotel\Program_Beta\SmartScan\BLL\bin\Debug\Model.xml
C:\Neotel\Program\SmartScan\BLL\bin\Debug\x86\liblept1753.dll
C:\Neotel\Program\SmartScan\BLL\bin\Debug\x86\libtesseract3052.dll
C:\Neotel\Program\SmartScan\BLL\bin\Debug\x64\liblept1753.dll
C:\Neotel\Program\SmartScan\BLL\bin\Debug\x64\libtesseract3052.dll
C:\Neotel\Program\SmartScan\BLL\bin\Debug\BLL.dll
C:\Neotel\Program\SmartScan\BLL\bin\Debug\BLL.pdb
C:\Neotel\Program\SmartScan\BLL\bin\Debug\Asa.Face.Control.dll
C:\Neotel\Program\SmartScan\BLL\bin\Debug\DAL.dll
C:\Neotel\Program\SmartScan\BLL\bin\Debug\log4net.dll
C:\Neotel\Program\SmartScan\BLL\bin\Debug\Model.dll
C:\Neotel\Program\SmartScan\BLL\bin\Debug\zxing.dll
C:\Neotel\Program\SmartScan\BLL\bin\Debug\zxing.presentation.dll
C:\Neotel\Program\SmartScan\BLL\bin\Debug\System.Data.SQLite.dll
C:\Neotel\Program\SmartScan\BLL\bin\Debug\RestSharp.dll
C:\Neotel\Program\SmartScan\BLL\bin\Debug\Tesseract.dll
C:\Neotel\Program\SmartScan\BLL\bin\Debug\DAL.pdb
C:\Neotel\Program\SmartScan\BLL\bin\Debug\Model.pdb
C:\Neotel\Program\SmartScan\BLL\bin\Debug\Asa.Face.Control.pdb
C:\Neotel\Program\SmartScan\BLL\bin\Debug\log4net.xml
C:\Neotel\Program\SmartScan\BLL\bin\Debug\zxing.xml
C:\Neotel\Program\SmartScan\BLL\bin\Debug\zxing.presentation.xml
C:\Neotel\Program\SmartScan\BLL\bin\Debug\System.Data.SQLite.xml
C:\Neotel\Program\SmartScan\BLL\bin\Debug\RestSharp.xml
C:\Neotel\Program\SmartScan\BLL\obj\Debug\BLL.csproj.AssemblyReference.cache
C:\Neotel\Program\SmartScan\BLL\obj\Debug\BLL.csproj.CoreCompileInputs.cache
C:\Neotel\Program\SmartScan\BLL\obj\Debug\BLL.csproj.CopyComplete
C:\Neotel\Program\SmartScan\BLL\obj\Debug\BLL.dll
C:\Neotel\Program\SmartScan\BLL\obj\Debug\BLL.pdb
D:\rick\vs\SmartScan\BLL\bin\Debug\x86\liblept1753.dll
D:\rick\vs\SmartScan\BLL\bin\Debug\x86\libtesseract3052.dll
D:\rick\vs\SmartScan\BLL\bin\Debug\x64\liblept1753.dll
D:\rick\vs\SmartScan\BLL\bin\Debug\x64\libtesseract3052.dll
D:\rick\vs\SmartScan\BLL\bin\Debug\BLL.dll
D:\rick\vs\SmartScan\BLL\bin\Debug\BLL.pdb
D:\rick\vs\SmartScan\BLL\bin\Debug\DAL.dll
D:\rick\vs\SmartScan\BLL\bin\Debug\log4net.dll
D:\rick\vs\SmartScan\BLL\bin\Debug\Model.dll
D:\rick\vs\SmartScan\BLL\bin\Debug\zxing.dll
D:\rick\vs\SmartScan\BLL\bin\Debug\zxing.presentation.dll
D:\rick\vs\SmartScan\BLL\bin\Debug\System.Data.SQLite.dll
D:\rick\vs\SmartScan\BLL\bin\Debug\RestSharp.dll
D:\rick\vs\SmartScan\BLL\bin\Debug\Tesseract.dll
D:\rick\vs\SmartScan\BLL\bin\Debug\DAL.pdb
D:\rick\vs\SmartScan\BLL\bin\Debug\Model.pdb
D:\rick\vs\SmartScan\BLL\bin\Debug\Asa.Face.Control.pdb
D:\rick\vs\SmartScan\BLL\bin\Debug\log4net.xml
D:\rick\vs\SmartScan\BLL\bin\Debug\zxing.xml
D:\rick\vs\SmartScan\BLL\bin\Debug\zxing.presentation.xml
D:\rick\vs\SmartScan\BLL\bin\Debug\System.Data.SQLite.xml
D:\rick\vs\SmartScan\BLL\bin\Debug\RestSharp.xml
D:\rick\vs\SmartScan\BLL\obj\Debug\BLL.csproj.AssemblyReference.cache
D:\rick\vs\SmartScan\BLL\obj\Debug\BLL.csproj.CoreCompileInputs.cache
D:\rick\vs\SmartScan\BLL\obj\Debug\BLL.dll
D:\rick\vs\SmartScan\BLL\obj\Debug\BLL.pdb
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.xml
D:\rick\vs\SmartScan\BLL\bin\Debug\Asa.Face.Control.dll
D:\rick\vs\SmartScan\BLL\bin\Debug\Asa.Camera.VisionLib.dll
D:\rick\vs\SmartScan\BLL\bin\Debug\Basler.Pylon.dll
D:\rick\vs\SmartScan\BLL\bin\Debug\MvCameraControl.Net.dll
D:\rick\vs\SmartScan\BLL\bin\Debug\halcondotnet.dll
D:\rick\vs\SmartScan\BLL\bin\Debug\Asa.Camera.VisionLib.pdb
D:\rick\vs\SmartScan\BLL\bin\Debug\Asa.Camera.VisionLib.xml
D:\rick\vs\SmartScan\BLL\bin\Debug\MvCameraControl.Net.xml
D:\rick\vs\SmartScan\BLL\bin\Debug\TcpKPIO.dll
D:\rick\vs\SmartScan\BLL\bin\Debug\TcpKPIO.pdb
D:\rick\vs\SmartScan\BLL\bin\Debug\TcpKPIO.xml
D:\rick\vs\SmartScan\BLL\bin\Debug\ConfigHelper.dll
D:\rick\vs\SmartScan\BLL\bin\Debug\ConfigHelper.pdb
D:\rick\vs\SmartScan\BLL\bin\Debug\ConfigHelper.xml
D:\rick\vs\SmartScan\BLL\bin\Debug\ClosedXML.dll
D:\rick\vs\SmartScan\BLL\bin\Debug\DocumentFormat.OpenXml.dll
D:\rick\vs\SmartScan\BLL\bin\Debug\ExcelNumberFormat.dll
D:\rick\vs\SmartScan\BLL\bin\Debug\ClosedXML.pdb
D:\rick\vs\SmartScan\BLL\bin\Debug\ClosedXML.xml
D:\rick\vs\SmartScan\BLL\bin\Debug\DocumentFormat.OpenXml.xml
D:\rick\vs\SmartScan\BLL\bin\Debug\ExcelNumberFormat.xml
E:\Codes\Neotel\SmartScan\BLL\bin\Debug\x86\liblept1753.dll
E:\Codes\Neotel\SmartScan\BLL\bin\Debug\x86\libtesseract3052.dll
E:\Codes\Neotel\SmartScan\BLL\bin\Debug\x64\liblept1753.dll
E:\Codes\Neotel\SmartScan\BLL\bin\Debug\x64\libtesseract3052.dll
E:\Codes\Neotel\SmartScan\BLL\bin\Debug\BLL.dll
E:\Codes\Neotel\SmartScan\BLL\bin\Debug\BLL.pdb
E:\Codes\Neotel\SmartScan\BLL\bin\Debug\Asa.Camera.VisionLib.dll
E:\Codes\Neotel\SmartScan\BLL\bin\Debug\Asa.Face.Control.dll
E:\Codes\Neotel\SmartScan\BLL\bin\Debug\ClosedXML.dll
E:\Codes\Neotel\SmartScan\BLL\bin\Debug\ConfigHelper.dll
E:\Codes\Neotel\SmartScan\BLL\bin\Debug\DAL.dll
E:\Codes\Neotel\SmartScan\BLL\bin\Debug\DocumentFormat.OpenXml.dll
E:\Codes\Neotel\SmartScan\BLL\bin\Debug\ExcelNumberFormat.dll
E:\Codes\Neotel\SmartScan\BLL\bin\Debug\log4net.dll
E:\Codes\Neotel\SmartScan\BLL\bin\Debug\Model.dll
E:\Codes\Neotel\SmartScan\BLL\bin\Debug\Newtonsoft.Json.dll
E:\Codes\Neotel\SmartScan\BLL\bin\Debug\zxing.dll
E:\Codes\Neotel\SmartScan\BLL\bin\Debug\zxing.presentation.dll
E:\Codes\Neotel\SmartScan\BLL\bin\Debug\System.Data.SQLite.dll
E:\Codes\Neotel\SmartScan\BLL\bin\Debug\RestSharp.dll
E:\Codes\Neotel\SmartScan\BLL\bin\Debug\Tesseract.dll
E:\Codes\Neotel\SmartScan\BLL\bin\Debug\Basler.Pylon.dll
E:\Codes\Neotel\SmartScan\BLL\bin\Debug\MvCameraControl.Net.dll
E:\Codes\Neotel\SmartScan\BLL\bin\Debug\DAL.pdb
E:\Codes\Neotel\SmartScan\BLL\bin\Debug\Model.pdb
E:\Codes\Neotel\SmartScan\BLL\bin\Debug\Asa.Camera.VisionLib.xml
E:\Codes\Neotel\SmartScan\BLL\bin\Debug\ClosedXML.pdb
E:\Codes\Neotel\SmartScan\BLL\bin\Debug\ClosedXML.xml
E:\Codes\Neotel\SmartScan\BLL\bin\Debug\ConfigHelper.xml
E:\Codes\Neotel\SmartScan\BLL\bin\Debug\DocumentFormat.OpenXml.xml
E:\Codes\Neotel\SmartScan\BLL\bin\Debug\ExcelNumberFormat.xml
E:\Codes\Neotel\SmartScan\BLL\bin\Debug\log4net.xml
E:\Codes\Neotel\SmartScan\BLL\bin\Debug\Newtonsoft.Json.xml
E:\Codes\Neotel\SmartScan\BLL\bin\Debug\zxing.xml
E:\Codes\Neotel\SmartScan\BLL\bin\Debug\zxing.presentation.xml
E:\Codes\Neotel\SmartScan\BLL\bin\Debug\System.Data.SQLite.xml
E:\Codes\Neotel\SmartScan\BLL\bin\Debug\RestSharp.xml
E:\Codes\Neotel\SmartScan\BLL\bin\Debug\MvCameraControl.Net.xml
E:\Codes\Neotel\SmartScan\BLL\obj\Debug\BLL.csproj.AssemblyReference.cache
E:\Codes\Neotel\SmartScan\BLL\obj\Debug\BLL.csproj.CoreCompileInputs.cache
E:\Codes\Neotel\SmartScan\BLL\obj\Debug\BLL.csproj.CopyComplete
E:\Codes\Neotel\SmartScan\BLL\obj\Debug\BLL.dll
E:\Codes\Neotel\SmartScan\BLL\obj\Debug\BLL.pdb
// <autogenerated />
using System;
using System.Reflection;
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.6.1", FrameworkDisplayName = ".NET Framework 4.6.1")]
......@@ -9,11 +9,12 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>DAL</RootNamespace>
<AssemblyName>DAL</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<Deterministic>true</Deterministic>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
......
// <autogenerated />
using System;
using System.Reflection;
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.6.1", FrameworkDisplayName = ".NET Framework 4.6.1")]
4dcab845fc2ffd8a4f82e25805cd3c1e6dab6a84
C:\Neotel\Program_Beta\SmartScan\DAL\bin\Debug\DAL.dll
C:\Neotel\Program_Beta\SmartScan\DAL\bin\Debug\DAL.pdb
C:\Neotel\Program_Beta\SmartScan\DAL\obj\Debug\DAL.csproj.CoreCompileInputs.cache
C:\Neotel\Program_Beta\SmartScan\DAL\obj\Debug\DAL.dll
C:\Neotel\Program_Beta\SmartScan\DAL\obj\Debug\DAL.pdb
C:\Neotel\Program_Beta\SmartScan\DAL\obj\Debug\DAL.csprojAssemblyReference.cache
C:\Neotel\Program_Beta\SmartScan\DAL\bin\Debug\log4net.config
C:\Neotel\Program_Beta\SmartScan\DAL\bin\Debug\x86\liblept1753.dll
C:\Neotel\Program_Beta\SmartScan\DAL\bin\Debug\x86\libtesseract3052.dll
C:\Neotel\Program_Beta\SmartScan\DAL\bin\Debug\x64\liblept1753.dll
C:\Neotel\Program_Beta\SmartScan\DAL\bin\Debug\x64\libtesseract3052.dll
C:\Neotel\Program_Beta\SmartScan\DAL\bin\Debug\Model.dll
C:\Neotel\Program_Beta\SmartScan\DAL\bin\Debug\System.Data.SQLite.dll
C:\Neotel\Program_Beta\SmartScan\DAL\bin\Debug\log4net.dll
C:\Neotel\Program_Beta\SmartScan\DAL\bin\Debug\Asa.Face.Control.dll
C:\Neotel\Program_Beta\SmartScan\DAL\bin\Debug\Tesseract.dll
C:\Neotel\Program_Beta\SmartScan\DAL\bin\Debug\Model.pdb
C:\Neotel\Program_Beta\SmartScan\DAL\bin\Debug\System.Data.SQLite.xml
C:\Neotel\Program_Beta\SmartScan\DAL\bin\Debug\log4net.xml
C:\Neotel\Program_Beta\SmartScan\DAL\bin\Debug\Asa.Face.Control.pdb
C:\Neotel\Program_Beta\SmartScan\DAL\obj\Debug\DAL.csproj.CopyComplete
C:\Neotel\Program_Beta\SmartScan\DAL\bin\Debug\RestSharp.dll
C:\Neotel\Program_Beta\SmartScan\DAL\bin\Debug\RestSharp.xml
C:\Neotel\Program_Beta\SmartScan\DAL\bin\Debug\Model.xml
C:\Neotel\Program\SmartScan\DAL\bin\Debug\x86\liblept1753.dll
C:\Neotel\Program\SmartScan\DAL\bin\Debug\x86\libtesseract3052.dll
C:\Neotel\Program\SmartScan\DAL\bin\Debug\x64\liblept1753.dll
C:\Neotel\Program\SmartScan\DAL\bin\Debug\x64\libtesseract3052.dll
C:\Neotel\Program\SmartScan\DAL\bin\Debug\DAL.dll
C:\Neotel\Program\SmartScan\DAL\bin\Debug\DAL.pdb
C:\Neotel\Program\SmartScan\DAL\bin\Debug\log4net.dll
C:\Neotel\Program\SmartScan\DAL\bin\Debug\Model.dll
C:\Neotel\Program\SmartScan\DAL\bin\Debug\System.Data.SQLite.dll
C:\Neotel\Program\SmartScan\DAL\bin\Debug\Asa.Face.Control.dll
C:\Neotel\Program\SmartScan\DAL\bin\Debug\RestSharp.dll
C:\Neotel\Program\SmartScan\DAL\bin\Debug\Tesseract.dll
C:\Neotel\Program\SmartScan\DAL\bin\Debug\Model.pdb
C:\Neotel\Program\SmartScan\DAL\bin\Debug\log4net.xml
C:\Neotel\Program\SmartScan\DAL\bin\Debug\System.Data.SQLite.xml
C:\Neotel\Program\SmartScan\DAL\bin\Debug\Asa.Face.Control.pdb
C:\Neotel\Program\SmartScan\DAL\bin\Debug\RestSharp.xml
C:\Neotel\Program\SmartScan\DAL\obj\Debug\DAL.csproj.AssemblyReference.cache
C:\Neotel\Program\SmartScan\DAL\obj\Debug\DAL.csproj.CoreCompileInputs.cache
C:\Neotel\Program\SmartScan\DAL\obj\Debug\DAL.csproj.CopyComplete
C:\Neotel\Program\SmartScan\DAL\obj\Debug\DAL.dll
C:\Neotel\Program\SmartScan\DAL\obj\Debug\DAL.pdb
D:\rick\vs\SmartScan\DAL\bin\Debug\x86\liblept1753.dll
D:\rick\vs\SmartScan\DAL\bin\Debug\x86\libtesseract3052.dll
D:\rick\vs\SmartScan\DAL\bin\Debug\x64\liblept1753.dll
D:\rick\vs\SmartScan\DAL\bin\Debug\x64\libtesseract3052.dll
D:\rick\vs\SmartScan\DAL\bin\Debug\DAL.dll
D:\rick\vs\SmartScan\DAL\bin\Debug\DAL.pdb
D:\rick\vs\SmartScan\DAL\bin\Debug\log4net.dll
D:\rick\vs\SmartScan\DAL\bin\Debug\Model.dll
D:\rick\vs\SmartScan\DAL\bin\Debug\System.Data.SQLite.dll
D:\rick\vs\SmartScan\DAL\bin\Debug\Asa.Face.Control.dll
D:\rick\vs\SmartScan\DAL\bin\Debug\RestSharp.dll
D:\rick\vs\SmartScan\DAL\bin\Debug\Tesseract.dll
D:\rick\vs\SmartScan\DAL\bin\Debug\Model.pdb
D:\rick\vs\SmartScan\DAL\bin\Debug\log4net.xml
D:\rick\vs\SmartScan\DAL\bin\Debug\System.Data.SQLite.xml
D:\rick\vs\SmartScan\DAL\bin\Debug\Asa.Face.Control.pdb
D:\rick\vs\SmartScan\DAL\bin\Debug\RestSharp.xml
D:\rick\vs\SmartScan\DAL\obj\Debug\DAL.csproj.AssemblyReference.cache
D:\rick\vs\SmartScan\DAL\obj\Debug\DAL.csproj.CoreCompileInputs.cache
D:\rick\vs\SmartScan\DAL\obj\Debug\DAL.csproj.CopyComplete
D:\rick\vs\SmartScan\DAL\obj\Debug\DAL.dll
D:\rick\vs\SmartScan\DAL\obj\Debug\DAL.pdb
D:\rick\vs\SmartScan\DAL\bin\Debug\Newtonsoft.Json.dll
D:\rick\vs\SmartScan\DAL\bin\Debug\Newtonsoft.Json.xml
D:\rick\vs\SmartScan\DAL\bin\Debug\Asa.Camera.VisionLib.dll
D:\rick\vs\SmartScan\DAL\bin\Debug\Basler.Pylon.dll
D:\rick\vs\SmartScan\DAL\bin\Debug\MvCameraControl.Net.dll
D:\rick\vs\SmartScan\DAL\bin\Debug\halcondotnet.dll
D:\rick\vs\SmartScan\DAL\bin\Debug\Asa.Camera.VisionLib.pdb
D:\rick\vs\SmartScan\DAL\bin\Debug\Asa.Camera.VisionLib.xml
D:\rick\vs\SmartScan\DAL\bin\Debug\MvCameraControl.Net.xml
E:\Codes\Neotel\SmartScan\DAL\bin\Debug\x86\liblept1753.dll
E:\Codes\Neotel\SmartScan\DAL\bin\Debug\x86\libtesseract3052.dll
E:\Codes\Neotel\SmartScan\DAL\bin\Debug\x64\liblept1753.dll
E:\Codes\Neotel\SmartScan\DAL\bin\Debug\x64\libtesseract3052.dll
E:\Codes\Neotel\SmartScan\DAL\bin\Debug\DAL.dll
E:\Codes\Neotel\SmartScan\DAL\bin\Debug\DAL.pdb
E:\Codes\Neotel\SmartScan\DAL\bin\Debug\log4net.dll
E:\Codes\Neotel\SmartScan\DAL\bin\Debug\Model.dll
E:\Codes\Neotel\SmartScan\DAL\bin\Debug\System.Data.SQLite.dll
E:\Codes\Neotel\SmartScan\DAL\bin\Debug\Asa.Face.Control.dll
E:\Codes\Neotel\SmartScan\DAL\bin\Debug\RestSharp.dll
E:\Codes\Neotel\SmartScan\DAL\bin\Debug\Asa.Camera.VisionLib.dll
E:\Codes\Neotel\SmartScan\DAL\bin\Debug\Tesseract.dll
E:\Codes\Neotel\SmartScan\DAL\bin\Debug\Newtonsoft.Json.dll
E:\Codes\Neotel\SmartScan\DAL\bin\Debug\Basler.Pylon.dll
E:\Codes\Neotel\SmartScan\DAL\bin\Debug\MvCameraControl.Net.dll
E:\Codes\Neotel\SmartScan\DAL\bin\Debug\Model.pdb
E:\Codes\Neotel\SmartScan\DAL\bin\Debug\log4net.xml
E:\Codes\Neotel\SmartScan\DAL\bin\Debug\System.Data.SQLite.xml
E:\Codes\Neotel\SmartScan\DAL\bin\Debug\Asa.Face.Control.pdb
E:\Codes\Neotel\SmartScan\DAL\bin\Debug\RestSharp.xml
E:\Codes\Neotel\SmartScan\DAL\bin\Debug\Asa.Camera.VisionLib.xml
E:\Codes\Neotel\SmartScan\DAL\bin\Debug\Newtonsoft.Json.xml
E:\Codes\Neotel\SmartScan\DAL\bin\Debug\MvCameraControl.Net.xml
E:\Codes\Neotel\SmartScan\DAL\obj\Debug\DAL.csproj.AssemblyReference.cache
E:\Codes\Neotel\SmartScan\DAL\obj\Debug\DAL.csproj.CoreCompileInputs.cache
E:\Codes\Neotel\SmartScan\DAL\obj\Debug\DAL.csproj.CopyComplete
E:\Codes\Neotel\SmartScan\DAL\obj\Debug\DAL.dll
E:\Codes\Neotel\SmartScan\DAL\obj\Debug\DAL.pdb
此文件类型无法预览
此文件类型无法预览
// <autogenerated />
using System;
using System.Reflection;
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.6.1", FrameworkDisplayName = ".NET Framework 4.6.1")]
......@@ -9,11 +9,12 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Model</RootNamespace>
<AssemblyName>Model</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<Deterministic>true</Deterministic>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
......
// <autogenerated />
using System;
using System.Reflection;
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.6.1", FrameworkDisplayName = ".NET Framework 4.6.1")]
C:\Neotel\Program_Beta\SmartScan\Model\bin\Debug\Model.dll
C:\Neotel\Program_Beta\SmartScan\Model\bin\Debug\Model.pdb
C:\Neotel\Program_Beta\SmartScan\Model\obj\Debug\Model.csproj.CoreCompileInputs.cache
C:\Neotel\Program_Beta\SmartScan\Model\obj\Debug\Model.dll
C:\Neotel\Program_Beta\SmartScan\Model\obj\Debug\Model.pdb
C:\Neotel\Program_Beta\SmartScan\Model\bin\Debug\Asa.Face.Control.dll
C:\Neotel\Program_Beta\SmartScan\Model\bin\Debug\Asa.Face.Control.pdb
C:\Neotel\Program_Beta\SmartScan\Model\obj\Debug\Model.csproj.CopyComplete
C:\Neotel\Program_Beta\SmartScan\Model\bin\Debug\log4net.config
C:\Neotel\Program_Beta\SmartScan\Model\bin\Debug\log4net.dll
C:\Neotel\Program_Beta\SmartScan\Model\bin\Debug\log4net.xml
C:\Neotel\Program_Beta\SmartScan\Model\bin\Debug\RestSharp.dll
C:\Neotel\Program_Beta\SmartScan\Model\bin\Debug\Tesseract.dll
C:\Neotel\Program_Beta\SmartScan\Model\bin\Debug\RestSharp.xml
C:\Neotel\Program_Beta\SmartScan\Model\bin\Debug\x86\liblept1753.dll
C:\Neotel\Program_Beta\SmartScan\Model\bin\Debug\x86\libtesseract3052.dll
C:\Neotel\Program_Beta\SmartScan\Model\bin\Debug\x64\liblept1753.dll
C:\Neotel\Program_Beta\SmartScan\Model\bin\Debug\x64\libtesseract3052.dll
C:\Neotel\Program_Beta\SmartScan\Model\bin\Debug\Model.xml
C:\Neotel\Program_Beta\SmartScan\Model\obj\Debug\Model.csprojAssemblyReference.cache
C:\Neotel\Program\SmartScan\Model\bin\Debug\x86\liblept1753.dll
C:\Neotel\Program\SmartScan\Model\bin\Debug\x86\libtesseract3052.dll
C:\Neotel\Program\SmartScan\Model\bin\Debug\x64\liblept1753.dll
C:\Neotel\Program\SmartScan\Model\bin\Debug\x64\libtesseract3052.dll
C:\Neotel\Program\SmartScan\Model\bin\Debug\Model.dll
C:\Neotel\Program\SmartScan\Model\bin\Debug\Model.pdb
C:\Neotel\Program\SmartScan\Model\bin\Debug\Asa.Face.Control.dll
C:\Neotel\Program\SmartScan\Model\bin\Debug\log4net.dll
C:\Neotel\Program\SmartScan\Model\bin\Debug\RestSharp.dll
C:\Neotel\Program\SmartScan\Model\bin\Debug\Tesseract.dll
C:\Neotel\Program\SmartScan\Model\bin\Debug\Asa.Face.Control.pdb
C:\Neotel\Program\SmartScan\Model\bin\Debug\log4net.xml
C:\Neotel\Program\SmartScan\Model\bin\Debug\RestSharp.xml
C:\Neotel\Program\SmartScan\Model\obj\Debug\Model.csproj.CoreCompileInputs.cache
C:\Neotel\Program\SmartScan\Model\obj\Debug\Model.csproj.CopyComplete
C:\Neotel\Program\SmartScan\Model\obj\Debug\Model.dll
C:\Neotel\Program\SmartScan\Model\obj\Debug\Model.pdb
D:\rick\vs\SmartScan\Model\bin\Debug\x86\liblept1753.dll
D:\rick\vs\SmartScan\Model\bin\Debug\x86\libtesseract3052.dll
D:\rick\vs\SmartScan\Model\bin\Debug\x64\liblept1753.dll
D:\rick\vs\SmartScan\Model\bin\Debug\x64\libtesseract3052.dll
D:\rick\vs\SmartScan\Model\bin\Debug\Model.dll
D:\rick\vs\SmartScan\Model\bin\Debug\Model.pdb
D:\rick\vs\SmartScan\Model\bin\Debug\log4net.dll
D:\rick\vs\SmartScan\Model\bin\Debug\RestSharp.dll
D:\rick\vs\SmartScan\Model\bin\Debug\Tesseract.dll
D:\rick\vs\SmartScan\Model\bin\Debug\Asa.Face.Control.pdb
D:\rick\vs\SmartScan\Model\bin\Debug\log4net.xml
D:\rick\vs\SmartScan\Model\bin\Debug\RestSharp.xml
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.dll
D:\rick\vs\SmartScan\Model\obj\Debug\Model.pdb
D:\rick\vs\SmartScan\Model\bin\Debug\Asa.Face.Control.dll
D:\rick\vs\SmartScan\Model\bin\Debug\Newtonsoft.Json.dll
D:\rick\vs\SmartScan\Model\bin\Debug\Newtonsoft.Json.xml
D:\rick\vs\SmartScan\Model\bin\Debug\Asa.Camera.VisionLib.dll
D:\rick\vs\SmartScan\Model\bin\Debug\Basler.Pylon.dll
D:\rick\vs\SmartScan\Model\bin\Debug\MvCameraControl.Net.dll
D:\rick\vs\SmartScan\Model\bin\Debug\halcondotnet.dll
D:\rick\vs\SmartScan\Model\bin\Debug\Asa.Camera.VisionLib.pdb
D:\rick\vs\SmartScan\Model\bin\Debug\Asa.Camera.VisionLib.xml
D:\rick\vs\SmartScan\Model\bin\Debug\MvCameraControl.Net.xml
D:\rick\vs\SmartScan\Model\obj\Debug\Model.csproj.AssemblyReference.cache
E:\Codes\Neotel\SmartScan\Model\bin\Debug\x86\liblept1753.dll
E:\Codes\Neotel\SmartScan\Model\bin\Debug\x86\libtesseract3052.dll
E:\Codes\Neotel\SmartScan\Model\bin\Debug\x64\liblept1753.dll
E:\Codes\Neotel\SmartScan\Model\bin\Debug\x64\libtesseract3052.dll
E:\Codes\Neotel\SmartScan\Model\bin\Debug\Model.dll
E:\Codes\Neotel\SmartScan\Model\bin\Debug\Model.pdb
E:\Codes\Neotel\SmartScan\Model\bin\Debug\Asa.Camera.VisionLib.dll
E:\Codes\Neotel\SmartScan\Model\bin\Debug\Asa.Face.Control.dll
E:\Codes\Neotel\SmartScan\Model\bin\Debug\log4net.dll
E:\Codes\Neotel\SmartScan\Model\bin\Debug\Newtonsoft.Json.dll
E:\Codes\Neotel\SmartScan\Model\bin\Debug\RestSharp.dll
E:\Codes\Neotel\SmartScan\Model\bin\Debug\Tesseract.dll
E:\Codes\Neotel\SmartScan\Model\bin\Debug\Basler.Pylon.dll
E:\Codes\Neotel\SmartScan\Model\bin\Debug\MvCameraControl.Net.dll
E:\Codes\Neotel\SmartScan\Model\bin\Debug\Asa.Camera.VisionLib.xml
E:\Codes\Neotel\SmartScan\Model\bin\Debug\log4net.xml
E:\Codes\Neotel\SmartScan\Model\bin\Debug\Newtonsoft.Json.xml
E:\Codes\Neotel\SmartScan\Model\bin\Debug\RestSharp.xml
E:\Codes\Neotel\SmartScan\Model\bin\Debug\MvCameraControl.Net.xml
E:\Codes\Neotel\SmartScan\Model\obj\Debug\Model.csproj.AssemblyReference.cache
E:\Codes\Neotel\SmartScan\Model\obj\Debug\Model.csproj.CoreCompileInputs.cache
E:\Codes\Neotel\SmartScan\Model\obj\Debug\Model.csproj.CopyComplete
E:\Codes\Neotel\SmartScan\Model\obj\Debug\Model.dll
E:\Codes\Neotel\SmartScan\Model\obj\Debug\Model.pdb
此文件类型无法预览
此文件类型无法预览
// <autogenerated />
using System;
using System.Reflection;
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.6.1", FrameworkDisplayName = ".NET Framework 4.6.1")]
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
<StartArguments>hide-</StartArguments>
</PropertyGroup>
<PropertyGroup>
<ProjectView>ProjectFiles</ProjectView>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
<StartArguments>hide-</StartArguments>
</PropertyGroup>
</Project>
\ No newline at end of file
......@@ -51,6 +51,7 @@
[2023-03-14 14:44:51,684][SmartScan.WebService:42]INFO Web服务已关闭
[2023-03-14 14:44:51,685][SmartScan.Program:92]INFO =====程序结束=====
<<<<<<< HEAD
[2023-03-14 14:44:54,218][SmartScan.FrmLoading:23]INFO ===== 程序开始 3.1.8473.26530 =====
[2023-03-14 14:44:54,252][DAL.ConfigRW:17]INFO 读取配置文件
[2023-03-14 14:44:54,265][BLL.ExtraFileData:32]INFO 数据源:C:\download\sample.csv
......@@ -111,3 +112,25 @@
[2023-03-14 15:01:23,596][BLL.ExtraFileData:32]INFO 数据源:C:\download\sample.csv
[2023-03-14 15:01:23,597][BLL.ExtraFileData:54]INFO 数据源加载文件:C:\download\sample.csv
[2023-03-14 15:01:27,354][SmartScan.FrmLoading:35]INFO 加载相机,数量:0
=======
[2023-03-08 17:01:42,044][SmartScan.FrmLoading:23]INFO ===== 程序开始 3.1.8467.30570 =====
[2023-03-08 17:01:42,109][DAL.ConfigRW:17]INFO 读取配置文件
[2023-03-08 17:01:44,176][BLL.ExtraFileData:122]INFO 数据源加载文件:D:\CUSTOME RACK STATUS-HELLA-V3.xlsx
[2023-03-08 17:01:44,421][BLL.ExtraFileData:122]INFO 数据源加载文件:D:\新建 Microsoft Excel 工作表.xlsx
[2023-03-08 17:01:48,682][SmartScan.FrmLoading:35]INFO 加载相机,数量:0
[2023-03-08 17:01:58,208][BLL.KND_IO:127]INFO Ping 192.168.20.100 请求没有回应
[2023-03-08 17:01:58,209][SmartScan.FrmLoading:42]INFO 加载IO模块,IP地址:192.168.20.100,iomodule:
[2023-03-08 17:01:58,210][SmartScan.FrmLoading:48]INFO 加载OCR模块
[2023-03-08 17:01:58,221][BLL.Extension:38]INFO 加载扩展:General
[2023-03-08 17:01:58,229][BLL.PrintLabelEdit:49]INFO 读取打印标签
[2023-03-08 17:01:58,241][BLL.MaterialEdit:20]INFO 读取物料模板
[2023-03-08 17:01:58,646][SmartScan.WebService:19]INFO WebService没有配置,不开启
[2023-03-08 17:01:58,647][SmartScan.FrmLoading:64]INFO 读取关键字文件
[2023-03-08 17:02:00,139][SmartScan.FrmMain:35]INFO 相机数量为0
[2023-03-08 17:02:03,909][SmartScan.FrmMain:376]INFO 按钮点击触发Work
[2023-03-08 17:02:06,612][SmartScan.FrmMain:376]INFO 按钮点击触发Work
[2023-03-08 17:02:12,749][SmartScan.Program:87]INFO =====准备退出...=====
[2023-03-08 17:02:12,774][SmartScan.WebService:42]INFO Web服务已关闭
[2023-03-08 17:02:12,774][SmartScan.Program:92]INFO =====程序结束=====
>>>>>>> d74613d158adbe1ef35172eefd805698bc4f0254
......@@ -117,6 +117,7 @@ System.DllNotFoundException: 无法加载 DLL“MvCameraControl.dll”: 找不
[2023-03-14 14:44:51,684][SmartScan.WebService:42]INFO Web服务已关闭
[2023-03-14 14:44:51,685][SmartScan.Program:92]INFO =====程序结束=====
<<<<<<< HEAD
[2023-03-14 14:44:54,218][SmartScan.FrmLoading:23]INFO ===== 程序开始 3.1.8473.26530 =====
[2023-03-14 14:44:54,252][DAL.ConfigRW:17]INFO 读取配置文件
[2023-03-14 14:44:54,265][BLL.ExtraFileData:32]INFO 数据源:C:\download\sample.csv
......@@ -259,3 +260,43 @@ System.DllNotFoundException: 无法加载 DLL“MvCameraControl.dll”: 找不
在 Asa.HIK.VisionCamera.Load() 位置 D:\rick\vs\Camera\CameraVisionLib\HIK\HIK_VisionCamera.cs:行号 76
[2023-03-14 15:01:27,354][Asa.Camera.VisionLib:50]INFO Load Camera, Asa.HIK.IPCamera:False, Asa.HIK.VisionCamera:False
[2023-03-14 15:01:27,354][SmartScan.FrmLoading:35]INFO 加载相机,数量:0
=======
[2023-03-08 17:01:42,044][SmartScan.FrmLoading:23]INFO ===== 程序开始 3.1.8467.30570 =====
[2023-03-08 17:01:42,109][DAL.ConfigRW:17]INFO 读取配置文件
[2023-03-08 17:01:44,176][BLL.ExtraFileData:122]INFO 数据源加载文件:D:\CUSTOME RACK STATUS-HELLA-V3.xlsx
[2023-03-08 17:01:44,421][BLL.ExtraFileData:122]INFO 数据源加载文件:D:\新建 Microsoft Excel 工作表.xlsx
[2023-03-08 17:01:44,462][Asa.Camera.VisionLib:11]DEBUG GetConfig Path=D:\rick\vs\SmartScan\SmartScan\bin\Debug\Config\Camera.json
[2023-03-08 17:01:44,736][Asa.Camera.VisionLib:35]DEBUG GetConfig_CodeOrder
[2023-03-08 17:01:44,737][Asa.Camera.VisionLib:41]DEBUG GetConfig_Halcon
[2023-03-08 17:01:44,739][Asa.Camera.VisionLib:53]DEBUG GetConfig_EyemLib
[2023-03-08 17:01:44,742][Asa.Camera.VisionLib:69]DEBUG GetConfig_Region
[2023-03-08 17:01:44,882][Asa.Region.Feature:51]INFO Feature init 0
[2023-03-08 17:01:44,938][Asa.Region.Feature:51]INFO Feature init 0
[2023-03-08 17:01:44,997][Asa.Region.Feature:51]INFO Feature init 0
[2023-03-08 17:01:45,061][Asa.Region.Feature:51]INFO Feature init 0
[2023-03-08 17:01:45,063][Asa.Camera.VisionLib:107]DEBUG GetConfig_HIKIPCamera
[2023-03-08 17:01:48,644][Asa.HIK.IPCamera:348]INFO IPCamera Load failed, IP=192.168.10.64, errorcode=7
[2023-03-08 17:01:48,674][Asa.HIK.VisionCamera:76]ERROR Load
System.DllNotFoundException: 无法加载 DLL“MvCameraControl.dll”: 找不到指定的模块。 (异常来自 HRESULT:0x8007007E)。
在 MvCamCtrl.NET.MyCamera.MV_CC_EnumDevices(UInt32 nTLayerType, MV_CC_DEVICE_INFO_LIST& stDevList)
在 Asa.HIK.VisionCamera.Load() 位置 D:\rick\vs\Camera\CameraVisionLib\HIK\HIK_VisionCamera.cs:行号 76
[2023-03-08 17:01:48,682][Asa.Camera.VisionLib:50]INFO Load Camera, Asa.HIK.IPCamera:False, Asa.HIK.VisionCamera:False
[2023-03-08 17:01:48,682][SmartScan.FrmLoading:35]INFO 加载相机,数量:0
[2023-03-08 17:01:58,208][BLL.KND_IO:127]INFO Ping 192.168.20.100 请求没有回应
[2023-03-08 17:01:58,209][SmartScan.FrmLoading:42]INFO 加载IO模块,IP地址:192.168.20.100,iomodule:
[2023-03-08 17:01:58,210][SmartScan.FrmLoading:48]INFO 加载OCR模块
[2023-03-08 17:01:58,221][BLL.Extension:38]INFO 加载扩展:General
[2023-03-08 17:01:58,229][BLL.PrintLabelEdit:49]INFO 读取打印标签
[2023-03-08 17:01:58,241][BLL.MaterialEdit:20]INFO 读取物料模板
[2023-03-08 17:01:58,646][SmartScan.WebService:19]INFO WebService没有配置,不开启
[2023-03-08 17:01:58,647][SmartScan.FrmLoading:64]INFO 读取关键字文件
[2023-03-08 17:02:00,139][SmartScan.FrmMain:35]INFO 相机数量为0
[2023-03-08 17:02:03,909][SmartScan.FrmMain:376]INFO 按钮点击触发Work
[2023-03-08 17:02:06,612][SmartScan.FrmMain:376]INFO 按钮点击触发Work
[2023-03-08 17:02:12,749][SmartScan.Program:87]INFO =====准备退出...=====
[2023-03-08 17:02:12,750][Asa.HIK.IPCamera:380]INFO IPCamera Dispose failed, IP=192.168.10.64, errorcode=17
[2023-03-08 17:02:12,771][Asa.Camera.VisionLib:61]INFO Dispose Camera
[2023-03-08 17:02:12,774][SmartScan.WebService:42]INFO Web服务已关闭
[2023-03-08 17:02:12,774][SmartScan.Program:92]INFO =====程序结束=====
>>>>>>> d74613d158adbe1ef35172eefd805698bc4f0254
此文件类型无法预览
此文件类型无法预览
// <autogenerated />
using System;
using System.Reflection;
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.6.1", FrameworkDisplayName = ".NET Framework 4.6.1")]
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!