1

.gitattributes

+###############################################################################
+# Set default behavior to automatically normalize line endings.
+###############################################################################
+* text=auto
+
+###############################################################################
+# Set default behavior for command prompt diff.
+#
+# This is need for earlier builds of msysgit that does not have it on by
+# default for csharp files.
+# Note: This is only used by command line
+###############################################################################
+#*.cs     diff=csharp
+
+###############################################################################
+# Set the merge driver for project and solution files
+#
+# Merging from the command prompt will add diff markers to the files if there
+# are conflicts (Merging from VS is not affected by the settings below, in VS
+# the diff markers are never inserted). Diff markers may cause the following 
+# file extensions to fail to load in VS. An alternative would be to treat
+# these files as binary and thus will always conflict and require user
+# intervention with every merge. To do so, just uncomment the entries below
+###############################################################################
+#*.sln       merge=binary
+#*.csproj    merge=binary
+#*.vbproj    merge=binary
+#*.vcxproj   merge=binary
+#*.vcproj    merge=binary
+#*.dbproj    merge=binary
+#*.fsproj    merge=binary
+#*.lsproj    merge=binary
+#*.wixproj   merge=binary
+#*.modelproj merge=binary
+#*.sqlproj   merge=binary
+#*.wwaproj   merge=binary
+
+###############################################################################
+# behavior for image files
+#
+# image files are treated as binary by default.
+###############################################################################
+#*.jpg   binary
+#*.png   binary
+#*.gif   binary
+
+###############################################################################
+# diff behavior for common document formats
+# 
+# Convert binary document formats to text before diffing them. This feature
+# is only available from the command line. Turn it on by uncommenting the 
+# entries below.
+###############################################################################
+#*.doc   diff=astextplain
+#*.DOC   diff=astextplain
+#*.docx  diff=astextplain
+#*.DOCX  diff=astextplain
+#*.dot   diff=astextplain
+#*.DOT   diff=astextplain
+#*.pdf   diff=astextplain
+#*.PDF   diff=astextplain
+#*.rtf   diff=astextplain
+#*.RTF   diff=astextplain

.gitignore

-################################################################################
-# 此 .gitignore 文件已由 Microsoft(R) Visual Studio 自动创建。
-################################################################################
-
-/.vs/扫码贴标/FileContentIndex/f4fbb8ce-434b-410c-be96-49bb7bf3a1f6.vsidx
-/.vs/扫码贴标/FileContentIndex/read.lock
-/.vs/扫码贴标/v17/.suo
-/.vs/扫码贴标/v17/DocumentLayout.backup.json
-/.vs/扫码贴标/v17/DocumentLayout.json
-/MES_NanRui/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
-/MES_NanRui/obj/Debug/MES_NanRui（南京南瑞）.csproj.AssemblyReference.cache
-/MES_DEMO/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
-/MES_DEMO/obj/Debug/MES_DEMO.csproj.AssemblyReference.cache
-/CodeSplice/obj/Debug/CodeSplice.csproj.AssemblyReference.cache
-/CodeSplice/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
-/MES_YangGuang/obj/Debug/DesignTimeResolveAssemblyReferences.cache
-/MES_YangGuang/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
-/MES_YangGuang/obj/Debug/MES.dll
-/MES_YangGuang/obj/Debug/MES.pdb
-/MES_YangGuang/obj/Debug/MES_Yang.648ADB87.Up2Date
-/MES_YangGuang/obj/Debug/MES_YangGuang（阳光电源）.csproj.AssemblyReference.cache
-/MES_YangGuang/obj/Debug/MES_YangGuang（阳光电源）.csproj.CoreCompileInputs.cache
-/MES_YangGuang/obj/Debug/MES_YangGuang（阳光电源）.csproj.FileListAbsolute.txt
-/SmartCode/bin/Debug/Logs/SmartCode.log
-/SmartCode/bin/Debug/Logs/SmartCode.log2023-11-14
-/SmartCode/bin/Debug/Logs/SmartCode.log2023-11-15
-/SmartCode/obj/Debug/DesignTimeResolveAssemblyReferences.cache
-/SmartCode/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
-/SmartCode/obj/Debug/SmartCode.csproj.AssemblyReference.cache
-/SmartCode/obj/Debug/SmartCode.csproj.CoreCompileInputs.cache
-/SmartCode/obj/Debug/SmartCode.csproj.FileListAbsolute.txt
-/SmartCode/obj/Debug/SmartCode.csproj.Up2Date
-/SmartCode/obj/Debug/SmartCode.exe
-/SmartCode/obj/Debug/SmartCode.pdb
-/.vs/扫码贴标/FileContentIndex
-/MES_Interface/bin/Debug/MES_Interface.dll
-/MES_Interface/bin/Debug/MES_Interface.pdb
-/MES_YangGuang/bin/Debug/MES.dll
-/MES_YangGuang/bin/Debug/MES.pdb
-/MES_YangGuang/bin/Debug/MES_Interface.dll
-/MES_YangGuang/bin/Debug/MES_Interface.pdb
-/SmartCode/bin/Debug/Logs
-/SmartCode/bin/Debug/MvSDKLog
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+##
+## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
+
+# User-specific files
+*.rsuser
+*.suo
+*.user
+*.userosscache
+*.sln.docstates
+
+# User-specific files (MonoDevelop/Xamarin Studio)
+*.userprefs
+
+# Mono auto generated files
+mono_crash.*
+
+# Build results
+[Dd]ebug/
+[Dd]ebugPublic/
+[Rr]elease/
+[Rr]eleases/
+x64/
+x86/
+[Ww][Ii][Nn]32/
+[Aa][Rr][Mm]/
+[Aa][Rr][Mm]64/
+bld/
+[Bb]in/
+[Oo]bj/
+[Oo]ut/
+[Ll]og/
+[Ll]ogs/
+
+# Visual Studio 2015/2017 cache/options directory
+.vs/
+# Uncomment if you have tasks that create the project's static files in wwwroot
+#wwwroot/
+
+# Visual Studio 2017 auto generated files
+Generated\ Files/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+# NUnit
+*.VisualState.xml
+TestResult.xml
+nunit-*.xml
+
+# Build Results of an ATL Project
+[Dd]ebugPS/
+[Rr]eleasePS/
+dlldata.c
+
+# Benchmark Results
+BenchmarkDotNet.Artifacts/
+
+# .NET Core
+project.lock.json
+project.fragment.lock.json
+artifacts/
+
+# ASP.NET Scaffolding
+ScaffoldingReadMe.txt
+
+# StyleCop
+StyleCopReport.xml
+
+# Files built by Visual Studio
+*_i.c
+*_p.c
+*_h.h
+*.ilk
+*.meta
+*.obj
+*.iobj
+*.pch
+*.pdb
+*.ipdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*_wpftmp.csproj
+*.log
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.svclog
+*.scc
+
+# Chutzpah Test files
+_Chutzpah*
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opendb
+*.opensdf
+*.sdf
+*.cachefile
+*.VC.db
+*.VC.VC.opendb
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+*.sap
+
+# Visual Studio Trace Files
+*.e2e
+
+# TFS 2012 Local Workspace
+$tf/
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+*.DotSettings.user
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# AxoCover is a Code Coverage Tool
+.axoCover/*
+!.axoCover/settings.json
+
+# Coverlet is a free, cross platform Code Coverage Tool
+coverage*.json
+coverage*.xml
+coverage*.info
+
+# Visual Studio code coverage results
+*.coverage
+*.coveragexml
+
+# NCrunch
+_NCrunch_*
+.*crunch*.local.xml
+nCrunchTemp_*
+
+# MightyMoose
+*.mm.*
+AutoTest.Net/
+
+# Web workbench (sass)
+.sass-cache/
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.[Pp]ublish.xml
+*.azurePubxml
+# Note: Comment the next line if you want to checkin your web deploy settings,
+# but database connection strings (with potential passwords) will be unencrypted
+*.pubxml
+*.publishproj
+
+# Microsoft Azure Web App publish settings. Comment the next line if you want to
+# checkin your Azure Web App publish settings, but sensitive information contained
+# in these scripts will be unencrypted
+PublishScripts/
+
+# NuGet Packages
+*.nupkg
+# NuGet Symbol Packages
+*.snupkg
+# The packages folder can be ignored because of Package Restore
+**/[Pp]ackages/*
+# except build/, which is used as an MSBuild target.
+!**/[Pp]ackages/build/
+# Uncomment if necessary however generally it will be regenerated when needed
+#!**/[Pp]ackages/repositories.config
+# NuGet v3's project.json files produces more ignorable files
+*.nuget.props
+*.nuget.targets
+
+# Microsoft Azure Build Output
+csx/
+*.build.csdef
+
+# Microsoft Azure Emulator
+ecf/
+rcf/
+
+# Windows Store app package directories and files
+AppPackages/
+BundleArtifacts/
+Package.StoreAssociation.xml
+_pkginfo.txt
+*.appx
+*.appxbundle
+*.appxupload
+
+# Visual Studio cache files
+# files ending in .cache can be ignored
+*.[Cc]ache
+# but keep track of directories ending in .cache
+!?*.[Cc]ache/
+
+# Others
+ClientBin/
+~$*
+*~
+*.dbmdl
+*.dbproj.schemaview
+*.jfm
+*.pfx
+*.publishsettings
+orleans.codegen.cs
+
+# Including strong name files can present a security risk
+# (https://github.com/github/gitignore/pull/2483#issue-259490424)
+#*.snk
+
+# Since there are multiple workflows, uncomment next line to ignore bower_components
+# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
+#bower_components/
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file
+# to a newer Visual Studio version. Backup files are not needed,
+# because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+ServiceFabricBackup/
+*.rptproj.bak
+
+# SQL Server files
+*.mdf
+*.ldf
+*.ndf
+
+# Business Intelligence projects
+*.rdl.data
+*.bim.layout
+*.bim_*.settings
+*.rptproj.rsuser
+*- [Bb]ackup.rdl
+*- [Bb]ackup ([0-9]).rdl
+*- [Bb]ackup ([0-9][0-9]).rdl
+
+# Microsoft Fakes
+FakesAssemblies/
+
+# GhostDoc plugin setting file
+*.GhostDoc.xml
+
+# Node.js Tools for Visual Studio
+.ntvs_analysis.dat
+node_modules/
+
+# Visual Studio 6 build log
+*.plg
+
+# Visual Studio 6 workspace options file
+*.opt
+
+# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
+*.vbw
+
+# Visual Studio LightSwitch build output
+**/*.HTMLClient/GeneratedArtifacts
+**/*.DesktopClient/GeneratedArtifacts
+**/*.DesktopClient/ModelManifest.xml
+**/*.Server/GeneratedArtifacts
+**/*.Server/ModelManifest.xml
+_Pvt_Extensions
+
+# Paket dependency manager
+.paket/paket.exe
+paket-files/
+
+# FAKE - F# Make
+.fake/
+
+# CodeRush personal settings
+.cr/personal
+
+# Python Tools for Visual Studio (PTVS)
+__pycache__/
+*.pyc
+
+# Cake - Uncomment if you are using it
+# tools/**
+# !tools/packages.config
+
+# Tabs Studio
+*.tss
+
+# Telerik's JustMock configuration file
+*.jmconfig
+
+# BizTalk build output
+*.btp.cs
+*.btm.cs
+*.odx.cs
+*.xsd.cs
+
+# OpenCover UI analysis results
+OpenCover/
+
+# Azure Stream Analytics local run output
+ASALocalRun/
+
+# MSBuild Binary and Structured Log
+*.binlog
+
+# NVidia Nsight GPU debugger configuration file
+*.nvuser
+
+# MFractors (Xamarin productivity tool) working folder
+.mfractor/
+
+# Local History for Visual Studio
+.localhistory/
+
+# BeatPulse healthcheck temp database
+healthchecksdb
+
+# Backup folder for Package Reference Convert tool in Visual Studio 2017
+MigrationBackup/
+
+# Ionide (cross platform F# VS Code tools) working folder
+.ionide/
+
+# Fody - auto-generated XML schema
+FodyWeavers.xsd
\ No newline at end of file

CodeSplice/BLL/BarCode.cs

@@ -204,8 +204,12 @@ namespace BLL
 
             try
             {
-                HOperatorSet.Rgb1ToGray(hObj, out HObject grayImage);
+                HOperatorSet.Rgb1ToGray(hObj, out HObject grayImage1);
+                HObject grayImage;
+                HOperatorSet.Emphasize(grayImage1, out grayImage, 3, 3, 1);
+                grayImage1.Dispose();
                 HOperatorSet.CreateBarCodeModel(new HTuple(), new HTuple(), out HTuple hv_BarCode);  //创建条码模型
+                HOperatorSet.SetBarCodeParam(hv_BarCode, "element_size_min", 1);  //成功解码最少扫描线数量
                 HOperatorSet.SetBarCodeParam(hv_BarCode, "num_scanlines", 5);  //扫描线的最大数量
                 HOperatorSet.SetBarCodeParam(hv_BarCode, "min_identical_scanlines", 3);  //成功解码最少扫描线数量
                 HOperatorSet.SetBarCodeParam(hv_BarCode, "start_stop_tolerance", "high");  //扫描线的起点和终点的容许误差，high误差大，low误差小

CodeSplice/obj/Debug/.NETFramework,Version=v4.6.1.AssemblyAttributes.cs

-// <autogenerated />
-using System;
-using System.Reflection;
-[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.6.1", FrameworkDisplayName = ".NET Framework 4.6.1")]

CodeSplice/obj/Debug/.NETFramework,Version=v4.6.AssemblyAttributes.cs

-// <autogenerated />
-using System;
-using System.Reflection;
-[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.6", FrameworkDisplayName = ".NET Framework 4.6")]

CodeSplice/obj/Debug/.NETFramework,Version=v4.8.AssemblyAttributes.cs

-// <autogenerated />
-using System;
-using System.Reflection;
-[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.8", FrameworkDisplayName = ".NET Framework 4.8")]

CodeSplice/obj/Debug/CodeSplice.csproj.CoreCompileInputs.cache

-9ae794dfbdb4c133f7595e4410001b70d97e97c2

CodeSplice/obj/Debug/CodeSplice.csproj.FileListAbsolute.txt

-C:\SMD\SmartScanningSystem\CodeSplice\bin\Debug\x86\liblept1753.dll
-C:\SMD\SmartScanningSystem\CodeSplice\bin\Debug\x86\libtesseract3052.dll
-C:\SMD\SmartScanningSystem\CodeSplice\bin\Debug\x64\liblept1753.dll
-C:\SMD\SmartScanningSystem\CodeSplice\bin\Debug\x64\libtesseract3052.dll
-C:\SMD\SmartScanningSystem\CodeSplice\bin\Debug\CodeSplice.exe.config
-C:\SMD\SmartScanningSystem\CodeSplice\bin\Debug\CodeSplice.exe
-C:\SMD\SmartScanningSystem\CodeSplice\bin\Debug\CodeSplice.pdb
-C:\SMD\SmartScanningSystem\CodeSplice\bin\Debug\Asa.IOModule.KND.dll
-C:\SMD\SmartScanningSystem\CodeSplice\bin\Debug\MvCameraControl.Net.dll
-C:\SMD\SmartScanningSystem\CodeSplice\bin\Debug\Tesseract.dll
-C:\SMD\SmartScanningSystem\CodeSplice\bin\Debug\zxing.dll
-C:\SMD\SmartScanningSystem\CodeSplice\bin\Debug\Asa.IOModule.KND.xml
-C:\SMD\SmartScanningSystem\CodeSplice\obj\Debug\CodeSplice.FrmLight.resources
-C:\SMD\SmartScanningSystem\CodeSplice\obj\Debug\CodeSplice.FrmLabel.resources
-C:\SMD\SmartScanningSystem\CodeSplice\obj\Debug\CodeSplice.FrmMain.resources
-C:\SMD\SmartScanningSystem\CodeSplice\obj\Debug\CodeSplice.FrmMate.resources
-C:\SMD\SmartScanningSystem\CodeSplice\obj\Debug\CodeSplice.FrmTrace.resources
-C:\SMD\SmartScanningSystem\CodeSplice\obj\Debug\CodeSplice.Properties.Resources.resources
-C:\SMD\SmartScanningSystem\CodeSplice\obj\Debug\CodeSplice.csproj.GenerateResource.cache
-C:\SMD\SmartScanningSystem\CodeSplice\obj\Debug\CodeSplice.csproj.CoreCompileInputs.cache
-C:\SMD\SmartScanningSystem\CodeSplice\obj\Debug\CodeSplice.csproj.CopyComplete
-C:\SMD\SmartScanningSystem\CodeSplice\obj\Debug\CodeSplice.exe
-C:\SMD\SmartScanningSystem\CodeSplice\obj\Debug\CodeSplice.pdb
-C:\SMD\SmartScanningSystem\CodeSplice\obj\Debug\CodeSplice.csprojAssemblyReference.cache
-C:\SMD\SmartScanningSystem\CodeSplice\bin\Debug\Asa.Theme.xml
-C:\SMD\SmartScanningSystem\CodeSplice\obj\Debug\CodeSplice.FrmSubstring.resources
-C:\SMD\SmartScanningSystem\CodeSplice\bin\Debug\Common.dll
-C:\SMD\SmartScanningSystem\CodeSplice\bin\Debug\Common.pdb
-C:\SMD\SmartScanningSystem\CodeSplice\bin\Debug\Asa.Camera.dll
-C:\SMD\SmartScanningSystem\CodeSplice\bin\Debug\Basler.Pylon.dll
-C:\SMD\SmartScanningSystem\CodeSplice\bin\Debug\Asa.Camera.xml
-C:\SMD\SmartScanningSystem\CodeSplice\obj\Debug\CodeSplice.FrmMultiple.resources
-C:\SMD\SmartScanningSystem\CodeSplice\bin\Debug\Asa.File.dll
-C:\SMD\SmartScanningSystem\CodeSplice\bin\Debug\Asa.File.xml
-C:\SMD\SmartScanningSystem\CodeSplice\bin\Debug\Asa.Dog.dll
-C:\SMD\SmartScanningSystem\CodeSplice\bin\Debug\dog_net_windows.dll
-C:\SMD\SmartScanningSystem\CodeSplice\bin\Debug\Asa.Dog.xml
-C:\SMD\SmartScanningSystem\CodeSplice\bin\Debug\Asa.Face.dll
-C:\SMD\SmartScanningSystem\CodeSplice\bin\Debug\Asa.Face.xml
-D:\rick\vs\SmartCode\CodeSplice\obj\Debug\CodeSplice.csproj.AssemblyReference.cache
-D:\rick\vs\SmartCode\CodeSplice\obj\Debug\CodeSplice.FrmMultiple.resources
-D:\rick\vs\SmartCode\CodeSplice\obj\Debug\CodeSplice.FrmSubstring.resources
-D:\rick\vs\SmartCode\CodeSplice\obj\Debug\CodeSplice.FrmLight.resources
-D:\rick\vs\SmartCode\CodeSplice\obj\Debug\CodeSplice.FrmLabel.resources
-D:\rick\vs\SmartCode\CodeSplice\obj\Debug\CodeSplice.FrmMain.resources
-D:\rick\vs\SmartCode\CodeSplice\obj\Debug\CodeSplice.FrmMate.resources
-D:\rick\vs\SmartCode\CodeSplice\obj\Debug\CodeSplice.FrmTrace.resources
-D:\rick\vs\SmartCode\CodeSplice\obj\Debug\CodeSplice.Properties.Resources.resources
-D:\rick\vs\SmartCode\CodeSplice\obj\Debug\CodeSplice.csproj.GenerateResource.cache
-D:\rick\vs\SmartCode\CodeSplice\obj\Debug\CodeSplice.csproj.CoreCompileInputs.cache
-D:\rick\vs\SmartCode\CodeSplice\obj\Debug\CodeSplice.exe
-D:\rick\vs\SmartCode\CodeSplice\obj\Debug\CodeSplice.pdb
-D:\rick\vs\SmartCode\CodeSplice\bin\Debug\x86\liblept1753.dll
-D:\rick\vs\SmartCode\CodeSplice\bin\Debug\x86\libtesseract3052.dll
-D:\rick\vs\SmartCode\CodeSplice\bin\Debug\x64\liblept1753.dll
-D:\rick\vs\SmartCode\CodeSplice\bin\Debug\x64\libtesseract3052.dll
-D:\rick\vs\SmartCode\CodeSplice\bin\Debug\CodeSplice.exe.config
-D:\rick\vs\SmartCode\CodeSplice\bin\Debug\CodeSplice.exe
-D:\rick\vs\SmartCode\CodeSplice\bin\Debug\CodeSplice.pdb
-D:\rick\vs\SmartCode\CodeSplice\bin\Debug\MES_Interface.dll
-D:\rick\vs\SmartCode\CodeSplice\bin\Debug\Tesseract.dll
-D:\rick\vs\SmartCode\CodeSplice\bin\Debug\Basler.Pylon.dll
-D:\rick\vs\SmartCode\CodeSplice\bin\Debug\MvCameraControl.Net.dll
-D:\rick\vs\SmartCode\CodeSplice\bin\Debug\dog_net_windows.dll
-D:\rick\vs\SmartCode\CodeSplice\bin\Debug\MES_Interface.pdb
-D:\rick\vs\SmartCode\CodeSplice\bin\Debug\Asa.Camera.xml
-D:\rick\vs\SmartCode\CodeSplice\bin\Debug\Asa.Dog.xml
-D:\rick\vs\SmartCode\CodeSplice\bin\Debug\Asa.Face.xml
-D:\rick\vs\SmartCode\CodeSplice\bin\Debug\Asa.File.xml
-D:\rick\vs\SmartCode\CodeSplice\bin\Debug\Asa.IOModule.KND.xml
-D:\rick\vs\SmartCode\CodeSplice\bin\Debug\Asa.Theme.xml

CodeSplice/obj/Release/.NETFramework,Version=v4.6.1.AssemblyAttributes.cs

-// <autogenerated />
-using System;
-using System.Reflection;
-[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.6.1", FrameworkDisplayName = ".NET Framework 4.6.1")]

CodeSplice/obj/Release/.NETFramework,Version=v4.6.AssemblyAttributes.cs

-// <autogenerated />
-using System;
-using System.Reflection;
-[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.6", FrameworkDisplayName = ".NET Framework 4.6")]

CodeSplice/obj/Release/CodeSplice.csproj.CoreCompileInputs.cache

-3daeb03ae403f5b7e354612ab9a6d83f36396059

MES_YangGuang/UsrYangGuang.cs

@@ -9,6 +9,7 @@ using System.Threading.Tasks;
 using System.Windows.Forms;
 using Interface;
 using RestSharp;
+using System.Security.Policy;
 
 namespace MES
 {
@@ -129,6 +130,10 @@ namespace MES
                     {
                         dc_code = _code[i].Substring(2);
                         TxtDC.Text = dc_code;
+                        if (dc_code.Length > 6)
+                            TxtDC.Text = dc_code.Substring(dc_code.Length - 6, 6);
+                        else
+                            TxtDC.Text = dc_code;
                         findDC = true;
                     }
                     else if (!findORDER)  //订单条码，订单号_物料号_日期_批次号
@@ -497,6 +502,7 @@ namespace MES
         {
             try
             {
+                LOG.Info("_ip: " + _ip);
                 string[] s = _ip.Split(':');
                 using (System.Net.NetworkInformation.Ping ping = new System.Net.NetworkInformation.Ping())
                 {

SmartCode/BLL/BarCode.cs

@@ -245,8 +245,12 @@ namespace BLL
 
             try
             {
-                HOperatorSet.Rgb1ToGray(hObj, out HObject grayImage);
+                HOperatorSet.Rgb1ToGray(hObj, out HObject grayImage1);
+                HObject grayImage;
+                HOperatorSet.Emphasize(grayImage1, out grayImage, 3, 3, 1);
+                grayImage1.Dispose();
                 HOperatorSet.CreateBarCodeModel(new HTuple(), new HTuple(), out HTuple hv_BarCode);  //创建条码模型
+                HOperatorSet.SetBarCodeParam(hv_BarCode, "element_size_min", 1);  //成功解码最少扫描线数量
                 HOperatorSet.SetBarCodeParam(hv_BarCode, "num_scanlines", 5);  //扫描线的最大数量
                 HOperatorSet.SetBarCodeParam(hv_BarCode, "min_identical_scanlines", 3);  //成功解码最少扫描线数量
                 HOperatorSet.SetBarCodeParam(hv_BarCode, "start_stop_tolerance", "high");  //扫描线的起点和终点的容许误差，high误差大，low误差小
@@ -402,6 +406,22 @@ namespace BLL
                     {
                         SmartCode.BarCode info = new SmartCode.BarCode();
                         info.Text = decodedDataStrings.SArr[i];
+                        if (info.Text.StartsWith("\\\\000029"))
+                        {
+                            info.Text = info.Text.Substring("\\\\000029".Length);
+                        }
+                        if (info.Text.StartsWith("\\000029"))
+                        {
+                            info.Text = info.Text.Substring("\\000029".Length);
+                        }
+                        if (info.Text.StartsWith("\\\\000026"))
+                        {
+                            info.Text = info.Text.Substring("\\\\000026".Length);
+                        }
+                        if (info.Text.StartsWith("\\000026"))
+                        {
+                            info.Text = info.Text.Substring("\\000026".Length);
+                        }
                         info.CodeType = "QR Code";
                         info.Angle = 0;
                         info.Center = new PointF(Convert.ToSingle(hv_Column.DArr[i]), Convert.ToSingle(hv_Row.DArr[i]));

SmartCode/BLL/Config.cs

@@ -346,7 +346,7 @@ namespace BLL
 
                 //密码
                 _node = _root.SelectSingleNode("Pwd");
-                Password = _node.Attributes["Value"].Value;
+                Password = _node?.Attributes["Value"].Value;
 
                 //标签校验
                 _node = _root.SelectSingleNode("Check");
@@ -355,12 +355,12 @@ namespace BLL
 
 
                 _node = _root.SelectSingleNode("Language");
-                Language = _node.InnerText;
+                Language = _node?.InnerText;
                 _node = _root.SelectSingleNode("IOIP");
-                IOAddress = _node.InnerText;
+                IOAddress = _node?.InnerText;
 
                 _node = _root.SelectSingleNode("IOTYPE");
-                if (_node.InnerText.ToLower() == "niren")
+                if (_node!=null && _node.InnerText.ToLower() == "niren")
                 {
                     IOType = IOType.NIREN;
 
@@ -376,22 +376,14 @@ namespace BLL
                 MES = _node.InnerText;
 
                 _node = _root.SelectSingleNode("SNPREFIX");
-                SNPREFIX = _node.InnerText;
-
-
-
+                SNPREFIX = _node?.InnerText;
             }
             catch (Exception ex)
             {
                 ErrInfo = ex.ToString();
                 return;
             }
-
-
         }
-
-
-
     }
     public enum IOType
     {

SmartCode/Program.cs

@@ -21,12 +21,15 @@ namespace SmartCode
                     sp.Kill();
 
 
+            Environment.CurrentDirectory = Application.StartupPath;
+
             log4net.Config.XmlConfigurator.Configure();
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault(false);
 
             Common.log = log4net.LogManager.GetLogger("SmartCode");
             Common.log.Info("=====程序开始=====");
+            Common.log.Info(Common.CONFIG_PATH);
             if (args.Length > 0)
             {
                 if (args[0].ToLower() == "debug")
@@ -37,7 +40,7 @@ namespace SmartCode
             }
 
             Common.Config = new BLL.Config(Common.CONFIG_PATH);
-            
+            Common.log.Info(Common.Config.ErrInfo);
             Common.Lang = new Asa.Face.Language(Common.LANGUAGE_DIR);
             Common.Lang.Load(Common.Config.Language);
             Common.Label = new BLL.Label.LabelEdit(Common.LABEL_DIR);

SmartCode/SmartCode.csproj

@@ -42,7 +42,7 @@
   <ItemGroup>
     <Reference Include="Asa.Camera, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\DLL\Camera\Asa.Camera.dll</HintPath>
+      <HintPath>bin\Debug\Asa.Camera.dll</HintPath>
     </Reference>
     <Reference Include="Asa.Face, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

SmartCode/UI/FrmMain.cs

@@ -701,7 +701,7 @@ namespace SmartCode
 
         private void IO_DI_Changed_Event(BLL.Status[] sta)
         {
-            Common.log.Info("sta.Length=" + sta.Length + "  sta[0]=" + sta[0].ToString()+ ", isRun:" + isRun+ ", isTouch:"+ isTouch);
+            //Common.log.Info("sta.Length=" + sta.Length + "  sta[0]=" + sta[0].ToString()+ ", isRun:" + isRun+ ", isTouch:"+ isTouch);
 
             if (!isRun) return;
             if (sta == null)

SmartCode/bin/Debug/Plugin/Config.xml

@@ -10,6 +10,8 @@
   <Pwd Value="admin123" />
   <Check Value="True" />
   <Language>简体中文</Language>
+  <SNPREFIX>
+  </SNPREFIX>
   <IOTYPE>NiRen</IOTYPE>
   <IOTouch>0</IOTouch>
   <IOLight>0</IOLight>