From 32e0a92a0c603db872d56739299cb7f603b23dd1 Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期五, 12 九月 2025 17:31:17 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkStart.Designer.cs | 22 ++++++++++++++++++----
DevApp/Gs.DevApp/App.config | 4 ++--
DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkStart.cs | 13 ++++++++++++-
DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs | 7 ++++---
4 files changed, 36 insertions(+), 10 deletions(-)
diff --git a/DevApp/Gs.DevApp/App.config b/DevApp/Gs.DevApp/App.config
index 18c73c6..548e44c 100644
--- a/DevApp/Gs.DevApp/App.config
+++ b/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" />
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
index d1be399..6a6d184 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
+++ b/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;
}
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkStart.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkStart.Designer.cs
index 4c0e27e..a5102a8 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkStart.Designer.cs
+++ b/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;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkStart.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkStart.cs
index fb467b3..6843b0f 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkStart.cs
+++ b/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();
}
--
Gitblit v1.9.3