From 851629329b2829b133bcdc56b0a75803f9c48b65 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期六, 12 七月 2025 15:18:14 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs | 23 ++++++-----
DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs | 6 +--
DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs | 7 ---
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs | 54 +++++++++++++-------------
4 files changed, 42 insertions(+), 48 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs
index eacaeb1..c3792b5 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs
@@ -1133,7 +1133,7 @@
this.gvMxDel.MinWidth = 50;
this.gvMxDel.Name = "gvMxDel";
this.gvMxDel.Visible = true;
- this.gvMxDel.VisibleIndex = 14;
+ this.gvMxDel.VisibleIndex = 13;
this.gvMxDel.Width = 100;
//
// repositoryItemButtonEdit1
@@ -1176,8 +1176,6 @@
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.Tag = "edit";
this.gridColumn9.UnboundDataType = typeof(bool);
- this.gridColumn9.Visible = true;
- this.gridColumn9.VisibleIndex = 12;
this.gridColumn9.Width = 94;
//
// repositoryItemCheckEdit1
@@ -1194,7 +1192,7 @@
this.gridColumn10.Name = "gridColumn10";
this.gridColumn10.Tag = "edit";
this.gridColumn10.Visible = true;
- this.gridColumn10.VisibleIndex = 13;
+ this.gridColumn10.VisibleIndex = 12;
this.gridColumn10.Width = 94;
//
// rptGroup
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
index 221bf79..d03e86e 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
@@ -53,11 +53,6 @@
{
gvMx1.Columns["stationName"].Visible = false;
}
- //濡傛灉鏄痠pqc棣栨锛屾樉绀鸿璇�
- if (strType != QcSeason.ipqc棣栨.ToString())
- {
- gvMx1.Columns["isRzxx"].Visible = false;
- }
//鏂拌鍒濆鍊�
this.gvMx1.InitNewRow += (s, e) =>
{
@@ -319,7 +314,7 @@
}
if (string.IsNullOrEmpty(row["ypsl"].ToString()))
{
- MsgHelper.ShowError("鏍峰搧鏁伴噺骞充笉鑳戒负绌猴紒");
+ MsgHelper.ShowError("鏍峰搧鏁伴噺涓嶈兘涓虹┖锛�");
return;
}
string _Fstand = row["Fstand"].ToString();
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
index f2fbc56..cd2aa9c 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
@@ -91,6 +91,7 @@
this.txt_checkDate = new DevExpress.XtraEditors.TextEdit();
this.txt_guid = new DevExpress.XtraEditors.TextEdit();
this.txt_paperBillNo = new DevExpress.XtraEditors.TextEdit();
+ this.txt_isSrm = new DevExpress.XtraEditors.CheckEdit();
this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
@@ -107,6 +108,7 @@
this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -149,8 +151,6 @@
this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
- this.txt_isSrm = new DevExpress.XtraEditors.CheckEdit();
- this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -181,6 +181,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_paperBillNo.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_isSrm.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
@@ -197,6 +198,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -206,8 +208,6 @@
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.rptHistory)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_isSrm.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -676,6 +676,16 @@
this.txt_paperBillNo.StyleController = this.layoutMx1;
this.txt_paperBillNo.TabIndex = 467;
//
+ // txt_isSrm
+ //
+ this.txt_isSrm.Location = new System.Drawing.Point(920, 108);
+ this.txt_isSrm.Name = "txt_isSrm";
+ this.txt_isSrm.Properties.Caption = "SRM鏍囪瘑";
+ this.txt_isSrm.Size = new System.Drawing.Size(299, 24);
+ this.txt_isSrm.StyleController = this.layoutMx1;
+ this.txt_isSrm.TabIndex = 468;
+ this.txt_isSrm.Tag = "readOnly";
+ //
// layoutControlItem18
//
this.layoutControlItem18.Control = this.lbGuid;
@@ -889,6 +899,17 @@
this.layoutControlItem4.Size = new System.Drawing.Size(303, 32);
this.layoutControlItem4.Text = "閫佽揣鍗曞彿";
this.layoutControlItem4.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // layoutControlItem6
+ //
+ this.layoutControlItem6.Control = this.txt_isSrm;
+ this.layoutControlItem6.Location = new System.Drawing.Point(908, 96);
+ this.layoutControlItem6.Name = "layoutControlItem6";
+ this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem6.Size = new System.Drawing.Size(303, 33);
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem6.TextVisible = false;
//
// tabMx
//
@@ -1386,27 +1407,6 @@
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
- // txt_isSrm
- //
- this.txt_isSrm.Location = new System.Drawing.Point(920, 108);
- this.txt_isSrm.Name = "txt_isSrm";
- this.txt_isSrm.Properties.Caption = "SRM鏍囪瘑";
- this.txt_isSrm.Size = new System.Drawing.Size(299, 24);
- this.txt_isSrm.StyleController = this.layoutMx1;
- this.txt_isSrm.TabIndex = 468;
- this.txt_isSrm.Tag = "readOnly";
- //
- // layoutControlItem6
- //
- this.layoutControlItem6.Control = this.txt_isSrm;
- this.layoutControlItem6.Location = new System.Drawing.Point(908, 96);
- this.layoutControlItem6.Name = "layoutControlItem6";
- this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem6.Size = new System.Drawing.Size(303, 33);
- this.layoutControlItem6.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem6.TextVisible = false;
- //
// Frm_MesInvItemArn
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1447,6 +1447,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_paperBillNo.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_isSrm.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
@@ -1463,6 +1464,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -1472,8 +1474,6 @@
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.rptHistory)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_isSrm.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
this.ResumeLayout(false);
}
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
index 572d65f..366629c 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
@@ -304,12 +304,16 @@
if (xtraTabControl1.SelectedTabPageIndex == 1)
{
getModel(rowGuid);
+ ////濡傛灉鏄痵rm,绂佺敤
+ setSrm();
}
else
{
List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
gvList.Add(gvMx1);
UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList);
+ ////濡傛灉鏄痵rm,绂佺敤
+ setSrm();
}
}
@@ -328,7 +332,8 @@
Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
//澧炲姞鏃讹紝榛樿缁勭粐
string deftOrg = UtilityHelper.GetFirstOrg(txt_receiveOrgId);
- setSrm(false);
+ txt_isSrm.Checked = false;
+ setSrm();
}
/// <summary>
@@ -514,14 +519,7 @@
{
UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
}
- //濡傛灉鏄痵rm,绂佺敤
- if (txt_isSrm.Checked)
- {
- setSrm(true);
- }
- else {
- setSrm(false);
- }
+
}
else
{
@@ -683,7 +681,9 @@
frm.ShowDialog();
}
- private void setSrm(bool isSrm) {
+ private void setSrm()
+ {
+ bool isSrm = (txt_isSrm.Checked);
if (isSrm == true)
{
gvMx1quantity.OptionsColumn.ReadOnly = true;
@@ -693,7 +693,8 @@
txt_suppId.Enabled = false;
btnSelect.Enabled = false;
}
- else {
+ else
+ {
gvMx1quantity.OptionsColumn.ReadOnly = false;
txt_paperBillNo.ReadOnly = false;
txt_isSrm.Checked = false;
--
Gitblit v1.9.3