diff --git a/ControlMonitorClient/FrmControlMonitor.designer.cs b/ControlMonitorClient/FrmControlMonitor.designer.cs index 0449b0f..7be6a2c 100644 --- a/ControlMonitorClient/FrmControlMonitor.designer.cs +++ b/ControlMonitorClient/FrmControlMonitor.designer.cs @@ -296,6 +296,8 @@ this.label5 = new System.Windows.Forms.Label(); this.button42 = new System.Windows.Forms.Button(); this.label41 = new System.Windows.Forms.Label(); + this.button61 = new System.Windows.Forms.Button(); + this.button60 = new System.Windows.Forms.Button(); this.button57 = new System.Windows.Forms.Button(); this.button36 = new System.Windows.Forms.Button(); this.label31 = new System.Windows.Forms.Label(); @@ -427,8 +429,22 @@ this.label91 = new System.Windows.Forms.Label(); this.label43 = new System.Windows.Forms.Label(); this.label44 = new System.Windows.Forms.Label(); - this.button60 = new System.Windows.Forms.Button(); - this.button61 = new System.Windows.Forms.Button(); + this.button95 = new System.Windows.Forms.Button(); + this.button96 = new System.Windows.Forms.Button(); + this.button97 = new System.Windows.Forms.Button(); + this.button98 = new System.Windows.Forms.Button(); + this.button99 = new System.Windows.Forms.Button(); + this.button100 = new System.Windows.Forms.Button(); + this.button101 = new System.Windows.Forms.Button(); + this.button102 = new System.Windows.Forms.Button(); + this.button103 = new System.Windows.Forms.Button(); + this.button104 = new System.Windows.Forms.Button(); + this.button105 = new System.Windows.Forms.Button(); + this.button106 = new System.Windows.Forms.Button(); + this.button107 = new System.Windows.Forms.Button(); + this.button108 = new System.Windows.Forms.Button(); + this.button109 = new System.Windows.Forms.Button(); + this.button110 = new System.Windows.Forms.Button(); pictureBox14 = new System.Windows.Forms.PictureBox(); pictureBox13 = new System.Windows.Forms.PictureBox(); pictureBox12 = new System.Windows.Forms.PictureBox(); @@ -1265,6 +1281,7 @@ // // plAccessorial1 // + this.plAccessorial1.Controls.Add(this.button95); this.plAccessorial1.Controls.Add(this.label105); this.plAccessorial1.Controls.Add(this.label104); this.plAccessorial1.Controls.Add(this.label114); @@ -1446,6 +1463,21 @@ this.plAccessorial1.Controls.Add(this.button77); this.plAccessorial1.Controls.Add(this.button70); this.plAccessorial1.Controls.Add(this.button74); + this.plAccessorial1.Controls.Add(this.button101); + this.plAccessorial1.Controls.Add(this.button100); + this.plAccessorial1.Controls.Add(this.button99); + this.plAccessorial1.Controls.Add(this.button98); + this.plAccessorial1.Controls.Add(this.button97); + this.plAccessorial1.Controls.Add(this.button107); + this.plAccessorial1.Controls.Add(this.button106); + this.plAccessorial1.Controls.Add(this.button105); + this.plAccessorial1.Controls.Add(this.button104); + this.plAccessorial1.Controls.Add(this.button103); + this.plAccessorial1.Controls.Add(this.button102); + this.plAccessorial1.Controls.Add(this.button110); + this.plAccessorial1.Controls.Add(this.button109); + this.plAccessorial1.Controls.Add(this.button108); + this.plAccessorial1.Controls.Add(this.button96); this.plAccessorial1.Controls.Add(this.button1); this.plAccessorial1.Controls.Add(this.label42); this.plAccessorial1.Controls.Add(this.label32); @@ -1500,7 +1532,7 @@ this.label104.BackColor = System.Drawing.Color.Transparent; this.label104.Enabled = false; this.label104.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label104.Location = new System.Drawing.Point(28, 271); + this.label104.Location = new System.Drawing.Point(20, 207); this.label104.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label104.Name = "label104"; this.label104.Size = new System.Drawing.Size(107, 15); @@ -1537,7 +1569,7 @@ // this.textBox78.BackColor = System.Drawing.Color.White; this.textBox78.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.textBox78.Location = new System.Drawing.Point(47, 360); + this.textBox78.Location = new System.Drawing.Point(32, 297); this.textBox78.Margin = new System.Windows.Forms.Padding(4); this.textBox78.Multiline = true; this.textBox78.Name = "textBox78"; @@ -1574,7 +1606,7 @@ // pictureBox2 // this.pictureBox2.Image = global::wcfControlMonitorClient.Properties.Resources.stop_0; - this.pictureBox2.Location = new System.Drawing.Point(47, 306); + this.pictureBox2.Location = new System.Drawing.Point(32, 239); this.pictureBox2.Margin = new System.Windows.Forms.Padding(4); this.pictureBox2.Name = "pictureBox2"; this.pictureBox2.Size = new System.Drawing.Size(53, 47); @@ -4054,6 +4086,33 @@ this.label41.TabIndex = 5866; this.label41.Text = "←"; // + // button61 + // + this.button61.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; + this.button61.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.button61.Location = new System.Drawing.Point(1395, 427); + this.button61.Margin = new System.Windows.Forms.Padding(4); + this.button61.Name = "button61"; + this.button61.Size = new System.Drawing.Size(38, 145); + this.button61.TabIndex = 5913; + this.button61.Tag = "18101"; + this.button61.Text = "快速卷帘门 1"; + this.button61.UseVisualStyleBackColor = false; + this.button61.Click += new System.EventHandler(this.button61_Click); + // + // button60 + // + this.button60.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; + this.button60.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.button60.Location = new System.Drawing.Point(360, 429); + this.button60.Margin = new System.Windows.Forms.Padding(4); + this.button60.Name = "button60"; + this.button60.Size = new System.Drawing.Size(31, 158); + this.button60.TabIndex = 5913; + this.button60.Tag = "18102"; + this.button60.Text = "快速卷帘门2"; + this.button60.UseVisualStyleBackColor = false; + // // button57 // this.button57.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; @@ -5556,32 +5615,213 @@ this.label44.TabIndex = 3219; this.label44.Tag = "17001"; // - // button60 - // - this.button60.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; - this.button60.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button60.Location = new System.Drawing.Point(360, 429); - this.button60.Margin = new System.Windows.Forms.Padding(4); - this.button60.Name = "button60"; - this.button60.Size = new System.Drawing.Size(31, 158); - this.button60.TabIndex = 5913; - this.button60.Tag = "18102"; - this.button60.Text = "快速卷帘门2"; - this.button60.UseVisualStyleBackColor = false; - // - // button61 - // - this.button61.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; - this.button61.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button61.Location = new System.Drawing.Point(1395, 427); - this.button61.Margin = new System.Windows.Forms.Padding(4); - this.button61.Name = "button61"; - this.button61.Size = new System.Drawing.Size(38, 145); - this.button61.TabIndex = 5913; - this.button61.Tag = "18101"; - this.button61.Text = "快速卷帘门 1"; - this.button61.UseVisualStyleBackColor = false; - this.button61.Click += new System.EventHandler(this.button61_Click); + // button95 + // + this.button95.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; + this.button95.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.button95.Location = new System.Drawing.Point(1286, 310); + this.button95.Margin = new System.Windows.Forms.Padding(4); + this.button95.Name = "button95"; + this.button95.Size = new System.Drawing.Size(131, 11); + this.button95.TabIndex = 8358; + this.button95.Tag = "15001"; + this.button95.Text = "15001"; + this.button95.UseVisualStyleBackColor = false; + // + // button96 + // + this.button96.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; + this.button96.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.button96.Location = new System.Drawing.Point(826, 4); + this.button96.Margin = new System.Windows.Forms.Padding(4); + this.button96.Name = "button96"; + this.button96.Size = new System.Drawing.Size(96, 35); + this.button96.TabIndex = 5910; + this.button96.Tag = "19013"; + this.button96.Text = "安全门"; + this.button96.UseVisualStyleBackColor = false; + // + // button97 + // + this.button97.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; + this.button97.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.button97.Location = new System.Drawing.Point(1718, 122); + this.button97.Margin = new System.Windows.Forms.Padding(4); + this.button97.Name = "button97"; + this.button97.Size = new System.Drawing.Size(96, 35); + this.button97.TabIndex = 5910; + this.button97.Tag = "19002"; + this.button97.Text = "安全门"; + this.button97.UseVisualStyleBackColor = false; + // + // button98 + // + this.button98.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; + this.button98.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.button98.Location = new System.Drawing.Point(1718, 257); + this.button98.Margin = new System.Windows.Forms.Padding(4); + this.button98.Name = "button98"; + this.button98.Size = new System.Drawing.Size(96, 35); + this.button98.TabIndex = 5910; + this.button98.Tag = "19003"; + this.button98.Text = "安全门"; + this.button98.UseVisualStyleBackColor = false; + // + // button99 + // + this.button99.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; + this.button99.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.button99.Location = new System.Drawing.Point(1491, 512); + this.button99.Margin = new System.Windows.Forms.Padding(4); + this.button99.Name = "button99"; + this.button99.Size = new System.Drawing.Size(96, 35); + this.button99.TabIndex = 5910; + this.button99.Tag = "19004"; + this.button99.Text = "安全门"; + this.button99.UseVisualStyleBackColor = false; + // + // button100 + // + this.button100.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; + this.button100.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.button100.Location = new System.Drawing.Point(1277, 699); + this.button100.Margin = new System.Windows.Forms.Padding(4); + this.button100.Name = "button100"; + this.button100.Size = new System.Drawing.Size(96, 35); + this.button100.TabIndex = 5910; + this.button100.Tag = "19006"; + this.button100.Text = "安全门"; + this.button100.UseVisualStyleBackColor = false; + // + // button101 + // + this.button101.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; + this.button101.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.button101.Location = new System.Drawing.Point(1732, 610); + this.button101.Margin = new System.Windows.Forms.Padding(4); + this.button101.Name = "button101"; + this.button101.Size = new System.Drawing.Size(96, 35); + this.button101.TabIndex = 5910; + this.button101.Tag = "19005"; + this.button101.Text = "安全门"; + this.button101.UseVisualStyleBackColor = false; + // + // button102 + // + this.button102.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; + this.button102.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.button102.Location = new System.Drawing.Point(450, 26); + this.button102.Margin = new System.Windows.Forms.Padding(4); + this.button102.Name = "button102"; + this.button102.Size = new System.Drawing.Size(96, 35); + this.button102.TabIndex = 5910; + this.button102.Tag = "19007"; + this.button102.Text = "安全门"; + this.button102.UseVisualStyleBackColor = false; + // + // button103 + // + this.button103.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; + this.button103.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.button103.Location = new System.Drawing.Point(216, 24); + this.button103.Margin = new System.Windows.Forms.Padding(4); + this.button103.Name = "button103"; + this.button103.Size = new System.Drawing.Size(96, 35); + this.button103.TabIndex = 5910; + this.button103.Tag = "19008"; + this.button103.Text = "安全门"; + this.button103.UseVisualStyleBackColor = false; + // + // button104 + // + this.button104.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; + this.button104.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.button104.Location = new System.Drawing.Point(64, 336); + this.button104.Margin = new System.Windows.Forms.Padding(4); + this.button104.Name = "button104"; + this.button104.Size = new System.Drawing.Size(96, 35); + this.button104.TabIndex = 5910; + this.button104.Tag = "19009"; + this.button104.Text = "安全门"; + this.button104.UseVisualStyleBackColor = false; + // + // button105 + // + this.button105.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; + this.button105.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.button105.Location = new System.Drawing.Point(228, 455); + this.button105.Margin = new System.Windows.Forms.Padding(4); + this.button105.Name = "button105"; + this.button105.Size = new System.Drawing.Size(96, 35); + this.button105.TabIndex = 5910; + this.button105.Tag = "19010"; + this.button105.Text = "安全门"; + this.button105.UseVisualStyleBackColor = false; + // + // button106 + // + this.button106.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; + this.button106.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.button106.Location = new System.Drawing.Point(48, 562); + this.button106.Margin = new System.Windows.Forms.Padding(4); + this.button106.Name = "button106"; + this.button106.Size = new System.Drawing.Size(96, 35); + this.button106.TabIndex = 5910; + this.button106.Tag = "19011"; + this.button106.Text = "安全门"; + this.button106.UseVisualStyleBackColor = false; + // + // button107 + // + this.button107.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; + this.button107.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.button107.Location = new System.Drawing.Point(443, 689); + this.button107.Margin = new System.Windows.Forms.Padding(4); + this.button107.Name = "button107"; + this.button107.Size = new System.Drawing.Size(96, 35); + this.button107.TabIndex = 5910; + this.button107.Tag = "19012"; + this.button107.Text = "安全门"; + this.button107.UseVisualStyleBackColor = false; + // + // button108 + // + this.button108.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; + this.button108.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.button108.Location = new System.Drawing.Point(826, 239); + this.button108.Margin = new System.Windows.Forms.Padding(4); + this.button108.Name = "button108"; + this.button108.Size = new System.Drawing.Size(96, 35); + this.button108.TabIndex = 5910; + this.button108.Tag = "19014"; + this.button108.Text = "安全门"; + this.button108.UseVisualStyleBackColor = false; + // + // button109 + // + this.button109.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; + this.button109.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.button109.Location = new System.Drawing.Point(826, 440); + this.button109.Margin = new System.Windows.Forms.Padding(4); + this.button109.Name = "button109"; + this.button109.Size = new System.Drawing.Size(96, 35); + this.button109.TabIndex = 5910; + this.button109.Tag = "19015"; + this.button109.Text = "安全门"; + this.button109.UseVisualStyleBackColor = false; + // + // button110 + // + this.button110.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; + this.button110.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.button110.Location = new System.Drawing.Point(826, 793); + this.button110.Margin = new System.Windows.Forms.Padding(4); + this.button110.Name = "button110"; + this.button110.Size = new System.Drawing.Size(96, 35); + this.button110.TabIndex = 5910; + this.button110.Tag = "19017"; + this.button110.Text = "安全门"; + this.button110.UseVisualStyleBackColor = false; // // FrmControlMonitor // @@ -6043,6 +6283,22 @@ private System.Windows.Forms.PictureBox pictureBox2; private System.Windows.Forms.Button button61; private System.Windows.Forms.Button button60; + private System.Windows.Forms.Button button95; + private System.Windows.Forms.Button button101; + private System.Windows.Forms.Button button100; + private System.Windows.Forms.Button button99; + private System.Windows.Forms.Button button98; + private System.Windows.Forms.Button button97; + private System.Windows.Forms.Button button103; + private System.Windows.Forms.Button button102; + private System.Windows.Forms.Button button96; + private System.Windows.Forms.Button button107; + private System.Windows.Forms.Button button106; + private System.Windows.Forms.Button button105; + private System.Windows.Forms.Button button104; + private System.Windows.Forms.Button button110; + private System.Windows.Forms.Button button109; + private System.Windows.Forms.Button button108; //private System.Windows.Forms.Button button132; diff --git a/ControlMonitorClient/wcfControlMonitorClient.csproj b/ControlMonitorClient/wcfControlMonitorClient.csproj index b26912c..c7a4eba 100644 --- a/ControlMonitorClient/wcfControlMonitorClient.csproj +++ b/ControlMonitorClient/wcfControlMonitorClient.csproj @@ -15,7 +15,7 @@ 512 true - http://10.152.7.210:8080/ + D:\项目\99-济宁时代后工序原料库\向导\ true Web true @@ -25,6 +25,7 @@ false false true + http://127.0.0.1/ControlClient/ http://www.siasun.com zh-Hans 智能物流调度系统WCS客户端 @@ -32,7 +33,7 @@ 智能物流调度系统WCS true pub.htm - 116 + 5 1.0.0.%2a false true @@ -74,10 +75,10 @@ sia.pfx - false + true - true + false LocalIntranet diff --git a/WcfControlMonitorLib/CControl.cs b/WcfControlMonitorLib/CControl.cs index a52df44..79d96d7 100644 --- a/WcfControlMonitorLib/CControl.cs +++ b/WcfControlMonitorLib/CControl.cs @@ -2092,7 +2092,7 @@ namespace WcfControlMonitorLib if (CONTROLTASKTYPE == 2 && EndDevice == 12051&&StartDevice!=13008) { // һ豸 12000ϱ״̬stateֽ 01 - Model.MDevice devOutMode = Model.CGetInfo.GetDeviceInfo(15001); + Model.MDevice devOutMode = Model.CGetInfo.GetDeviceInfo(15101); if (devOutMode.RunState == 1) // ģʽ 1У 2 ⣨ɣ { AheadDetectUnallow.Append("12051ģʽ"); @@ -2103,7 +2103,7 @@ namespace WcfControlMonitorLib else if (CONTROLTASKTYPE == 2 &&StartDevice == 13008 && EndDevice != 12051) { // һ豸 12000ϱ״̬stateֽ 01 - Model.MDevice devOutMode = Model.CGetInfo.GetDeviceInfo(15001); + Model.MDevice devOutMode = Model.CGetInfo.GetDeviceInfo(15101); if (devOutMode.RunState == 2) // ģʽ 1У 2 ⣨ɣ { AheadDetectUnallow.Append("12051ģʽ"); @@ -2116,7 +2116,7 @@ namespace WcfControlMonitorLib if (CONTROLTASKTYPE == 2 && EndDevice == 120004 && StartDevice != 14004)//񲻼 { // һ豸 12000ϱ״̬stateֽ 01 - Model.MDevice devOutMode = Model.CGetInfo.GetDeviceInfo(15002); + Model.MDevice devOutMode = Model.CGetInfo.GetDeviceInfo(15102); if (devOutMode.RunState == 1) // ģʽ 1У 2 ⣨ɣ { AheadDetectUnallow.Append("12004ģʽ"); @@ -2127,7 +2127,7 @@ namespace WcfControlMonitorLib else if (CONTROLTASKTYPE == 2 && StartDevice == 14004 && EndDevice != 12004) { // һ豸 12000ϱ״̬stateֽ 01 - Model.MDevice devOutMode = Model.CGetInfo.GetDeviceInfo(15002); + Model.MDevice devOutMode = Model.CGetInfo.GetDeviceInfo(15102); if (devOutMode.RunState == 2) // ģʽ 1У 2 ⣨ɣ { AheadDetectUnallow.Append("12004ģʽ"); diff --git a/WcfControlMonitorLib/SControlMonitor.cs b/WcfControlMonitorLib/SControlMonitor.cs index a5c628a..367f2f3 100644 --- a/WcfControlMonitorLib/SControlMonitor.cs +++ b/WcfControlMonitorLib/SControlMonitor.cs @@ -6635,7 +6635,7 @@ namespace WcfControlMonitorLib // else // {//条码和扫码结果不一致，暂定回复99 // witemnames[0].Append(Model.CGeneralFunction.DBGet).Append(".").Append(Convert.ToString(devinfo.Dbw2Address + 0)).Append(",b");//20130510 - // wv[0].Clear(); + // wv[0].Clear(); // wv[0].Append("99"); // sdo = CommModeCreate.CreateSendDeviceOrder(devidx); // sdo.WriteDBData(witemnames, wv, devinfo.S7Connection);