增加水检选项卡

lu

2025-09-12 aec865d6349b5a4fbc776a6923a507ed690c710f

增加水检选项卡

 DevApp/Gs.DevApp/App.config

@@ -37,8 +37,8 @@
    
  <appSettings>
    <!--<add key="webapiurl" value="http://localhost:5263/" />-->
    <add key="WebApiUrl" value="http://192.168.1.145:8081/" />
    <!--<add key="WebApiUrl" value="http://192.168.1.145:81/" />-->
    <!--<add key="WebApiUrl" value="http://192.168.1.145:8081/" />-->
    <add key="WebApiUrl" value="http://192.168.1.145:81/" />
    <add key="LogPath" value="logs" />
    <add key="ProductName" value="G-MES V2.0" />
    <add key="PageSize" value="50" />

 DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs

@@ -36,19 +36,20 @@
        string fGxDianJian = "G002:电检";
        string fGxShouJian = "G003:水检";
        string fGxZhongJian = "G004:终检";

       
        /// <summary>
        /// 
        /// </summary>
        /// <param name="_fGx">工序</param>
        /// <param name="_fBc">班次</param>
        /// <param name="_strinOther">目前为电检路径</param>
        public Frm_Work01(string _fGx, string _fBc, string _strinOther)
        /// <param name="chkWater">是否水检</param>
        public Frm_Work01(string _fGx, string _fBc, string _strinOther,int chkWater=0)
        {
            InitializeComponent();
            try
            {
                string _vanishingSeconds = ConfigurationManager.AppSettings["IsWater"];
                string _vanishingSeconds = chkWater.ToString();
                if (!string.IsNullOrEmpty(_vanishingSeconds))
                    isWater = _vanishingSeconds;
            }

 DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkStart.Designer.cs

@@ -29,6 +29,7 @@
        private void InitializeComponent()
        {
            this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
            this.chkWater = new DevExpress.XtraEditors.CheckEdit();
            this.btnLogin = new DevExpress.XtraEditors.SimpleButton();
            this.txt_gx = new DevExpress.XtraEditors.ComboBoxEdit();
            this.label2 = new System.Windows.Forms.Label();
@@ -36,6 +37,7 @@
            this.label1 = new System.Windows.Forms.Label();
            ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).BeginInit();
            this.panelControl1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.chkWater.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_gx.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_bc.Properties)).BeginInit();
            this.SuspendLayout();
@@ -45,6 +47,7 @@
            this.panelControl1.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.panelControl1.Controls.Add(this.chkWater);
            this.panelControl1.Controls.Add(this.btnLogin);
            this.panelControl1.Controls.Add(this.txt_gx);
            this.panelControl1.Controls.Add(this.label2);
@@ -52,8 +55,17 @@
            this.panelControl1.Controls.Add(this.label1);
            this.panelControl1.Location = new System.Drawing.Point(162, 116);
            this.panelControl1.Name = "panelControl1";
            this.panelControl1.Size = new System.Drawing.Size(280, 249);
            this.panelControl1.Size = new System.Drawing.Size(280, 264);
            this.panelControl1.TabIndex = 0;
            // 
            // chkWater
            // 
            this.chkWater.Location = new System.Drawing.Point(100, 140);
            this.chkWater.Name = "chkWater";
            this.chkWater.Properties.Caption = "对接水检机器";
            this.chkWater.Size = new System.Drawing.Size(125, 24);
            this.chkWater.TabIndex = 5;
            this.chkWater.Visible = false;
            // 
            // btnLogin
            // 
@@ -61,7 +73,7 @@
            this.btnLogin.Appearance.Options.UseBackColor = true;
            this.btnLogin.Appearance.Options.UseFont = true;
            this.btnLogin.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.user_32x32;
            this.btnLogin.Location = new System.Drawing.Point(45, 162);
            this.btnLogin.Location = new System.Drawing.Point(45, 194);
            this.btnLogin.Name = "btnLogin";
            this.btnLogin.Size = new System.Drawing.Size(180, 40);
            this.btnLogin.TabIndex = 4;
@@ -69,7 +81,7 @@
            // 
            // txt_gx
            // 
            this.txt_gx.Location = new System.Drawing.Point(100, 96);
            this.txt_gx.Location = new System.Drawing.Point(100, 86);
            this.txt_gx.Name = "txt_gx";
            this.txt_gx.Properties.Appearance.Options.UseFont = true;
            this.txt_gx.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
@@ -81,7 +93,7 @@
            // label2
            // 
            this.label2.AutoSize = true;
            this.label2.Location = new System.Drawing.Point(45, 99);
            this.label2.Location = new System.Drawing.Point(45, 89);
            this.label2.Name = "label2";
            this.label2.Size = new System.Drawing.Size(38, 18);
            this.label2.TabIndex = 2;
@@ -124,6 +136,7 @@
            ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).EndInit();
            this.panelControl1.ResumeLayout(false);
            this.panelControl1.PerformLayout();
            ((System.ComponentModel.ISupportInitialize)(this.chkWater.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_gx.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_bc.Properties)).EndInit();
            this.ResumeLayout(false);
@@ -138,5 +151,6 @@
        private DevExpress.XtraEditors.ComboBoxEdit txt_gx;
        private System.Windows.Forms.Label label2;
        private DevExpress.XtraEditors.SimpleButton btnLogin;
        private DevExpress.XtraEditors.CheckEdit chkWater;
    }
}

 DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkStart.cs

@@ -4,6 +4,7 @@
using System;
using System.Data;
using System.IO;
using System.Windows;

namespace Gs.DevApp.DevFrm.Work
{
@@ -22,6 +23,16 @@
            InitializeComponent();
            _getListJyxm();
            btnLogin.Click += BtnLogin_Click;
            txt_gx.EditValueChanged += (s, e) =>
            {
                string fGx = txt_gx.Text.Trim();
                if (fGx == "G003:水检")
                {
                    chkWater.Visible = true;
                }
                else
                    chkWater.Visible = false;
            };
        }

        private void BtnLogin_Click(object sender, EventArgs e)
@@ -49,7 +60,7 @@
                    return;
                }
            }
            Frm_Work01 frm = new Frm_Work01(fGx, fBc, dianJianPath);
            Frm_Work01 frm = new Frm_Work01(fGx, fBc, dianJianPath, (chkWater.Checked ? 1 : 0));
            frm.ShowDialog();
        }