Skip to content

李娜 / Line-Smart-Workstation

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

1

1 个父辈 9d59f828
内嵌 并排
正在显示 5 个修改的文件 包含 91 行增加 和 49 行删除
DeviceLibrary/deviceLibrary/ledLabel/LedLabelController.cs
......@@ -56,7 +56,11 @@ namespace TSA_V.DeviceLibrary
return new LabelInfo();
}
LabelInfo label = new LabelInfo(position.PositionNum, com.ComCount, com.PN, com.ComponentDes, com.Notes, position.DeviceIP, position.Leds, opendLed);
if (int.Parse(com.ComCount) <= 0)
{
label.notes = ResourceControl.GetString("元器件数量不足", "元器件数量不足");
}
return label;
}
......
TSA-V/Properties/Resource.en-US.resx
......@@ -187,7 +187,7 @@
<value>Not available</value>
</data>
<data name="FrmWork_label6_Text" xml:space="preserve">
<value>Part Number</value>
<value>Part Number:</value>
</data>
<data name="FrmWork_lblPartNum_Text" xml:space="preserve">
<value>Not available</value>
......@@ -196,7 +196,7 @@
<value>Quantity Edit</value>
</data>
<data name="FrmWork_label5_Text" xml:space="preserve">
<value>Qty</value>
<value>Qty:</value>
</data>
<data name="FrmWork_lblCount_Text" xml:space="preserve">
<value>Not available</value>
......@@ -205,19 +205,19 @@
<value>Not available</value>
</data>
<data name="FrmWork_label4_Text" xml:space="preserve">
<value>Position</value>
<value>Position:</value>
</data>
<data name="FrmWork_label1_Text" xml:space="preserve">
<value>Description</value>
<value>Description:</value>
</data>
<data name="FrmWork_lblComDes_Text" xml:space="preserve">
<value>Not available</value>
</data>
<data name="FrmWork_label2_Text" xml:space="preserve">
<value>Notice</value>
<value>Notice:</value>
</data>
<data name="FrmWork_label3_Text" xml:space="preserve">
<value>Material</value>
<value>Component:</value>
</data>
<data name="FrmWork_lblComName_Text" xml:space="preserve">
<value>Not available</value>
......@@ -1232,7 +1232,7 @@
<value>Note: The last step is to start the new program.</value>
</data>
<data name="FrmWork_lblStart_Text" xml:space="preserve">
<value>Note: The new program has started and reached the first assembly point.</value>
<value>Note: New program, reached 1st position.</value>
</data>
<data name="FrmWork_radioButton1_Text" xml:space="preserve">
<value>Foot Peddler</value>
......@@ -2156,7 +2156,7 @@
<value>Inline Mode</value>
</data>
<data name="元器件数量不足，请及时补充" xml:space="preserve">
<value>The number of components is insufficient, please supplement in time</value>
<value>Component out of stock, please replenish</value>
</data>
<data name="FrmDeviceConfig_groupBox3_Text" xml:space="preserve">
<value>Data Upload Test</value>
......@@ -2606,24 +2606,33 @@
<value>Close LED</value>
</data>
<data name="Label_lblPos" xml:space="preserve">
<value>Postion: </value>
<value>Postion:</value>
</data>
<data name="Label_lblNum" xml:space="preserve">
<value>Count: </value>
<value>Qty:</value>
</data>
<data name="Label_lblPn" xml:space="preserve">
<value>PartNumber: </value>
<value>Component:</value>
</data>
<data name="Label_lblDes" xml:space="preserve">
<value>Description : </value>
<value>Description:</value>
</data>
<data name="Label_lblNotes" xml:space="preserve">
<value>Note: </value>
<value>Notice:</value>
</data>
<data name="FrmComponentList_btnExport_Text" xml:space="preserve">
<value>Export</value>
</data>
<data name = "FrmComponentList_linkCloseAll_Text" xml:space = "preserve"> <value> Close All </value> </data>
<data name = "FrmComponentList_linkOpenAll_Text" xml:space = "preserve"> <value> Open All </value> </data>
<data name = "FrmComponentList_linkUpdate_Text" xml:space = "preserve"> <value> Display Test </value> </data>
<data name="FrmComponentList_linkCloseAll_Text" xml:space="preserve">
<value> Close All </value>
</data>
<data name="FrmComponentList_linkOpenAll_Text" xml:space="preserve">
<value> Open All </value>
</data>
<data name="FrmComponentList_linkUpdate_Text" xml:space="preserve">
<value> Display Test </value>
</data>
<data name="元器件数量不足" xml:space="preserve">
<value>Component out of stock</value>
</data>
</root>
\ No newline at end of file
TSA-V/Properties/Resource.ru-RU.resx
......@@ -2583,20 +2583,40 @@
<data name="iscontinue" xml:space="preserve">
<value>有未结束的程序'{0}'，是否继续?</value>
</data>
<data name = "不使用AOI" xml:space = "preserve"> <value> 不使用AOI </value> </data>
<data name = "FrmWork_lblGuoBan_Text" xml:space = "preserve"> <value> 过板模式 </value> </data>
<data name = "FrmAOICheck_btnUpdateImg_Text" xml:space = "preserve"> <value> 修正 </value> </data>
<data name = "SureUpdateMethod" xml:space = "preserve"> <value> 确定修正{0}？ </value> </data>
<data name = "FrmLanguage_rbtnRussian_Text" xml:space = "preserve"> <value> 俄文 </value> </data>
<data name="不使用AOI" xml:space="preserve">
<value> 不使用AOI </value>
</data>
<data name="FrmWork_lblGuoBan_Text" xml:space="preserve">
<value> 过板模式 </value>
</data>
<data name="FrmAOICheck_btnUpdateImg_Text" xml:space="preserve">
<value> 修正 </value>
</data>
<data name="SureUpdateMethod" xml:space="preserve">
<value> 确定修正{0}？ </value>
</data>
<data name="FrmLanguage_rbtnRussian_Text" xml:space="preserve">
<value> 俄文 </value>
</data>
<data name="FrmComponentList_linkLabel1_Text" xml:space="preserve">
<value>亮灯测试</value>
</data>
<data name="FrmComponentList_linkLabel2_Text" xml:space="preserve">
<value>关灯测试</value>
</data>
<data name = "FrmComponentList_btnExport_Text" xml:space = "preserve"> <value> EXPORT </value> </data>
<data name = "FrmComponentList_linkCloseAll_Text" xml:space = "preserve"> <value> 全关 </value> </data>
<data name = "FrmComponentList_linkOpenAll_Text" xml:space = "preserve"> <value> 全开 </value> </data>
<data name = "FrmComponentList_linkUpdate_Text" xml:space = "preserve"> <value> 显示测试 </value> </data>
<data name="FrmComponentList_btnExport_Text" xml:space="preserve">
<value> EXPORT </value>
</data>
<data name="FrmComponentList_linkCloseAll_Text" xml:space="preserve">
<value> 全关 </value>
</data>
<data name="FrmComponentList_linkOpenAll_Text" xml:space="preserve">
<value> 全开 </value>
</data>
<data name="FrmComponentList_linkUpdate_Text" xml:space="preserve">
<value> 显示测试 </value>
</data>
<data name="元器件数量不足" xml:space="preserve">
<value>元器件数量不足</value>
</data>
</root>
\ No newline at end of file
TSA-V/Properties/Resource.zh-CN.resx
......@@ -2622,7 +2622,16 @@
<data name="FrmComponentList_btnExport_Text" xml:space="preserve">
<value> 导出 </value>
</data>
<data name = "FrmComponentList_linkCloseAll_Text" xml:space = "preserve"> <value> 全关 </value> </data>
<data name = "FrmComponentList_linkOpenAll_Text" xml:space = "preserve"> <value> 全开 </value> </data>
<data name = "FrmComponentList_linkUpdate_Text" xml:space = "preserve"> <value> 显示测试 </value> </data>
<data name="FrmComponentList_linkCloseAll_Text" xml:space="preserve">
<value> 全关 </value>
</data>
<data name="FrmComponentList_linkOpenAll_Text" xml:space="preserve">
<value> 全开 </value>
</data>
<data name="FrmComponentList_linkUpdate_Text" xml:space="preserve">
<value> 显示测试 </value>
</data>
<data name="元器件数量不足" xml:space="preserve">
<value>元器件数量不足</value>
</data>
</root>
\ No newline at end of file
TSA-V/workForm/FrmTSAV.Designer.cs
......@@ -383,7 +383,7 @@
this.lblComNotices.AutoSize = true;
this.lblComNotices.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblComNotices.ForeColor = System.Drawing.Color.Red;
this.lblComNotices.Location = new System.Drawing.Point(193, 165);
this.lblComNotices.Location = new System.Drawing.Point(167, 165);
this.lblComNotices.Name = "lblComNotices";
this.lblComNotices.Size = new System.Drawing.Size(37, 19);
this.lblComNotices.TabIndex = 279;
......@@ -404,9 +404,9 @@
this.label6.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label6.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
this.label6.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label6.Location = new System.Drawing.Point(43, 20);
this.label6.Location = new System.Drawing.Point(9, 20);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(128, 19);
this.label6.Size = new System.Drawing.Size(157, 19);
this.label6.TabIndex = 277;
this.label6.Text = "编号：";
this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
......@@ -416,7 +416,7 @@
this.lblPartNum.AutoSize = true;
this.lblPartNum.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblPartNum.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
this.lblPartNum.Location = new System.Drawing.Point(193, 20);
this.lblPartNum.Location = new System.Drawing.Point(167, 20);
this.lblPartNum.Name = "lblPartNum";
this.lblPartNum.Size = new System.Drawing.Size(37, 19);
this.lblPartNum.TabIndex = 276;
......@@ -439,9 +439,9 @@
this.label5.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label5.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
this.label5.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label5.Location = new System.Drawing.Point(43, 78);
this.label5.Location = new System.Drawing.Point(9, 78);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(128, 19);
this.label5.Size = new System.Drawing.Size(157, 19);
this.label5.TabIndex = 274;
this.label5.Text = "剩余数量：";
this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
......@@ -451,7 +451,7 @@
this.lblCount.AutoSize = true;
this.lblCount.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblCount.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
this.lblCount.Location = new System.Drawing.Point(193, 78);
this.lblCount.Location = new System.Drawing.Point(167, 78);
this.lblCount.Name = "lblCount";
this.lblCount.Size = new System.Drawing.Size(37, 19);
this.lblCount.TabIndex = 273;
......@@ -462,7 +462,7 @@
this.lblPositionNum.AutoSize = true;
this.lblPositionNum.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblPositionNum.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
this.lblPositionNum.Location = new System.Drawing.Point(193, 107);
this.lblPositionNum.Location = new System.Drawing.Point(167, 107);
this.lblPositionNum.Name = "lblPositionNum";
this.lblPositionNum.Size = new System.Drawing.Size(42, 22);
this.lblPositionNum.TabIndex = 8;
......@@ -473,9 +473,9 @@
this.label4.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label4.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
this.label4.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label4.Location = new System.Drawing.Point(43, 107);
this.label4.Location = new System.Drawing.Point(9, 107);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(128, 19);
this.label4.Size = new System.Drawing.Size(157, 19);
this.label4.TabIndex = 7;
this.label4.Text = "位置：";
this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
......@@ -485,9 +485,9 @@
this.label1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
this.label1.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label1.Location = new System.Drawing.Point(43, 136);
this.label1.Location = new System.Drawing.Point(9, 136);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(128, 19);
this.label1.Size = new System.Drawing.Size(157, 19);
this.label1.TabIndex = 6;
this.label1.Text = "描述：";
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
......@@ -497,7 +497,7 @@
this.lblComDes.AutoSize = true;
this.lblComDes.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblComDes.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
this.lblComDes.Location = new System.Drawing.Point(193, 136);
this.lblComDes.Location = new System.Drawing.Point(167, 136);
this.lblComDes.Name = "lblComDes";
this.lblComDes.Size = new System.Drawing.Size(37, 19);
this.lblComDes.TabIndex = 3;
......@@ -508,9 +508,9 @@
this.label2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label2.ForeColor = System.Drawing.Color.Red;
this.label2.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label2.Location = new System.Drawing.Point(43, 165);
this.label2.Location = new System.Drawing.Point(9, 165);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(128, 19);
this.label2.Size = new System.Drawing.Size(157, 19);
this.label2.TabIndex = 5;
this.label2.Text = "注意事项：";
this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
......@@ -520,9 +520,9 @@
this.label3.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
this.label3.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label3.Location = new System.Drawing.Point(43, 49);
this.label3.Location = new System.Drawing.Point(9, 49);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(128, 19);
this.label3.Size = new System.Drawing.Size(157, 19);
this.label3.TabIndex = 4;
this.label3.Text = "名称：";
this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
......@@ -544,7 +544,7 @@
this.lblPointName.AutoSize = true;
this.lblPointName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblPointName.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
this.lblPointName.Location = new System.Drawing.Point(193, 49);
this.lblPointName.Location = new System.Drawing.Point(167, 49);
this.lblPointName.Name = "lblPointName";
this.lblPointName.Size = new System.Drawing.Size(42, 22);
this.lblPointName.TabIndex = 1;
......@@ -874,7 +874,7 @@
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MainMenuStrip = this.menuStrip1;
this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.Margin = new System.Windows.Forms.Padding(4);
this.Name = "FrmWork";
this.Text = "TSA_V工作";
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!