meswork/16-Xikai-MesProjectNew
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 增加LG/TCS-AGV接口并完善物料校验与Function逻辑

Browse Source
This commit is contained in:
XingCheng3
2026-07-16 16:47:45 +08:00
parent 7303ddde9a
commit 8e44e11248
74 changed files with 4324 additions and 1091 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
MisDataFun/MisDataFun/App.config
View File

@@ -10,12 +10,12 @@
<!--是启用保存监控变量到数据库-->
<add key="IsRecordTagStatus" value="1" />
<!--数据库连接-->
<add key="ConnectionString_MES" value="server=.,1333;User ID=sa;Password=126.com;database=MESBasicDB_XD_ZZ;Connection Reset=FALSE" />
<add key="ConnectionString_MES" value="server=127.0.0.1,25001;User ID=meswork;Password=126.com;database=MESBasicDB_XD_GLKG;Connection Reset=FALSE" />
<!--MQTT参数配置-->
<!--<add key="MqttUrl" value="172.16.1.5:1883,WEB/InstantMessaging/XD_GLKG/MisServer" />-->
<add key="MqttUrl" value="127.0.0.1:1883,WEB/InstantMessaging/XD_ZZ/MisServer" />
<add key="TopicList" value="PLC/InstantMessaging/XD_ZZ/+,PLC|WEB/InstantMessaging/XD_ZZ/MisServer,WEB" />
<add key="MqttTargetTopic" value="MES/InstantMessaging/XD_ZZ" />
<add key="MqttUrl" value="127.0.0.1:1883,WEB/InstantMessaging/XD_GLKG/MisServer" />
<add key="TopicList" value="PLC/InstantMessaging/XD_GLKG/+,PLC|WEB/InstantMessaging/XD_GLKG/MisServer,WEB" />
<add key="MqttTargetTopic" value="MES/InstantMessaging/XD_GLKG" />
<!--电阻仪地址-->
<add key="ResistorDeviceIP_AC0901" value="192.168.10.59" />
<add key="ResistorDeviceIP_AC0906" value="192.168.10.109" />
@@ -25,7 +25,7 @@
<add key="ResistorDevicePort" value="8088" />
<!--实时监控MES在线状态-->
<add key="Webapi_MesIP" value="10.112.254.40" />
<add key="Webapi_MesIP" value="mes.xkyx.com.cn" />
<!--API端口号-->
<add key="WebSvrPort" value="9982" />
<add key="upload_Interval" value="10000" />
@@ -36,7 +36,7 @@
<add key="WebapiPostHeader_Authorization" value="Bearer c4a965c1-84e4-764e-9108-7fe66c239b54" />
<!--MES_ZHDQ_126GLKG MES_ZHDQ_126DLQ MES_ZHDQ_126ZZ-->
<add key="WebapiPostHeader_Systemcode" value="MES_ZHDQ_126ZZ" />
<add key="WebapiPostHeader_Systemcode" value="MES_ZHDQ_126GLKG" />
<!--工厂AGV部分-->
<add key="AGV_BaseUrl" value="http://10.107.68.36:8181" />
@@ -111,4 +111,4 @@
</providers>
</roleManager>
</system.web>
</configuration>
</configuration>

72
MisDataFun/MisDataFun/MisDataFun.Designer.cs generated
View File

@@ -268,7 +268,7 @@ namespace MisDataSaveDate
this.tableLayoutPanel1.Controls.Add(this.panel5, 1, 3);
this.tableLayoutPanel1.Controls.Add(this.panel2, 0, 3);
this.tableLayoutPanel1.Location = new System.Drawing.Point(334, 319);
this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(2);
this.tableLayoutPanel1.Name = "tableLayoutPanel1";
this.tableLayoutPanel1.RowCount = 4;
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F));
@@ -283,9 +283,9 @@ namespace MisDataSaveDate
this.groupBox5.Controls.Add(this.textBox_WEB_TO_MES);
this.groupBox5.Dock = System.Windows.Forms.DockStyle.Fill;
this.groupBox5.Location = new System.Drawing.Point(2, 172);
this.groupBox5.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.groupBox5.Margin = new System.Windows.Forms.Padding(2);
this.groupBox5.Name = "groupBox5";
this.groupBox5.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.groupBox5.Padding = new System.Windows.Forms.Padding(2);
this.groupBox5.Size = new System.Drawing.Size(386, 64);
this.groupBox5.TabIndex = 4;
this.groupBox5.TabStop = false;
@@ -295,7 +295,7 @@ namespace MisDataSaveDate
//
this.textBox_WEB_TO_MES.Dock = System.Windows.Forms.DockStyle.Fill;
this.textBox_WEB_TO_MES.Location = new System.Drawing.Point(2, 16);
this.textBox_WEB_TO_MES.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.textBox_WEB_TO_MES.Margin = new System.Windows.Forms.Padding(2);
this.textBox_WEB_TO_MES.Multiline = true;
this.textBox_WEB_TO_MES.Name = "textBox_WEB_TO_MES";
this.textBox_WEB_TO_MES.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
@@ -307,9 +307,9 @@ namespace MisDataSaveDate
this.groupBox1.Controls.Add(this.textBox_PLC_TO_MES);
this.groupBox1.Controls.Add(this.panel8);
this.groupBox1.Location = new System.Drawing.Point(2, 2);
this.groupBox1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.groupBox1.Margin = new System.Windows.Forms.Padding(2);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.groupBox1.Padding = new System.Windows.Forms.Padding(2);
this.groupBox1.Size = new System.Drawing.Size(386, 64);
this.groupBox1.TabIndex = 0;
this.groupBox1.TabStop = false;
@@ -319,7 +319,7 @@ namespace MisDataSaveDate
//
this.textBox_PLC_TO_MES.Dock = System.Windows.Forms.DockStyle.Fill;
this.textBox_PLC_TO_MES.Location = new System.Drawing.Point(2, 16);
this.textBox_PLC_TO_MES.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.textBox_PLC_TO_MES.Margin = new System.Windows.Forms.Padding(2);
this.textBox_PLC_TO_MES.Multiline = true;
this.textBox_PLC_TO_MES.Name = "textBox_PLC_TO_MES";
this.textBox_PLC_TO_MES.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
@@ -532,9 +532,9 @@ namespace MisDataSaveDate
this.groupBox3.Controls.Add(this.textBox_MES_TO_WEB);
this.groupBox3.Dock = System.Windows.Forms.DockStyle.Fill;
this.groupBox3.Location = new System.Drawing.Point(2, 70);
this.groupBox3.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.groupBox3.Margin = new System.Windows.Forms.Padding(2);
this.groupBox3.Name = "groupBox3";
this.groupBox3.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.groupBox3.Padding = new System.Windows.Forms.Padding(2);
this.groupBox3.Size = new System.Drawing.Size(386, 98);
this.groupBox3.TabIndex = 2;
this.groupBox3.TabStop = false;
@@ -544,7 +544,7 @@ namespace MisDataSaveDate
//
this.textBox_MES_TO_WEB.Dock = System.Windows.Forms.DockStyle.Fill;
this.textBox_MES_TO_WEB.Location = new System.Drawing.Point(2, 16);
this.textBox_MES_TO_WEB.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.textBox_MES_TO_WEB.Margin = new System.Windows.Forms.Padding(2);
this.textBox_MES_TO_WEB.Multiline = true;
this.textBox_MES_TO_WEB.Name = "textBox_MES_TO_WEB";
this.textBox_MES_TO_WEB.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
@@ -556,7 +556,7 @@ namespace MisDataSaveDate
this.panel1.Controls.Add(this.tableLayoutPanel3);
this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel1.Location = new System.Drawing.Point(392, 2);
this.panel1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.panel1.Margin = new System.Windows.Forms.Padding(2);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(196, 64);
this.panel1.TabIndex = 10;
@@ -574,7 +574,7 @@ namespace MisDataSaveDate
this.tableLayoutPanel3.Controls.Add(this.button_PLC_TO_MES_Small, 1, 0);
this.tableLayoutPanel3.Dock = System.Windows.Forms.DockStyle.Fill;
this.tableLayoutPanel3.Location = new System.Drawing.Point(0, 0);
this.tableLayoutPanel3.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.tableLayoutPanel3.Margin = new System.Windows.Forms.Padding(2);
this.tableLayoutPanel3.Name = "tableLayoutPanel3";
this.tableLayoutPanel3.RowCount = 2;
this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle());
@@ -590,7 +590,7 @@ namespace MisDataSaveDate
this.checkBox_PLC_TO_MES.AutoSize = true;
this.checkBox_PLC_TO_MES.Dock = System.Windows.Forms.DockStyle.Fill;
this.checkBox_PLC_TO_MES.Location = new System.Drawing.Point(2, 2);
this.checkBox_PLC_TO_MES.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.checkBox_PLC_TO_MES.Margin = new System.Windows.Forms.Padding(2);
this.checkBox_PLC_TO_MES.Name = "checkBox_PLC_TO_MES";
this.checkBox_PLC_TO_MES.Size = new System.Drawing.Size(54, 22);
this.checkBox_PLC_TO_MES.TabIndex = 0;
@@ -601,7 +601,7 @@ namespace MisDataSaveDate
//
this.button_PLC_TO_MES_Clear.Dock = System.Windows.Forms.DockStyle.Fill;
this.button_PLC_TO_MES_Clear.Location = new System.Drawing.Point(138, 2);
this.button_PLC_TO_MES_Clear.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.button_PLC_TO_MES_Clear.Margin = new System.Windows.Forms.Padding(2);
this.button_PLC_TO_MES_Clear.Name = "button_PLC_TO_MES_Clear";
this.button_PLC_TO_MES_Clear.Size = new System.Drawing.Size(56, 22);
this.button_PLC_TO_MES_Clear.TabIndex = 1;
@@ -611,7 +611,7 @@ namespace MisDataSaveDate
// button_PLC_TO_MES_Big
//
this.button_PLC_TO_MES_Big.Location = new System.Drawing.Point(99, 2);
this.button_PLC_TO_MES_Big.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.button_PLC_TO_MES_Big.Margin = new System.Windows.Forms.Padding(2);
this.button_PLC_TO_MES_Big.Name = "button_PLC_TO_MES_Big";
this.button_PLC_TO_MES_Big.Size = new System.Drawing.Size(34, 20);
this.button_PLC_TO_MES_Big.TabIndex = 2;
@@ -621,7 +621,7 @@ namespace MisDataSaveDate
// button_PLC_TO_MES_Small
//
this.button_PLC_TO_MES_Small.Location = new System.Drawing.Point(60, 2);
this.button_PLC_TO_MES_Small.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.button_PLC_TO_MES_Small.Margin = new System.Windows.Forms.Padding(2);
this.button_PLC_TO_MES_Small.Name = "button_PLC_TO_MES_Small";
this.button_PLC_TO_MES_Small.Size = new System.Drawing.Size(34, 20);
this.button_PLC_TO_MES_Small.TabIndex = 2;
@@ -633,7 +633,7 @@ namespace MisDataSaveDate
this.panel3.Controls.Add(this.tableLayoutPanel2);
this.panel3.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel3.Location = new System.Drawing.Point(392, 70);
this.panel3.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.panel3.Margin = new System.Windows.Forms.Padding(2);
this.panel3.Name = "panel3";
this.panel3.Size = new System.Drawing.Size(196, 98);
this.panel3.TabIndex = 12;
@@ -652,7 +652,7 @@ namespace MisDataSaveDate
this.tableLayoutPanel2.Controls.Add(this.button_MES_TO_WEB_Big, 2, 0);
this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill;
this.tableLayoutPanel2.Location = new System.Drawing.Point(0, 0);
this.tableLayoutPanel2.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.tableLayoutPanel2.Margin = new System.Windows.Forms.Padding(2);
this.tableLayoutPanel2.Name = "tableLayoutPanel2";
this.tableLayoutPanel2.RowCount = 2;
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle());
@@ -673,7 +673,7 @@ namespace MisDataSaveDate
this.tableLayoutPanel2.SetColumnSpan(this.dataGridView_CheckOpName, 4);
this.dataGridView_CheckOpName.Dock = System.Windows.Forms.DockStyle.Fill;
this.dataGridView_CheckOpName.Location = new System.Drawing.Point(2, 28);
this.dataGridView_CheckOpName.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.dataGridView_CheckOpName.Margin = new System.Windows.Forms.Padding(2);
this.dataGridView_CheckOpName.MultiSelect = false;
this.dataGridView_CheckOpName.Name = "dataGridView_CheckOpName";
this.dataGridView_CheckOpName.RowHeadersVisible = false;
@@ -705,7 +705,7 @@ namespace MisDataSaveDate
this.checkBox__MES_TO_WEB.AutoSize = true;
this.checkBox__MES_TO_WEB.Dock = System.Windows.Forms.DockStyle.Fill;
this.checkBox__MES_TO_WEB.Location = new System.Drawing.Point(2, 2);
this.checkBox__MES_TO_WEB.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.checkBox__MES_TO_WEB.Margin = new System.Windows.Forms.Padding(2);
this.checkBox__MES_TO_WEB.Name = "checkBox__MES_TO_WEB";
this.checkBox__MES_TO_WEB.Size = new System.Drawing.Size(54, 22);
this.checkBox__MES_TO_WEB.TabIndex = 0;
@@ -716,7 +716,7 @@ namespace MisDataSaveDate
//
this.button_MES_TO_WEB_Clear.Dock = System.Windows.Forms.DockStyle.Fill;
this.button_MES_TO_WEB_Clear.Location = new System.Drawing.Point(138, 2);
this.button_MES_TO_WEB_Clear.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.button_MES_TO_WEB_Clear.Margin = new System.Windows.Forms.Padding(2);
this.button_MES_TO_WEB_Clear.Name = "button_MES_TO_WEB_Clear";
this.button_MES_TO_WEB_Clear.Size = new System.Drawing.Size(56, 22);
this.button_MES_TO_WEB_Clear.TabIndex = 2;
@@ -726,7 +726,7 @@ namespace MisDataSaveDate
// button_MES_TO_WEB_Small
//
this.button_MES_TO_WEB_Small.Location = new System.Drawing.Point(60, 2);
this.button_MES_TO_WEB_Small.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.button_MES_TO_WEB_Small.Margin = new System.Windows.Forms.Padding(2);
this.button_MES_TO_WEB_Small.Name = "button_MES_TO_WEB_Small";
this.button_MES_TO_WEB_Small.Size = new System.Drawing.Size(34, 20);
this.button_MES_TO_WEB_Small.TabIndex = 4;
@@ -736,7 +736,7 @@ namespace MisDataSaveDate
// button_MES_TO_WEB_Big
//
this.button_MES_TO_WEB_Big.Location = new System.Drawing.Point(99, 2);
this.button_MES_TO_WEB_Big.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.button_MES_TO_WEB_Big.Margin = new System.Windows.Forms.Padding(2);
this.button_MES_TO_WEB_Big.Name = "button_MES_TO_WEB_Big";
this.button_MES_TO_WEB_Big.Size = new System.Drawing.Size(34, 20);
this.button_MES_TO_WEB_Big.TabIndex = 4;
@@ -749,7 +749,7 @@ namespace MisDataSaveDate
this.panel4.Controls.Add(this.tableLayoutPanel4);
this.panel4.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel4.Location = new System.Drawing.Point(392, 172);
this.panel4.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.panel4.Margin = new System.Windows.Forms.Padding(2);
this.panel4.Name = "panel4";
this.panel4.Size = new System.Drawing.Size(196, 64);
this.panel4.TabIndex = 13;
@@ -767,7 +767,7 @@ namespace MisDataSaveDate
this.tableLayoutPanel4.Controls.Add(this.button_WEB_TO_MES_Clear, 3, 0);
this.tableLayoutPanel4.Dock = System.Windows.Forms.DockStyle.Fill;
this.tableLayoutPanel4.Location = new System.Drawing.Point(0, 0);
this.tableLayoutPanel4.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.tableLayoutPanel4.Margin = new System.Windows.Forms.Padding(2);
this.tableLayoutPanel4.Name = "tableLayoutPanel4";
this.tableLayoutPanel4.RowCount = 2;
this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle());
@@ -778,7 +778,7 @@ namespace MisDataSaveDate
// button_WEB_TO_MES_Big
//
this.button_WEB_TO_MES_Big.Location = new System.Drawing.Point(98, 2);
this.button_WEB_TO_MES_Big.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.button_WEB_TO_MES_Big.Margin = new System.Windows.Forms.Padding(2);
this.button_WEB_TO_MES_Big.Name = "button_WEB_TO_MES_Big";
this.button_WEB_TO_MES_Big.Size = new System.Drawing.Size(34, 20);
this.button_WEB_TO_MES_Big.TabIndex = 6;
@@ -788,7 +788,7 @@ namespace MisDataSaveDate
// button_WEB_TO_MES_Small
//
this.button_WEB_TO_MES_Small.Location = new System.Drawing.Point(60, 2);
this.button_WEB_TO_MES_Small.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.button_WEB_TO_MES_Small.Margin = new System.Windows.Forms.Padding(2);
this.button_WEB_TO_MES_Small.Name = "button_WEB_TO_MES_Small";
this.button_WEB_TO_MES_Small.Size = new System.Drawing.Size(34, 20);
this.button_WEB_TO_MES_Small.TabIndex = 5;
@@ -800,7 +800,7 @@ namespace MisDataSaveDate
this.checkBox_WEB_TO_MES.AutoSize = true;
this.checkBox_WEB_TO_MES.Dock = System.Windows.Forms.DockStyle.Fill;
this.checkBox_WEB_TO_MES.Location = new System.Drawing.Point(2, 2);
this.checkBox_WEB_TO_MES.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.checkBox_WEB_TO_MES.Margin = new System.Windows.Forms.Padding(2);
this.checkBox_WEB_TO_MES.Name = "checkBox_WEB_TO_MES";
this.checkBox_WEB_TO_MES.Size = new System.Drawing.Size(54, 22);
this.checkBox_WEB_TO_MES.TabIndex = 0;
@@ -811,7 +811,7 @@ namespace MisDataSaveDate
//
this.button_WEB_TO_MES_Clear.Dock = System.Windows.Forms.DockStyle.Fill;
this.button_WEB_TO_MES_Clear.Location = new System.Drawing.Point(136, 2);
this.button_WEB_TO_MES_Clear.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.button_WEB_TO_MES_Clear.Margin = new System.Windows.Forms.Padding(2);
this.button_WEB_TO_MES_Clear.Name = "button_WEB_TO_MES_Clear";
this.button_WEB_TO_MES_Clear.Size = new System.Drawing.Size(56, 22);
this.button_WEB_TO_MES_Clear.TabIndex = 1;
@@ -895,7 +895,7 @@ namespace MisDataSaveDate
// button_SaveData
//
this.button_SaveData.Location = new System.Drawing.Point(13, 95);
this.button_SaveData.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.button_SaveData.Margin = new System.Windows.Forms.Padding(2);
this.button_SaveData.Name = "button_SaveData";
this.button_SaveData.Size = new System.Drawing.Size(56, 18);
this.button_SaveData.TabIndex = 4;
@@ -991,7 +991,7 @@ namespace MisDataSaveDate
this.tabPage1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.tabPage1.Name = "tabPage1";
this.tabPage1.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.tabPage1.Size = new System.Drawing.Size(171, 69);
this.tabPage1.Size = new System.Drawing.Size(170, 69);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = "产品信息";
this.tabPage1.UseVisualStyleBackColor = true;
@@ -1002,7 +1002,7 @@ namespace MisDataSaveDate
this.tabPage2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.tabPage2.Name = "tabPage2";
this.tabPage2.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.tabPage2.Size = new System.Drawing.Size(171, 69);
this.tabPage2.Size = new System.Drawing.Size(170, 69);
this.tabPage2.TabIndex = 1;
this.tabPage2.Text = "工步信息";
this.tabPage2.UseVisualStyleBackColor = true;
@@ -1012,7 +1012,7 @@ namespace MisDataSaveDate
this.tabPage3.Location = new System.Drawing.Point(4, 22);
this.tabPage3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.tabPage3.Name = "tabPage3";
this.tabPage3.Size = new System.Drawing.Size(171, 69);
this.tabPage3.Size = new System.Drawing.Size(170, 69);
this.tabPage3.TabIndex = 2;
this.tabPage3.Text = "物料信息";
this.tabPage3.UseVisualStyleBackColor = true;
@@ -1022,7 +1022,7 @@ namespace MisDataSaveDate
this.tabPage4.Location = new System.Drawing.Point(4, 22);
this.tabPage4.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.tabPage4.Name = "tabPage4";
this.tabPage4.Size = new System.Drawing.Size(171, 69);
this.tabPage4.Size = new System.Drawing.Size(170, 69);
this.tabPage4.TabIndex = 3;
this.tabPage4.Text = "操作图片";
this.tabPage4.UseVisualStyleBackColor = true;
@@ -1032,7 +1032,7 @@ namespace MisDataSaveDate
this.tabPage5.Location = new System.Drawing.Point(4, 22);
this.tabPage5.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.tabPage5.Name = "tabPage5";
this.tabPage5.Size = new System.Drawing.Size(171, 69);
this.tabPage5.Size = new System.Drawing.Size(170, 69);
this.tabPage5.TabIndex = 4;
this.tabPage5.Text = "PLC信号";
this.tabPage5.UseVisualStyleBackColor = true;
@@ -1304,6 +1304,7 @@ namespace MisDataSaveDate
this.pb_OnLine_Print.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.pb_OnLine_Print.TabIndex = 1485;
this.pb_OnLine_Print.TabStop = false;
this.pb_OnLine_Print.Visible = false;
//
// label28
//
@@ -1314,6 +1315,7 @@ namespace MisDataSaveDate
this.label28.Size = new System.Drawing.Size(41, 12);
this.label28.TabIndex = 1484;
this.label28.Text = "打印机";
this.label28.Visible = false;
//
// pb_OnLine_SQL
//

2
MisDataFun/MisDataFun/MisDataFun.cs
View File

@@ -697,7 +697,7 @@ namespace MisDataSaveDate
{
string mesAlarmType = errDt["测量单位"].ToString();
if (AlarmExceptionTypeMap.ContainsKey(mesAlarmType)) mesAlarmType = AlarmExceptionTypeMap[mesAlarmType];
WebApi.CALL_Inerface_DataHandle.CALL_Inerface_DeviceAlarm(opName, tagID, mesAlarmType, errDt["测量项目"].ToString());
// WebApi.CALL_Inerface_DataHandle.CALL_Inerface_DeviceAlarm(opName, tagID, mesAlarmType, errDt["测量项目"].ToString());
}
}

2
MisDataFun/MisDataFun/mes_signal_conf/MES_CONF.cs
View File

@@ -1,4 +1,4 @@
using SlMesDbIterface;
using SlMesDbIterface;
using System;
using System.Data;
using System.Linq;