Skip to content

孙克 / ACSingleStore

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 10be948a 由 几米阳光
选项

代码修改

1 个父辈 e1c28beb
全部展开
内嵌 并排
正在显示 37 个修改的文件 包含 181 行增加 和 1190 行删除
source/ACSingleStore/FrmAxisDebug.Designer.cs
...@@ -51,27 +51,27 @@ ...@@ -51,27 +51,27 @@
// label1 // label1
// //
this.label1.AutoSize = true; this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(39, 91); this.label1.Location = new System.Drawing.Point(39, 77);
this.label1.Name = "label1"; this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(89, 12); this.label1.Size = new System.Drawing.Size(107, 20);
this.label1.TabIndex = 0; this.label1.TabIndex = 0;
this.label1.Text = "（轴一）旋转轴"; this.label1.Text = "（轴一）旋转轴";
// //
// label2 // label2
// //
this.label2.AutoSize = true; this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(39, 145); this.label2.Location = new System.Drawing.Point(39, 131);
this.label2.Name = "label2"; this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(89, 12); this.label2.Size = new System.Drawing.Size(107, 20);
this.label2.TabIndex = 1; this.label2.TabIndex = 1;
this.label2.Text = "（轴二）升降轴"; this.label2.Text = "（轴二）升降轴";
// //
// label3 // label3
// //
this.label3.AutoSize = true; this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(39, 198); this.label3.Location = new System.Drawing.Point(39, 184);
this.label3.Name = "label3"; this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(89, 12); this.label3.Size = new System.Drawing.Size(107, 20);
this.label3.TabIndex = 2; this.label3.TabIndex = 2;
this.label3.Text = "（轴三）进出轴"; this.label3.Text = "（轴三）进出轴";
// //
...@@ -80,16 +80,16 @@ ...@@ -80,16 +80,16 @@
this.label4.AutoSize = true; this.label4.AutoSize = true;
this.label4.Location = new System.Drawing.Point(39, 233); this.label4.Location = new System.Drawing.Point(39, 233);
this.label4.Name = "label4"; this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(89, 12); this.label4.Size = new System.Drawing.Size(107, 20);
this.label4.TabIndex = 3; this.label4.TabIndex = 3;
this.label4.Text = "（轴四）压紧轴"; this.label4.Text = "（轴四）压紧轴";
this.label4.Visible = false; this.label4.Visible = false;
// //
// btnMiddleMove // btnMiddleMove
// //
this.btnMiddleMove.Location = new System.Drawing.Point(293, 79); this.btnMiddleMove.Location = new System.Drawing.Point(266, 70);
this.btnMiddleMove.Name = "btnMiddleMove"; this.btnMiddleMove.Name = "btnMiddleMove";
this.btnMiddleMove.Size = new System.Drawing.Size(107, 31); this.btnMiddleMove.Size = new System.Drawing.Size(131, 36);
this.btnMiddleMove.TabIndex = 4; this.btnMiddleMove.TabIndex = 4;
this.btnMiddleMove.Text = "旋转轴+(顺时针)"; this.btnMiddleMove.Text = "旋转轴+(顺时针)";
this.btnMiddleMove.UseVisualStyleBackColor = true; this.btnMiddleMove.UseVisualStyleBackColor = true;
...@@ -99,38 +99,38 @@ ...@@ -99,38 +99,38 @@
// //
// txtMiddleSpeed // txtMiddleSpeed
// //
this.txtMiddleSpeed.Location = new System.Drawing.Point(150, 86); this.txtMiddleSpeed.Location = new System.Drawing.Point(150, 75);
this.txtMiddleSpeed.Name = "txtMiddleSpeed"; this.txtMiddleSpeed.Name = "txtMiddleSpeed";
this.txtMiddleSpeed.Size = new System.Drawing.Size(108, 21); this.txtMiddleSpeed.Size = new System.Drawing.Size(108, 26);
this.txtMiddleSpeed.TabIndex = 5; this.txtMiddleSpeed.TabIndex = 5;
// //
// txtUpDownSpeed // txtUpDownSpeed
// //
this.txtUpDownSpeed.Location = new System.Drawing.Point(150, 140); this.txtUpDownSpeed.Location = new System.Drawing.Point(150, 129);
this.txtUpDownSpeed.Name = "txtUpDownSpeed"; this.txtUpDownSpeed.Name = "txtUpDownSpeed";
this.txtUpDownSpeed.Size = new System.Drawing.Size(108, 21); this.txtUpDownSpeed.Size = new System.Drawing.Size(108, 26);
this.txtUpDownSpeed.TabIndex = 6; this.txtUpDownSpeed.TabIndex = 6;
// //
// txtInOutSpeed // txtInOutSpeed
// //
this.txtInOutSpeed.Location = new System.Drawing.Point(150, 193); this.txtInOutSpeed.Location = new System.Drawing.Point(150, 182);
this.txtInOutSpeed.Name = "txtInOutSpeed"; this.txtInOutSpeed.Name = "txtInOutSpeed";
this.txtInOutSpeed.Size = new System.Drawing.Size(108, 21); this.txtInOutSpeed.Size = new System.Drawing.Size(108, 26);
this.txtInOutSpeed.TabIndex = 7; this.txtInOutSpeed.TabIndex = 7;
// //
// txtComSpeed // txtComSpeed
// //
this.txtComSpeed.Location = new System.Drawing.Point(150, 228); this.txtComSpeed.Location = new System.Drawing.Point(150, 228);
this.txtComSpeed.Name = "txtComSpeed"; this.txtComSpeed.Name = "txtComSpeed";
this.txtComSpeed.Size = new System.Drawing.Size(108, 21); this.txtComSpeed.Size = new System.Drawing.Size(108, 26);
this.txtComSpeed.TabIndex = 8; this.txtComSpeed.TabIndex = 8;
this.txtComSpeed.Visible = false; this.txtComSpeed.Visible = false;
// //
// btnUpDownMove // btnUpDownMove
// //
this.btnUpDownMove.Location = new System.Drawing.Point(293, 133); this.btnUpDownMove.Location = new System.Drawing.Point(266, 124);
this.btnUpDownMove.Name = "btnUpDownMove"; this.btnUpDownMove.Name = "btnUpDownMove";
this.btnUpDownMove.Size = new System.Drawing.Size(107, 31); this.btnUpDownMove.Size = new System.Drawing.Size(131, 36);
this.btnUpDownMove.TabIndex = 9; this.btnUpDownMove.TabIndex = 9;
this.btnUpDownMove.Text = "升降轴+(下降)"; this.btnUpDownMove.Text = "升降轴+(下降)";
this.btnUpDownMove.UseVisualStyleBackColor = true; this.btnUpDownMove.UseVisualStyleBackColor = true;
...@@ -139,9 +139,9 @@ ...@@ -139,9 +139,9 @@
// //
// btnInOutMove // btnInOutMove
// //
this.btnInOutMove.Location = new System.Drawing.Point(293, 186); this.btnInOutMove.Location = new System.Drawing.Point(266, 177);
this.btnInOutMove.Name = "btnInOutMove"; this.btnInOutMove.Name = "btnInOutMove";
this.btnInOutMove.Size = new System.Drawing.Size(107, 31); this.btnInOutMove.Size = new System.Drawing.Size(131, 36);
this.btnInOutMove.TabIndex = 10; this.btnInOutMove.TabIndex = 10;
this.btnInOutMove.Text = "进出轴+(前进)"; this.btnInOutMove.Text = "进出轴+(前进)";
this.btnInOutMove.UseVisualStyleBackColor = true; this.btnInOutMove.UseVisualStyleBackColor = true;
...@@ -174,9 +174,9 @@ ...@@ -174,9 +174,9 @@
// //
// btnInOutMovej // btnInOutMovej
// //
this.btnInOutMovej.Location = new System.Drawing.Point(421, 186); this.btnInOutMovej.Location = new System.Drawing.Point(401, 177);
this.btnInOutMovej.Name = "btnInOutMovej"; this.btnInOutMovej.Name = "btnInOutMovej";
this.btnInOutMovej.Size = new System.Drawing.Size(107, 31); this.btnInOutMovej.Size = new System.Drawing.Size(131, 36);
this.btnInOutMovej.TabIndex = 14; this.btnInOutMovej.TabIndex = 14;
this.btnInOutMovej.Text = "进出轴-(后退)"; this.btnInOutMovej.Text = "进出轴-(后退)";
this.btnInOutMovej.UseVisualStyleBackColor = true; this.btnInOutMovej.UseVisualStyleBackColor = true;
...@@ -185,9 +185,9 @@ ...@@ -185,9 +185,9 @@
// //
// btnUpDownMovej // btnUpDownMovej
// //
this.btnUpDownMovej.Location = new System.Drawing.Point(421, 133); this.btnUpDownMovej.Location = new System.Drawing.Point(401, 124);
this.btnUpDownMovej.Name = "btnUpDownMovej"; this.btnUpDownMovej.Name = "btnUpDownMovej";
this.btnUpDownMovej.Size = new System.Drawing.Size(107, 31); this.btnUpDownMovej.Size = new System.Drawing.Size(131, 36);
this.btnUpDownMovej.TabIndex = 13; this.btnUpDownMovej.TabIndex = 13;
this.btnUpDownMovej.Text = "升降轴-(上升)"; this.btnUpDownMovej.Text = "升降轴-(上升)";
this.btnUpDownMovej.UseVisualStyleBackColor = true; this.btnUpDownMovej.UseVisualStyleBackColor = true;
...@@ -196,9 +196,9 @@ ...@@ -196,9 +196,9 @@
// //
// btnMiddleMovej // btnMiddleMovej
// //
this.btnMiddleMovej.Location = new System.Drawing.Point(421, 79); this.btnMiddleMovej.Location = new System.Drawing.Point(401, 70);
this.btnMiddleMovej.Name = "btnMiddleMovej"; this.btnMiddleMovej.Name = "btnMiddleMovej";
this.btnMiddleMovej.Size = new System.Drawing.Size(107, 31); this.btnMiddleMovej.Size = new System.Drawing.Size(131, 36);
this.btnMiddleMovej.TabIndex = 12; this.btnMiddleMovej.TabIndex = 12;
this.btnMiddleMovej.Text = "旋转轴-(逆时针)"; this.btnMiddleMovej.Text = "旋转轴-(逆时针)";
this.btnMiddleMovej.UseVisualStyleBackColor = true; this.btnMiddleMovej.UseVisualStyleBackColor = true;
...@@ -209,7 +209,7 @@ ...@@ -209,7 +209,7 @@
// //
this.button1.Location = new System.Drawing.Point(402, 253); this.button1.Location = new System.Drawing.Point(402, 253);
this.button1.Name = "button1"; this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(126, 30); this.button1.Size = new System.Drawing.Size(126, 37);
this.button1.TabIndex = 16; this.button1.TabIndex = 16;
this.button1.Text = "关闭"; this.button1.Text = "关闭";
this.button1.UseVisualStyleBackColor = true; this.button1.UseVisualStyleBackColor = true;
...@@ -217,7 +217,7 @@ ...@@ -217,7 +217,7 @@
// //
// FrmAxisDebug // FrmAxisDebug
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(558, 318); this.ClientSize = new System.Drawing.Size(558, 318);
this.Controls.Add(this.button1); this.Controls.Add(this.button1);
......
source/ACSingleStore/FrmAxisDebug.cs
...@@ -230,11 +230,7 @@ namespace OnlineStore.ACSingleStore ...@@ -230,11 +230,7 @@ namespace OnlineStore.ACSingleStore
{ {
this.Close(); this.Close();
} }
private void btnMiddleMove_Click(object sender, EventArgs e)
{
}
private void FrmAxisDebug_Shown(object sender, EventArgs e) private void FrmAxisDebug_Shown(object sender, EventArgs e)
{ {
......
source/ACSingleStore/FrmBase.Designer.cs
...@@ -43,9 +43,10 @@ ...@@ -43,9 +43,10 @@
// //
// FrmBase // FrmBase
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.ClientSize = new System.Drawing.Size(300, 300); this.ClientSize = new System.Drawing.Size(300, 300);
this.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "FrmBase"; this.Name = "FrmBase";
this.Text = "FrmBase"; this.Text = "FrmBase";
......
source/ACSingleStore/FrmIOStatus.cs
...@@ -236,25 +236,25 @@ namespace OnlineStore.ACSingleStore ...@@ -236,25 +236,25 @@ namespace OnlineStore.ACSingleStore
} }
private void btnOpenDoor_Click(object sender, EventArgs e) private void btnOpenDoor_Click(object sender, EventArgs e)
{ {
boxBean.KNDIOMove(Store_IO_Type.Door_Up, IO_VALUE.HIGH); boxBean.KNDIOMove(IO_Type.Door_Up, IO_VALUE.HIGH);
boxBean.KNDIOMove(Store_IO_Type.Door_Down, IO_VALUE.LOW); boxBean.KNDIOMove(IO_Type.Door_Down, IO_VALUE.LOW);
} }
private void btnCloseDoor_Click(object sender, EventArgs e) private void btnCloseDoor_Click(object sender, EventArgs e)
{ {
boxBean.KNDIOMove(Store_IO_Type.Door_Down, IO_VALUE.HIGH); boxBean.KNDIOMove(IO_Type.Door_Down, IO_VALUE.HIGH);
boxBean.KNDIOMove(Store_IO_Type.Door_Up, IO_VALUE.LOW); boxBean.KNDIOMove(IO_Type.Door_Up, IO_VALUE.LOW);
} }
private void btnLocationUp_Click(object sender, EventArgs e) private void btnLocationUp_Click(object sender, EventArgs e)
{ {
boxBean.KNDIOMove(Store_IO_Type.LocationCylinder_Down, IO_VALUE.LOW); boxBean.KNDIOMove(IO_Type.LocationCylinder_Down, IO_VALUE.LOW);
boxBean.KNDIOMove(Store_IO_Type.LocationCylinder_Up, IO_VALUE.HIGH); boxBean.KNDIOMove(IO_Type.LocationCylinder_Up, IO_VALUE.HIGH);
} }
private void btnLocationDown_Click(object sender, EventArgs e) private void btnLocationDown_Click(object sender, EventArgs e)
{ {
boxBean.KNDIOMove(Store_IO_Type.LocationCylinder_Down, IO_VALUE.HIGH); boxBean.KNDIOMove(IO_Type.LocationCylinder_Down, IO_VALUE.HIGH);
boxBean.KNDIOMove(Store_IO_Type.LocationCylinder_Up, IO_VALUE.LOW); boxBean.KNDIOMove(IO_Type.LocationCylinder_Up, IO_VALUE.LOW);
} }
private void FrmIOStatus_Shown(object sender, EventArgs e) private void FrmIOStatus_Shown(object sender, EventArgs e)
......
source/ACSingleStore/FrmLogin.Designer.cs
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
this.txtPwd.MaxLength = 100; this.txtPwd.MaxLength = 100;
this.txtPwd.Name = "txtPwd"; this.txtPwd.Name = "txtPwd";
this.txtPwd.PasswordChar = '*'; this.txtPwd.PasswordChar = '*';
this.txtPwd.Size = new System.Drawing.Size(100, 21); this.txtPwd.Size = new System.Drawing.Size(100, 26);
this.txtPwd.TabIndex = 5; this.txtPwd.TabIndex = 5;
// //
// txtUserName // txtUserName
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
this.txtUserName.Location = new System.Drawing.Point(145, 32); this.txtUserName.Location = new System.Drawing.Point(145, 32);
this.txtUserName.MaxLength = 100; this.txtUserName.MaxLength = 100;
this.txtUserName.Name = "txtUserName"; this.txtUserName.Name = "txtUserName";
this.txtUserName.Size = new System.Drawing.Size(100, 21); this.txtUserName.Size = new System.Drawing.Size(100, 26);
this.txtUserName.TabIndex = 4; this.txtUserName.TabIndex = 4;
// //
// btnCancel // btnCancel
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
this.btnCancel.Anchor = System.Windows.Forms.AnchorStyles.None; this.btnCancel.Anchor = System.Windows.Forms.AnchorStyles.None;
this.btnCancel.Location = new System.Drawing.Point(170, 148); this.btnCancel.Location = new System.Drawing.Point(170, 148);
this.btnCancel.Name = "btnCancel"; this.btnCancel.Name = "btnCancel";
this.btnCancel.Size = new System.Drawing.Size(75, 23); this.btnCancel.Size = new System.Drawing.Size(84, 33);
this.btnCancel.TabIndex = 3; this.btnCancel.TabIndex = 3;
this.btnCancel.Text = "取消(&C)"; this.btnCancel.Text = "取消(&C)";
this.btnCancel.UseVisualStyleBackColor = true; this.btnCancel.UseVisualStyleBackColor = true;
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
this.btnLogin.Anchor = System.Windows.Forms.AnchorStyles.None; this.btnLogin.Anchor = System.Windows.Forms.AnchorStyles.None;
this.btnLogin.Location = new System.Drawing.Point(72, 148); this.btnLogin.Location = new System.Drawing.Point(72, 148);
this.btnLogin.Name = "btnLogin"; this.btnLogin.Name = "btnLogin";
this.btnLogin.Size = new System.Drawing.Size(75, 23); this.btnLogin.Size = new System.Drawing.Size(84, 33);
this.btnLogin.TabIndex = 2; this.btnLogin.TabIndex = 2;
this.btnLogin.Text = "登录(&L)"; this.btnLogin.Text = "登录(&L)";
this.btnLogin.UseVisualStyleBackColor = true; this.btnLogin.UseVisualStyleBackColor = true;
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
this.label2.AutoSize = true; this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(84, 78); this.label2.Location = new System.Drawing.Point(84, 78);
this.label2.Name = "label2"; this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(41, 12); this.label2.Size = new System.Drawing.Size(51, 20);
this.label2.TabIndex = 1; this.label2.TabIndex = 1;
this.label2.Text = "密码："; this.label2.Text = "密码：";
// //
...@@ -110,13 +110,13 @@ ...@@ -110,13 +110,13 @@
this.label1.AutoSize = true; this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(72, 41); this.label1.Location = new System.Drawing.Point(72, 41);
this.label1.Name = "label1"; this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(53, 12); this.label1.Size = new System.Drawing.Size(65, 20);
this.label1.TabIndex = 0; this.label1.TabIndex = 0;
this.label1.Text = "用户名："; this.label1.Text = "用户名：";
// //
// FrmLogin // FrmLogin
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(793, 397); this.ClientSize = new System.Drawing.Size(793, 397);
this.Controls.Add(this.panel1); this.Controls.Add(this.panel1);
......
source/ACSingleStore/FrmStoreBox.cs
...@@ -50,12 +50,12 @@ namespace OnlineStore.ACSingleStore ...@@ -50,12 +50,12 @@ namespace OnlineStore.ACSingleStore
cmbAxisList.ValueMember = "Explain"; cmbAxisList.ValueMember = "Explain";
cmbAxisList.SelectedIndex = 0; cmbAxisList.SelectedIndex = 0;
KTKSAStorePostion ktkPosition = null; ACStorePosition ktkPosition = null;
if (store.PositionNumList.Count > 0) if (store.PositionNumList.Count > 0)
{ {
cmbPosition.DataSource = store.PositionNumList; cmbPosition.DataSource = store.PositionNumList;
cmbPosition.SelectedIndex = 0; cmbPosition.SelectedIndex = 0;
ktkPosition = CSVPositionReader<KTKSAStorePostion>.GetPositon(cmbPosition.Text); ktkPosition = CSVPositionReader<ACStorePosition>.GetPositon(cmbPosition.Text);
//store.PositionNumList = positionNumList; //store.PositionNumList = positionNumList;
} }
...@@ -249,10 +249,10 @@ namespace OnlineStore.ACSingleStore ...@@ -249,10 +249,10 @@ namespace OnlineStore.ACSingleStore
} }
lblWarnMsg.Text = store.WarnMsg; lblWarnMsg.Text = store.WarnMsg;
if (store.KNDIOValue(Store_IO_Type.Left_Door_LimitSingle).Equals(IO_VALUE.LOW)) if (store.KNDIOValue(IO_Type.Left_Door_LimitSingle).Equals(IO_VALUE.LOW))
{ {
lblWarnMsg.Text = lblWarnMsg.Text + " 左侧门未关"; lblWarnMsg.Text = lblWarnMsg.Text + " 左侧门未关";
} if (store.KNDIOValue(Store_IO_Type.Right_Door_LimitSingle).Equals(IO_VALUE.LOW)) } if (store.KNDIOValue(IO_Type.Right_Door_LimitSingle).Equals(IO_VALUE.LOW))
{ {
lblWarnMsg.Text = lblWarnMsg.Text + " 右侧门未关"; lblWarnMsg.Text = lblWarnMsg.Text + " 右侧门未关";
} }
...@@ -403,7 +403,7 @@ namespace OnlineStore.ACSingleStore ...@@ -403,7 +403,7 @@ namespace OnlineStore.ACSingleStore
if (cmbPosition.SelectedIndex >= 0) if (cmbPosition.SelectedIndex >= 0)
{ {
string selectPositionNum = cmbPosition.Text; string selectPositionNum = cmbPosition.Text;
KTKSAStorePostion ktkPosition = CSVPositionReader<KTKSAStorePostion>.GetPositon(selectPositionNum); ACStorePosition ktkPosition = CSVPositionReader<ACStorePosition>.GetPositon(selectPositionNum);
if (ktkPosition != null) if (ktkPosition != null)
{ {
...@@ -514,7 +514,7 @@ namespace OnlineStore.ACSingleStore ...@@ -514,7 +514,7 @@ namespace OnlineStore.ACSingleStore
{ {
//料仓格子位置保存 //料仓格子位置保存
string selectPositionNum = cmbPosition.Text; string selectPositionNum = cmbPosition.Text;
KTKSAStorePostion ktkPosition = CSVPositionReader<KTKSAStorePostion>.GetPositon(selectPositionNum); ACStorePosition ktkPosition = CSVPositionReader<ACStorePosition>.GetPositon(selectPositionNum);
if (ktkPosition != null) if (ktkPosition != null)
{ {
ktkPosition.MiddleAxis_Position_P2 = FormUtil.GetIntValue(txtMiddleP2); ktkPosition.MiddleAxis_Position_P2 = FormUtil.GetIntValue(txtMiddleP2);
...@@ -542,7 +542,7 @@ namespace OnlineStore.ACSingleStore ...@@ -542,7 +542,7 @@ namespace OnlineStore.ACSingleStore
{ {
positionConfigFile = appPath + ConfigAppSettings.GetValue(Setting_Init.Store_Position_Config, "_" + store.StoreID.ToString()); positionConfigFile = appPath + ConfigAppSettings.GetValue(Setting_Init.Store_Position_Config, "_" + store.StoreID.ToString());
} }
bool result = CSVPositionReader<KTKSAStorePostion>.SavePostion(positionConfigFile, ktkPosition); bool result = CSVPositionReader<ACStorePosition>.SavePostion(positionConfigFile, ktkPosition);
if (!result) if (!result)
{ {
MessageBox.Show("保存位置失败！"); MessageBox.Show("保存位置失败！");
...@@ -891,7 +891,7 @@ namespace OnlineStore.ACSingleStore ...@@ -891,7 +891,7 @@ namespace OnlineStore.ACSingleStore
private void 料仓运转ONToolStripMenuItem_Click(object sender, EventArgs e) private void 料仓运转ONToolStripMenuItem_Click(object sender, EventArgs e)
{ {
//store.RunAxis(); //store.RunAxis();
store.KNDIOMove(Store_IO_Type.Run_Sign, IO_VALUE.HIGH); store.KNDIOMove(IO_Type.Run_Sign, IO_VALUE.HIGH);
Thread.Sleep(1000); Thread.Sleep(1000);
//打开三个轴 //打开三个轴
foreach (ConfigMoveAxis SlvAddr in store.moveAxisList) foreach (ConfigMoveAxis SlvAddr in store.moveAxisList)
...@@ -925,8 +925,8 @@ namespace OnlineStore.ACSingleStore ...@@ -925,8 +925,8 @@ namespace OnlineStore.ACSingleStore
private void 打开舱门ToolStripMenuItem_Click(object sender, EventArgs e) private void 打开舱门ToolStripMenuItem_Click(object sender, EventArgs e)
{ {
store.KNDIOMove(Store_IO_Type.Door_Up, IO_VALUE.HIGH); store.KNDIOMove(IO_Type.Door_Up, IO_VALUE.HIGH);
store.KNDIOMove(Store_IO_Type.Door_Down, IO_VALUE.LOW); store.KNDIOMove(IO_Type.Door_Down, IO_VALUE.LOW);
} }
private void 料仓运转OFFToolStripMenuItem_Click(object sender, EventArgs e) private void 料仓运转OFFToolStripMenuItem_Click(object sender, EventArgs e)
...@@ -936,13 +936,13 @@ namespace OnlineStore.ACSingleStore ...@@ -936,13 +936,13 @@ namespace OnlineStore.ACSingleStore
ACServerManager.ServoOff(SlvAddr.DeviceName, SlvAddr.GetAxisValue()); ACServerManager.ServoOff(SlvAddr.DeviceName, SlvAddr.GetAxisValue());
} }
store.KNDIOMove(Store_IO_Type.Run_Sign, IO_VALUE.LOW); store.KNDIOMove(IO_Type.Run_Sign, IO_VALUE.LOW);
} }
private void 关闭仓门ToolStripMenuItem_Click(object sender, EventArgs e) private void 关闭仓门ToolStripMenuItem_Click(object sender, EventArgs e)
{ {
store.KNDIOMove(Store_IO_Type.Door_Down, IO_VALUE.HIGH); store.KNDIOMove(IO_Type.Door_Down, IO_VALUE.HIGH);
store.KNDIOMove(Store_IO_Type.Door_Up, IO_VALUE.LOW); store.KNDIOMove(IO_Type.Door_Up, IO_VALUE.LOW);
} }
private void 回待机点ToolStripMenuItem_Click(object sender, EventArgs e) private void 回待机点ToolStripMenuItem_Click(object sender, EventArgs e)
......
source/ACSingleStore/FrmStoreBox.resx
...@@ -124,7 +124,7 @@ ...@@ -124,7 +124,7 @@
<value>107, 16</value> <value>107, 16</value>
</metadata> </metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>95</value> <value>25</value>
</metadata> </metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
......
source/DeviceLibrary/DeviceLibrary.csproj
...@@ -69,6 +69,7 @@ ...@@ -69,6 +69,7 @@
<Compile Include="PanasonicServo\ACCMDManager.cs" /> <Compile Include="PanasonicServo\ACCMDManager.cs" />
<Compile Include="PanasonicServo\ACServerManager.cs" /> <Compile Include="PanasonicServo\ACServerManager.cs" />
<Compile Include="PanasonicServo\ACServerManager_Partial.cs" /> <Compile Include="PanasonicServo\ACServerManager_Partial.cs" />
<Compile Include="store\LineMoveP.cs" />
<Compile Include="store\LineAlarm.cs"> <Compile Include="store\LineAlarm.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
...@@ -79,7 +80,6 @@ ...@@ -79,7 +80,6 @@
<Compile Include="ShuoKe\ShuoKeControls.cs" /> <Compile Include="ShuoKe\ShuoKeControls.cs" />
<Compile Include="store\model\AxisAlarmInfo.cs" /> <Compile Include="store\model\AxisAlarmInfo.cs" />
<Compile Include="store\model\FixtureCodeInfo.cs" /> <Compile Include="store\model\FixtureCodeInfo.cs" />
<Compile Include="store\KTKLinePosition.cs" />
<Compile Include="store\KTK_DeviceBase.cs" /> <Compile Include="store\KTK_DeviceBase.cs" />
<Compile Include="store\InOrOutStoreParam.cs"> <Compile Include="store\InOrOutStoreParam.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
...@@ -88,7 +88,6 @@ ...@@ -88,7 +88,6 @@
<Compile Include="store\model\StoreMoveInfo.cs"> <Compile Include="store\model\StoreMoveInfo.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="store\StoreBase.cs" />
<Compile Include="store\KTK_Store.cs" /> <Compile Include="store\KTK_Store.cs" />
<Compile Include="store\StoreManager.cs"> <Compile Include="store\StoreManager.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
...@@ -126,20 +125,6 @@ ...@@ -126,20 +125,6 @@
<None Include="StoreConfig\AC\StoreConfig.csv"> <None Include="StoreConfig\AC\StoreConfig.csv">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None> </None>
<None Include="StoreConfig\SA\linePositions.csv">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="StoreConfig\SA\StoreConfig.csv">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup>
<None Include="StoreConfig\SA-boshi\linePositions.csv">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="StoreConfig\SA-boshi\StoreConfig.csv">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
......
source/DeviceLibrary/PanasonicServo/ACServerManager.cs
...@@ -251,16 +251,16 @@ namespace OnlineStore.DeviceLibrary ...@@ -251,16 +251,16 @@ namespace OnlineStore.DeviceLibrary
date = ACCMDManager.GetWriteData(slvAddr, ACCMDManager.CMD_WriteRegisters, "4638", string.Format("{0:X2}", Math.Abs(speed / 2)), 1); date = ACCMDManager.GetWriteData(slvAddr, ACCMDManager.CMD_WriteRegisters, "4638", string.Format("{0:X2}", Math.Abs(speed / 2)), 1);
SendData(portName, date); SendData(portName, date);
Thread.Sleep(100); Thread.Sleep(100);
if (speed > 0) //if (speed > 0)
{ //{
byte[] data = ACCMDManager.GetWriteData(slvAddr, ACCMDManager.CMD_WriteRegisters, ACCMDManager.BlockNo, ACCMDManager.Block_HomeMove0, 2); // byte[] data = ACCMDManager.GetWriteData(slvAddr, ACCMDManager.CMD_WriteRegisters, ACCMDManager.BlockNo, ACCMDManager.Block_HomeMove0, 2);
SendData(portName, data); // SendData(portName, data);
} //}
else //else
{ //{
byte[] data = ACCMDManager.GetWriteData(slvAddr, ACCMDManager.CMD_WriteRegisters, ACCMDManager.BlockNo, ACCMDManager.Block_HomeMove1, 2); byte[] data = ACCMDManager.GetWriteData(slvAddr, ACCMDManager.CMD_WriteRegisters, ACCMDManager.BlockNo, ACCMDManager.Block_HomeMove1, 2);
SendData(portName, data); SendData(portName, data);
} //}
Thread.Sleep(100); Thread.Sleep(100);
OpenSTB(portName, slvAddr); OpenSTB(portName, slvAddr);
......
source/DeviceLibrary/StoreConfig/AC/StoreConfig.csv
...@@ -28,48 +28,46 @@ AXIS,（轴一）旋转轴,Middle_Axis,1,COM1,0,,,, ...@@ -28,48 +28,46 @@ AXIS,（轴一）旋转轴,Middle_Axis,1,COM1,0,,,,
AXIS,（轴二）升降轴轴,UpDown_Axis,1,COM2,0,,,, AXIS,（轴二）升降轴轴,UpDown_Axis,1,COM2,0,,,,
AXIS,（轴三）进出轴,InOut_Axis,1,COM3,0,,,, AXIS,（轴三）进出轴,InOut_Axis,1,COM3,0,,,,
PRO,温湿度传感器地址,Temperate_ServerAddress,192.168.0.14,,,,,, PRO,温湿度传感器地址,Temperate_ServerAddress,192.168.0.14,,,,,,
PRO,升降轴 进料口取料点 P1,UpDownAxis_DoorOPosition_P1,-886000,,,,,, PRO,升降轴 进料口取料点 P1,UpDownAxis_DoorOPosition_P1,-886,,,,,,
PRO,升降轴 进料口出料前点 P2,UpDownAxis_DoorIPosition_P2,-900000,,,,,, PRO,升降轴 进料口出料前点 P2,UpDownAxis_DoorIPosition_P2,-900,,,,,,
PRO,升降轴 进料口取料缓冲点 P7,UpDownAxis_DoorOBPosition_P7,-900000,,,,,, PRO,升降轴 进料口取料缓冲点 P7,UpDownAxis_DoorOBPosition_P7,-900,,,,,,
PRO,升降轴 进料口出料缓冲点 P8,UpDownAxis_DoorIBPosition_P8,-886000,,,,,, PRO,升降轴 进料口出料缓冲点 P8,UpDownAxis_DoorIBPosition_P8,-886,,,,,,
,进出轴进料口取料点 P2,InOutAxis_DoorPosition_P2,9000,,,,,, ,进出轴进料口取料点 P2,InOutAxis_DoorPosition_P2,9,,,,,,
PRO,旋转轴（轴1）P1 待机原位点,MiddleAxis_P1_Position,219200,,,,,, PRO,旋转轴（轴1）P1 待机原位点,MiddleAxis_P1_Position,219,,,,,,
PRO,进出轴（轴3）P1待机原位点,InOutAxis_P1_Position,0,,,,,, PRO,进出轴（轴3）P1待机原位点,InOutAxis_P1_Position,0,,,,,,
PRO,押金轴（轴4）P1待机原位点,CompressAxis_P1_Position,360000,,,,,, PRO,押金轴（轴4）P1待机原位点,CompressAxis_P1_Position,360,,,,,,
,,,,,,,,, ,,,,,,,,,
PRO,是否使用压紧轴（1=使用）,IsHasCompress_Axis,1,,,,, , PRO,是否使用压紧轴（1=使用）,IsHasCompress_Axis,1,,,,, ,
PRO,设备是否处于调试状态（1=调试，0=正常）,IsInDebug,0,,,,,, PRO,设备是否处于调试状态（1=调试，0=正常）,IsInDebug,0,,,,,,
PRO,气压检测IO关闭需要持续的时间,AirCheckSeconds,3,,,,,, PRO,气压检测IO关闭需要持续的时间,AirCheckSeconds,3,,,,,,
PRO,扫码枪IP,Scanner_Ip,192.168.0.24,,,,,,
PRO,扫码枪端口号,Scanner_Port,51236,,,,,,
PRO,温湿度传感器地址,TemperateServer_Port,9001,,,,,, PRO,温湿度传感器地址,TemperateServer_Port,9001,,,,,,
PRO,预警温度,WarnTemperate,80,,,,,, PRO,预警温度,WarnTemperate,80,,,,,,
PRO,预警湿度,WarnHumidity,80,,,,,, PRO,预警湿度,WarnHumidity,80,,,,,,
PRO,（轴一）旋转轴原点目标速度,MiddleAxis_TargetSpeed,9000,,,,,, PRO,（轴一）旋转轴原点目标速度,MiddleAxis_TargetSpeed,30,,,,,,
PRO,（轴一）旋转轴原点开始速度,MiddleAxis_StartSpeed,3000,,,,,, PRO,（轴一）旋转轴原点开始速度,MiddleAxis_StartSpeed,30,,,,,,
PRO,（轴一）旋转轴加速时间,MiddleAxis_AccelTime,500,,,,,, PRO,（轴一）旋转轴加速时间,MiddleAxis_AccelTime,10,,,,,,
PRO,（轴一）旋转轴减速时间,MiddleAxis_DecelTime,500,,,,,, PRO,（轴一）旋转轴减速时间,MiddleAxis_DecelTime,10,,,,,,
PRO,（轴二）升降轴轴原点目标速度,UpdownAxis_TargetSpeed,12000,,,,,, PRO,（轴二）升降轴轴原点目标速度,UpdownAxis_TargetSpeed,50,,,,,,
PRO,（轴二）升降轴轴原点开始速度,UpdownAxis_StartSpeed,4500,,,,,, PRO,（轴二）升降轴轴原点开始速度,UpdownAxis_StartSpeed,50,,,,,,
PRO,（轴二）升降轴轴加速时间,UpdownAxis_AccelTime,200,,,,,, PRO,（轴二）升降轴轴加速时间,UpdownAxis_AccelTime,10,,,,,,
PRO,（轴二）升降轴轴减速时间,UpdownAxis_DecelTime,200,,,,,, PRO,（轴二）升降轴轴减速时间,UpdownAxis_DecelTime,10,,,,,,
PRO,（轴三）进出轴原点目标速度,InoutAxis_TargetSpeed,3600,,,,,, PRO,（轴三）进出轴原点目标速度,InoutAxis_TargetSpeed,50,,,,,,
PRO,（轴三）进出轴原点开始速度,InoutAxis_StartSpeed,1200,,,,,, PRO,（轴三）进出轴原点开始速度,InoutAxis_StartSpeed,50,,,,,,
PRO,（轴三）进出轴加速时间,InoutAxis_AccelTime,200,,,,,, PRO,（轴三）进出轴加速时间,InoutAxis_AccelTime,10,,,,,,
PRO,（轴三）进出轴减速时间,InoutAxis_DecelTime,200,,,,,, PRO,（轴三）进出轴减速时间,InoutAxis_DecelTime,10,,,,,,
PRO,升降轴（轴2）P1速度,UpDownAxis_P1_Speed,130000,,,,,, PRO,升降轴（轴2）P1速度,UpDownAxis_P1_Speed,130,,,,,,
PRO,升降轴（轴2）P2速度,UpDownAxis_P2_Speed,130000,,,,,, PRO,升降轴（轴2）P2速度,UpDownAxis_P2_Speed,130,,,,,,
PRO,升降轴（轴2）P3速度,UpDownAxis_P3_Speed,130000,,,,,, PRO,升降轴（轴2）P3速度,UpDownAxis_P3_Speed,130,,,,,,
PRO,升降轴（轴2）P4速度,UpDownAxis_P4_Speed,20000,,,,,, PRO,升降轴（轴2）P4速度,UpDownAxis_P4_Speed,20,,,,,,
PRO,升降轴（轴2）P5速度,UpDownAxis_P5_Speed,130000,,,,,, PRO,升降轴（轴2）P5速度,UpDownAxis_P5_Speed,130,,,,,,
PRO,升降轴（轴2）P6速度,UpDownAxis_P6_Speed,20000,,,,,, PRO,升降轴（轴2）P6速度,UpDownAxis_P6_Speed,20,,,,,,
PRO,升降轴（轴2）P7速度,UpDownAxis_P7_Speed,20000,,,,,, PRO,升降轴（轴2）P7速度,UpDownAxis_P7_Speed,20,,,,,,
PRO,升降轴（轴2）P8速度,UpDownAxis_P8_Speed,20000,,,,,, PRO,升降轴（轴2）P8速度,UpDownAxis_P8_Speed,20,,,,,,
PRO,旋转轴（轴1）P1速度,MiddleAxis_P1_Speed,100000,,,,,, PRO,旋转轴（轴1）P1速度,MiddleAxis_P1_Speed,100,,,,,,
PRO,旋转轴（轴1）P2速度,MiddleAxis_P2_Speed,100000,,,,,, PRO,旋转轴（轴1）P2速度,MiddleAxis_P2_Speed,100,,,,,,
PRO,进出轴（轴3）P1速度,InOutAxis_P1_Speed,20000,,,,,, PRO,进出轴（轴3）P1速度,InOutAxis_P1_Speed,20,,,,,,
PRO,进出轴（轴3）P2速度,InOutAxis_P2_Speed,20000,,,,,, PRO,进出轴（轴3）P2速度,InOutAxis_P2_Speed,20,,,,,,
PRO,进出轴（轴3）P3速度,InOutAxis_P3_Speed,20000,,,,,, PRO,进出轴（轴3）P3速度,InOutAxis_P3_Speed,20,,,,,,
PRO,（轴一）旋转轴停止时可误差的脉冲数的最小值,MiddleAxis_ErrorCountMin,10,,,,,, PRO,（轴一）旋转轴停止时可误差的脉冲数的最小值,MiddleAxis_ErrorCountMin,10,,,,,,
PRO,（轴二）升降轴轴停止时可误差的脉冲数的最小值,UpdownAxis_ErrorCountMin,10,,,,,, PRO,（轴二）升降轴轴停止时可误差的脉冲数的最小值,UpdownAxis_ErrorCountMin,10,,,,,,
PRO,（轴三）进出轴停止时可误差的脉冲数的最小值,InoutAxis_ErrorCountMin,10,,,,,, PRO,（轴三）进出轴停止时可误差的脉冲数的最小值,InoutAxis_ErrorCountMin,10,,,,,,
......
source/DeviceLibrary/StoreConfig/SA-boshi/StoreConfig.csv deleted 100644 → 0
类型,说明,名称,属性值,设备名称,默认值,描述,电器定义,代码定义,SlaveID
DI,急停,SuddenStop_BTN,200,192.168.0.10,0,急停,X01,DI-01,0
DI,复位,Reset_BTN,201,192.168.0.10,0,复位,X02,DI-02,0
DI,自动,AutoRun_Single,202,192.168.0.10,0,自动,X03,DI-03,0
DI,气压检测,Airpressure_Check,203,192.168.0.10,0,气压检测,X04,DI-04,0
DI,料盘检测1,TrayCheck_1,204,192.168.0.10,0,料盘检测1,X05,DI-05,0
,料盘检测2,TrayCheck_2,205,192.168.0.10,0,料盘检测2,X06,DI-06,0
DI,进料口门上升端,Door_Up,206,192.168.0.10,0,进料口门上升端,X07,DI-07,0
DI,进料口门下降端,Door_Down,207,192.168.0.10,0,进料口门下降端,X08,DI-08,0
DI,定位气缸上升端,LocationCylinder_Up,208,192.168.0.10,0,定位气缸上升端,X09,DI-09,0
DI,定位气缸下降端,LocationCylinder_Down,209,192.168.0.10,0,定位气缸下降端,X10,DI-10,0
DI,左侧门限位,Left_Door_LimitSingle,210,192.168.0.10,0,左侧门限位,X11,DI-11,0
DI,右侧门限位,Right_Door_LimitSingle,211,192.168.0.10,0,右侧门限位,X12,DI-12,0
DI,料盘检测3,TrayCheck_3,212,192.168.0.10,0,料盘检测3,X13,DI-13,0
,料盘检测4,TrayCheck_4,213,192.168.0.10,0,料盘检测4,X14,DI-14,0
DO,自动指示灯,AutoRun_HddLed,100,192.168.0.10,0,自动指示灯,Y01,DO-01,0
DO,故障指示灯,Alarm_HddLed,101,192.168.0.10,0,故障指示灯,Y02,DO-02,0
DO,待机指示灯,RunSign_HddLed,102,192.168.0.10,0,待机指示灯,Y03,DO-03,0
DO,吹气SOL ON,StartOrStopBlow,103,192.168.0.10,0,吹气SOL ON,Y04,DO-04,0
DO,料仓运转ON,Run_Sign,104,192.168.0.10,0,料仓运转ON,Y05,DO-05,0
DO,上下轴刹车,Axis_Brake,105,192.168.0.10,0,上下轴刹车,Y06,DO-06,0
DO,进料口门上升SOL,Door_Up,106,192.168.0.10,0,进料口门上升SOL,Y07,DO-07,0
DO,进料口门下降SOL,Door_Down,107,192.168.0.10,0,进料口门下降SOL,Y08,DO-08,0
DO,定位上升SOL,LocationCylinder_Up,108,192.168.0.10,0,定位上升SOL,Y09,DO-09,0
DO,定位下降SOL,LocationCylinder_Down,109,192.168.0.10,0,定位下降SOL,Y10,DO-10,0
DO,摄像机光源,CameraLight_Power,110,192.168.0.10,0,摄像机光源,Y11,DO-11,0
AXIS,（轴一）旋转轴,Middle_Axis,1,SMC000,0,,,,
AXIS,（轴二）升降轴轴,UpDown_Axis,2,SMC000,0,,,,
AXIS,（轴三）进出轴,InOut_Axis,3,SMC000,0,,,,
PRO,温湿度传感器地址,Temperate_ServerAddress,192.168.0.14#192.168.0.15#192.168.0.16,,,,,,
PRO,升降轴 进料口取料点 P1,UpDownAxis_DoorOPosition_P1,-484800,,,,,,
PRO,升降轴 进料口出料前点 P2,UpDownAxis_DoorIPosition_P2,-498000,,,,,,
PRO,升降轴 进料口取料缓冲点 P7,UpDownAxis_DoorOBPosition_P7,-498000,,,,,,
PRO,升降轴 进料口出料缓冲点 P8,UpDownAxis_DoorIBPosition_P8,-484800,,,,,,
,进出轴进料口取料点 P2,InOutAxis_DoorPosition_P2,9000,,,,,,
PRO,旋转轴（轴1）P1 待机原位点,MiddleAxis_P1_Position,229190,,,,,,
PRO,进出轴（轴3）P1待机原位点,InOutAxis_P1_Position,0,,,,,,
PRO,押金轴（轴4）P1待机原位点,CompressAxis_P1_Position,-30000,,,,,,
,,,,,,,,,
PRO,是否使用压紧轴（1=使用）,IsHasCompress_Axis,1,,,,, ,
PRO,设备是否处于调试状态（1=调试，0=正常）,IsInDebug,0,,,,,,
PRO,气压检测IO关闭需要持续的时间,AirCheckSeconds,3,,,,,,
PRO,扫码枪IP,Scanner_Ip,192.168.0.24,,,,,,
PRO,扫码枪端口号,Scanner_Port,51236,,,,,,
PRO,温湿度传感器服务器端口号,TemperateServer_Port,9001,,,,,,
PRO,预警温度,WarnTemperate,80,,,,,,
PRO,预警湿度,WarnHumidity,80,,,,,,
PRO,（轴一）旋转轴原点目标速度,MiddleAxis_TargetSpeed,9000,,,,,,
PRO,（轴一）旋转轴原点开始速度,MiddleAxis_StartSpeed,3000,,,,,,
PRO,（轴一）旋转轴加速时间,MiddleAxis_AccelTime,500,,,,,,
PRO,（轴一）旋转轴减速时间,MiddleAxis_DecelTime,500,,,,,,
PRO,（轴二）升降轴轴原点目标速度,UpdownAxis_TargetSpeed,12000,,,,,,
PRO,（轴二）升降轴轴原点开始速度,UpdownAxis_StartSpeed,4500,,,,,,
PRO,（轴二）升降轴轴加速时间,UpdownAxis_AccelTime,200,,,,,,
PRO,（轴二）升降轴轴减速时间,UpdownAxis_DecelTime,200,,,,,,
PRO,（轴三）进出轴原点目标速度,InoutAxis_TargetSpeed,1800,,,,,,
PRO,（轴三）进出轴原点开始速度,InoutAxis_StartSpeed,600,,,,,,
PRO,（轴三）进出轴加速时间,InoutAxis_AccelTime,10,,,,,,
PRO,（轴三）进出轴减速时间,InoutAxis_DecelTime,10,,,,,,
PRO,升降轴（轴2）P1速度,UpDownAxis_P1_Speed,80000,,,,,,
PRO,升降轴（轴2）P2速度,UpDownAxis_P2_Speed,80000,,,,,,
PRO,升降轴（轴2）P3速度,UpDownAxis_P3_Speed,80000,,,,,,
PRO,升降轴（轴2）P4速度,UpDownAxis_P4_Speed,8000,,,,,,
PRO,升降轴（轴2）P5速度,UpDownAxis_P5_Speed,80000,,,,,,
PRO,升降轴（轴2）P6速度,UpDownAxis_P6_Speed,8000,,,,,,
PRO,升降轴（轴2）P7速度,UpDownAxis_P7_Speed,8000,,,,,,
PRO,升降轴（轴2）P8速度,UpDownAxis_P8_Speed,8000,,,,,,
PRO,旋转轴（轴1）P1速度,MiddleAxis_P1_Speed,80000,,,,,,
PRO,旋转轴（轴1）P2速度,MiddleAxis_P2_Speed,80000,,,,,,
PRO,进出轴（轴3）P1速度,InOutAxis_P1_Speed,20000,,,,,,
PRO,进出轴（轴3）P2速度,InOutAxis_P2_Speed,20000,,,,,,
PRO,进出轴（轴3）P3速度,InOutAxis_P3_Speed,20000,,,,,,
PRO,（轴一）旋转轴停止时可误差的脉冲数的最小值,MiddleAxis_ErrorCountMin,10,,,,,,
PRO,（轴二）升降轴轴停止时可误差的脉冲数的最小值,UpdownAxis_ErrorCountMin,10,,,,,,
PRO,（轴三）进出轴停止时可误差的脉冲数的最小值,InoutAxis_ErrorCountMin,10,,,,,,
PRO,（轴一）旋转轴停止时可误差的脉冲数的最大值,MiddleAxis_ErrorCountMax,5000,,,,,,
PRO,（轴二）升降轴轴停止时可误差的脉冲数的最大值,UpdownAxis_ErrorCountMax,5000,,,,,,
PRO,（轴三）进出轴停止时可误差的脉冲数的最大值,InoutAxis_ErrorCountMax,5000,,,,,,
PRO,出入库多少次，会自动重置旋转轴,Box_ResetMCount,1000,,,,,,
PRO,出入库多少次，会自动重置所有轴操作,Box_ResetACount,100,,,,,,
PRO,（轴一）旋转轴速度倍率,MiddleAxis_ResolveSpeed,10,,,,,,
PRO,（轴二）升降轴速度倍率,UpdownAxis_ResolveSpeed,20,,,,,,
PRO,（轴三）进出轴速度倍率,InoutAxis_ResolveSpeed,10,,,,,,
PRO,IO信号超时时间（毫秒）,IOSingle_TimerOut,10000,,,,,,
PRO,是否使用料盘检测信号,IsUse_Tray_Check,0,,,,,,
,,,,,,,,,
PRO,硕科步进电机（压紧轴）控制端口号,CompressAxis_PortName,COM4,,,,,,
PRO,硕科步进电机（压紧轴）控制波特率,CompressAxis_PortBaudrate,9600,,,,,,
PRO,硕科步进电机（压紧轴）控制奇偶校验,CompressAxis_PortParity,0,,,,,,
PRO,硕科步进电机（压紧轴）控制停止位,CompressAxis_StopBits,1,,,,,,
PRO,硕科步进电机（压紧轴）控制初速度,CompressAxis_StartSpeed,15000,,,,,,
PRO,硕科步进电机（压紧轴）控制最大速度,CompressAxis_MaxSpeed,50000,,,,,,
PRO,硕科步进电机（压紧轴）控制末速度,CompressAxis_EndSpeed,30000,,,,,,
PRO,硕科步进电机（压紧轴）控制加速度,CompressAxis_AddSpeed,15000,,,,,,
PRO,硕科步进电机（压紧轴）控制减速度,CompressAxis_DelSpeed,15000,,,,,,
PRO,硕科步进电机（压紧轴）控制归零速度（原点返回速度）,CompressAxis_HomeSpeed,15000,,,,,,
PRO,硕科步进电机轴地址（压紧轴),CompressAxis_Slv,1,,,,,,
,,,,,,,,,
PRO,（轴一）旋转轴最小限位,MiddleAxis_PositionMin,0,,,,,,
PRO,（轴二）升降轴最小限位,UpdownAxis_PositionMin,0,,,,,,
PRO,（轴三）进出轴最小限位,InoutAxis_PositionMin,0,,,,,,
PRO,（轴一）旋转轴最大限位,MiddleAxis_PositionMax,0,,,,,,
PRO,（轴二）升降轴最大限位,UpdownAxis_PositionMax,0,,,,,,
PRO,（轴三）进出轴最大限位,InoutAxis_PositionMax,0,,,,,,
PRO,扫码枪类型:0=默认扫码枪；1=摄像机识别,Scanner_Type,1,,,,,,
PRO,需要吹气的湿度(湿度标准),Max_Humidity,10,,,,,,
PRO,每次吹气的时间（分钟）,BlowAir_Time,10,,,,,,
PRO,两次吹气间隔（分钟）,BlowAir_Interval,10,,,,,,
source/DeviceLibrary/StoreConfig/SA/StoreConfig.csv deleted 100644 → 0
类型,说明,名称,属性值,设备名称,默认值,描述,电器定义,代码定义,SlaveID
DI,急停,SuddenStop_BTN,200,192.168.0.10,0,急停,X01,DI-01,0
DI,复位,Reset_BTN,201,192.168.0.10,0,复位,X02,DI-02,0
DI,自动,AutoRun_Single,202,192.168.0.10,0,自动,X03,DI-03,0
DI,气压检测,Airpressure_Check,203,192.168.0.10,0,气压检测,X04,DI-04,0
DI,料盘检测1,TrayCheck_1,204,192.168.0.10,0,料盘检测1,X05,DI-05,0
DI,料盘检测2,TrayCheck_2,205,192.168.0.10,0,料盘检测2,X06,DI-06,0
DI,进料口门上升端,Door_Up,206,192.168.0.10,0,进料口门上升端,X07,DI-07,0
DI,进料口门下降端,Door_Down,207,192.168.0.10,0,进料口门下降端,X08,DI-08,0
DI,定位气缸上升端,LocationCylinder_Up,208,192.168.0.10,0,定位气缸上升端,X09,DI-09,0
DI,定位气缸下降端,LocationCylinder_Down,209,192.168.0.10,0,定位气缸下降端,X10,DI-10,0
DI,左侧门限位,Left_Door_LimitSingle,210,192.168.0.10,0,左侧门限位,X11,DI-11,0
DI,右侧门限位,Right_Door_LimitSingle,211,192.168.0.10,0,右侧门限位,X12,DI-12,0
DI,料盘检测3,TrayCheck_3,212,192.168.0.10,0,料盘检测3,X13,DI-13,0
DI,料盘检测4,TrayCheck_4,213,192.168.0.10,0,料盘检测4,X14,DI-14,0
DO,自动指示灯,AutoRun_HddLed,100,192.168.0.10,0,自动指示灯,Y01,DO-01,0
DO,故障指示灯,Alarm_HddLed,101,192.168.0.10,0,故障指示灯,Y02,DO-02,0
DO,待机指示灯,RunSign_HddLed,102,192.168.0.10,0,待机指示灯,Y03,DO-03,0
DO,吹气SOL ON,StartOrStopBlow,103,192.168.0.10,0,吹气SOL ON,Y04,DO-04,0
DO,料仓运转ON,Run_Sign,104,192.168.0.10,0,料仓运转ON,Y05,DO-05,0
DO,上下轴刹车,Axis_Brake,105,192.168.0.10,0,上下轴刹车,Y06,DO-06,0
DO,进料口门上升SOL,Door_Up,106,192.168.0.10,0,进料口门上升SOL,Y07,DO-07,0
DO,进料口门下降SOL,Door_Down,107,192.168.0.10,0,进料口门下降SOL,Y08,DO-08,0
DO,定位上升SOL,LocationCylinder_Up,108,192.168.0.10,0,定位上升SOL,Y09,DO-09,0
DO,定位下降SOL,LocationCylinder_Down,109,192.168.0.10,0,定位下降SOL,Y10,DO-10,0
AXIS,（轴一）旋转轴,Middle_Axis,1,SMC000,0,,,,
AXIS,（轴二）升降轴轴,UpDown_Axis,2,SMC000,0,,,,
AXIS,（轴三）进出轴,InOut_Axis,3,SMC000,0,,,,
PRO,温湿度传感器地址,Temperate_ServerAddress,192.168.0.14,,,,,,
PRO,升降轴 进料口取料点 P1,UpDownAxis_DoorOPosition_P1,-886000,,,,,,
PRO,升降轴 进料口出料前点 P2,UpDownAxis_DoorIPosition_P2,-900000,,,,,,
PRO,升降轴 进料口取料缓冲点 P7,UpDownAxis_DoorOBPosition_P7,-900000,,,,,,
PRO,升降轴 进料口出料缓冲点 P8,UpDownAxis_DoorIBPosition_P8,-886000,,,,,,
,进出轴进料口取料点 P2,InOutAxis_DoorPosition_P2,9000,,,,,,
PRO,旋转轴（轴1）P1 待机原位点,MiddleAxis_P1_Position,219200,,,,,,
PRO,进出轴（轴3）P1待机原位点,InOutAxis_P1_Position,0,,,,,,
PRO,押金轴（轴4）P1待机原位点,CompressAxis_P1_Position,360000,,,,,,
,,,,,,,,,
PRO,是否使用压紧轴（1=使用）,IsHasCompress_Axis,1,,,,, ,
PRO,设备是否处于调试状态（1=调试，0=正常）,IsInDebug,0,,,,,,
PRO,气压检测IO关闭需要持续的时间,AirCheckSeconds,3,,,,,,
PRO,扫码枪IP,Scanner_Ip,192.168.0.24,,,,,,
PRO,扫码枪端口号,Scanner_Port,51236,,,,,,
PRO,温湿度传感器地址,TemperateServer_Port,9001,,,,,,
PRO,预警温度,WarnTemperate,80,,,,,,
PRO,预警湿度,WarnHumidity,80,,,,,,
PRO,（轴一）旋转轴原点目标速度,MiddleAxis_TargetSpeed,9000,,,,,,
PRO,（轴一）旋转轴原点开始速度,MiddleAxis_StartSpeed,3000,,,,,,
PRO,（轴一）旋转轴加速时间,MiddleAxis_AccelTime,500,,,,,,
PRO,（轴一）旋转轴减速时间,MiddleAxis_DecelTime,500,,,,,,
PRO,（轴二）升降轴轴原点目标速度,UpdownAxis_TargetSpeed,12000,,,,,,
PRO,（轴二）升降轴轴原点开始速度,UpdownAxis_StartSpeed,4500,,,,,,
PRO,（轴二）升降轴轴加速时间,UpdownAxis_AccelTime,200,,,,,,
PRO,（轴二）升降轴轴减速时间,UpdownAxis_DecelTime,200,,,,,,
PRO,（轴三）进出轴原点目标速度,InoutAxis_TargetSpeed,3600,,,,,,
PRO,（轴三）进出轴原点开始速度,InoutAxis_StartSpeed,1200,,,,,,
PRO,（轴三）进出轴加速时间,InoutAxis_AccelTime,200,,,,,,
PRO,（轴三）进出轴减速时间,InoutAxis_DecelTime,200,,,,,,
PRO,升降轴（轴2）P1速度,UpDownAxis_P1_Speed,130000,,,,,,
PRO,升降轴（轴2）P2速度,UpDownAxis_P2_Speed,130000,,,,,,
PRO,升降轴（轴2）P3速度,UpDownAxis_P3_Speed,130000,,,,,,
PRO,升降轴（轴2）P4速度,UpDownAxis_P4_Speed,20000,,,,,,
PRO,升降轴（轴2）P5速度,UpDownAxis_P5_Speed,130000,,,,,,
PRO,升降轴（轴2）P6速度,UpDownAxis_P6_Speed,20000,,,,,,
PRO,升降轴（轴2）P7速度,UpDownAxis_P7_Speed,20000,,,,,,
PRO,升降轴（轴2）P8速度,UpDownAxis_P8_Speed,20000,,,,,,
PRO,旋转轴（轴1）P1速度,MiddleAxis_P1_Speed,100000,,,,,,
PRO,旋转轴（轴1）P2速度,MiddleAxis_P2_Speed,100000,,,,,,
PRO,进出轴（轴3）P1速度,InOutAxis_P1_Speed,20000,,,,,,
PRO,进出轴（轴3）P2速度,InOutAxis_P2_Speed,20000,,,,,,
PRO,进出轴（轴3）P3速度,InOutAxis_P3_Speed,20000,,,,,,
PRO,（轴一）旋转轴停止时可误差的脉冲数的最小值,MiddleAxis_ErrorCountMin,10,,,,,,
PRO,（轴二）升降轴轴停止时可误差的脉冲数的最小值,UpdownAxis_ErrorCountMin,10,,,,,,
PRO,（轴三）进出轴停止时可误差的脉冲数的最小值,InoutAxis_ErrorCountMin,10,,,,,,
PRO,（轴一）旋转轴停止时可误差的脉冲数的最大值,MiddleAxis_ErrorCountMax,1000,,,,,,
PRO,（轴二）升降轴轴停止时可误差的脉冲数的最大值,UpdownAxis_ErrorCountMax,1000,,,,,,
PRO,（轴三）进出轴停止时可误差的脉冲数的最大值,InoutAxis_ErrorCountMax,1000,,,,,,
PRO,出入库多少次，会自动重置旋转轴,Box_ResetMCount,1000,,,,,,
PRO,出入库多少次，会自动重置所有轴操作,Box_ResetACount,100,,,,,,
PRO,（轴一）旋转轴速度倍率,MiddleAxis_ResolveSpeed,10,,,,,,
PRO,（轴二）升降轴速度倍率,UpdownAxis_ResolveSpeed,20,,,,,,
PRO,（轴三）进出轴速度倍率,InoutAxis_ResolveSpeed,10,,,,,,
PRO,IO信号超时时间（毫秒）,IOSingle_TimerOut,10000,,,,,,
PRO,是否使用料盘检测信号,IsUse_Tray_Check,0,,,,,,
,,,,,,,,,
PRO,硕科步进电机（压紧轴）控制端口号,CompressAxis_PortName,COM3,,,,,,
PRO,硕科步进电机（压紧轴）控制波特率,CompressAxis_PortBaudrate,9600,,,,,,
PRO,硕科步进电机（压紧轴）控制奇偶校验,CompressAxis_PortParity,0,,,,,,
PRO,硕科步进电机（压紧轴）控制停止位,CompressAxis_StopBits,1,,,,,,
PRO,硕科步进电机（压紧轴）控制初速度,CompressAxis_StartSpeed,50000,,,,,,
PRO,硕科步进电机（压紧轴）控制最大速度,CompressAxis_MaxSpeed,200000,,,,,,
PRO,硕科步进电机（压紧轴）控制末速度,CompressAxis_EndSpeed,70000,,,,,,
PRO,硕科步进电机（压紧轴）控制加速度,CompressAxis_AddSpeed,50000,,,,,,
PRO,硕科步进电机（压紧轴）控制减速度,CompressAxis_DelSpeed,50000,,,,,,
PRO,硕科步进电机（压紧轴）控制归零速度（原点返回速度）,CompressAxis_HomeSpeed,50000,,,,,,
PRO,硕科步进电机轴地址（压紧轴),CompressAxis_Slv,1,,,,,,
,,,,,,,,,
PRO,（轴一）旋转轴最小限位,MiddleAxis_PositionMin,0,,,,,,
PRO,（轴二）升降轴最小限位,UpdownAxis_PositionMin,0,,,,,,
PRO,（轴三）进出轴最小限位,InoutAxis_PositionMin,0,,,,,,
PRO,（轴一）旋转轴最大限位,MiddleAxis_PositionMax,0,,,,,,
PRO,（轴二）升降轴最大限位,UpdownAxis_PositionMax,0,,,,,,
PRO,（轴三）进出轴最大限位,InoutAxis_PositionMax,0,,,,,,
source/DeviceLibrary/acSingleStore/ACStoreManager.cs
...@@ -71,7 +71,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -71,7 +71,7 @@ namespace OnlineStore.DeviceLibrary
if (File.Exists(positionConfigFile)) if (File.Exists(positionConfigFile))
{ {
LogUtil.info(LOGGER, "加载位置文件：" + positionConfigFile); LogUtil.info(LOGGER, "加载位置文件：" + positionConfigFile);
CSVPositionReader<KTKSAStorePostion>.ReloadCSVFile(positionConfigFile); CSVPositionReader<ACStorePosition>.ReloadCSVFile(positionConfigFile);
} }
AC_SA_BoxBean storeBean = new AC_SA_BoxBean((AC_SA_Config)storeConfig); AC_SA_BoxBean storeBean = new AC_SA_BoxBean((AC_SA_Config)storeConfig);
storeBean.CID = CID; storeBean.CID = CID;
......
source/DeviceLibrary/ktkSingleStore/SAStoreManager.cs deleted 100644 → 0
using log4net;
using OnlineStore.Common;
using OnlineStore.LoadCSVLibrary;
using System;
using System.Collections.Generic;
using System.IO;
using System.IO.Ports;
using System.Linq;
using System.Text;
using System.Windows.Forms;
namespace OnlineStore.DeviceLibrary
{
public class SAStoreManager
{
public static readonly ILog LOGGER = LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
public static KTK_SA_BoxBean store = null;
private static bool isInit = false;
public static bool IsConnectServer = true;
public SAStoreManager()
{
}
public static void CheckEnum(Type type)
{
if (type.IsEnum)
{
List<int> valueList = new List<int>();
foreach (int item in Enum.GetValues(type))
{
if (valueList.Contains(item))
{
LogUtil.error(LOGGER, type.Name + "枚举值：" + item + "重复存在，请检查代码！");
Application.Exit();
break;
}
valueList.Add(item);
}
}
}
public static KTK_SA_BoxBean InitStore()
{
try
{
if (!isInit)
{
string server = ConfigAppSettings.GetValue(Setting_Init.http_server);
if (server.Equals(""))
{
IsConnectServer = false;
}
else
{
IsConnectServer = true;
}
CheckEnum(typeof(StoreMoveStep));
CheckEnum(typeof(StoreStatus));
CheckEnum(typeof(StoreRunStatus));
isInit = true;
string storeType = ConfigAppSettings.GetValue(Setting_Init.Store_Type);
LogUtil.info(LOGGER, "配置的料仓 类型=" + storeType + "，开始加载料仓配置");
if (storeType == StoreType.RC_KTK_SA)
{
string appPath = Application.StartupPath;
string lineType = ConfigAppSettings.GetValue(Setting_Init.Store_Type);
string CID = ConfigAppSettings.GetValue(Setting_Init.Store_CID);
string linefilePath = appPath + ConfigAppSettings.GetValue(Setting_Init.Store_ConfigPath);
StoreConfig storeConfig = CSVConfigReader.LoadConfig(1, CID, StoreType.RC_KTK_SA, linefilePath);
string positionConfigFile = appPath + ConfigAppSettings.GetValue(Setting_Init.Store_Position_Config);
if (File.Exists(positionConfigFile))
{
LogUtil.info(LOGGER, "加载位置文件：" + positionConfigFile);
CSVPositionReader<KTKSAStorePostion>.ReloadCSVFile(positionConfigFile);
}
KTK_SA_BoxBean storeBean = new KTK_SA_BoxBean((KTK_SA_Config)storeConfig);
storeBean.CID = CID;
LogUtil.info(LOGGER, "加载料仓完成！");
store = storeBean;
return store;
}
}
}
catch (Exception ex)
{
LOGGER.Error("出错：", ex);
MessageBox.Show(ex.ToString(), "加载配置错误（请检查配置）");
Application.Exit();
}
return store;
}
/// <summary>
/// 修改了料仓配置，更新缓存，更新配置文件（只能更新PRO的配置）
/// </summary>
/// <param name="kTK_LA_Store_Config"></param>
public static void UpdateBoxConfig(KTK_SA_Config storeConfig)
{
try
{
//位置配置到文件中
string appPath = Application.StartupPath;
string configFile = appPath + ConfigAppSettings.GetValue(Setting_Init.Store_ConfigPath);
bool result = CSVConfigReader.SaveBoxPosition(configFile, storeConfig);
if (!result)
{
LOGGER.Error("保存配置文件失败：" + configFile);
}
store.Config = storeConfig;
store.MoveAxisConfig();
}
catch (Exception ex)
{
LOGGER.Error("出错：", ex);
}
}
public static bool OpenShuoKe(KTK_SA_BoxBean box)
{
//打开硕科步进驱动器端口
Parity parity = (Parity)box.Config.CompressAxis_PortParity;
StopBits bit = (StopBits)box.Config.CompressAxis_StopBits;
bool result = ShuoKeControls.InitPort(box.Config.CompressAxis_PortName, box.Config.CompressAxis_PortBaudrate,
box.Config.CompressAxis_PortParity, 8, bit);
if (result)
{
LogUtil.info(box.StoreName + "打开硕科步进控制器【" + box.Config.CompressAxis_PortName + "】成功");
return true;
}
else
{
LogUtil.error(LOGGER, box.StoreName + "打开硕科步进控制器【" + box.Config.CompressAxis_PortName + "】失败，启动失败！");
return false;
}
}
}
}
source/DeviceLibrary/store/IOUtil.cs
...@@ -20,79 +20,5 @@ namespace OnlineStore.DeviceLibrary ...@@ -20,79 +20,5 @@ namespace OnlineStore.DeviceLibrary
} }
public enum IO_TYPE {
/// <summary>
/// 输入io
/// </summary>
DI = 1,
/// <summary>
/// 输出io
/// </summary>
DO = 2,
/// <summary>
/// 扩展板卡输入IO
/// </summary>
EC_DI = 3,
/// <summary>
/// 扩展板卡输出Io
/// </summary>
EC_DO = 4,
/// <summary>
/// 轴IO
/// </summary>
AXIS_IO=5,
/// <summary>
/// 轴MontionIO
/// </summary>
AXIS_MONTION_IO=6,
/// <summary>
/// 康泰克输入IO
/// </summary>
KTK_DI=10,
/// <summary>
/// 康泰克输出IO
/// </summary>
KTK_DO=11,
}
//public class IOUtil
//{
// /// <summary>
// /// Io状态转为二进制字符串的长度
// /// </summary>
// public static int IOStrLength = 16;
// public static int TypeValue = 1000;
// //根据枚举获得类型和索引
// public static IO_TYPE GetIoType(PCI_IO io)
// {
// return (IO_TYPE)((int)io / TypeValue);
// }
// public static int GetIoIndex(PCI_IO io)
// {
// return (int)io % TypeValue;
// }
// //根据枚举获得类型和索引
// public static IO_TYPE GetIoType(PCI_AXIS_IO io)
// {
// return (IO_TYPE)((int)io / TypeValue);
// }
// public static int GetIoIndex(PCI_AXIS_IO io)
// {
// return (int)io % TypeValue;
// }
// public static PCI_IO ToPCIIO(IO_TYPE type, int index)
// {
// return (PCI_IO)((int)type * TypeValue + index);
// }
//}
} }
source/DeviceLibrary/store/InOrOutStoreParam.cs
...@@ -18,11 +18,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -18,11 +18,9 @@ namespace OnlineStore.DeviceLibrary
public static readonly ILog log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); public static readonly ILog log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
public InOutStoreParam() public InOutStoreParam()
{ {
KTKStoreP = null; ACStoreP = null;
this.WareNumber = ""; this.WareNumber = "";
MoveP = null; MoveP = null;
KTKSAStoreP = null;
} }
/// <summary> /// <summary>
/// 新建一个对象 /// 新建一个对象
...@@ -31,7 +29,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -31,7 +29,7 @@ namespace OnlineStore.DeviceLibrary
/// <param name="position">仓位号</param> /// <param name="position">仓位号</param>
public InOutStoreParam(string wareNo, string posId) public InOutStoreParam(string wareNo, string posId)
{ {
KTKStoreP = null; ACStoreP = null;
WareNumber = wareNo; WareNumber = wareNo;
PositionNum = posId; PositionNum = posId;
MoveP = null; MoveP = null;
...@@ -39,7 +37,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -39,7 +37,7 @@ namespace OnlineStore.DeviceLibrary
} }
public InOutStoreParam(string wareNo, string posId,string plateH,string plateW) public InOutStoreParam(string wareNo, string posId,string plateH,string plateW)
{ {
KTKStoreP = null; ACStoreP = null;
WareNumber = wareNo; WareNumber = wareNo;
PositionNum = posId; PositionNum = posId;
MoveP = null; MoveP = null;
...@@ -49,7 +47,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -49,7 +47,7 @@ namespace OnlineStore.DeviceLibrary
} }
public InOutStoreParam(string wareNo, string posId, string plateH, string plateW,int trayCode) public InOutStoreParam(string wareNo, string posId, string plateH, string plateW,int trayCode)
{ {
KTKStoreP = null; ACStoreP = null;
WareNumber = wareNo; WareNumber = wareNo;
PositionNum = posId; PositionNum = posId;
MoveP = null; MoveP = null;
...@@ -61,81 +59,39 @@ namespace OnlineStore.DeviceLibrary ...@@ -61,81 +59,39 @@ namespace OnlineStore.DeviceLibrary
public InOutStoreParam(string wareNo, string posId, LineMoveP linePosition) public InOutStoreParam(string wareNo, string posId, LineMoveP linePosition)
{ {
KTKStoreP = null; ACStoreP = null;
WareNumber = wareNo; WareNumber = wareNo;
PositionNum = posId; PositionNum = posId;
MoveP = linePosition; MoveP = linePosition;
IsSolderPaste = false; IsSolderPaste = false;
} }
public InOutStoreParam(string wareNo, string posId, KTKSAStorePostion movep) public InOutStoreParam(string wareNo, string posId, ACStorePosition movep)
{ {
KTKStoreP = null; ACStoreP = movep;
DBMoveP = null;
WareNumber = wareNo; WareNumber = wareNo;
PositionNum = posId; PositionNum = posId;
MoveP = null; MoveP = null;
KTKSAStoreP = movep;
IsSolderPaste = false;
}
public InOutStoreParam(string wareNo, string posId, DoubleLineMoveP linePosition)
{
KTKStoreP = null;
WareNumber = wareNo;
PositionNum = posId;
DBMoveP = linePosition;
IsSolderPaste = false; IsSolderPaste = false;
} }
private KTKStorePostion KTKStoreP = null;
private ACStorePosition ACStoreP = null;
public KTKStorePostion GetKTKPosition() public ACStorePosition GetACPosition()
{ {
try try
{ {
if (KTKStoreP == null) if (ACStoreP == null)
{ {
KTKStoreP = CSVPositionReader<KTKStorePostion>.GetPositon(PositionNum); ACStoreP = CSVPositionReader<ACStorePosition>.GetPositon(PositionNum);
} }
} }
catch (Exception ex) catch (Exception ex)
{ {
LogUtil.error(log, "出入库获取库位信息GetKTKPosition出错：" + ex.ToString()); LogUtil.error(log, "出入库获取库位信息GetKTKPosition出错：" + ex.ToString());
} }
return KTKStoreP; return ACStoreP;
}
private DoublePosition DBStoreP = null;
public DoublePosition GetDBPostion()
{
try
{
if (DBStoreP == null)
{
DBStoreP = CSVPositionReader<DoublePosition>.GetPositon(PositionNum);
}
}
catch (Exception ex)
{
LogUtil.error(log, "出入库获取库位信息GetDBPostion出错：" + ex.ToString());
}
return DBStoreP;
}
private KTKSAStorePostion KTKSAStoreP = null;
public KTKSAStorePostion GetKTKSAPosition()
{
try
{
if (KTKSAStoreP == null)
{
KTKSAStoreP = CSVPositionReader<KTKSAStorePostion>.GetPositon(PositionNum);
}
}
catch (Exception ex)
{
LogUtil.error(log, "出入库获取库位信息GetKTKSAPosition出错：" + ex.ToString());
}
return KTKSAStoreP;
} }
/// <summary> /// <summary>
/// 物品二维码信息 /// 物品二维码信息
/// </summary> /// </summary>
...@@ -162,8 +118,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -162,8 +118,7 @@ namespace OnlineStore.DeviceLibrary
/// 是否是放入锡膏（在线料仓才需要此字段） /// 是否是放入锡膏（在线料仓才需要此字段）
/// </summary> /// </summary>
public bool IsSolderPaste { get; set; } public bool IsSolderPaste { get; set; }
public DoubleLineMoveP DBMoveP { get; set; }
} }
} }
source/DeviceLibrary/store/KTKLinePosition.cs → source/DeviceLibrary/store/LineMoveP.cs
...@@ -6,33 +6,7 @@ using System.Text; ...@@ -6,33 +6,7 @@ using System.Text;
namespace OnlineStore.DeviceLibrary namespace OnlineStore.DeviceLibrary
{ {
/// <summary>
/// 双层料仓的移动信息（电钢上下运动，康泰克旋转）
/// </summary>
public class DoubleLineMoveP
{
/// <summary>
/// 电钢门高位
/// </summary>
public int DooHighPosition { get; set; }
/// <summary>
/// 电钢门低位
/// </summary>
public int DoorLowPosition { get; set; }
/// <summary>
/// 库位高点
/// </summary>
public int BagHighPosition { get; set; }
/// <summary>
/// 库位低点
/// </summary>
public int BagLowPosition { get; set; }
/// <summary>
/// 库位中轴位置
/// </summary>
public int MiddleAxisPosition { get; set; }
}
/// <summary> /// <summary>
/// 康泰克料仓的移动信息 /// 康泰克料仓的移动信息
/// </summary> /// </summary>
......
source/DeviceLibrary/store/StoreBase.cs deleted 100644 → 0
//using log4net;
//using System;
//using System.Collections.Generic;
//using System.Drawing;
//using System.Linq;
//using System.Text;
//
//using OnlineStore.Common;
//using OnlineStore.LoadCSVLibrary;
//namespace OnlineStore.DeviceLibrary
//{
// public abstract class StoreBase
// {
// public static readonly ILog LOGGER = LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
// /// <summary>
// /// 料仓ID唯一
// /// </summary>
// public int StoreId { get; set; }
// /// <summary>
// /// 开始运行的时间
// /// </summary>
// public DateTime StartTime { get; set; }
// /// <summary>
// /// 日志颜色
// /// </summary>
// public static Color storeMoveColor = Color.Blue;
// public DateTime statusTime = DateTime.Now;
// /// <summary>
// /// 伺服运行时间列表，key=轴，key=开始时间，value=结束时间
// /// </summary>
// public Dictionary<int, Dictionary<DateTime, DateTime>> AxisRunTimeMap = new Dictionary<int, Dictionary<DateTime, DateTime>>();
// public DateTime middleAxisLastStartTime;
// public DateTime updownAxisLastStartTime;
// /// <summary>
// /// 上下轴报警状态
// /// </summary>
// public int UpDownAxisAlarmCode = 0;
// /// <summary>
// /// 料仓中轴报警状态
// /// </summary>
// public int MiddleAxisAlarmCode = 0;
// /// <summary>
// /// 定时器
// /// </summary>
// protected System.Timers.Timer timersTimer;
// /// <summary>
// /// 料仓状态
// /// </summary>
// protected StoreRunStatus storerunstatus = StoreRunStatus.Wait;
// /// <summary>
// /// 移动信息
// /// </summary>
// public StoreMoveInfo StoreMove = null;
// /// <summary>
// /// 料仓配置信息
// /// </summary>
// public StoreConfig Config { get; set; }
// public string StoreName()
// {
// return "ID=" + Config.Id + ",CID+" + Config.CID;
// }
// public StoreStatus storeStatus = StoreStatus.StoreOnline;
// /// <summary>
// /// 料仓状态
// /// </summary>
// public StoreRunStatus storeRunStatus
// {
// get
// {
// return storerunstatus;
// }
// set
// {
// StoreRunStatus oldStatus = storerunstatus;
// storerunstatus = value;
// statusTime = DateTime.Now;
// }
// }
// public StoreBase()
// {
// }
// public StoreBase(StoreConfig config)
// {
// this.StoreId = config.Id;
// this.Config = config;
// StoreMove = new StoreMoveInfo(StoreId);
// }
// /// <summary>
// /// 定时任务
// /// </summary>
// protected abstract void timersTimer_Elapsed(object sender, System.Timers.ElapsedEventArgs e);
// /// <summary>
// /// 复位
// /// </summary>
// public abstract void Reset();
// /// <summary>
// /// 报警
// /// </summary>
// /// <param name="alarmType"></param>
// public abstract void Alarm(StoreAlarmType alarmType);
// /// <summary>
// /// 停止运动
// /// </summary>
// public abstract void StopMove();
// /// <summary>
// /// 上下移动（根据料仓类型，为电钢移动或者运动轴运动）
// /// </summary>
// /// <param name="abs"></param>
// public abstract void UpDownAxisMove(AbsMoveParam abs);
// /// <summary>
// /// 中轴运动
// /// </summary>
// /// <param name="abs"></param>
// public abstract void MiddleAxisMove(AbsMoveParam abs);
// /// <summary>
// /// 出仓流程处理
// /// </summary>
// protected abstract void OutStoreProcess();
// /// <summary>
// /// 入仓流程处理
// /// </summary>
// protected abstract void InStoreProcess();
// /// <summary>
// /// 判断急停是否开着，开着表示可以运行
// /// </summary>
// /// <returns></returns>
// public abstract Boolean IsCanStart();
// /// <summary>
// /// 开始运行
// /// </summary>
// public abstract void StartRun();
// /// <summary>
// /// 停止运行
// /// </summary>
// public abstract void StopRun();
// /// <summary>
// /// 初始化
// /// </summary>
// public virtual void Init()
// {
// StoreMove = new StoreMoveInfo(this.StoreId);
// timersTimer = new System.Timers.Timer();
// timersTimer.Enabled = false;
// timersTimer.Interval = 100;
// timersTimer.Elapsed += timersTimer_Elapsed;
// timersTimer.AutoReset = true;
// }
// /// <summary>
// /// 运动处理
// /// </summary>
// public virtual void BusyMoveProcess()
// {
// if (StoreMove.MoveType == StoreMoveType.InStore)
// {
// InStoreProcess();
// }
// else if (StoreMove.MoveType == StoreMoveType.OutStore)
// {
// OutStoreProcess();
// }
// }
// /// <summary>
// /// 开始入库移动移动
// /// </summary>
// public abstract void StartInStoreMove(InOutStoreParam param);
// /// <summary>
// /// 开始出库运动
// /// </summary>
// public abstract void StartOutStoreMove(InOutStoreParam param);
// /// <summary>
// /// 开始或者停止吹吹气，通过io来判断
// /// </summary>
// /// <param name="start"></param>
// public abstract void StartOrStopBlow(bool start);
// /// <summary>
// /// io控制的运动（取料叉子运动，门上下移动）
// /// </summary>
// /// <param name="moveType">运行方式</param>
// /// <param name="ioValue">1=开始，0=停止</param>
// public abstract void DeviceIoMove(Store_IO_Type moveType, IO_VALUE ioValue);
// /// <summary>
// /// 获取io控制的运动当前的指示灯状态
// /// </summary>
// public abstract IO_VALUE GetDeviceIoStatus(Store_IO_Type moveType);
// /// <summary>
// /// 中轴轴定点运动结束处理
// /// </summary>
// public virtual void MiddleMoveEnd(int moveType, int AxisNo, int targetPosition)
// {
// StoreMoveInfo move = StoreMove;
// if (middleAxisLastStartTime != null && middleAxisLastStartTime.Year > 1)
// {
// Dictionary<DateTime,DateTime> moveTimeMap=null;
// if (AxisRunTimeMap.ContainsKey(AxisNo))
// {
// moveTimeMap = AxisRunTimeMap[AxisNo];
// }
// else
// {
// moveTimeMap = new Dictionary<DateTime, DateTime>();
// AxisRunTimeMap.Add(AxisNo, moveTimeMap);
// }
// if (!moveTimeMap.ContainsKey(middleAxisLastStartTime))
// {
// moveTimeMap.Add(middleAxisLastStartTime, DateTime.Now);
// LOGGER.Info("storeId=" + StoreId + ",伺服运动结束，开始时间" + middleAxisLastStartTime.ToString() + "，结束时间" + DateTime.Now.ToString());
// middleAxisLastStartTime.AddYears(-1 * middleAxisLastStartTime.Year+1);
// }
// AxisRunTimeMap.Remove(AxisNo);
// AxisRunTimeMap.Add(AxisNo, moveTimeMap);
// }
// if (moveType == 0)
// {
// //if (move.moveStatus == StoreMoveStep.InStoreReadyMove
// // || move.moveStatus == StoreMoveStep.MoveToRoom
// // || move.moveStatus == StoreMoveStep.MoveOutFromRoom
// // || move.moveStatus == StoreMoveStep.OutStoreReadyMove
// // )
// {
// move.MoveResult++;
// }
// }
// else if (moveType == 1)
// {
// //if (storeRunStatus == StoreRunStatus.Reset)
// //{
// // StoreMove.MoveResult--;
// // if (StoreMove.MoveResult == 0)
// // {
// // storeRunStatus = StoreRunStatus.Runing;
// // }
// //}
// }
// }
// /// <summary>
// /// 获取料仓运行的时间
// /// </summary>
// /// <returns></returns>
// public TimeSpan GetStoreRunTime()
// {
// if (StartTime != null)
// {
// return DateTime.Now - StartTime;
// }
// else
// {
// return new TimeSpan(0);
// }
// }
// /// <summary>
// /// 获取轴已运行时间
// /// </summary>
// /// <returns></returns>
// public TimeSpan GetAxisRunTime(int axisNo)
// {
// TimeSpan span = new TimeSpan(0);
// if (AxisRunTimeMap.ContainsKey(axisNo))
// {
// Dictionary<DateTime, DateTime> moveMap = AxisRunTimeMap[axisNo];
// if (moveMap != null && moveMap.Count > 0)
// {
// foreach (DateTime key in moveMap.Keys)
// {
// span += moveMap[key] - key;
// }
// }
// }
// return span;
// }
// public abstract string GetTemperateAddress();
// public abstract bool IsMyAxis(string deviceName, int AxisNo);
// }
//}
source/LoadCVSLibrary/LoadCSVLibrary.csproj
...@@ -48,8 +48,6 @@ ...@@ -48,8 +48,6 @@
<ItemGroup> <ItemGroup>
<Compile Include="CSVExection.cs" /> <Compile Include="CSVExection.cs" />
<Compile Include="position\ACSAStorePosition.cs" /> <Compile Include="position\ACSAStorePosition.cs" />
<Compile Include="position\DoublePosition.cs" />
<Compile Include="position\KTKSAStorePostion.cs" />
<Compile Include="storeConfig\ConfigItemBase.cs" /> <Compile Include="storeConfig\ConfigItemBase.cs" />
<Compile Include="storeConfig\ConfigProAttribute.cs" /> <Compile Include="storeConfig\ConfigProAttribute.cs" />
<Compile Include="storeConfig\config\AC_SA_Config.cs" /> <Compile Include="storeConfig\config\AC_SA_Config.cs" />
...@@ -62,7 +60,6 @@ ...@@ -62,7 +60,6 @@
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="storeConfig\config\StoreConfig.cs" /> <Compile Include="storeConfig\config\StoreConfig.cs" />
<Compile Include="position\StorePostionBase.cs" /> <Compile Include="position\StorePostionBase.cs" />
<Compile Include="position\KTKStorePostion.cs" />
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
......
source/LoadCVSLibrary/position/ACSAStorePosition.cs
...@@ -4,12 +4,12 @@ using System.Linq; ...@@ -4,12 +4,12 @@ using System.Linq;
using System.Text; using System.Text;
namespace OnlineStore.LoadCSVLibrary.position namespace OnlineStore.LoadCSVLibrary
{ {
/// <summary> /// <summary>
/// 松下伺服485控制，单台料仓 /// 松下伺服485控制，单台料仓
/// </summary> /// </summary>
public class ACSAStorePosition : StorePostionBase public class ACStorePosition : StorePostionBase
{ /// <summary> { /// <summary>
/// 对应的料仓ID（流水线料仓需要用此字段区分哪个BOX） /// 对应的料仓ID（流水线料仓需要用此字段区分哪个BOX）
/// </summary> /// </summary>
......
source/LoadCVSLibrary/position/DoublePosition.cs deleted 100644 → 0
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace OnlineStore.LoadCSVLibrary
{
public class DoublePosition : StorePostionBase
{ /// <summary>
/// 对应的料仓ID（流水线料仓需要用此字段区分哪个BOX）
/// </summary>
[CSVAttribute("料仓ID")]
public int StoreId { get; set; }
/// <summary>
///电钢高位
/// </summary>
[CSVAttribute("电钢高位")]
public int StellHigh { get; set; }
/// <summary>
///电钢低位
/// </summary>
[CSVAttribute("电钢低位")]
public int StellLow { get; set; }
/// <summary>
/// 出库中轴位置
/// </summary>
[CSVAttribute("出库中轴位置")]
public int MiddleOutPosition { get; set; }
/// <summary>
/// 入库中轴位置
/// </summary>
[CSVAttribute("入库中轴位置")]
public int MiddleInPosition { get; set; }
}
}
source/LoadCVSLibrary/position/KTKSAStorePostion.cs deleted 100644 → 0
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace OnlineStore.LoadCSVLibrary
{
/// <summary>
/// KTK单台料仓
/// </summary>
public class KTKSAStorePostion : StorePostionBase
{
/// <summary>
/// 对应的料仓ID（流水线料仓需要用此字段区分哪个BOX）
/// </summary>
[CSVAttribute("料仓ID")]
public int StoreId { get; set; }
/// <summary>
/// 中轴位置（旋转轴库位点）P2
/// </summary>
[CSVAttribute("中轴位置P2")]
public int MiddleAxis_Position_P2 { get; set; }
/// <summary>
/// 升降轴（库位出料前点）P5
/// </summary>
[CSVAttribute("升降轴库位出料前点P5")]
public int UpDownAxis_OHPosition_P5 { get; set; }
/// <summary>
/// 升降轴（库位出料缓冲点）P6
/// </summary>
[CSVAttribute("升降轴库位出料缓冲点P6")]
public int UpDownAxis_OLPosition_P6 { get; set; }
/// <summary>
/// 升降轴（库位入料前点）P3
/// </summary>
[CSVAttribute("升降轴库位入料前点P3")]
public int UpDownAxis_IHPosition_P3 { get; set; }
/// <summary>
/// 升降轴（库位入料缓冲点）P4
/// </summary>
[CSVAttribute("升降轴库位入料缓冲点P4")]
public int UpDownAxis_ILPosition_P4 { get; set; }
/// <summary>
/// 进出轴（库位点取料点）P3
/// </summary>
[CSVAttribute("进出轴库位点取料点P3")]
public int InOutAxis_Position_P3 { get; set; }
/// <summary>
/// 压紧轴（压紧点）P2
/// </summary>
[CSVAttribute("压紧轴压紧点P2")]
public int CompressAxis_Position_P2 { get; set; }
/// <summary>
/// 压紧轴（压紧前点）P3
/// </summary>
[CSVAttribute("压紧轴压紧前点P3")]
public int CompressAxis_CPosition_P3 { get; set; }
/// <summary>
/// 轴3(进出轴） 进料口取料点P2
/// </summary>
[CSVAttribute("进出轴进料口取料点P2")]
public int InOutAxis_DoorPosition_P2 { get; set; }
///// <summary>
///// 轴2（ 升降轴） 进料口取料点 P1
///// </summary>
//[CSVAttribute("升降轴进料口取料点P1")]
//public int UpDownAxis_DoorOPosition_P1 { get; set; }
///// <summary>
///// 轴2（ 升降轴） 进料口出料缓冲点P8
///// </summary>
//[CSVAttribute("升降轴进料口出料缓冲点P8")]
//public int UpDownAxis_DoorIBPosition_P8 { get; set; }
/// <summary>
/// 轴2（ 升降轴） 进料口出料前点P2
/// </summary>
[CSVAttribute("升降轴进料口出料前点P2")]
public int UpDownAxis_DoorIPosition_P2 { get; set; }
/// <summary>
/// 轴2（ 升降轴） 进料口取料缓冲点P7
/// </summary>
[CSVAttribute("升降轴进料口取料缓冲点P7")]
public int UpDownAxis_DoorOBPosition_P7 { get; set; }
}
}
source/LoadCVSLibrary/position/KTKStorePostion.cs deleted 100644 → 0
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace OnlineStore.LoadCSVLibrary
{
/// <summary>
/// 流水线料仓，使用ktk运动版的配置
/// </summary>
public class KTKStorePostion : StorePostionBase
{
/// <summary>
/// 对应的料仓ID（流水线料仓需要用此字段区分哪个BOX）
/// </summary>
[CSVAttribute("料仓ID")]
public int StoreId { get; set; }
/// <summary>
/// 中轴位置（旋转轴库位点）P2
/// </summary>
[CSVAttribute("中轴位置P2")]
public int MiddleAxis_Position_P2 { get; set; }
/// <summary>
/// 升降轴（库位出料前点）P5
/// </summary>
[CSVAttribute("升降轴库位出料前点P5")]
public int UpDownAxis_OHPosition_P5 { get; set; }
/// <summary>
/// 升降轴（库位出料缓冲点）P6
/// </summary>
[CSVAttribute("升降轴库位出料缓冲点P6")]
public int UpDownAxis_OLPosition_P6 { get; set; }
/// <summary>
/// 升降轴（库位入料前点）P3
/// </summary>
[CSVAttribute("升降轴库位入料前点P3")]
public int UpDownAxis_IHPosition_P3 { get; set; }
/// <summary>
/// 升降轴（库位入料缓冲点）P4
/// </summary>
[CSVAttribute("升降轴库位入料缓冲点P4")]
public int UpDownAxis_ILPosition_P4 { get; set; }
/// <summary>
/// 进出轴（库位点取料点）P3
/// </summary>
[CSVAttribute("进出轴库位点取料点P3")]
public int InOutAxis_Position_P3 { get; set; }
/// <summary>
/// 压紧轴（压紧点）P2
/// </summary>
[CSVAttribute("压紧轴压紧点P2")]
public int CompressAxis_Position_P2 { get; set; }
/// <summary>
/// 压紧轴（压紧前点）P3
/// </summary>
[CSVAttribute("压紧轴压紧前点P3")]
public int CompressAxis_CPosition_P3 { get; set; }
}
}
source/LoadCVSLibrary/storeConfig/config/AC_SA_Config.cs
...@@ -16,16 +16,7 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -16,16 +16,7 @@ namespace OnlineStore.LoadCSVLibrary
: base(id, cid, type, filepath) : base(id, cid, type, filepath)
{ {
} }
/// <summary>
/// 扫码枪IP
/// </summary>
[ConfigProAttribute("Scanner_Ip")]
public string Scanner_Ip { get; set; }
/// <summary>
/// 扫码枪端口
/// </summary>
[ConfigProAttribute("Scanner_Port")]
public int Scanner_Port { get; set; }
/// <summary> /// <summary>
/// 温湿度传感器地址 /// 温湿度传感器地址
/// </summary> /// </summary>
...@@ -422,34 +413,34 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -422,34 +413,34 @@ namespace OnlineStore.LoadCSVLibrary
{ {
MustHaveDIList = new List<string>(); MustHaveDIList = new List<string>();
MustHaveDOList = new List<string>(); MustHaveDOList = new List<string>();
MustHaveDIList.Add(Store_IO_Type.SuddenStop_BTN); MustHaveDIList.Add(IO_Type.SuddenStop_BTN);
MustHaveDIList.Add(Store_IO_Type.Reset_BTN); MustHaveDIList.Add(IO_Type.Reset_BTN);
MustHaveDIList.Add(Store_IO_Type.AutoRun_Single); MustHaveDIList.Add(IO_Type.AutoRun_Single);
MustHaveDIList.Add(Store_IO_Type.Airpressure_Check); MustHaveDIList.Add(IO_Type.Airpressure_Check);
MustHaveDIList.Add(Store_IO_Type.TrayCheck_1); MustHaveDIList.Add(IO_Type.TrayCheck_1);
MustHaveDIList.Add(Store_IO_Type.TrayCheck_2); MustHaveDIList.Add(IO_Type.TrayCheck_2);
MustHaveDIList.Add(Store_IO_Type.TrayCheck_3); MustHaveDIList.Add(IO_Type.TrayCheck_3);
MustHaveDIList.Add(Store_IO_Type.TrayCheck_4); MustHaveDIList.Add(IO_Type.TrayCheck_4);
MustHaveDIList.Add(Store_IO_Type.Door_Up); MustHaveDIList.Add(IO_Type.Door_Up);
MustHaveDIList.Add(Store_IO_Type.Door_Down); MustHaveDIList.Add(IO_Type.Door_Down);
MustHaveDIList.Add(Store_IO_Type.LocationCylinder_Down); MustHaveDIList.Add(IO_Type.LocationCylinder_Down);
MustHaveDIList.Add(Store_IO_Type.LocationCylinder_Up); MustHaveDIList.Add(IO_Type.LocationCylinder_Up);
MustHaveDIList.Add(Store_IO_Type.Left_Door_LimitSingle); MustHaveDIList.Add(IO_Type.Left_Door_LimitSingle);
MustHaveDIList.Add(Store_IO_Type.Right_Door_LimitSingle); MustHaveDIList.Add(IO_Type.Right_Door_LimitSingle);
MustHaveDOList.Add(Store_IO_Type.AutoRun_HddLed); MustHaveDOList.Add(IO_Type.AutoRun_HddLed);
MustHaveDOList.Add(Store_IO_Type.Alarm_HddLed); MustHaveDOList.Add(IO_Type.Alarm_HddLed);
MustHaveDOList.Add(Store_IO_Type.RunSign_HddLed); MustHaveDOList.Add(IO_Type.RunSign_HddLed);
MustHaveDOList.Add(Store_IO_Type.StartOrStopBlow); MustHaveDOList.Add(IO_Type.StartOrStopBlow);
MustHaveDOList.Add(Store_IO_Type.Run_Sign); MustHaveDOList.Add(IO_Type.Run_Sign);
MustHaveDOList.Add(Store_IO_Type.Door_Up); MustHaveDOList.Add(IO_Type.Door_Up);
MustHaveDOList.Add(Store_IO_Type.Door_Down); MustHaveDOList.Add(IO_Type.Door_Down);
MustHaveDOList.Add(Store_IO_Type.LocationCylinder_Down); MustHaveDOList.Add(IO_Type.LocationCylinder_Down);
MustHaveDOList.Add(Store_IO_Type.LocationCylinder_Up); MustHaveDOList.Add(IO_Type.LocationCylinder_Up);
MustHaveDOList.Add(Store_IO_Type.Axis_Brake); MustHaveDOList.Add(IO_Type.Axis_Brake);
MustHaveDOList.Add(Store_IO_Type.CameraLight_Power); MustHaveDOList.Add(IO_Type.CameraLight_Power);
} }
} }
} }
source/LoadCVSLibrary/storeConfig/config/StoreConfig.cs
...@@ -120,7 +120,7 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -120,7 +120,7 @@ namespace OnlineStore.LoadCSVLibrary
} }
else if (con.ProType == ConfigItemType.DI) else if (con.ProType == ConfigItemType.DI)
{ {
if (Store_IO_Type.GetTypeList().Contains(con.ProName)) if (IO_Type.GetTypeList().Contains(con.ProName))
{ {
ConfigIO io = (ConfigIO)con; ConfigIO io = (ConfigIO)con;
if (!DIODeviceNameList.Contains(io.DeviceName) && (io.GetIOValue() >= 0 || io.GetIOAddr() >= 0)) if (!DIODeviceNameList.Contains(io.DeviceName) && (io.GetIOValue() >= 0 || io.GetIOAddr() >= 0))
...@@ -136,7 +136,7 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -136,7 +136,7 @@ namespace OnlineStore.LoadCSVLibrary
} }
else if (con.ProType == ConfigItemType.DO) else if (con.ProType == ConfigItemType.DO)
{ {
if (Store_IO_Type.GetTypeList().Contains(con.ProName)) if (IO_Type.GetTypeList().Contains(con.ProName))
{ {
ConfigIO io = (ConfigIO)con; ConfigIO io = (ConfigIO)con;
if (!DIODeviceNameList.Contains(io.DeviceName) && io.GetIOValue() >= 0) if (!DIODeviceNameList.Contains(io.DeviceName) && io.GetIOValue() >= 0)
......
source/LoadCVSLibrary/storeConfig/config/StoreType.cs
...@@ -8,33 +8,33 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -8,33 +8,33 @@ namespace OnlineStore.LoadCSVLibrary
{ {
public class StoreType public class StoreType
{ {
/// <summary> ///// <summary>
/// 双层在线料仓（电钢，康泰克板子，康奈德IO模块）料仓总配置 ///// 双层在线料仓（电钢，康泰克板子，康奈德IO模块）料仓总配置
/// </summary> ///// </summary>
public static string RC_DB_LINE = "RC_DB_LINE"; //public static string RC_DB_LINE = "RC_DB_LINE";
/// <summary> ///// <summary>
/// 双层在线料仓（电钢，康泰克板子，康奈德IO模块）单个料仓配置 ///// 双层在线料仓（电钢，康泰克板子，康奈德IO模块）单个料仓配置
/// </summary> ///// </summary>
public static string RC_DB_LA = "RC_DB_LA"; //public static string RC_DB_LA = "RC_DB_LA";
/// <summary> ///// <summary>
/// 单台自动料仓 锁孔板PLC ///// 单台自动料仓 锁孔板PLC
/// </summary> ///// </summary>
public static string RC_PLC_SM = "RC_PLC_SM"; //public static string RC_PLC_SM = "RC_PLC_SM";
/// <summary> ///// <summary>
/// 康泰克流水线料仓_子料仓 ///// 康泰克流水线料仓_子料仓
/// </summary> ///// </summary>
public static string RC_KTK_LA = "RC_KTK_LA"; //public static string RC_KTK_LA = "RC_KTK_LA";
/// <summary> ///// <summary>
/// 康泰克流水线料仓_流水线 ///// 康泰克流水线料仓_流水线
/// </summary> ///// </summary>
public static string RC_KTK_LINE = "RC_KTK_LINE"; //public static string RC_KTK_LINE = "RC_KTK_LINE";
/// <summary> ///// <summary>
/// 康泰克单台料仓 ///// 康泰克单台料仓
/// </summary> ///// </summary>
public static string RC_KTK_SA = "RC_KTK_SA"; //public static string RC_KTK_SA = "RC_KTK_SA";
/// <summary> /// <summary>
/// 松下伺服485通信单台料仓 /// 松下伺服485通信单台料仓
/// </summary> /// </summary>
......
source/LoadCVSLibrary/storeConfig/config/Store_IO_Type.cs
...@@ -8,7 +8,7 @@ using System.Text; ...@@ -8,7 +8,7 @@ using System.Text;
namespace OnlineStore.LoadCSVLibrary namespace OnlineStore.LoadCSVLibrary
{ {
public class Store_IO_Type public class IO_Type
{ {
private static List<string> TypeList = null; private static List<string> TypeList = null;
public static List<string> GetTypeList() public static List<string> GetTypeList()
...@@ -16,7 +16,7 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -16,7 +16,7 @@ namespace OnlineStore.LoadCSVLibrary
if (TypeList == null) if (TypeList == null)
{ {
TypeList = new List<string>(); TypeList = new List<string>();
var p = typeof(Store_IO_Type).GetFields(BindingFlags.Instance | BindingFlags.Public | BindingFlags.Static); var p = typeof(IO_Type).GetFields(BindingFlags.Instance | BindingFlags.Public | BindingFlags.Static);
foreach (var item in p) foreach (var item in p)
{ {
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!