Skip to content

李娜 / SO664-HCSingleStore

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

修改配置

1 个父辈 5570db58
内嵌 并排
正在显示 8 个修改的文件 包含 46 行增加 和 47 行删除
source/DeviceLibrary/acSingleStore/BoxBean.cs
......@@ -60,10 +60,10 @@ namespace OnlineStore.DeviceLibrary
IsDebug = config.ISDebug.Equals(1);
UseCompress_Axis = true;
Name = ("左侧BOX_" + config.GetStoreId() + " ").ToUpper();
Name = ("左侧BOX_D" + config.GetStoreId() + " ").ToUpper();
if (config.DeviceID.Equals(2))
{
Name = ("右侧BOX_" + config.GetStoreId() + " ").ToUpper();
Name = ("右侧BOX_D" + config.GetStoreId() + " ").ToUpper();
}
moveAxisList = new List<ConfigMoveAxis>();
......
source/HCSingleStore/App.config
......@@ -9,7 +9,7 @@
<!-- 开始吹气的判断值（配置值=服务器发送的湿度值-开始吹气值）-->
<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.162.124/myproject/" />
<!--storeType-->
......@@ -19,9 +19,9 @@
<add key="Store_ConfigPath" value="\StoreConfig\StoreConfig.csv" />
<add key="Box_ConfigPath" value="\StoreConfig\BoxConfig.csv" />
<add key="Store_Type" value="RC_AC_SA" />
<add key="Store_CID" value="D1" />
<add key="Store_CID_1" value="line-ac-01" />
<add key="Store_CID_2" value="line-ac-02" />
<add key="Store_CID" value="D2D1" />
<add key="Store_CID_1" value="line-ac-02" />
<add key="Store_CID_2" value="line-ac-01" />
<!--end one store config-->
<add key="ACBaudRate" value="115200" />
<add key="InOutDefaultPosition" value="5000" />
......
source/HCSingleStore/FrmIDConfig.Designer.cs
......@@ -89,7 +89,7 @@
this.btnNext.Anchor = System.Windows.Forms.AnchorStyles.Top;
this.btnNext.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnNext.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnNext.Location = new System.Drawing.Point(443, 153);
this.btnNext.Location = new System.Drawing.Point(444, 153);
this.btnNext.Name = "btnNext";
this.btnNext.Size = new System.Drawing.Size(120, 45);
this.btnNext.TabIndex = 275;
......@@ -101,7 +101,7 @@
//
this.btnBack.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnBack.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnBack.Location = new System.Drawing.Point(361, 590);
this.btnBack.Location = new System.Drawing.Point(361, 619);
this.btnBack.Name = "btnBack";
this.btnBack.Size = new System.Drawing.Size(120, 45);
this.btnBack.TabIndex = 274;
......@@ -163,7 +163,7 @@
this.btnReset.Anchor = System.Windows.Forms.AnchorStyles.Top;
this.btnReset.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnReset.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnReset.Location = new System.Drawing.Point(443, 67);
this.btnReset.Location = new System.Drawing.Point(444, 67);
this.btnReset.Name = "btnReset";
this.btnReset.Size = new System.Drawing.Size(89, 33);
this.btnReset.TabIndex = 281;
......@@ -189,7 +189,7 @@
this.groupBox1.Controls.Add(this.label3);
this.groupBox1.Location = new System.Drawing.Point(12, 6);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(584, 339);
this.groupBox1.Size = new System.Drawing.Size(586, 368);
this.groupBox1.TabIndex = 283;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "料仓地址配置";
......@@ -206,10 +206,13 @@
//
// pictureBox1
//
this.pictureBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image")));
this.pictureBox1.Location = new System.Drawing.Point(4, 204);
this.pictureBox1.Location = new System.Drawing.Point(6, 204);
this.pictureBox1.Name = "pictureBox1";
this.pictureBox1.Size = new System.Drawing.Size(555, 129);
this.pictureBox1.Size = new System.Drawing.Size(572, 158);
this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.pictureBox1.TabIndex = 285;
this.pictureBox1.TabStop = false;
......@@ -250,7 +253,7 @@
this.groupBox2.Controls.Add(this.label21);
this.groupBox2.Location = new System.Drawing.Point(6, 6);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(530, 216);
this.groupBox2.Size = new System.Drawing.Size(530, 191);
this.groupBox2.TabIndex = 284;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "料盘定位功能配置";
......@@ -372,7 +375,7 @@
this.btnSavePosID.Anchor = System.Windows.Forms.AnchorStyles.Top;
this.btnSavePosID.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSavePosID.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSavePosID.Location = new System.Drawing.Point(131, 590);
this.btnSavePosID.Location = new System.Drawing.Point(132, 619);
this.btnSavePosID.Name = "btnSavePosID";
this.btnSavePosID.Size = new System.Drawing.Size(120, 45);
this.btnSavePosID.TabIndex = 277;
......@@ -386,10 +389,10 @@
| System.Windows.Forms.AnchorStyles.Right)));
this.tabControl1.Controls.Add(this.tabPage1);
this.tabControl1.Controls.Add(this.tabPage2);
this.tabControl1.Location = new System.Drawing.Point(12, 351);
this.tabControl1.Location = new System.Drawing.Point(12, 380);
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
this.tabControl1.Size = new System.Drawing.Size(584, 233);
this.tabControl1.Size = new System.Drawing.Size(586, 233);
this.tabControl1.TabIndex = 285;
//
// tabPage1
......@@ -398,9 +401,9 @@
this.tabPage1.Location = new System.Drawing.Point(4, 26);
this.tabPage1.Name = "tabPage1";
this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
this.tabPage1.Size = new System.Drawing.Size(576, 203);
this.tabPage1.Size = new System.Drawing.Size(578, 203);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = " 左侧BOX1料仓 ";
this.tabPage1.Text = " 左侧BOX料仓 ";
this.tabPage1.UseVisualStyleBackColor = true;
//
// tabPage2
......@@ -409,9 +412,9 @@
this.tabPage2.Location = new System.Drawing.Point(4, 26);
this.tabPage2.Name = "tabPage2";
this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
this.tabPage2.Size = new System.Drawing.Size(576, 203);
this.tabPage2.Size = new System.Drawing.Size(578, 203);
this.tabPage2.TabIndex = 1;
this.tabPage2.Text = " 右侧BOX2料仓 ";
this.tabPage2.Text = " 右侧BOX料仓 ";
this.tabPage2.UseVisualStyleBackColor = true;
//
// groupBox3
......@@ -426,7 +429,7 @@
this.groupBox3.Controls.Add(this.label10);
this.groupBox3.Location = new System.Drawing.Point(6, 7);
this.groupBox3.Name = "groupBox3";
this.groupBox3.Size = new System.Drawing.Size(530, 216);
this.groupBox3.Size = new System.Drawing.Size(530, 190);
this.groupBox3.TabIndex = 285;
this.groupBox3.TabStop = false;
this.groupBox3.Text = "料盘定位功能配置";
......@@ -547,7 +550,7 @@
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(608, 689);
this.ClientSize = new System.Drawing.Size(610, 689);
this.Controls.Add(this.btnSavePosID);
this.Controls.Add(this.tabControl1);
this.Controls.Add(this.btnBack);
......
source/HCSingleStore/FrmIDConfig.cs
......@@ -50,16 +50,10 @@ namespace OnlineStore.ACSingleStore
txtLineAddr.Text = ConfigAppSettings.GetValue(Setting_Init.LineServerIp);
cmbId.Items.Clear();
int index = 0;
for (int i = 1; i <= 12; i++)
{
string n = "D" + i;
cmbId.Items.Add(n);
if (cid.Equals(n))
{
index = i - 1;
}
}
cmbId.Items.Add("D2D1");
cmbId.Items.Add("D4D3");
cmbId.Items.Add("D6D5");
cmbId.SelectedIndex = index;
LoadPos();
......@@ -240,22 +234,24 @@ namespace OnlineStore.ACSingleStore
if (index >= 0)
{
int num = index + 1;
cid = "D" + num;
if (num <= 6)
{
LeftId = num * 2 - 1;
RightId = num * 2;
cid1 = "line-ac-" + (LeftId).ToString().PadLeft(2, '0');
cid2 = "line-ac-" + (RightId).ToString().PadLeft(2, '0');
}
else
{
LeftId = num * 2;
RightId = num * 2 - 1;
cid = cmbId.Text;
//if (num <= 6)
//{
// LeftId = num * 2 - 1;
// RightId = num * 2;
// cid1 = "line-ac-" + (LeftId).ToString().PadLeft(2, '0');
// cid2 = "line-ac-" + (RightId).ToString().PadLeft(2, '0');
//}
//else
//{
// LeftId = num * 2;
// RightId = num * 2 - 1;
cid1 = "line-ac-" + (num * 2 ).ToString().PadLeft(2, '0');
cid2 = "line-ac-" + (num * 2 - 1).ToString().PadLeft(2, '0');
}
// cid1 = "line-ac-" + (num * 2 ).ToString().PadLeft(2, '0');
// cid2 = "line-ac-" + (num * 2 - 1).ToString().PadLeft(2, '0');
//}
cid1 = "line-ac-0" + cid.Substring(1, 1);
cid2 = "line-ac-0" + cid.Substring(3, 1);
lblLeftCid.Text = "左侧 : " + cid1;
lblRightCid.Text = "右侧 : " + cid2;
......
source/HCSingleStore/FrmIdConfig.resx
此文件的差异太大，无法显示。
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!