Skip to content

顾剑亮 / SmartCode

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

DC不足6位往右补0

1 个父辈 80cf6d3d
内嵌 并排
正在显示 22 个修改的文件 包含 46 行增加 和 39 行删除
MES_Interface/obj/Debug/MES_Interface.csproj.FileListAbsolute.txt
...@@ -27,7 +27,7 @@ C:\Neotel\Program\SmartCode\MES_Interface\obj\Debug\MES_Interface.pdb ...@@ -27,7 +27,7 @@ C:\Neotel\Program\SmartCode\MES_Interface\obj\Debug\MES_Interface.pdb
C:\Neotel\Program\SmartCode\MES_Interface\obj\Debug\MES_Interface.csprojAssemblyReference.cache C:\Neotel\Program\SmartCode\MES_Interface\obj\Debug\MES_Interface.csprojAssemblyReference.cache
D:\rick\vs\SmartCode\MES_Interface\bin\Debug\MES_Interface.dll D:\rick\vs\SmartCode\MES_Interface\bin\Debug\MES_Interface.dll
D:\rick\vs\SmartCode\MES_Interface\bin\Debug\MES_Interface.pdb D:\rick\vs\SmartCode\MES_Interface\bin\Debug\MES_Interface.pdb
D:\rick\vs\SmartCode\MES_Interface\obj\Debug\MES_Interface.csproj.AssemblyReference.cache
D:\rick\vs\SmartCode\MES_Interface\obj\Debug\MES_Interface.csproj.CoreCompileInputs.cache D:\rick\vs\SmartCode\MES_Interface\obj\Debug\MES_Interface.csproj.CoreCompileInputs.cache
D:\rick\vs\SmartCode\MES_Interface\obj\Debug\MES_Interface.dll D:\rick\vs\SmartCode\MES_Interface\obj\Debug\MES_Interface.dll
D:\rick\vs\SmartCode\MES_Interface\obj\Debug\MES_Interface.pdb D:\rick\vs\SmartCode\MES_Interface\obj\Debug\MES_Interface.pdb
D:\rick\vs\SmartCode\MES_Interface\obj\Debug\MES_Interface.csproj.AssemblyReference.cache
MES_YangGuang/UsrYangGuang.cs
...@@ -139,7 +139,7 @@ namespace MES ...@@ -139,7 +139,7 @@ namespace MES
if (dc_code.Length > 6) if (dc_code.Length > 6)
TxtDC.Text = dc_code.Substring(dc_code.Length - 6, 6); TxtDC.Text = dc_code.Substring(dc_code.Length - 6, 6);
else else
TxtDC.Text = dc_code; TxtDC.Text = dc_code.PadRight(6, '0');
findDC = true; findDC = true;
} }
else if (!findORDER) //订单条码，订单号_物料号_日期_批次号 else if (!findORDER) //订单条码，订单号_物料号_日期_批次号
...@@ -184,7 +184,7 @@ namespace MES ...@@ -184,7 +184,7 @@ namespace MES
if (dc_code.Length > 6) if (dc_code.Length > 6)
TxtDC.Text = dc_code.Substring(dc_code.Length - 6, 6); TxtDC.Text = dc_code.Substring(dc_code.Length - 6, 6);
else else
TxtDC.Text = dc_code; TxtDC.Text = dc_code.PadRight(6, '0');
findDC = true; findDC = true;
} }
} }
...@@ -204,7 +204,7 @@ namespace MES ...@@ -204,7 +204,7 @@ namespace MES
if (dc_order.Length > 6) if (dc_order.Length > 6)
TxtDC.Text = dc_order.Substring(dc_order.Length - 6, 6); TxtDC.Text = dc_order.Substring(dc_order.Length - 6, 6);
else else
TxtDC.Text = dc_order; TxtDC.Text = dc_order.PadRight(6, '0');
} }
} }
catch (Exception ex) catch (Exception ex)
......
SmartCode/Program.cs
...@@ -15,11 +15,14 @@ namespace SmartCode ...@@ -15,11 +15,14 @@ namespace SmartCode
[STAThread] [STAThread]
static void Main(string[] args) static void Main(string[] args)
{ {
var scp = Process.GetProcessesByName("SmartCode"); try
foreach (var sp in scp) {
if (sp.Id!=Process.GetCurrentProcess().Id) var scp = Process.GetProcessesByName("SmartCode");
sp.Kill(); foreach (var sp in scp)
if (sp.Id != Process.GetCurrentProcess().Id)
sp.Kill();
}
catch { }
Environment.CurrentDirectory = Application.StartupPath; Environment.CurrentDirectory = Application.StartupPath;
......
SmartCode/Properties/Settings.Designer.cs
...@@ -12,7 +12,7 @@ namespace SmartCode.Properties { ...@@ -12,7 +12,7 @@ namespace SmartCode.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.5.0.0")] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.14.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
......
SmartCode/SmartCode.csproj
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<TargetFrameworkProfile /> <TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>x64</PlatformTarget> <PlatformTarget>AnyCPU</PlatformTarget>
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType> <DebugType>full</DebugType>
<Optimize>false</Optimize> <Optimize>false</Optimize>
......
SmartCode/UI/FrmMain.cs
using BLL; using System;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing; using System.Drawing;
using System.Linq; using System.Linq;
using System.Text;
using System.Threading; using System.Threading;
using System.Threading.Tasks;
using System.Windows.Forms; using System.Windows.Forms;
using Image = System.Drawing.Image;
namespace SmartCode namespace SmartCode
{ {
...@@ -40,7 +36,7 @@ namespace SmartCode ...@@ -40,7 +36,7 @@ namespace SmartCode
/// <summary> /// <summary>
/// 是否接触，用于判断DI触发时上一次是false /// 是否接触，用于判断DI触发时上一次是false
/// </summary> /// </summary>
private bool isTouch; private volatile bool isTouch;
/// <summary> /// <summary>
/// 是否运行 /// 是否运行
/// </summary> /// </summary>
...@@ -367,7 +363,7 @@ namespace SmartCode ...@@ -367,7 +363,7 @@ namespace SmartCode
if (Common.Camera.Count == 0) if (Common.Camera.Count == 0)
{ {
noCamera = true; noCamera = true;
s2 =Common.Lang.Dialog("NoCamera"); s2 = Common.Lang.Dialog("NoCamera");
} }
else else
{ {
...@@ -400,7 +396,7 @@ namespace SmartCode ...@@ -400,7 +396,7 @@ namespace SmartCode
BtnLight.Visible = false; BtnLight.Visible = false;
return; return;
} }
try try
{ {
string s; string s;
...@@ -483,7 +479,7 @@ namespace SmartCode ...@@ -483,7 +479,7 @@ namespace SmartCode
try try
{ {
Common.log.Info($"MES:{Common.Config.MES}"); Common.log.Info($"MES:{Common.Config.MES}");
var mes =new MES.User(Common.Config.MES); var mes = new MES.User(Common.Config.MES);
mes.SNPREFIX = Common.Config.SNPREFIX; mes.SNPREFIX = Common.Config.SNPREFIX;
userControl = mes; userControl = mes;
Control ctl = userControl.GetControl(); Control ctl = userControl.GetControl();
...@@ -546,7 +542,7 @@ namespace SmartCode ...@@ -546,7 +542,7 @@ namespace SmartCode
//} //}
} }
/// <summary> /// <summary>
/// 初始化右上显示 /// 初始化右上显示
...@@ -609,7 +605,7 @@ namespace SmartCode ...@@ -609,7 +605,7 @@ namespace SmartCode
BtnLight.Enabled = limit[8]; BtnLight.Enabled = limit[8];
BtnSet.Enabled = limit[9]; BtnSet.Enabled = limit[9];
} }
} }
...@@ -624,7 +620,7 @@ namespace SmartCode ...@@ -624,7 +620,7 @@ namespace SmartCode
log += s + ":" + text[s] + ","; log += s + ":" + text[s] + ",";
Common.log.Info(log); Common.log.Info(log);
Common.Label.FindDefault(Common.Config.LabelName); Common.Label.FindDefault(Common.Config.LabelName);
PicLabel.Image = Common.Label.PrintLast(text, out string[] code1); PicLabel.Image = Common.Label.PrintLast(text, out string[] code1);
Common.Label.PrintLast(text, Common.Config.PrinterName, Common.Config.PrinterLandscape, out string[] code2); Common.Label.PrintLast(text, Common.Config.PrinterName, Common.Config.PrinterLandscape, out string[] code2);
labelReplace = text; labelReplace = text;
...@@ -694,7 +690,7 @@ namespace SmartCode ...@@ -694,7 +690,7 @@ namespace SmartCode
} }
} }
private int UserControl_GetSN(string key,bool doIncrease) private int UserControl_GetSN(string key, bool doIncrease)
{ {
return Common.Database.GetSN(key, doIncrease); return Common.Database.GetSN(key, doIncrease);
} }
...@@ -720,19 +716,20 @@ namespace SmartCode ...@@ -720,19 +716,20 @@ namespace SmartCode
if (isTouch) return; if (isTouch) return;
isTouch = true; isTouch = true;
Common.log.Info("IO触发自动拍照"); Common.log.Info("IO触发自动拍照");
Invoke(new Action(() => BeginInvoke(new Action(() =>
{ {
try try
{ {
DoScan(); DoScan();
}catch (Exception ex) { Common.log.Error("DoScan:" + ex); } }
finally { catch (Exception ex) { Common.log.Error("DoScan:" + ex); }
finally
{
Common.log.Info("DoScan finish"); Common.log.Info("DoScan finish");
isTouch = false; isTouch = false;
} }
Common.log.Info("IO触发自动拍照完成");
})); }));
Common.log.Info("IO触发自动拍照完成");
} }
else else
{ {
...@@ -740,13 +737,15 @@ namespace SmartCode ...@@ -740,13 +737,15 @@ namespace SmartCode
} }
} }
void DoScan() { void DoScan()
{
bool rtn; bool rtn;
label = null; label = null;
Common.log.Info("开始拍照");
if (Common.Config.CameraSingle) if (Common.Config.CameraSingle)
{ {
rtn = Common.Camera.GrabOne(); rtn = Common.Camera.GrabOne();
Common.log.Info("图像获取完成:"+rtn);
if (rtn) if (rtn)
{ {
grabImage = new Bitmap(Common.Camera.Image); grabImage = new Bitmap(Common.Camera.Image);
...@@ -756,6 +755,7 @@ namespace SmartCode ...@@ -756,6 +755,7 @@ namespace SmartCode
else else
{ {
Bitmap[] image = new Bitmap[Common.Camera.Count]; Bitmap[] image = new Bitmap[Common.Camera.Count];
Common.log.Info("图像获取完成:" + image.Length);
for (int i = 0; i < Common.Camera.Count; i++) for (int i = 0; i < Common.Camera.Count; i++)
{ {
rtn = Common.Camera.GrabOne(i); rtn = Common.Camera.GrabOne(i);
...@@ -768,11 +768,15 @@ namespace SmartCode ...@@ -768,11 +768,15 @@ namespace SmartCode
//Common.IO.WriteDO(Asa.IOModule.Addr.DO_1, Asa.IOModule.Status.Off); //Common.IO.WriteDO(Asa.IOModule.Addr.DO_1, Asa.IOModule.Status.Off);
//Thread.Sleep(500); //Thread.Sleep(500);
rtn = DiscernCode(); rtn = DiscernCode();
Common.log.Info("图像解码完成:" + rtn);
if (!rtn) return; if (!rtn) return;
if (userControl == null) return; if (userControl == null) return;
if (userControl.Match) MatchTemplate(); if (userControl.Match) MatchTemplate();
Common.log.Info("模板匹配完成");
userControl.Preview(); userControl.Preview();
Common.log.Info("预览完成");
labelReplace = userControl.GetPrint(); labelReplace = userControl.GetPrint();
Common.log.Info("打印完成:" + string.Join(", ", labelReplace.Select(t => $"{t.Key}:{t.Value}").ToArray()));
PicLabel.Image = Common.Label.PrintLast(labelReplace, out string[] code); PicLabel.Image = Common.Label.PrintLast(labelReplace, out string[] code);
} }
...@@ -797,13 +801,13 @@ namespace SmartCode ...@@ -797,13 +801,13 @@ namespace SmartCode
InitMesPanel(); InitMesPanel();
Common.Lang.SetLanguage(this); Common.Lang.SetLanguage(this);
PicLogo.Image = Image.FromFile(Application.StartupPath + PicLogo.Tag.ToString()); PicLogo.Image = Image.FromFile(System.Windows.Forms.Application.StartupPath + PicLogo.Tag.ToString());
//if (!Common.debug) //if (!Common.debug)
// InitSuperDog(); // InitSuperDog();
InitCamera(); InitCamera();
InitReg(); InitReg();
InitLightPort(); InitLightPort();
if (Common.Database == null) if (Common.Database == null)
...@@ -836,12 +840,12 @@ namespace SmartCode ...@@ -836,12 +840,12 @@ namespace SmartCode
{ {
try try
{ {
if (Common.IO.IsConn) if (Common.IO.IsConn)
Common.IO.Close(); Common.IO.Close();
if (Common.Database.IsCon) if (Common.Database.IsCon)
Common.Database.Close(); Common.Database.Close();
if (port != null) if (port != null)
{ {
port.Open(); port.Open();
System.Threading.Thread.Sleep(50); System.Threading.Thread.Sleep(50);
...@@ -1023,7 +1027,7 @@ namespace SmartCode ...@@ -1023,7 +1027,7 @@ namespace SmartCode
if (!rtn) return; if (!rtn) return;
if (userControl == null) return; if (userControl == null) return;
if (userControl.Match) MatchTemplate(); if (userControl.Match) MatchTemplate();
if (userControl.LabelOCR) if (userControl.LabelOCR)
{ {
System.Threading.Thread tOCR = new System.Threading.Thread(new System.Threading.ThreadStart(ExtractLabel)); System.Threading.Thread tOCR = new System.Threading.Thread(new System.Threading.ThreadStart(ExtractLabel));
......
SmartCode/bin/Debug/log4net.dll deleted 100644 → 0
此文件类型无法预览
SmartCode/packages.config
...@@ -2,5 +2,5 @@ ...@@ -2,5 +2,5 @@
<packages> <packages>
<package id="System.Data.SQLite.Core" version="1.0.113.1" targetFramework="net461" /> <package id="System.Data.SQLite.Core" version="1.0.113.1" targetFramework="net461" />
<package id="Tesseract" version="3.3.0" targetFramework="net46" /> <package id="Tesseract" version="3.3.0" targetFramework="net46" />
<package id="ZXing.Net" version="0.16.5" targetFramework="net461" /> <package id="ZXing.Net" version="0.16.5" targetFramework="net461" requireReinstallation="true" />
</packages> </packages>
\ No newline at end of file \ No newline at end of file
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!