Skip to content

孙克 / ACSquareStore

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 51f0148d 由 LN
选项

1

1 个父辈 252a2fee
内嵌 并排
正在显示 25 个修改的文件 包含 59 行增加 和 61 行删除
source/ACSquareStore/ACSquareStore.csproj
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
<ProjectGuid>{0D2542F5-DD62-4352-82D0-383D9A045E74}</ProjectGuid> <ProjectGuid>{0D2542F5-DD62-4352-82D0-383D9A045E74}</ProjectGuid>
<OutputType>WinExe</OutputType> <OutputType>WinExe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>OnlineStore.ACSingleStore</RootNamespace> <RootNamespace>OnlineStore.ACSquareStore</RootNamespace>
<AssemblyName>ACSingleStore</AssemblyName> <AssemblyName>ACSquareStore</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
......
source/ACSquareStore/FormManager.cs
...@@ -8,7 +8,7 @@ using System.Text; ...@@ -8,7 +8,7 @@ using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows.Forms; using System.Windows.Forms;
namespace OnlineStore.ACSingleStore namespace OnlineStore.ACSquareStore
{ {
public class FormManager public class FormManager
{ {
......
source/ACSquareStore/FrmAbout.Designer.cs
namespace OnlineStore.ACSingleStore namespace OnlineStore.ACSquareStore
{ {
partial class FrmAbout partial class FrmAbout
{ {
......
source/ACSquareStore/FrmAbout.cs
...@@ -10,7 +10,7 @@ using System.Text; ...@@ -10,7 +10,7 @@ using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows.Forms; using System.Windows.Forms;
namespace OnlineStore.ACSingleStore namespace OnlineStore.ACSquareStore
{ {
public partial class FrmAbout : FrmBase public partial class FrmAbout : FrmBase
{ {
......
source/ACSquareStore/FrmAxisDebug.Designer.cs
namespace OnlineStore.ACSingleStore namespace OnlineStore.ACSquareStore
{ {
partial class FrmAxisDebug partial class FrmAxisDebug
{ {
......
source/ACSquareStore/FrmAxisDebug.cs
...@@ -13,7 +13,7 @@ using System.Text; ...@@ -13,7 +13,7 @@ using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows.Forms; using System.Windows.Forms;
namespace OnlineStore.ACSingleStore namespace OnlineStore.ACSquareStore
{ {
public partial class FrmAxisDebug : FrmBase public partial class FrmAxisDebug : FrmBase
......
source/ACSquareStore/FrmBase.Designer.cs
namespace OnlineStore.ACSingleStore namespace OnlineStore.ACSquareStore
{ {
partial class FrmBase partial class FrmBase
{ {
......
source/ACSquareStore/FrmBase.cs
...@@ -9,7 +9,7 @@ using System.Text; ...@@ -9,7 +9,7 @@ using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows.Forms; using System.Windows.Forms;
namespace OnlineStore.ACSingleStore namespace OnlineStore.ACSquareStore
{ {
public partial class FrmBase : Form public partial class FrmBase : Form
{ {
......
source/ACSquareStore/FrmIOStatus.Designer.cs
namespace OnlineStore.ACSingleStore namespace OnlineStore.ACSquareStore
{ {
partial class FrmIOStatus partial class FrmIOStatus
{ {
......
source/ACSquareStore/FrmIOStatus.cs
...@@ -18,7 +18,7 @@ using OnlineStore.LoadCSVLibrary; ...@@ -18,7 +18,7 @@ using OnlineStore.LoadCSVLibrary;
using OnlineStore.Common; using OnlineStore.Common;
namespace OnlineStore.ACSingleStore namespace OnlineStore.ACSquareStore
{ {
public partial class FrmIOStatus : FrmBase public partial class FrmIOStatus : FrmBase
{ {
......
source/ACSquareStore/FrmPwd.Designer.cs
namespace OnlineStore.ACSingleStore namespace OnlineStore.ACSquareStore
{ {
partial class FrmPwd partial class FrmPwd
{ {
......
source/ACSquareStore/FrmPwd.cs
...@@ -10,7 +10,7 @@ using System.Text; ...@@ -10,7 +10,7 @@ using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows.Forms; using System.Windows.Forms;
namespace OnlineStore.ACSingleStore namespace OnlineStore.ACSquareStore
{ {
public partial class FrmPwd : FrmBase public partial class FrmPwd : FrmBase
{ {
......
source/ACSquareStore/FrmStoreBox.Designer.cs
namespace OnlineStore.ACSingleStore namespace OnlineStore.ACSquareStore
{ {
partial class FrmStoreBox partial class FrmStoreBox
{ {
......
source/ACSquareStore/FrmStoreBox.cs
...@@ -19,7 +19,7 @@ using OnlineStore.LoadCSVLibrary; ...@@ -19,7 +19,7 @@ using OnlineStore.LoadCSVLibrary;
using CodeLibrary; using CodeLibrary;
using UserFromControl; using UserFromControl;
namespace OnlineStore.ACSingleStore namespace OnlineStore.ACSquareStore
{ {
public partial class FrmStoreBox : FrmBase public partial class FrmStoreBox : FrmBase
{ {
......
source/ACSquareStore/ManagerUtil.cs
...@@ -5,7 +5,7 @@ using System.Text; ...@@ -5,7 +5,7 @@ using System.Text;
using System.Windows; using System.Windows;
using System.Windows.Forms; using System.Windows.Forms;
namespace OnlineStore.ACSingleStore namespace OnlineStore.ACSquareStore
{ {
public class ManagerUtil public class ManagerUtil
{ {
......
source/ACSquareStore/Program.cs
using log4net; using log4net;
using log4net.Config; using log4net.Config;
using OnlineStore.Common; using OnlineStore.Common;
using OnlineStore.ACSingleStore; using OnlineStore.ACSquareStore;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
...@@ -10,7 +10,7 @@ using System.Runtime.InteropServices; ...@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows.Forms; using System.Windows.Forms;
namespace OnlineStore.ACSingleStore namespace OnlineStore.ACSquareStore
{ {
static class Program static class Program
{ {
......
source/ACSquareStore/Properties/Resources.Designer.cs
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
// </auto-generated> // </auto-generated>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
namespace OnlineStore.ACSingleStore.Properties { namespace OnlineStore.ACSquareStore.Properties {
using System; using System;
...@@ -39,7 +39,7 @@ namespace OnlineStore.ACSingleStore.Properties { ...@@ -39,7 +39,7 @@ namespace OnlineStore.ACSingleStore.Properties {
internal static global::System.Resources.ResourceManager ResourceManager { internal static global::System.Resources.ResourceManager ResourceManager {
get { get {
if (object.ReferenceEquals(resourceMan, null)) { if (object.ReferenceEquals(resourceMan, null)) {
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("OnlineStore.ACSingleStore.Properties.Resources", typeof(Resources).Assembly); global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("OnlineStore.ACSquareStore.Properties.Resources", typeof(Resources).Assembly);
resourceMan = temp; resourceMan = temp;
} }
return resourceMan; return resourceMan;
......
source/ACSquareStore/Properties/Settings.Designer.cs
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
// </auto-generated> // </auto-generated>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
namespace OnlineStore.ACSingleStore.Properties { namespace OnlineStore.ACSquareStore.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
......
source/ACSquareStore/ServoAxisInfo.Designer.cs
namespace OnlineStore.ACSingleStore namespace OnlineStore.ACSquareStore
{ {
partial class ServoAxisInfo partial class ServoAxisInfo
{ {
......
source/ACSquareStore/ServoAxisInfo.cs
...@@ -8,7 +8,7 @@ using System.Text; ...@@ -8,7 +8,7 @@ using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows.Forms; using System.Windows.Forms;
namespace OnlineStore.ACSingleStore namespace OnlineStore.ACSquareStore
{ {
public partial class ServoAxisInfo : UserControl public partial class ServoAxisInfo : UserControl
{ {
......
source/ACSquareStore/positionTool/FrmPositionTool.Designer.cs
namespace OnlineStore.ACSingleStore namespace OnlineStore.ACSquareStore
{ {
partial class FrmPositionTool partial class FrmPositionTool
{ {
......
source/ACSquareStore/positionTool/FrmPositionTool.cs
...@@ -15,7 +15,7 @@ using System.Threading; ...@@ -15,7 +15,7 @@ using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows.Forms; using System.Windows.Forms;
namespace OnlineStore.ACSingleStore namespace OnlineStore.ACSquareStore
{ {
public partial class FrmPositionTool : FrmBase public partial class FrmPositionTool : FrmBase
{ {
......
source/DeviceLibrary/StoreConfig/StoreConfig.csv
...@@ -45,12 +45,10 @@ PRO,升降轴 进料口出料前点 P2,UpDownAxis_DoorI_P2,321500,,,,,,, ...@@ -45,12 +45,10 @@ PRO,升降轴 进料口出料前点 P2,UpDownAxis_DoorI_P2,321500,,,,,,,
PRO,升降轴 进料口取料缓冲点 P7,UpDownAxis_DoorOB_P7,321500,,,,,,, PRO,升降轴 进料口取料缓冲点 P7,UpDownAxis_DoorOB_P7,321500,,,,,,,
PRO,升降轴 进料口出料缓冲点 P8,UpDownAxis_DoorIB_P8,301400,,,,,,, PRO,升降轴 进料口出料缓冲点 P8,UpDownAxis_DoorIB_P8,301400,,,,,,,
PRO,（Y轴-前后轴）P1 待机原位点,MiddleAxis_P1_Position,325000,,,,,,, PRO,（Y轴-前后轴）P1 待机原位点,MiddleAxis_P1_Position,325000,,,,,,,
PRO,（ X轴-进出轴）P1待机原位点,InOutAxis_P1_Position,7900,,,,,,, PRO,（ X轴-进出轴）P1待机原位点,InOutAxis_P1_Position,500,,,,,,,
PRO,（ X轴-进出轴）P1左侧托架取料点P2,InOutAxis_P2_Position,7900,,,,,,, PRO,（ X轴-进出轴）P1左侧托架取料点P2,InOutAxis_P2_Position,7900,,,,,,,
PRO,（ X轴-进出轴）P1右侧托架取料点P3,InOutAxis_P3_Position,7900,,,,,,, PRO,（ X轴-进出轴）P1右侧托架取料点P3,InOutAxis_P3_Position,-7900,,,,,,,
PRO,是否使用定位气缸,IsHasLocationCylinder,0,,,,,,,
PRO,是否有左右侧门,IsHasDoorLimit,1,,,,,,, PRO,是否有左右侧门,IsHasDoorLimit,1,,,,,,,
PRO,是否使用压紧轴（1=使用）,IsHasCompress_Axis,1,,,,, ,,
PRO,气压检测IO关闭需要持续的时间,AirCheckSeconds,3,,,,,,, PRO,气压检测IO关闭需要持续的时间,AirCheckSeconds,3,,,,,,,
,,,,,,,,,, ,,,,,,,,,,
PRO,预警温度,WarnTemperate,80,,,,,,, PRO,预警温度,WarnTemperate,80,,,,,,,
......
source/DeviceLibrary/StoreConfig/linePositions.csv
位置,优先级,高度,宽度,料仓ID,前后轴位置P2,升降轴库位出料前点P5,升降轴库位出料缓冲点P6,升降轴库位入料前点P3,升降轴库位入料缓冲点P4,进出轴库位取料点P4 位置,优先级,高度,宽度,料仓ID,前后轴位置P2,升降轴库位出料前点P5,升降轴库位出料缓冲点P6,升降轴库位入料前点P3,升降轴库位入料缓冲点P4,进出轴库位取料点P4
4D07010101,2104,8,7,7,325100,1600,8600,8600,1600,124500
4D07010102,2103,8,7,7,325074,17555,24555,24555,17555,124500
4D07010103,2102,8,7,7,325048,33991,40991,40991,33991,124500
4D07010104,2101,8,7,7,325022,50967,57967,57967,50967,124500
4D07010105,2100,8,7,7,324996,66526,73526,73526,66526,124500
4D07010106,2099,8,7,7,324970,83181,90181,90181,83181,124500
4D07010107,2098,8,7,7,324944,99432,106432,106432,99432,124500
4D07010108,2097,8,7,7,324918,115296,122296,122296,115296,124500
4D07010109,2096,8,7,7,324892,132584,139584,139584,132584,124500
4D07010110,2095,8,7,7,324866,149033,156033,156033,149033,124500
4D07010111,2094,8,7,7,324840,165316,172316,172316,165316,124500
4D07010112,2093,8,7,7,324814,181769,188769,188769,181769,124500
4D07010306,2067,8,7,7,323310,1002812,1009812,1009812,1002812,124500
4D07010307,2066,8,7,7,323272,1019406,1026406,1026406,1019406,124500
4D07010308,2065,8,7,7,323234,1035569,1042569,1042569,1035569,124500
4D07010309,2064,8,7,7,323196,1052159,1059159,1059159,1052159,124500
4D07010310,2063,8,7,7,323158,1068703,1075703,1075703,1068703,124500
4D07010311,2062,8,7,7,323120,1085683,1092683,1092683,1085683,124500
4D07010312,2061,8,7,7,323082,1101660,1108660,1108660,1101660,124500
4D07010313,2060,8,7,7,323044,1118110,1125110,1125110,1118110,124500
4D07010314,2059,8,7,7,323006,1134193,1141193,1141193,1134193,124500
4D07010315,2058,8,7,7,322968,1150744,1157744,1157744,1150744,124500
\ No newline at end of file \ No newline at end of file
AC1#1_1_1,1,8,7,1,325100,1600,8600,8600,1600,124500
AC1#1_1_2,2,8,7,1,325074,17555,24555,24555,17555,124500
AC1#1_1_3,3,8,7,1,325048,33991,40991,40991,33991,124500
AC1#1_1_4,4,8,7,1,325022,50967,57967,57967,50967,124500
AC1#1_1_5,5,8,7,1,324996,66526,73526,73526,66526,124500
AC1#1_1_6,6,8,7,1,324970,83181,90181,90181,83181,124500
AC1#1_1_7,7,8,7,1,324944,99432,106432,106432,99432,124500
AC1#1_1_8,8,8,7,1,324918,115296,122296,122296,115296,124500
AC1#1_1_9,9,8,7,1,324892,132584,139584,139584,132584,124500
AC1#1_1_10,10,8,7,1,324866,149033,156033,156033,149033,124500
AC1#1_1_11,11,8,7,1,324840,165316,172316,172316,165316,124500
AC1#1_1_12,12,8,7,1,324814,181769,188769,188769,181769,124500
AC1#1_1_13,13,8,7,1,323310,1002812,1009812,1009812,1002812,124500
AC1#1_1_14,14,8,7,1,323272,1019406,1026406,1026406,1019406,124500
AC1#1_1_15,15,8,7,1,323234,1035569,1042569,1042569,1035569,124500
AC1#1_1_16,16,8,7,1,323196,1052159,1059159,1059159,1052159,124500
AC1#1_1_17,17,8,7,1,323158,1068703,1075703,1075703,1068703,124500
AC1#1_1_18,18,8,7,1,323120,1085683,1092683,1092683,1085683,124500
AC1#1_1_19,19,8,7,1,323082,1101660,1108660,1108660,1101660,124500
AC1#1_1_20,20,8,7,1,323044,1118110,1125110,1125110,1118110,124500
AC1#1_1_21,21,8,7,1,323006,1134193,1141193,1141193,1134193,124500
AC1#1_1_22,22,8,7,1,322968,1150744,1157744,1157744,1150744,124500
source/LoadCVSLibrary/storeConfig/config/Box_Config.cs
...@@ -33,16 +33,16 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -33,16 +33,16 @@ namespace OnlineStore.LoadCSVLibrary
/// </summary> /// </summary>
[ConfigProAttribute("AirCheckSeconds")] [ConfigProAttribute("AirCheckSeconds")]
public int AirCheckSeconds { get; set; } public int AirCheckSeconds { get; set; }
/// <summary> ///// <summary>
/// IsHasCompress_Axis是否使用压紧轴 ///// IsHasCompress_Axis是否使用压紧轴
/// </summary> ///// </summary>
[ConfigProAttribute("IsHasCompress_Axis")] //[ConfigProAttribute("IsHasCompress_Axis")]
public int IsHasCompress_Axis { get; set; } //public int IsHasCompress_Axis { get; set; }
/// <summary> ///// <summary>
/// PRO 是否使用定位气缸 IsHasLocationCylinder 0 ///// PRO 是否使用定位气缸 IsHasLocationCylinder 0
/// </summary> ///// </summary>
[ConfigProAttribute("IsHasLocationCylinder")] //[ConfigProAttribute("IsHasLocationCylinder")]
public int IsHasLocationCylinder { get; set; } //public int IsHasLocationCylinder { get; set; }
/// <summary> /// <summary>
/// PRO 是否有左右侧门 IsHasDoorLimit 0 /// PRO 是否有左右侧门 IsHasDoorLimit 0
/// </summary> /// </summary>
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!