From 2ffa3cda080d1990775fe42e13ced433d27ca3e8 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 10 十二月 2024 10:36:37 +0800
Subject: [PATCH] Merge branch 'master' of http://43.142.96.171:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesInvItemMoves.Designer.cs | 166 ++++++++++++++++++------------------------------------
1 files changed, 56 insertions(+), 110 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesInvItemMoves.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesInvItemMoves.Designer.cs
index f7574a6..977ff2d 100644
--- a/DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesInvItemMoves.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesInvItemMoves.Designer.cs
@@ -79,10 +79,9 @@
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gvMx1guid = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1qtrkGuid = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx1ItemOutId = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
- this.gvMx1qd001 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemSearchLookUpEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit();
this.gridView2 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -94,13 +93,11 @@
this.gvMx1qd002 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1qd003 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1qd004 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1qd005 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1qd006 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1qd007 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1qd008 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1qd009 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1qd010 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1qd011 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_ts = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_zdNum = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_mtransactionNo = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -770,20 +767,17 @@
//
this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gvMx1guid,
- this.gvMx1qtrkGuid,
+ this.gvMx1ItemOutId,
this.gvMxDel,
- this.gvMx1qd001,
this.gridColumn1,
this.gvMx1qd002,
this.gvMx1qd003,
this.gvMx1qd004,
- this.gvMx1qd005,
- this.gvMx1qd006,
this.gvMx1qd007,
this.gvMx1qd008,
+ this.gridColumn2,
this.gvMx1qd009,
- this.gvMx1qd010,
- this.gvMx1qd011});
+ this.gvMx1qd010});
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -801,21 +795,21 @@
this.gvMx1guid.Name = "gvMx1guid";
this.gvMx1guid.Tag = "query_a.guid";
this.gvMx1guid.Visible = true;
- this.gvMx1guid.VisibleIndex = 1;
+ this.gvMx1guid.VisibleIndex = 0;
this.gvMx1guid.Width = 94;
//
- // gvMx1qtrkGuid
+ // gvMx1ItemOutId
//
- this.gvMx1qtrkGuid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1qtrkGuid.AppearanceCell.Options.UseFont = true;
- this.gvMx1qtrkGuid.Caption = "qtGuid";
- this.gvMx1qtrkGuid.FieldName = "qtGuid";
- this.gvMx1qtrkGuid.MinWidth = 50;
- this.gvMx1qtrkGuid.Name = "gvMx1qtrkGuid";
- this.gvMx1qtrkGuid.Tag = "query_a.qtrkGuid";
- this.gvMx1qtrkGuid.Visible = true;
- this.gvMx1qtrkGuid.VisibleIndex = 2;
- this.gvMx1qtrkGuid.Width = 94;
+ this.gvMx1ItemOutId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx1ItemOutId.AppearanceCell.Options.UseFont = true;
+ this.gvMx1ItemOutId.Caption = "itemOutId";
+ this.gvMx1ItemOutId.FieldName = "itemOutId";
+ this.gvMx1ItemOutId.MinWidth = 50;
+ this.gvMx1ItemOutId.Name = "gvMx1ItemOutId";
+ this.gvMx1ItemOutId.Tag = "query_a.qtrkGuid";
+ this.gvMx1ItemOutId.Visible = true;
+ this.gvMx1ItemOutId.VisibleIndex = 1;
+ this.gvMx1ItemOutId.Width = 94;
//
// gvMxDel
//
@@ -824,7 +818,7 @@
this.gvMxDel.MinWidth = 25;
this.gvMxDel.Name = "gvMxDel";
this.gvMxDel.Visible = true;
- this.gvMxDel.VisibleIndex = 0;
+ this.gvMxDel.VisibleIndex = 2;
this.gvMxDel.Width = 94;
//
// repositoryItemButtonEdit1
@@ -838,19 +832,6 @@
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
//
- // 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 = 50;
- this.gvMx1qd001.Name = "gvMx1qd001";
- this.gvMx1qd001.Tag = "query_a.qd001";
- this.gvMx1qd001.Visible = true;
- this.gvMx1qd001.VisibleIndex = 3;
- this.gvMx1qd001.Width = 94;
- //
// gridColumn1
//
this.gridColumn1.Caption = "鐗╂枡ID";
@@ -859,7 +840,7 @@
this.gridColumn1.MinWidth = 25;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 4;
+ this.gridColumn1.VisibleIndex = 3;
this.gridColumn1.Width = 94;
//
// repositoryItemSearchLookUpEdit1
@@ -941,66 +922,40 @@
//
this.gvMx1qd002.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1qd002.AppearanceCell.Options.UseFont = true;
- this.gvMx1qd002.Caption = "鐗╂枡缂栧彿 ";
- this.gvMx1qd002.FieldName = "qd002";
+ this.gvMx1qd002.Caption = "鐗╂枡缂栧彿";
+ this.gvMx1qd002.FieldName = "itemNo";
this.gvMx1qd002.MinWidth = 50;
this.gvMx1qd002.Name = "gvMx1qd002";
this.gvMx1qd002.Tag = "query_a.qd002";
this.gvMx1qd002.Visible = true;
- this.gvMx1qd002.VisibleIndex = 5;
+ this.gvMx1qd002.VisibleIndex = 4;
this.gvMx1qd002.Width = 94;
//
// gvMx1qd003
//
this.gvMx1qd003.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1qd003.AppearanceCell.Options.UseFont = true;
- this.gvMx1qd003.Caption = "鐗╂枡鍚嶇О ";
- this.gvMx1qd003.FieldName = "qd003";
+ this.gvMx1qd003.Caption = "鐗╂枡鍚嶇О";
+ this.gvMx1qd003.FieldName = "itemName";
this.gvMx1qd003.MinWidth = 50;
this.gvMx1qd003.Name = "gvMx1qd003";
this.gvMx1qd003.Tag = "query_a.qd003";
this.gvMx1qd003.Visible = true;
- this.gvMx1qd003.VisibleIndex = 6;
+ this.gvMx1qd003.VisibleIndex = 5;
this.gvMx1qd003.Width = 94;
//
// gvMx1qd004
//
this.gvMx1qd004.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1qd004.AppearanceCell.Options.UseFont = true;
- this.gvMx1qd004.Caption = "瑙勬牸鍨嬪彿 ";
- this.gvMx1qd004.FieldName = "qd004";
+ this.gvMx1qd004.Caption = "瑙勬牸鍨嬪彿";
+ this.gvMx1qd004.FieldName = "itemModel";
this.gvMx1qd004.MinWidth = 50;
this.gvMx1qd004.Name = "gvMx1qd004";
this.gvMx1qd004.Tag = "query_a.qd004";
this.gvMx1qd004.Visible = true;
- this.gvMx1qd004.VisibleIndex = 7;
+ this.gvMx1qd004.VisibleIndex = 6;
this.gvMx1qd004.Width = 94;
- //
- // gvMx1qd005
- //
- this.gvMx1qd005.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1qd005.AppearanceCell.Options.UseFont = true;
- this.gvMx1qd005.Caption = "棰滆壊 ";
- this.gvMx1qd005.FieldName = "qd005";
- this.gvMx1qd005.MinWidth = 50;
- this.gvMx1qd005.Name = "gvMx1qd005";
- this.gvMx1qd005.Tag = "query_a.qd005";
- this.gvMx1qd005.Visible = true;
- this.gvMx1qd005.VisibleIndex = 8;
- this.gvMx1qd005.Width = 94;
- //
- // gvMx1qd006
- //
- this.gvMx1qd006.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1qd006.AppearanceCell.Options.UseFont = true;
- this.gvMx1qd006.Caption = "璁″垝鏁伴噺 ";
- this.gvMx1qd006.FieldName = "qd006";
- this.gvMx1qd006.MinWidth = 50;
- this.gvMx1qd006.Name = "gvMx1qd006";
- this.gvMx1qd006.Tag = "query_a.qd006";
- this.gvMx1qd006.Visible = true;
- this.gvMx1qd006.VisibleIndex = 9;
- this.gvMx1qd006.Width = 94;
//
// gvMx1qd007
//
@@ -1010,39 +965,49 @@
this.gvMx1qd007.AppearanceCell.Options.UseForeColor = true;
this.gvMx1qd007.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
this.gvMx1qd007.AppearanceHeader.Options.UseForeColor = true;
- this.gvMx1qd007.Caption = "鐢宠鏁伴噺 ";
- this.gvMx1qd007.FieldName = "qd007";
+ this.gvMx1qd007.Caption = "鐢宠鏁伴噺";
+ this.gvMx1qd007.FieldName = "quantity";
this.gvMx1qd007.MinWidth = 50;
this.gvMx1qd007.Name = "gvMx1qd007";
- this.gvMx1qd007.Tag = "query_a.qd007";
+ this.gvMx1qd007.Tag = "yz_quantity_0";
this.gvMx1qd007.Visible = true;
- this.gvMx1qd007.VisibleIndex = 10;
+ this.gvMx1qd007.VisibleIndex = 7;
this.gvMx1qd007.Width = 94;
//
// gvMx1qd008
//
this.gvMx1qd008.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1qd008.AppearanceCell.Options.UseFont = true;
- this.gvMx1qd008.Caption = "宸插叆鏁伴噺 ";
- this.gvMx1qd008.FieldName = "qd008";
+ this.gvMx1qd008.Caption = "鍑哄簱鏁伴噺";
+ this.gvMx1qd008.FieldName = "quantityCkok";
this.gvMx1qd008.MinWidth = 50;
this.gvMx1qd008.Name = "gvMx1qd008";
- this.gvMx1qd008.Tag = "query_a.qd008";
+ this.gvMx1qd008.Tag = "";
this.gvMx1qd008.Visible = true;
- this.gvMx1qd008.VisibleIndex = 11;
+ this.gvMx1qd008.VisibleIndex = 8;
this.gvMx1qd008.Width = 94;
+ //
+ // gridColumn2
+ //
+ this.gridColumn2.Caption = "宸茶皟鎷ㄦ暟閲�";
+ this.gridColumn2.FieldName = "quantityOk";
+ this.gridColumn2.MinWidth = 25;
+ this.gridColumn2.Name = "gridColumn2";
+ this.gridColumn2.Visible = true;
+ this.gridColumn2.VisibleIndex = 9;
+ this.gridColumn2.Width = 94;
//
// gvMx1qd009
//
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.Caption = "鍗曚綅";
+ this.gvMx1qd009.FieldName = "itemUnit";
this.gvMx1qd009.MinWidth = 50;
this.gvMx1qd009.Name = "gvMx1qd009";
this.gvMx1qd009.Tag = "query_a.qd009";
this.gvMx1qd009.Visible = true;
- this.gvMx1qd009.VisibleIndex = 12;
+ this.gvMx1qd009.VisibleIndex = 10;
this.gvMx1qd009.Width = 94;
//
// gvMx1qd010
@@ -1053,27 +1018,14 @@
this.gvMx1qd010.AppearanceCell.Options.UseForeColor = true;
this.gvMx1qd010.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
this.gvMx1qd010.AppearanceHeader.Options.UseForeColor = true;
- this.gvMx1qd010.Caption = "澶囨敞 ";
- this.gvMx1qd010.FieldName = "qd010";
+ this.gvMx1qd010.Caption = "澶囨敞";
+ this.gvMx1qd010.FieldName = "remark";
this.gvMx1qd010.MinWidth = 50;
this.gvMx1qd010.Name = "gvMx1qd010";
this.gvMx1qd010.Tag = "query_a.qd010";
this.gvMx1qd010.Visible = true;
- this.gvMx1qd010.VisibleIndex = 13;
+ this.gvMx1qd010.VisibleIndex = 11;
this.gvMx1qd010.Width = 94;
- //
- // gvMx1qd011
- //
- this.gvMx1qd011.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1qd011.AppearanceCell.Options.UseFont = true;
- this.gvMx1qd011.Caption = "瀹岀粨鏍囪瘑 ";
- this.gvMx1qd011.FieldName = "qd011";
- this.gvMx1qd011.MinWidth = 50;
- this.gvMx1qd011.Name = "gvMx1qd011";
- this.gvMx1qd011.Tag = "query_a.qd011";
- this.gvMx1qd011.Visible = true;
- this.gvMx1qd011.VisibleIndex = 14;
- this.gvMx1qd011.Width = 94;
//
// gv_ts
//
@@ -1708,7 +1660,7 @@
this.xtraTabPage1.Controls.Add(this.pageBar1);
this.xtraTabPage1.Name = "xtraTabPage1";
this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
- this.xtraTabPage1.Text = "鏁版嵁鏌ヨ";
+ this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// pageBar1
//
@@ -1718,7 +1670,6 @@
this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.RowsCount = 50;
this.pageBar1.Size = new System.Drawing.Size(1126, 39);
this.pageBar1.TabIndex = 3;
this.pageBar1.TotalPages = 0;
@@ -1730,7 +1681,7 @@
this.xtraTabPage2.Name = "xtraTabPage2";
this.xtraTabPage2.PageEnabled = false;
this.xtraTabPage2.Size = new System.Drawing.Size(1126, 570);
- this.xtraTabPage2.Text = "鏁版嵁缂栬緫";
+ this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// tabMx
//
@@ -1777,7 +1728,6 @@
// txt_invDepotsId
//
this.txt_invDepotsId.IsReadly = false;
- this.txt_invDepotsId.KeyFile = "";
this.txt_invDepotsId.Location = new System.Drawing.Point(116, 88);
this.txt_invDepotsId.Margin = new System.Windows.Forms.Padding(0);
this.txt_invDepotsId.Name = "txt_invDepotsId";
@@ -1787,7 +1737,6 @@
// txt_fromDepotsId
//
this.txt_fromDepotsId.IsReadly = false;
- this.txt_fromDepotsId.KeyFile = "";
this.txt_fromDepotsId.Location = new System.Drawing.Point(116, 47);
this.txt_fromDepotsId.Margin = new System.Windows.Forms.Padding(0);
this.txt_fromDepotsId.Name = "txt_fromDepotsId";
@@ -1962,10 +1911,9 @@
private DevExpress.XtraGrid.GridControl gcMx1;
private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1guid;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1qtrkGuid;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1ItemOutId;
private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1qd001;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
private DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit repositoryItemSearchLookUpEdit1;
private DevExpress.XtraGrid.Views.Grid.GridView gridView2;
@@ -1977,12 +1925,10 @@
private DevExpress.XtraGrid.Columns.GridColumn gvMx1qd002;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1qd003;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1qd004;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1qd005;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1qd006;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1qd007;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1qd008;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1qd009;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1qd010;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1qd011;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
}
}
\ No newline at end of file
--
Gitblit v1.9.3