From d037b658c491f634cbefeb0e11fa5a0564baaf71 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期一, 17 二月 2025 10:53:53 +0800
Subject: [PATCH] 生产退料申请
---
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs | 106 ++++++++++++++------
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs | 112 +++++++++++-----------
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs | 7
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs | 23 +++
4 files changed, 151 insertions(+), 97 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs
index 14eac65..12ec6df 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs
@@ -46,7 +46,6 @@
this.gvMx1qd004 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1qd003 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1qd002 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1qd001 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1qtrkGuid = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1guid = new DevExpress.XtraGrid.Columns.GridColumn();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -60,6 +59,8 @@
this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -70,7 +71,7 @@
this.labelControl14 = new DevExpress.XtraEditors.LabelControl();
this.txt_psnQty_1 = new DevExpress.XtraEditors.TextEdit();
this.labelControl12 = new DevExpress.XtraEditors.LabelControl();
- this.kyPrtQty = new DevExpress.XtraEditors.TextEdit();
+ this.txtKdy = new DevExpress.XtraEditors.TextEdit();
this.labelControl13 = new DevExpress.XtraEditors.LabelControl();
this.txtYdy = new DevExpress.XtraEditors.TextEdit();
this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
@@ -108,6 +109,8 @@
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.gcMain = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
this.pageBar1 = new UserControls.Data.UcPageBar();
@@ -153,7 +156,7 @@
this.panelMx1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.kyPrtQty.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txtKdy.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txtYdy.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txtQuantity.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txtWlgg.Properties)).BeginInit();
@@ -204,14 +207,14 @@
this.gvMx1qd009.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1qd009.AppearanceCell.Options.UseFont = true;
this.gvMx1qd009.Caption = "鍗曚綅 ";
- this.gvMx1qd009.FieldName = "qd009";
+ this.gvMx1qd009.FieldName = "kcDw";
this.gvMx1qd009.MinWidth = 25;
this.gvMx1qd009.Name = "gvMx1qd009";
this.gvMx1qd009.OptionsColumn.AllowEdit = false;
this.gvMx1qd009.OptionsColumn.ReadOnly = true;
this.gvMx1qd009.Tag = "query_a.qd009";
this.gvMx1qd009.Visible = true;
- this.gvMx1qd009.VisibleIndex = 7;
+ this.gvMx1qd009.VisibleIndex = 9;
this.gvMx1qd009.Width = 94;
//
// gvMx1qd008
@@ -226,7 +229,7 @@
this.gvMx1qd008.OptionsColumn.ReadOnly = true;
this.gvMx1qd008.Tag = "query_a.qd008";
this.gvMx1qd008.Visible = true;
- this.gvMx1qd008.VisibleIndex = 6;
+ this.gvMx1qd008.VisibleIndex = 8;
this.gvMx1qd008.Width = 94;
//
// gvMx1qd007
@@ -291,19 +294,6 @@
this.gvMx1qd002.VisibleIndex = 1;
this.gvMx1qd002.Width = 150;
//
- // gvMx1qd001
- //
- this.gvMx1qd001.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1qd001.AppearanceCell.Options.UseFont = true;
- this.gvMx1qd001.Caption = "宸ュ崟鍙� ";
- this.gvMx1qd001.FieldName = "qd001";
- this.gvMx1qd001.MinWidth = 25;
- this.gvMx1qd001.Name = "gvMx1qd001";
- this.gvMx1qd001.OptionsColumn.AllowEdit = false;
- this.gvMx1qd001.OptionsColumn.ReadOnly = true;
- this.gvMx1qd001.Tag = "query_a.qd001";
- this.gvMx1qd001.Width = 94;
- //
// gvMx1qtrkGuid
//
this.gvMx1qtrkGuid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -357,13 +347,14 @@
this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gvMx1guid,
this.gvMx1qtrkGuid,
- this.gvMx1qd001,
this.gridColumn1,
this.gvMx1qd002,
this.gvMx1qd003,
this.gvMx1qd004,
this.gvMx1qd007,
this.gvMx1qd010,
+ this.gridColumn15,
+ this.gridColumn16,
this.gvMx1qd008,
this.gvMx1qd009,
this.gvMxDel,
@@ -465,6 +456,26 @@
this.gridColumn11.VisibleIndex = 4;
this.gridColumn11.Width = 120;
//
+ // gridColumn15
+ //
+ this.gridColumn15.Caption = "宸叉墦鍗版�婚噺";
+ this.gridColumn15.FieldName = "ydy";
+ this.gridColumn15.MinWidth = 25;
+ this.gridColumn15.Name = "gridColumn15";
+ this.gridColumn15.Visible = true;
+ this.gridColumn15.VisibleIndex = 6;
+ this.gridColumn15.Width = 94;
+ //
+ // gridColumn16
+ //
+ this.gridColumn16.Caption = "鍙墦鍗版�婚噺";
+ this.gridColumn16.FieldName = "kdy";
+ this.gridColumn16.MinWidth = 25;
+ this.gridColumn16.Name = "gridColumn16";
+ this.gridColumn16.Visible = true;
+ this.gridColumn16.VisibleIndex = 7;
+ this.gridColumn16.Width = 94;
+ //
// gvMxDel
//
this.gvMxDel.Caption = "绉诲嚭";
@@ -472,7 +483,7 @@
this.gvMxDel.MinWidth = 25;
this.gvMxDel.Name = "gvMxDel";
this.gvMxDel.Visible = true;
- this.gvMxDel.VisibleIndex = 8;
+ this.gvMxDel.VisibleIndex = 10;
this.gvMxDel.Width = 94;
//
// repositoryItemButtonEdit1
@@ -502,7 +513,7 @@
this.panelMx1.Controls.Add(this.labelControl14);
this.panelMx1.Controls.Add(this.txt_psnQty_1);
this.panelMx1.Controls.Add(this.labelControl12);
- this.panelMx1.Controls.Add(this.kyPrtQty);
+ this.panelMx1.Controls.Add(this.txtKdy);
this.panelMx1.Controls.Add(this.labelControl13);
this.panelMx1.Controls.Add(this.txtYdy);
this.panelMx1.Controls.Add(this.labelControl1);
@@ -572,15 +583,17 @@
this.labelControl12.TabIndex = 225;
this.labelControl12.Text = "姣忓紶鏉＄爜鏁伴噺锛�";
//
- // kyPrtQty
+ // txtKdy
//
- this.kyPrtQty.Location = new System.Drawing.Point(430, 65);
- this.kyPrtQty.Name = "kyPrtQty";
- this.kyPrtQty.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.kyPrtQty.Properties.Appearance.Options.UseFont = true;
- this.kyPrtQty.Properties.ReadOnly = true;
- this.kyPrtQty.Size = new System.Drawing.Size(96, 28);
- this.kyPrtQty.TabIndex = 224;
+ this.txtKdy.Location = new System.Drawing.Point(430, 65);
+ this.txtKdy.Name = "txtKdy";
+ this.txtKdy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txtKdy.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
+ this.txtKdy.Properties.Appearance.Options.UseFont = true;
+ this.txtKdy.Properties.Appearance.Options.UseForeColor = true;
+ this.txtKdy.Properties.ReadOnly = true;
+ this.txtKdy.Size = new System.Drawing.Size(96, 28);
+ this.txtKdy.TabIndex = 224;
//
// labelControl13
//
@@ -995,13 +1008,35 @@
this.gv_qt001,
this.gv_qt016,
this.gv_qt002,
- this.gv_qt010});
+ this.gv_qt010,
+ this.gridColumn13,
+ this.gridColumn14});
this.gridView1.GridControl = this.gcMain;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
this.gridView1.OptionsView.ShowAutoFilterRow = true;
this.gridView1.OptionsView.ShowGroupPanel = false;
+ //
+ // gridColumn13
+ //
+ this.gridColumn13.Caption = "搴撳瓨缁勭粐";
+ this.gridColumn13.FieldName = "kcOrg";
+ this.gridColumn13.MinWidth = 25;
+ this.gridColumn13.Name = "gridColumn13";
+ this.gridColumn13.Visible = true;
+ this.gridColumn13.VisibleIndex = 10;
+ this.gridColumn13.Width = 94;
+ //
+ // gridColumn14
+ //
+ this.gridColumn14.Caption = "璐т富绫诲瀷";
+ this.gridColumn14.FieldName = "qt023";
+ this.gridColumn14.MinWidth = 25;
+ this.gridColumn14.Name = "gridColumn14";
+ this.gridColumn14.Visible = true;
+ this.gridColumn14.VisibleIndex = 11;
+ this.gridColumn14.Width = 94;
//
// xtraTabControl1
//
@@ -1428,7 +1463,7 @@
this.panelMx1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.kyPrtQty.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txtKdy.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txtYdy.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txtQuantity.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txtWlgg.Properties)).EndInit();
@@ -1478,7 +1513,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gvMx1qd004;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1qd003;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1qd002;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1qd001;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1qtrkGuid;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1guid;
private DevExpress.XtraTab.XtraTabPage tabMxPage1;
@@ -1539,7 +1573,7 @@
private DevExpress.XtraEditors.LabelControl labelControl14;
private DevExpress.XtraEditors.TextEdit txt_psnQty_1;
private DevExpress.XtraEditors.LabelControl labelControl12;
- private DevExpress.XtraEditors.TextEdit kyPrtQty;
+ private DevExpress.XtraEditors.TextEdit txtKdy;
private DevExpress.XtraEditors.LabelControl labelControl13;
private DevExpress.XtraEditors.TextEdit txtYdy;
private DevExpress.XtraEditors.LabelControl labelControl1;
@@ -1573,5 +1607,9 @@
private DevExpress.XtraEditors.LabelControl labelControl2;
private UserControl.UcLookHuoZhu ucLookHuoZhu1;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs
index 654b799..18c40bd 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs
@@ -30,6 +30,7 @@
this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1;
this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
+ toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
@@ -121,6 +122,19 @@
Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
Task.Delay(100);
getPageList(1);
+ }
+ /// <summary>
+ /// 鏃ュ織
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnLogClick(object sender, EventArgs e)
+ {
+ toolBarMenu1.guidKey = "";
+ string rowGuid, rowName;
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+ lbGuid, txt_qtck, gridView1);
+ toolBarMenu1.guidKey = rowGuid;
}
/// <summary>
@@ -473,6 +487,7 @@
_ucCk = "";
_ucHzlx = "";
_ucHz = "";
+ ucLookHuoZhu1.Enabled = isEdit;
JObject _job = JObject.Parse(strJson);
JArray array = new JArray();
foreach (var a in _job["rtnData"]["list"])
@@ -525,7 +540,7 @@
gvMx1.SetFocusedRowCellValue("qd002", SelectedDataRow["itemNo"]);
gvMx1.SetFocusedRowCellValue("qd003", SelectedDataRow["itemName"]);
gvMx1.SetFocusedRowCellValue("qd004", SelectedDataRow["itemModel"]);
- gvMx1.SetFocusedRowCellValue("qd009", SelectedDataRow["dwName"]);
+ gvMx1.SetFocusedRowCellValue("kcDw", SelectedDataRow["dwName"]);
gvMx1.SetFocusedRowCellValue("itemId", SelectedDataRow["id"]);
}
@@ -656,9 +671,9 @@
txtWlid.Text = row["qd002"].ToString();
txtWlgg.Text = row["qd004"].ToString();
txtWlmc.Text = row["qd003"].ToString();
- //txtQuantity.Text = row["qd007"].ToString();//鐢宠鎬婚噺
- //txtYdy.Text = row["YDYNUM"].ToString();//宸叉墦鍗版�婚噺
- //kyPrtQty.Text = row["KDYNUM"].ToString();//鍙墦鍗版�婚噺
+ txtQuantity.Text = row["qd007"].ToString();//鐢宠鎬婚噺
+ txtYdy.Text = row["ydy"].ToString();//宸叉墦鍗版�婚噺
+ txtKdy.Text = row["kdy"].ToString();//鍙墦鍗版�婚噺
}
}
/// <summary>
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs
index 9cb1121..8bb7c76 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs
@@ -29,16 +29,16 @@
/// </summary>
private void InitializeComponent()
{
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject13 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject();
this.gvMx1tld009 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1tld007 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1tld006 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -63,7 +63,7 @@
this.labelControl14 = new DevExpress.XtraEditors.LabelControl();
this.txt_psnQty_1 = new DevExpress.XtraEditors.TextEdit();
this.labelControl12 = new DevExpress.XtraEditors.LabelControl();
- this.kyPrtQty = new DevExpress.XtraEditors.TextEdit();
+ this.txtKdy = new DevExpress.XtraEditors.TextEdit();
this.labelControl13 = new DevExpress.XtraEditors.LabelControl();
this.txtYdy = new DevExpress.XtraEditors.TextEdit();
this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
@@ -152,7 +152,7 @@
this.panelMx1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.kyPrtQty.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txtKdy.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txtYdy.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txtQuantity.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txtWlgg.Properties)).BeginInit();
@@ -194,8 +194,6 @@
this.gvMx1tld009.MinWidth = 50;
this.gvMx1tld009.Name = "gvMx1tld009";
this.gvMx1tld009.Tag = "query_a.tld009";
- this.gvMx1tld009.Visible = true;
- this.gvMx1tld009.VisibleIndex = 7;
this.gvMx1tld009.Width = 94;
//
// gvMx1tld007
@@ -208,7 +206,7 @@
this.gvMx1tld007.Name = "gvMx1tld007";
this.gvMx1tld007.Tag = "query_a.tld007";
this.gvMx1tld007.Visible = true;
- this.gvMx1tld007.VisibleIndex = 6;
+ this.gvMx1tld007.VisibleIndex = 7;
this.gvMx1tld007.Width = 94;
//
// gvMx1tld006
@@ -221,7 +219,7 @@
this.gvMx1tld006.Name = "gvMx1tld006";
this.gvMx1tld006.Tag = "query_a.tld006";
this.gvMx1tld006.Visible = true;
- this.gvMx1tld006.VisibleIndex = 5;
+ this.gvMx1tld006.VisibleIndex = 6;
this.gvMx1tld006.Width = 94;
//
// gvMx1tld005
@@ -238,7 +236,7 @@
this.gvMx1tld005.Name = "gvMx1tld005";
this.gvMx1tld005.Tag = "edit";
this.gvMx1tld005.Visible = true;
- this.gvMx1tld005.VisibleIndex = 4;
+ this.gvMx1tld005.VisibleIndex = 5;
this.gvMx1tld005.Width = 94;
//
// gvMx1tld004
@@ -251,7 +249,7 @@
this.gvMx1tld004.Name = "gvMx1tld004";
this.gvMx1tld004.Tag = "query_a.tld004";
this.gvMx1tld004.Visible = true;
- this.gvMx1tld004.VisibleIndex = 3;
+ this.gvMx1tld004.VisibleIndex = 4;
this.gvMx1tld004.Width = 94;
//
// gvMx1tld003
@@ -264,7 +262,7 @@
this.gvMx1tld003.Name = "gvMx1tld003";
this.gvMx1tld003.Tag = "query_a.tld003";
this.gvMx1tld003.Visible = true;
- this.gvMx1tld003.VisibleIndex = 2;
+ this.gvMx1tld003.VisibleIndex = 3;
this.gvMx1tld003.Width = 94;
//
// gvMx1tld002
@@ -277,7 +275,7 @@
this.gvMx1tld002.Name = "gvMx1tld002";
this.gvMx1tld002.Tag = "query_a.tld002";
this.gvMx1tld002.Visible = true;
- this.gvMx1tld002.VisibleIndex = 1;
+ this.gvMx1tld002.VisibleIndex = 2;
this.gvMx1tld002.Width = 94;
//
// gvMx1tld001
@@ -290,7 +288,7 @@
this.gvMx1tld001.Name = "gvMx1tld001";
this.gvMx1tld001.Tag = "query_a.tld001";
this.gvMx1tld001.Visible = true;
- this.gvMx1tld001.VisibleIndex = 0;
+ this.gvMx1tld001.VisibleIndex = 1;
this.gvMx1tld001.Width = 94;
//
// gvMx1tlid
@@ -358,6 +356,7 @@
// gridColumn1
//
this.gridColumn1.Caption = "宸叉墦鍗版暟閲�";
+ this.gridColumn1.FieldName = "ydy";
this.gridColumn1.MinWidth = 25;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Visible = true;
@@ -367,6 +366,7 @@
// gridColumn2
//
this.gridColumn2.Caption = "鍙墦鍗版暟閲�";
+ this.gridColumn2.FieldName = "kdy";
this.gridColumn2.MinWidth = 25;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Visible = true;
@@ -380,16 +380,16 @@
this.gvMxDel.MinWidth = 25;
this.gvMxDel.Name = "gvMxDel";
this.gvMxDel.Visible = true;
- this.gvMxDel.VisibleIndex = 10;
+ this.gvMxDel.VisibleIndex = 9;
this.gvMxDel.Width = 94;
//
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -402,7 +402,7 @@
this.panelMx1.Controls.Add(this.labelControl14);
this.panelMx1.Controls.Add(this.txt_psnQty_1);
this.panelMx1.Controls.Add(this.labelControl12);
- this.panelMx1.Controls.Add(this.kyPrtQty);
+ this.panelMx1.Controls.Add(this.txtKdy);
this.panelMx1.Controls.Add(this.labelControl13);
this.panelMx1.Controls.Add(this.txtYdy);
this.panelMx1.Controls.Add(this.labelControl1);
@@ -472,15 +472,17 @@
this.labelControl12.TabIndex = 225;
this.labelControl12.Text = "姣忓紶鏉＄爜鏁伴噺锛�";
//
- // kyPrtQty
+ // txtKdy
//
- this.kyPrtQty.Location = new System.Drawing.Point(430, 65);
- this.kyPrtQty.Name = "kyPrtQty";
- this.kyPrtQty.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.kyPrtQty.Properties.Appearance.Options.UseFont = true;
- this.kyPrtQty.Properties.ReadOnly = true;
- this.kyPrtQty.Size = new System.Drawing.Size(96, 28);
- this.kyPrtQty.TabIndex = 224;
+ this.txtKdy.Location = new System.Drawing.Point(430, 65);
+ this.txtKdy.Name = "txtKdy";
+ this.txtKdy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txtKdy.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
+ this.txtKdy.Properties.Appearance.Options.UseFont = true;
+ this.txtKdy.Properties.Appearance.Options.UseForeColor = true;
+ this.txtKdy.Properties.ReadOnly = true;
+ this.txtKdy.Size = new System.Drawing.Size(96, 28);
+ this.txtKdy.TabIndex = 224;
//
// labelControl13
//
@@ -584,7 +586,7 @@
//
this.lb_tbl021.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_tbl021.Appearance.Options.UseFont = true;
- this.lb_tbl021.Location = new System.Drawing.Point(255, 52);
+ this.lb_tbl021.Location = new System.Drawing.Point(281, 52);
this.lb_tbl021.Name = "lb_tbl021";
this.lb_tbl021.Size = new System.Drawing.Size(68, 21);
this.lb_tbl021.TabIndex = 298;
@@ -592,11 +594,11 @@
//
// txt_workName
//
- this.txt_workName.Location = new System.Drawing.Point(326, 48);
+ this.txt_workName.Location = new System.Drawing.Point(352, 48);
this.txt_workName.Name = "txt_workName";
this.txt_workName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_workName.Properties.Appearance.Options.UseFont = true;
- this.txt_workName.Size = new System.Drawing.Size(201, 28);
+ this.txt_workName.Size = new System.Drawing.Size(180, 28);
this.txt_workName.TabIndex = 298;
this.txt_workName.Tag = "readonly";
//
@@ -807,7 +809,7 @@
//
this.lb_tbl004.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_tbl004.Appearance.Options.UseFont = true;
- this.lb_tbl004.Location = new System.Drawing.Point(255, 112);
+ this.lb_tbl004.Location = new System.Drawing.Point(281, 112);
this.lb_tbl004.Name = "lb_tbl004";
this.lb_tbl004.Size = new System.Drawing.Size(68, 21);
this.lb_tbl004.TabIndex = 219;
@@ -815,11 +817,11 @@
//
// txt_itemName
//
- this.txt_itemName.Location = new System.Drawing.Point(326, 108);
+ this.txt_itemName.Location = new System.Drawing.Point(352, 108);
this.txt_itemName.Name = "txt_itemName";
this.txt_itemName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_itemName.Properties.Appearance.Options.UseFont = true;
- this.txt_itemName.Size = new System.Drawing.Size(437, 28);
+ this.txt_itemName.Size = new System.Drawing.Size(411, 28);
this.txt_itemName.TabIndex = 219;
this.txt_itemName.Tag = "readonly";
//
@@ -841,7 +843,7 @@
//
this.lb_tbl003.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_tbl003.Appearance.Options.UseFont = true;
- this.lb_tbl003.Location = new System.Drawing.Point(255, 20);
+ this.lb_tbl003.Location = new System.Drawing.Point(281, 20);
this.lb_tbl003.Name = "lb_tbl003";
this.lb_tbl003.Size = new System.Drawing.Size(68, 21);
this.lb_tbl003.TabIndex = 217;
@@ -849,11 +851,11 @@
//
// txt_rwd
//
- this.txt_rwd.Location = new System.Drawing.Point(326, 16);
+ this.txt_rwd.Location = new System.Drawing.Point(352, 16);
this.txt_rwd.Name = "txt_rwd";
this.txt_rwd.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_rwd.Properties.Appearance.Options.UseFont = true;
- this.txt_rwd.Size = new System.Drawing.Size(201, 28);
+ this.txt_rwd.Size = new System.Drawing.Size(180, 28);
this.txt_rwd.TabIndex = 217;
this.txt_rwd.Tag = "readonly";
//
@@ -899,7 +901,7 @@
//
this.lb_tbl001.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_tbl001.Appearance.Options.UseFont = true;
- this.lb_tbl001.Location = new System.Drawing.Point(255, 82);
+ this.lb_tbl001.Location = new System.Drawing.Point(281, 82);
this.lb_tbl001.Name = "lb_tbl001";
this.lb_tbl001.Size = new System.Drawing.Size(68, 21);
this.lb_tbl001.TabIndex = 213;
@@ -907,11 +909,11 @@
//
// txt_lineName
//
- this.txt_lineName.Location = new System.Drawing.Point(326, 78);
+ this.txt_lineName.Location = new System.Drawing.Point(352, 78);
this.txt_lineName.Name = "txt_lineName";
this.txt_lineName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_lineName.Properties.Appearance.Options.UseFont = true;
- this.txt_lineName.Size = new System.Drawing.Size(201, 28);
+ this.txt_lineName.Size = new System.Drawing.Size(180, 28);
this.txt_lineName.TabIndex = 213;
this.txt_lineName.Tag = "readonly";
//
@@ -945,7 +947,7 @@
this.txt_billNo.Name = "txt_billNo";
this.txt_billNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_billNo.Properties.Appearance.Options.UseFont = true;
- this.txt_billNo.Size = new System.Drawing.Size(164, 28);
+ this.txt_billNo.Size = new System.Drawing.Size(190, 28);
this.txt_billNo.TabIndex = 211;
this.txt_billNo.Tag = "readonly";
//
@@ -1259,10 +1261,10 @@
// repositoryItemButtonEdit2
//
this.repositoryItemButtonEdit2.AutoHeight = false;
- editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions4.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions4.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2";
this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit2.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit2_ButtonClick);
@@ -1321,7 +1323,7 @@
this.txt_tbl023.IsReadly = false;
this.txt_tbl023.Location = new System.Drawing.Point(85, 47);
this.txt_tbl023.Name = "txt_tbl023";
- this.txt_tbl023.Size = new System.Drawing.Size(164, 30);
+ this.txt_tbl023.Size = new System.Drawing.Size(190, 30);
this.txt_tbl023.TabIndex = 462;
//
// txt_tbl020
@@ -1353,7 +1355,7 @@
"鏉ユ枡涓嶈壇閫�鏂�",
"浣滀笟涓嶈壇閫�鏂�"});
this.txt_tbl005.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_tbl005.Size = new System.Drawing.Size(164, 24);
+ this.txt_tbl005.Size = new System.Drawing.Size(190, 24);
this.txt_tbl005.TabIndex = 459;
//
// txt_tbl002
@@ -1361,7 +1363,7 @@
this.txt_tbl002.IsReadly = false;
this.txt_tbl002.Location = new System.Drawing.Point(85, 78);
this.txt_tbl002.Name = "txt_tbl002";
- this.txt_tbl002.Size = new System.Drawing.Size(164, 30);
+ this.txt_tbl002.Size = new System.Drawing.Size(190, 30);
this.txt_tbl002.TabIndex = 458;
//
// btnSelect
@@ -1422,7 +1424,7 @@
this.panelMx1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.kyPrtQty.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txtKdy.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txtYdy.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txtQuantity.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txtWlgg.Properties)).EndInit();
@@ -1536,7 +1538,7 @@
private DevExpress.XtraEditors.LabelControl labelControl14;
private DevExpress.XtraEditors.TextEdit txt_psnQty_1;
private DevExpress.XtraEditors.LabelControl labelControl12;
- private DevExpress.XtraEditors.TextEdit kyPrtQty;
+ private DevExpress.XtraEditors.TextEdit txtKdy;
private DevExpress.XtraEditors.LabelControl labelControl13;
private DevExpress.XtraEditors.TextEdit txtYdy;
private DevExpress.XtraEditors.LabelControl labelControl1;
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs
index 1990bf7..8a81053 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs
@@ -379,6 +379,7 @@
gridViews.Add(gvMx2);
UtilityHelper.CleanValueByControl(this.panel1.Controls, true, gridViews);
Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
+ Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx2, gvMx2);
}
/// <summary>
/// 淇濆瓨浜嬩欢
@@ -731,10 +732,8 @@
txtWlgg.Text = row["tld004"].ToString();
txtWlmc.Text = row["tld003"].ToString();
txtQuantity.Text = row["tld004"].ToString();//鐢宠鎬婚噺
- //txtYdy.Text = row["YDYNUM"].ToString();//宸叉墦鍗版�婚噺
- //kyPrtQty.Text = row["KDYNUM"].ToString();//鍙墦鍗版�婚噺
- txtYdy.Text = "";//宸叉墦鍗版�婚噺
- kyPrtQty.Text = "";//鍙墦鍗版�婚噺
+ txtYdy.Text = row["ydy"].ToString();//宸叉墦鍗版�婚噺
+ txtKdy.Text = row["kdy"].ToString();//鍙墦鍗版�婚噺
}
}
--
Gitblit v1.9.3