From 0d721e907c394d1e8694da7bb5669a2feeb2f202 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期六, 14 六月 2025 08:05:34 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | 2 +
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs | 30 ++++++++++++--
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTblShow.Designer.cs | 53 +++++++++++++-------------
DevApp/Gs.DevApp/Gs.DevApp.csproj | 9 ++++
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs | 6 +-
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTblShow.cs | 13 ++++++
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.Designer.cs | 4 +-
7 files changed, 81 insertions(+), 36 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.Designer.cs
index 2c64f62..ed45cfb 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.Designer.cs
@@ -512,7 +512,7 @@
//
this.txt_isZxbg.Location = new System.Drawing.Point(288, 107);
this.txt_isZxbg.Name = "txt_isZxbg";
- this.txt_isZxbg.Properties.Caption = "鏁寸嚎鎶ュ伐";
+ this.txt_isZxbg.Properties.Caption = "杩囩珯鏃跺己鍒堕噰闆嗘暟鎹�";
this.txt_isZxbg.Size = new System.Drawing.Size(272, 24);
this.txt_isZxbg.StyleController = this.layoutMx1;
this.txt_isZxbg.TabIndex = 246;
@@ -652,7 +652,7 @@
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 3;
this.layoutControlItem8.Size = new System.Drawing.Size(276, 32);
- this.layoutControlItem8.Text = "鏁寸嚎鎶ュ伐";
+ this.layoutControlItem8.Text = "杩囩珯鏃跺己鍒堕噰闆嗘暟鎹�";
this.layoutControlItem8.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem8.TextVisible = false;
//
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs
index f384a35..086d5d5 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs
@@ -1,3 +1,4 @@
+using Gs.DevApp.DevFrm.Rk;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
@@ -473,8 +474,8 @@
MsgHelper.ShowError("鐢宠鏁伴噺涓嶈兘涓虹┖锛�");
return;
}
- _sl = row["tld014"].ToString();
- if (string.IsNullOrEmpty(_sl))
+ string _tld014 = row["tld014"].ToString();
+ if (string.IsNullOrEmpty(_tld014))
{
MsgHelper.ShowError("閫�鏂欏娉ㄤ笉鑳戒负绌猴紒");
return;
@@ -484,7 +485,7 @@
Guid = _guid,
AboutGuid = Gs.DevApp.ToolBox.UtilityHelper.ToGuid(row["aboutGuid"].ToString()),
Sl = _sl, //鐢宠鏁伴噺
- Remark = row["tld014"].ToString()
+ Remark = _tld014
});
}
}
@@ -721,8 +722,6 @@
/// <param name="inFieldValue"></param>
private void _toolCk(int _inFieldValue)
{
-
-
string strMsg = "";
switch (_inFieldValue)
{
@@ -749,10 +748,31 @@
}
if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵"))
return;
+
+ //濡傛灉鏄鏍革紝璇㈤棶瑕佷笉瑕佺敓鎴愯ˉ鏂檅eg
+ string txt_chkOut = "0";
+ if (_inFieldValue == 1 && txt_tbl005.Text.Trim() == "浣滀笟涓嶈壇閫�鏂�") {
+ var frm = new Frm_MesItemTblShow();
+ frm.UpdateParent += (ss, ee) =>
+ {
+ try
+ {
+ txt_chkOut = ee.StringSingle;
+ }
+ catch (Exception ex)
+ {
+ MessageBox.Show(ex.Message);
+ }
+ };
+ frm.ShowDialog();
+ }
+ //濡傛灉鏄鏍革紝璇㈤棶瑕佷笉瑕佺敓鎴愯ˉ鏂檈nd
+
var _obj = new
{
guid = rowGuid,
inFieldValue = _inFieldValue,
+ chkOut = txt_chkOut
};
try
{
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTblShow.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTblShow.Designer.cs
index 2b98355..c869ba5 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTblShow.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTblShow.Designer.cs
@@ -32,15 +32,15 @@
DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Frm_MesItemTblShow));
this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
+ this.txt_chkOut = new DevExpress.XtraEditors.CheckEdit();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
- this.checkEdit1 = new DevExpress.XtraEditors.CheckEdit();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
- this.btnOk = new DevExpress.XtraEditors.SimpleButton();
+ this.btnIn = new DevExpress.XtraEditors.SimpleButton();
((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit();
this.layoutControl1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_chkOut.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.checkEdit1.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.panelControl1)).BeginInit();
this.panelControl1.SuspendLayout();
@@ -48,7 +48,7 @@
//
// layoutControl1
//
- this.layoutControl1.Controls.Add(this.checkEdit1);
+ this.layoutControl1.Controls.Add(this.txt_chkOut);
this.layoutControl1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutControl1.Location = new System.Drawing.Point(0, 0);
this.layoutControl1.Name = "layoutControl1";
@@ -57,6 +57,15 @@
this.layoutControl1.Size = new System.Drawing.Size(298, 260);
this.layoutControl1.TabIndex = 0;
this.layoutControl1.Text = "layoutControl1";
+ //
+ // txt_chkOut
+ //
+ this.txt_chkOut.Location = new System.Drawing.Point(12, 12);
+ this.txt_chkOut.Name = "txt_chkOut";
+ this.txt_chkOut.Properties.Caption = "鏄惁鑷姩鐢熸垚琛ユ枡鍗�";
+ this.txt_chkOut.Size = new System.Drawing.Size(274, 24);
+ this.txt_chkOut.StyleController = this.layoutControl1;
+ this.txt_chkOut.TabIndex = 4;
//
// Root
//
@@ -77,18 +86,9 @@
this.Root.Size = new System.Drawing.Size(298, 260);
this.Root.TextVisible = false;
//
- // checkEdit1
- //
- this.checkEdit1.Location = new System.Drawing.Point(12, 12);
- this.checkEdit1.Name = "checkEdit1";
- this.checkEdit1.Properties.Caption = "鏄惁鑷姩鐢熸垚琛ユ枡鍗�";
- this.checkEdit1.Size = new System.Drawing.Size(274, 24);
- this.checkEdit1.StyleController = this.layoutControl1;
- this.checkEdit1.TabIndex = 4;
- //
// layoutControlItem1
//
- this.layoutControlItem1.Control = this.checkEdit1;
+ this.layoutControlItem1.Control = this.txt_chkOut;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
this.layoutControlItem1.Size = new System.Drawing.Size(278, 240);
@@ -97,22 +97,23 @@
//
// panelControl1
//
- this.panelControl1.Controls.Add(this.btnOk);
+ this.panelControl1.Controls.Add(this.btnIn);
this.panelControl1.Dock = System.Windows.Forms.DockStyle.Bottom;
this.panelControl1.Location = new System.Drawing.Point(0, 211);
this.panelControl1.Name = "panelControl1";
this.panelControl1.Size = new System.Drawing.Size(298, 49);
this.panelControl1.TabIndex = 1;
//
- // btnOk
+ // btnIn
//
- this.btnOk.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Question;
- this.btnOk.Appearance.Options.UseBackColor = true;
- this.btnOk.Location = new System.Drawing.Point(192, 15);
- this.btnOk.Name = "btnOk";
- this.btnOk.Size = new System.Drawing.Size(94, 29);
- this.btnOk.TabIndex = 0;
- this.btnOk.Text = "纭畾";
+ this.btnIn.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Question;
+ this.btnIn.Appearance.Options.UseBackColor = true;
+ this.btnIn.Location = new System.Drawing.Point(192, 15);
+ this.btnIn.Name = "btnIn";
+ this.btnIn.Size = new System.Drawing.Size(94, 29);
+ this.btnIn.TabIndex = 0;
+ this.btnIn.Text = "纭畾";
+
//
// Frm_MesItemTblShow
//
@@ -129,8 +130,8 @@
this.Text = "鏄惁鐢熸垚琛ユ枡鍗�";
((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit();
this.layoutControl1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.txt_chkOut.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.checkEdit1.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.panelControl1)).EndInit();
this.panelControl1.ResumeLayout(false);
@@ -142,9 +143,9 @@
private DevExpress.XtraLayout.LayoutControl layoutControl1;
private DevExpress.XtraLayout.LayoutControlGroup Root;
- private DevExpress.XtraEditors.CheckEdit checkEdit1;
+ private DevExpress.XtraEditors.CheckEdit txt_chkOut;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
private DevExpress.XtraEditors.PanelControl panelControl1;
- private DevExpress.XtraEditors.SimpleButton btnOk;
+ private DevExpress.XtraEditors.SimpleButton btnIn;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTblShow.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTblShow.cs
index c65df2e..1aa1e8e 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTblShow.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTblShow.cs
@@ -1,4 +1,5 @@
锘縰sing DevExpress.XtraEditors;
+using Gs.DevApp.ToolBox;
using System;
using System.Collections.Generic;
using System.ComponentModel;
@@ -16,6 +17,18 @@
public Frm_MesItemTblShow()
{
InitializeComponent();
+
+ btnIn.Click += (s, e) =>
+ {
+ string _StringSingle = txt_chkOut.Checked ? "1" : "0";
+ UpdateParent?.Invoke(this, new UpdateParentEventArgs { StringSingle = _StringSingle }); Close();
+ };
}
+
+ /// <summary>
+ /// 閫夋嫨鍚庣殑鍥炶皟浜嬩欢
+ /// </summary>
+ public event EventHandler<UpdateParentEventArgs> UpdateParent;
+
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs
index a600953..1328b03 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs
@@ -382,8 +382,8 @@
MsgHelper.ShowError("鐢宠鏁伴噺涓嶈兘涓虹┖锛�");
return;
}
- _sl = row["tld014"].ToString();
- if (string.IsNullOrEmpty(_sl))
+ string _tld014 = row["tld014"].ToString();
+ if (string.IsNullOrEmpty(_tld014))
{
MsgHelper.ShowError("閫�鏂欏娉ㄤ笉鑳戒负绌猴紒");
return;
@@ -393,7 +393,7 @@
Guid = _guid,
AboutGuid = Gs.DevApp.ToolBox.UtilityHelper.ToGuid(row["aboutGuid"].ToString()),
Sl = _sl, //鐢宠鏁伴噺
- Remark = row["tld014"].ToString()
+ Remark = _tld014
});
}
}
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 954fa86..431e6c8 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -578,6 +578,12 @@
<Compile Include="DevFrm\Rk\Frm_MesItemQtrkDj.Designer.cs">
<DependentUpon>Frm_MesItemQtrkDj.cs</DependentUpon>
</Compile>
+ <Compile Include="DevFrm\Rk\Frm_MesItemTblShow.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\Rk\Frm_MesItemTblShow.Designer.cs">
+ <DependentUpon>Frm_MesItemTblShow.cs</DependentUpon>
+ </Compile>
<Compile Include="DevFrm\Rk\HistoryDhmxcs.cs">
<SubType>Form</SubType>
</Compile>
@@ -1459,6 +1465,9 @@
<EmbeddedResource Include="DevFrm\Rk\Frm_MesItemQtrkDj.resx">
<DependentUpon>Frm_MesItemQtrkDj.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\Rk\Frm_MesItemTblShow.resx">
+ <DependentUpon>Frm_MesItemTblShow.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="DevFrm\Rk\HistoryDhmxcs.resx">
<DependentUpon>HistoryDhmxcs.cs</DependentUpon>
</EmbeddedResource>
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index 14e1b40..b70ed3b 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -383,6 +383,7 @@
lst.Add(btnIn.Name);
lst.Add(btnLog.Name);
lst.Add(btnPiZhun.Name);
+ lst.Add(btnFPiZhun.Name);
lst.Add(btnHelp.Name);
lst.Add(btnLayout.Name);
lst.Add(btnFont.Name);
@@ -424,6 +425,7 @@
lst.Add(btnQuery.Name);
lst.Add(btnLog.Name);
lst.Add(btnPiZhun.Name);
+ lst.Add(btnFPiZhun.Name);
lst.Add(btnDesign.Name);
lst.Add(btnReport.Name);
lst.Add(btnKg.Name);
--
Gitblit v1.9.3