Skip to content

刘韬 / SO491-DUOStore

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

添加语言选项

1 个父辈 e35141b7
内嵌 并排
正在显示 15 个修改的文件 包含 188 行增加 和 144 行删除
source/Common/CodeResourceControl.cs
......@@ -100,6 +100,7 @@ namespace OnlineStore
{
if (OpenResourceLog)
{
getLangRes("zh-CN");
if (!LangMap["zh-CN"].ContainsKey(id) && checkInterid(id))
LOG.Info("No Res id:" + id + "#" + defaultStr);
}
......
source/Common/Common.csproj
......@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>OnlineStore.Common</RootNamespace>
<AssemblyName>Common</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
......
source/DUOStore/App.config
<?xml version="1.0"?>
<configuration>
<configSections>
<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net"/>
</configSections>
<appSettings>
<!--是否开机自动启动料仓-->
<add key="App_AutoRun" value="0" />
<add key="App_Title" value="DUO料仓" />
<add key="App_AutoRun" value="0"/>
<add key="App_Title" value="DUO料仓"/>
<!-- 开始吹气的判断值（配置值=服务器发送的湿度值-开始吹气值）-->
<add key="StartBlowValue" value="4" />
<add key="StartBlowValue" value="4"/>
<!-- 停止吹气的判断值（配置值=服务器发送的湿度值-停止吹气值）-->
<add key="StopBlowValue" value="4" />
<add key="StopBlowValue" value="4"/>
<!--Server address-->
<!--<add key="http.server" value="http://10.85.160.25/myproject/" />-->
<!--storeType-->
<add key="store_count" value="2" />
<add key="Store_ConfigPath" value="\StoreConfig\StoreConfig.csv" />
<add key="store_count" value="2"/>
<add key="Store_ConfigPath" value="\StoreConfig\StoreConfig.csv"/>
<!--start one store config-->
<add key="Store_Position_Config" value="\StoreConfig\linePositions.csv" />
<add key="BOX_ConfigPath" value="\StoreConfig\BoxConfig.csv" />
<add key="Store_Type" value="RC_AC_PA" />
<add key="Store_CID" value="duo-store" />
<add key="Store_CID_1" value="duo-1" />
<add key="Store_CID_2" value="duo-2" />
<add key="Store_CID_1_disabled" value="1" />
<add key="Store_CID_2_disabled" value="1" />
<add key="Store_Position_Config" value="\StoreConfig\linePositions.csv"/>
<add key="BOX_ConfigPath" value="\StoreConfig\BoxConfig.csv"/>
<add key="Store_Type" value="RC_AC_PA"/>
<add key="Store_CID" value="duo-store"/>
<add key="Store_CID_1" value="duo-1"/>
<add key="Store_CID_2" value="duo-2"/>
<add key="Store_CID_1_disabled" value="1"/>
<add key="Store_CID_2_disabled" value="1"/>
<!--end one store config-->
<add key="ACBaudRate" value="115200" />
<add key="Config_Pwd" value="123456" />
<add key="ACBaudRate" value="115200"/>
<add key="Config_Pwd" value="123456"/>
<!--二维码类型列表配置，用#分割，一维码=Barcode 二维码： QR Code#Data Matrix ECC 200#Micro QR Code-->
<add key="CodeType" value="QR Code#Data Matrix ECC 200" />
<add key="CodeType" value="QR Code#Data Matrix ECC 200"/>
<!--二维码参数文件所在路径，文件名与二维码类型名一样-->
<add key="CodeParamPath" value="\CodeParam\" />
<add key="CodeParamPath" value="\CodeParam\"/>
<!--出库等待料盘拿走的时间，秒-->
<add key="OutStoreWaitSeconds" value="1" />
<add key="OutStoreWaitSeconds" value="1"/>
<!--温控器类型，0=壁挂王字壳温湿度变送器，1=妙昕温湿度记录仪-->
<add key="HumitureControllerType" value="0" />
<add key="Default_Language" value="zh-CN" />
<add key="UseBuzzer" value="0" />
<add key="HumitureControllerType" value="0"/>
<add key="Default_Language" value="zh-CN"/>
<add key="UseBuzzer" value="0"/>
<!--IO模块是否主动上传-->
<add key="AIOAutoUpload" value="0" />
<add key="CodeCount" value="3" />
<add key="Tool_P3_Offset" value="7000" />
<add key="Tool_P4_Offset" value="-2000" />
<add key="Tool_P5_Offset" value="-2000" />
<add key="Tool_P6_Offset" value="7000" />
<add key="Tool_TargetSpeed" value="20" />
<add key="Tool_TargetPosition" value="1835000" />
<add key="AIOAutoUpload" value="0"/>
<add key="CodeCount" value="3"/>
<add key="Tool_P3_Offset" value="7000"/>
<add key="Tool_P4_Offset" value="-2000"/>
<add key="Tool_P5_Offset" value="-2000"/>
<add key="Tool_P6_Offset" value="7000"/>
<add key="Tool_TargetSpeed" value="20"/>
<add key="Tool_TargetPosition" value="1835000"/>
<add key="Agv_Log_Open" value="1" />
<add key="Agv_Log_Open" value="1"/>
<!--进出轴位置-->
<add key ="InOutDefaultPosition" value ="3000"/>
<add key="InOutDefaultPosition" value="3000"/>
<!--当前料架信息-料架号-->
<add key ="CurrShelfNum" value ="-1"/>
<add key="CurrShelfNum" value="-1"/>
<!--当前料架信息-料架类型，0=空料架，1=入库料架，2=出库料架-->
<add key ="CurrShelfType" value ="-1"/>
<add key ="Code_Block_Size_List" value ="17,19"/>
<add key="CurrShelfType" value="-1"/>
<add key="Code_Block_Size_List" value="17,19"/>
</appSettings>
<log4net>
<appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender">
<file value="logs/duoStore.log" />
<param name="Encoding" value="UTF-8" />
<appendToFile value="true" />
<rollingStyle value="Date" />
<datePattern value="yyyy-MM-dd" />
<file value="logs/duoStore.log"/>
<param name="Encoding" value="UTF-8"/>
<appendToFile value="true"/>
<rollingStyle value="Date"/>
<datePattern value="yyyy-MM-dd"/>
<layout type="log4net.Layout.PatternLayout">
<conversionPattern value="[%date][%t]%-5p %m%n" />
<conversionPattern value="[%date][%t]%-5p %m%n"/>
</layout>
</appender>
<appender name="AIOBOX" type="log4net.Appender.RollingFileAppender">
<file value="logs/aio/AIOBOX.log" />
<param name="Encoding" value="UTF-8" />
<appendToFile value="true" />
<rollingStyle value="Date" />
<datePattern value="yyyy-MM-dd" />
<file value="logs/aio/AIOBOX.log"/>
<param name="Encoding" value="UTF-8"/>
<appendToFile value="true"/>
<rollingStyle value="Date"/>
<datePattern value="yyyy-MM-dd"/>
<layout type="log4net.Layout.PatternLayout">
<conversionPattern value="[%date][%t]%-5p %m%n" />
<conversionPattern value="[%date][%t]%-5p %m%n"/>
</layout>
</appender>
<appender name="LngResource" type="log4net.Appender.RollingFileAppender">
<file value="logs/LngResource.log" />
<param name="Encoding" value="UTF-8" />
<appendToFile value="true" />
<rollingStyle value="Date" />
<datePattern value="yyyy-MM-dd" />
<file value="logs/LngResource.log"/>
<param name="Encoding" value="UTF-8"/>
<appendToFile value="true"/>
<rollingStyle value="Date"/>
<datePattern value="yyyy-MM-dd"/>
<layout type="log4net.Layout.PatternLayout">
<conversionPattern value="[%date][%t]%-5p %m%n" />
<conversionPattern value="[%date][%t]%-5p %m%n"/>
</layout>
</appender>
<logger name="RollingLogFileAppender">
<level value="Info" />
<appender-ref ref="RollingLogFileAppender" />
<level value="Info"/>
<appender-ref ref="RollingLogFileAppender"/>
</logger>
<logger name="AIOBOX">
<level value="Info" />
<appender-ref ref="AIOBOX" />
<level value="Info"/>
<appender-ref ref="AIOBOX"/>
</logger>
<logger name="LngResource">
<level value="Info" />
<appender-ref ref="LngResource" />
<level value="Info"/>
<appender-ref ref="LngResource"/>
</logger>
<!--<root>
<level value="Info" />
......@@ -106,6 +106,6 @@
</root>-->
</log4net>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
</startup>
</configuration>
\ No newline at end of file
</configuration>
source/DUOStore/DUOStore.csproj
......@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>OnlineStore.DUOStore</RootNamespace>
<AssemblyName>DUOStore</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
......
source/DUOStore/FrmStore.Designer.cs
......@@ -37,6 +37,7 @@
this.chkDebug = new System.Windows.Forms.CheckBox();
this.lblMoveInfo = new System.Windows.Forms.Label();
this.chbAutoRun = new System.Windows.Forms.CheckBox();
this.btn_releaseShelf = new System.Windows.Forms.Button();
this.btnCopyLog = new System.Windows.Forms.Button();
this.btnClearLog = new System.Windows.Forms.Button();
this.lblShelf = new System.Windows.Forms.Label();
......@@ -120,6 +121,7 @@
this.panel1.Controls.Add(this.chkDebug);
this.panel1.Controls.Add(this.lblMoveInfo);
this.panel1.Controls.Add(this.chbAutoRun);
this.panel1.Controls.Add(this.btn_releaseShelf);
this.panel1.Controls.Add(this.btnCopyLog);
this.panel1.Controls.Add(this.btnClearLog);
this.panel1.Controls.Add(this.lblShelf);
......@@ -176,6 +178,19 @@
this.chbAutoRun.UseVisualStyleBackColor = true;
this.chbAutoRun.CheckedChanged += new System.EventHandler(this.chbAutoRun_CheckedChanged);
//
// btn_releaseShelf
//
this.btn_releaseShelf.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.btn_releaseShelf.BackColor = System.Drawing.Color.White;
this.btn_releaseShelf.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btn_releaseShelf.Location = new System.Drawing.Point(12, 383);
this.btn_releaseShelf.Name = "btn_releaseShelf";
this.btn_releaseShelf.Size = new System.Drawing.Size(140, 35);
this.btn_releaseShelf.TabIndex = 191;
this.btn_releaseShelf.Text = "释放料架";
this.btn_releaseShelf.UseVisualStyleBackColor = false;
this.btn_releaseShelf.Click += new System.EventHandler(this.btn_releaseShelf_Click);
//
// btnCopyLog
//
this.btnCopyLog.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
......@@ -450,7 +465,7 @@
// 中文ToolStripMenuItem
//
this.中文ToolStripMenuItem.Name = "中文ToolStripMenuItem";
this.中文ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.中文ToolStripMenuItem.Size = new System.Drawing.Size(134, 26);
this.中文ToolStripMenuItem.Tag = "not";
this.中文ToolStripMenuItem.Text = "中文";
this.中文ToolStripMenuItem.Click += new System.EventHandler(this.中文ToolStripMenuItem_Click);
......@@ -458,7 +473,7 @@
// 英语ToolStripMenuItem
//
this.英语ToolStripMenuItem.Name = "英语ToolStripMenuItem";
this.英语ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.英语ToolStripMenuItem.Size = new System.Drawing.Size(134, 26);
this.英语ToolStripMenuItem.Tag = "not";
this.英语ToolStripMenuItem.Text = "English";
this.英语ToolStripMenuItem.Click += new System.EventHandler(this.英语ToolStripMenuItem_Click);
......@@ -584,6 +599,7 @@
private System.Windows.Forms.ToolStripMenuItem 语言ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem 中文ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem 英语ToolStripMenuItem;
private System.Windows.Forms.Button btn_releaseShelf;
}
}
source/DUOStore/FrmStore.cs
......@@ -29,14 +29,17 @@ namespace OnlineStore.DUOStore
private System.Timers.Timer startTimer = null;
internal FrmStore()
{
CodeResourceControl.GetLanguageEvent += CodeResourceControl_GetLanguageEvent;
InitializeComponent();
startTimer = new System.Timers.Timer();
startTimer.Interval = 1000;
startTimer.Enabled = false;
startTimer.AutoReset = false;
Control.CheckForIllegalCrossThreadCalls = false;
this.Shown += FrmStore_Shown;
CodeResourceControl.GetLanguageEvent += CodeResourceControl_GetLanguageEvent;
}
private string CodeResourceControl_GetLanguageEvent()
......@@ -57,6 +60,7 @@ namespace OnlineStore.DUOStore
{
try
{
CodeResourceControl.LanguageProcess(this, this.GetType().Name);
FrmBase.GetVersion();
store = StoreManager.InitStore();
if (store == null)
......@@ -120,10 +124,10 @@ namespace OnlineStore.DUOStore
{
this.listView1.Columns.Clear();
AddHealder(crc.GetString("table_name","名称"), 90);
AddHealder(crc.GetString("table_enable","启用"), 50);
AddHealder(crc.GetString("table_enable","启用"), 60);
AddHealder(crc.GetString("table_alarm","报警"), 130);
AddHealder(crc.GetString("table_state","状态"), 110);
AddHealder(crc.GetString("table_reelinfo","料盘信息"), listView1.Size.Width - 110 - 130 - 50 - 90 - 10);
AddHealder(crc.GetString("table_state","状态"), 130);
AddHealder(crc.GetString("table_reelinfo","料盘信息"), listView1.Size.Width - 130 - 130 - 60 - 90 - 10);
//AddHealder("BOX状态", listView1.Size.Width - 100 - 80 - 80 - 100 - 100 - 100 -40- 8);
AddRow(store, false );
......@@ -775,5 +779,10 @@ namespace OnlineStore.DUOStore
ConfigAppSettings.SaveValue("Default_Language", "zh-CN");
FrmStore_Shown(this, EventArgs.Empty);
}
private void btn_releaseShelf_Click(object sender, EventArgs e)
{
StoreManager.Store.LineOut_BTN_Process(true);
}
}
}
source/DUOStore/Program.cs
......@@ -5,10 +5,12 @@ using OnlineStore.DUOStore;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Runtime.InteropServices;
using System.Threading.Tasks;
using System.Windows.Forms;
using System.Xml;
namespace OnlineStore.DUOStore
{
......@@ -55,11 +57,11 @@ namespace OnlineStore.DUOStore
[STAThread]
static void Main(string[] Args)
{
//string path = @"http://localhost:4090/rest/api/v1/station/status";
//HttpHelper.PostOperation(path, new Operation());
//var a = DeviceLibrary.InOutParam.GetPosStoreId("4#AC3_17_3_22");
//string path = @"http://localhost:4090/rest/api/v1/station/status";
//HttpHelper.PostOperation(path, new Operation());
//var a = DeviceLibrary.InOutParam.GetPosStoreId("4#AC3_17_3_22");
CheckConfigFile();
Application.ThreadException += new System.Threading.ThreadExceptionEventHandler(Application_ThreadException);
AppDomain.CurrentDomain.UnhandledException += new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException);
......@@ -109,6 +111,24 @@ namespace OnlineStore.DUOStore
Application.Run(new FrmStore());
}
}
private static void CheckConfigFile()
{
string configfile = AppDomain.CurrentDomain.SetupInformation.ConfigurationFile;
string backupfile = configfile + ".backup";
try
{
var c = new XmlDocument();
c.Load(configfile);
File.Copy(configfile, backupfile, true);
}
catch
{
if (File.Exists(backupfile))
{
File.Copy(backupfile, configfile, true);
}
}
}
static void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e)
{
LogUnhandledException(e.ExceptionObject);
......
source/DUOStore/Properties/Resources.Designer.cs
......@@ -19,7 +19,7 @@ namespace OnlineStore.DUOStore.Properties {
// 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
// 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen
// (以 /str 作为命令选项)，或重新生成 VS 项目。
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources {
......@@ -47,8 +47,8 @@ namespace OnlineStore.DUOStore.Properties {
}
/// <summary>
/// 重写当前线程的 CurrentUICulture 属性
/// 重写当前线程的 CurrentUICulture 属性。
/// 重写当前线程的 CurrentUICulture 属性，对
/// 使用此强类型资源类的所有资源查找执行重写。
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Globalization.CultureInfo Culture {
......
source/DUOStore/Properties/Settings.Designer.cs
......@@ -12,7 +12,7 @@ namespace OnlineStore.DUOStore.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.9.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.5.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
......
source/DUOStore/useControl/AxisMoveControl.Designer.cs
......@@ -30,6 +30,8 @@
{
this.groupAxis = new System.Windows.Forms.GroupBox();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.txtStb = new System.Windows.Forms.TextBox();
this.label2 = new System.Windows.Forms.Label();
this.txtBusyStatus = new System.Windows.Forms.TextBox();
this.label11 = new System.Windows.Forms.Label();
this.txtHomeStatus = new System.Windows.Forms.TextBox();
......@@ -74,8 +76,6 @@
this.txtAxisValue = new System.Windows.Forms.TextBox();
this.txtAxisDeviceName = new System.Windows.Forms.TextBox();
this.lblServerOn = new System.Windows.Forms.Label();
this.txtStb = new System.Windows.Forms.TextBox();
this.label2 = new System.Windows.Forms.Label();
this.groupAxis.SuspendLayout();
this.groupBox1.SuspendLayout();
this.panel1.SuspendLayout();
......@@ -124,6 +124,23 @@
this.groupBox1.TabStop = false;
this.groupBox1.Text = "状态";
//
// txtStb
//
this.txtStb.Enabled = false;
this.txtStb.Location = new System.Drawing.Point(120, 76);
this.txtStb.Name = "txtStb";
this.txtStb.Size = new System.Drawing.Size(25, 23);
this.txtStb.TabIndex = 329;
//
// label2
//
this.label2.Location = new System.Drawing.Point(12, 79);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(99, 20);
this.label2.TabIndex = 330;
this.label2.Text = "STB状态:";
this.label2.TextAlign = System.Drawing.ContentAlignment.TopRight;
//
// txtBusyStatus
//
this.txtBusyStatus.Enabled = false;
......@@ -134,12 +151,12 @@
//
// label11
//
this.label11.AutoSize = true;
this.label11.Location = new System.Drawing.Point(6, 135);
this.label11.Name = "label11";
this.label11.Size = new System.Drawing.Size(105, 17);
this.label11.Size = new System.Drawing.Size(105, 20);
this.label11.TabIndex = 292;
this.label11.Text = "HOME-CMP状态:";
this.label11.TextAlign = System.Drawing.ContentAlignment.TopRight;
//
// txtHomeStatus
//
......@@ -151,40 +168,39 @@
//
// label10
//
this.label10.AutoSize = true;
this.label10.Location = new System.Drawing.Point(45, 107);
this.label10.Location = new System.Drawing.Point(15, 107);
this.label10.Name = "label10";
this.label10.Size = new System.Drawing.Size(66, 17);
this.label10.Size = new System.Drawing.Size(96, 15);
this.label10.TabIndex = 289;
this.label10.Text = "BUSY状态:";
this.label10.TextAlign = System.Drawing.ContentAlignment.TopRight;
//
// label3
//
this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(52, 51);
this.label3.Location = new System.Drawing.Point(12, 51);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(59, 17);
this.label3.Size = new System.Drawing.Size(99, 20);
this.label3.TabIndex = 286;
this.label3.Text = "报警状态:";
this.label3.TextAlign = System.Drawing.ContentAlignment.TopRight;
//
// label24
//
this.label24.AutoSize = true;
this.label24.Location = new System.Drawing.Point(40, 219);
this.label24.Location = new System.Drawing.Point(15, 219);
this.label24.Name = "label24";
this.label24.Size = new System.Drawing.Size(71, 17);
this.label24.Size = new System.Drawing.Size(96, 20);
this.label24.TabIndex = 316;
this.label24.Text = "负极限信号:";
this.label24.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label24.TextAlign = System.Drawing.ContentAlignment.TopRight;
//
// label5
//
this.label5.AutoSize = true;
this.label5.Location = new System.Drawing.Point(52, 23);
this.label5.Location = new System.Drawing.Point(9, 23);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(59, 17);
this.label5.Size = new System.Drawing.Size(102, 20);
this.label5.TabIndex = 328;
this.label5.Text = "伺服状态:";
this.label5.TextAlign = System.Drawing.ContentAlignment.TopRight;
//
// btnGetAlarm
//
......@@ -224,13 +240,12 @@
//
// label22
//
this.label22.AutoSize = true;
this.label22.Location = new System.Drawing.Point(40, 191);
this.label22.Location = new System.Drawing.Point(12, 191);
this.label22.Name = "label22";
this.label22.Size = new System.Drawing.Size(71, 17);
this.label22.Size = new System.Drawing.Size(99, 18);
this.label22.TabIndex = 312;
this.label22.Text = "正极限信号:";
this.label22.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label22.TextAlign = System.Drawing.ContentAlignment.TopRight;
//
// txtLimit1
//
......@@ -242,12 +257,12 @@
//
// label6
//
this.label6.AutoSize = true;
this.label6.Location = new System.Drawing.Point(52, 163);
this.label6.Location = new System.Drawing.Point(12, 163);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(59, 17);
this.label6.Size = new System.Drawing.Size(99, 16);
this.label6.TabIndex = 300;
this.label6.Text = "原点信号:";
this.label6.TextAlign = System.Drawing.ContentAlignment.TopRight;
//
// txtHomeSingle
//
......@@ -457,12 +472,12 @@
//
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(9, 231);
this.label1.Location = new System.Drawing.Point(-8, 231);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(68, 17);
this.label1.Size = new System.Drawing.Size(78, 22);
this.label1.TabIndex = 329;
this.label1.Text = "点动速度：";
this.label1.TextAlign = System.Drawing.ContentAlignment.TopRight;
//
// label47
//
......@@ -512,13 +527,13 @@
//
// label8
//
this.label8.AutoSize = true;
this.label8.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label8.Location = new System.Drawing.Point(18, 149);
this.label8.Location = new System.Drawing.Point(3, 149);
this.label8.Name = "label8";
this.label8.Size = new System.Drawing.Size(59, 17);
this.label8.Size = new System.Drawing.Size(74, 21);
this.label8.TabIndex = 255;
this.label8.Text = "实时位置:";
this.label8.TextAlign = System.Drawing.ContentAlignment.TopRight;
//
// btnAxisRMove
//
......@@ -563,12 +578,11 @@
//
// label49
//
this.label49.AutoSize = true;
this.label49.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label49.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label49.Location = new System.Drawing.Point(10, 18);
this.label49.Location = new System.Drawing.Point(0, 18);
this.label49.Name = "label49";
this.label49.Size = new System.Drawing.Size(51, 17);
this.label49.Size = new System.Drawing.Size(61, 20);
this.label49.TabIndex = 233;
this.label49.Text = "AC伺服:";
this.label49.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
......@@ -589,12 +603,11 @@
//
// label46
//
this.label46.AutoSize = true;
this.label46.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label46.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label46.Location = new System.Drawing.Point(26, 104);
this.label46.Location = new System.Drawing.Point(-1, 104);
this.label46.Name = "label46";
this.label46.Size = new System.Drawing.Size(35, 17);
this.label46.Size = new System.Drawing.Size(62, 19);
this.label46.TabIndex = 239;
this.label46.Text = "地址:";
this.label46.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
......@@ -615,12 +628,11 @@
//
// label45
//
this.label45.AutoSize = true;
this.label45.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label45.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label45.Location = new System.Drawing.Point(14, 62);
this.label45.Location = new System.Drawing.Point(3, 62);
this.label45.Name = "label45";
this.label45.Size = new System.Drawing.Size(47, 17);
this.label45.Size = new System.Drawing.Size(58, 17);
this.label45.TabIndex = 240;
this.label45.Text = "端口号:";
this.label45.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
......@@ -658,23 +670,6 @@
this.lblServerOn.Size = new System.Drawing.Size(0, 19);
this.lblServerOn.TabIndex = 268;
//
// txtStb
//
this.txtStb.Enabled = false;
this.txtStb.Location = new System.Drawing.Point(120, 76);
this.txtStb.Name = "txtStb";
this.txtStb.Size = new System.Drawing.Size(25, 23);
this.txtStb.TabIndex = 329;
//
// label2
//
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(54, 79);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(57, 17);
this.label2.TabIndex = 330;
this.label2.Text = "STB状态:";
//
// AxisMoveControl
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
......
source/DeviceLibrary/DeviceLibrary.csproj
......@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>OnlineStore.DeviceLibrary</RootNamespace>
<AssemblyName>DeviceLibrary</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
......
source/DeviceLibrary/device/halcon/CodeManager.cs
......@@ -159,16 +159,16 @@ namespace OnlineStore.DeviceLibrary
List<CodeInfo> cc = new List<CodeInfo>();
string r = "";
foreach (int codesize in Code_Block_Size_List)
//foreach (int codesize in Code_Block_Size_List)
{
//if (codeList.Count > 0)
// break;
List<CodeInfo> tlci = EyemDecode.Decoder(ref bmp, null, codesize);
List<CodeInfo> tlci = EyemDecode2.Decoder(ref bmp);
foreach (CodeInfo code in tlci)
{
LogUtil.info(" 【" + cameraName + $"】[eyemDecode blocksize:{codesize}]" + code.CodeType + "(X: " + code.X + "，Y: " + code.Y + ") " + code.CodeStr);
LogUtil.info(" 【" + cameraName + $"】[eyemDecode]" + code.CodeType + "(X: " + code.X + "，Y: " + code.Y + ") " + code.CodeStr);
string str = CodeManager.ReplaceCode(code.CodeStr);
lock (codeList)
{
......
source/DeviceLibrary/duoStore/BoxBean_Partial.cs
......@@ -207,6 +207,7 @@ namespace OnlineStore.DeviceLibrary
MiddleAxis.AbsMove(MoveInfo, Config.MiddleAxis_P11, Config.MiddleAxis_P11_Speed);
UpdownAxis.AbsMove(MoveInfo, Config.UpDownAxis_P12, Config.UpDownAxis_P12_Speed);
}
MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.Fixture_Check, IO_VALUE.HIGH));
}
#region 正常入库处理
......@@ -245,6 +246,7 @@ namespace OnlineStore.DeviceLibrary
ComAxis.AbsMove(MoveInfo, moveP.ComPress_P1, Config.CompAxis_P1_Speed);
MiddleAxis.AbsMove(MoveInfo, moveP.Middle_P1, Config.MiddleAxis_P1_Speed);
UpdownAxis.AbsMove(MoveInfo, moveP.UpDown_P1, Config.UpDownAxis_P1_Speed);
MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.Fixture_Check, IO_VALUE.LOW));
}
else if (MoveInfo.IsStep(StoreMoveStep.SI_10_GoBack))
{
......@@ -460,6 +462,7 @@ namespace OnlineStore.DeviceLibrary
MiddleAxis.AbsMove(MoveInfo, Config.MiddleAxis_P11, Config.MiddleAxis_P11_Speed);
UpdownAxis.AbsMove(MoveInfo, Config.UpDownAxis_P12, Config.UpDownAxis_P12_Speed);
}
MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.Fixture_Check, IO_VALUE.HIGH));
}
#region 批量出料，到料串
......
source/DeviceLibrary/duoStore/DUOStoreBean.cs
......@@ -650,9 +650,9 @@ namespace OnlineStore.DeviceLibrary
}
}
private void LineOut_BTN_Process()
public void LineOut_BTN_Process(bool force=false)
{
if (IOValue(IO_Type.LineOut_BTN).Equals(IO_VALUE.LOW))
if (IOValue(IO_Type.LineOut_BTN).Equals(IO_VALUE.LOW) && !force)
return;
if (IOValue(IO_Type.Line_OutCheck).Equals(IO_VALUE.HIGH))
......@@ -660,7 +660,7 @@ namespace OnlineStore.DeviceLibrary
//IOMove(IO_Type.Line_Run, IO_VALUE.HIGH, false, 4000);
LineRun("LineOut_BTN_Process", 4);
IOMove(IO_Type.Line_Stop4_Out, IO_VALUE.HIGH, false, 2000);
LogUtil.info(Name + "脚踩按钮,放行区放行");
LogUtil.info(Name + $"{(force?"界面": "脚踩")}按钮,放行区放行");
}
if (IOValue(IO_Type.Line_OutCheck).Equals(IO_VALUE.LOW)
......@@ -671,7 +671,7 @@ namespace OnlineStore.DeviceLibrary
{
LineRun("LineOut_BTN_Process", 3);
IOMove(IO_Type.Line_Stop2_Work, IO_VALUE.HIGH, false, 2000);
LogUtil.info(Name + "脚踩按钮,工作区放行");
LogUtil.info(Name + $"{(force?"界面": "脚踩")}按钮,工作区放行");
}
bool box1stay = BoxMap[1].runStatus == StoreRunStatus.Runing || BoxMap[1].runStatus == StoreRunStatus.Wait;
bool box2stay = BoxMap[2].runStatus == StoreRunStatus.Runing || BoxMap[2].runStatus == StoreRunStatus.Wait;
......@@ -680,7 +680,7 @@ namespace OnlineStore.DeviceLibrary
{
//OutstoreEndSendShelf = true;
LO_31_BatchAxisToP1();
LogUtil.info(Name + "脚踩按钮,出库强制放行");
LogUtil.info(Name + $"{(force ? "界面" : "脚踩")}按钮,出库强制放行");
}
}
......
source/LoadCVSLibrary/LoadCSVLibrary.csproj
......@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>OnlineStore.LoadCSVLibrary</RootNamespace>
<AssemblyName>LoadCSVLibrary</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!