From 8366fcbfed5c66fa1fab4f6dba964a3451c24091 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期五, 12 九月 2025 16:26:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.Designer.cs | 37 +++++++++++++++++++------------------
1 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.Designer.cs
index 2be82bb..afd6e5c 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.Designer.cs
@@ -1,5 +1,8 @@
/* Create By GS EasyCode */
-namespace Gs.DevApp.DevFrm
+
+using Gs.DevApp.UserControl;
+
+namespace Gs.DevApp.DevFrm.Rk
{
partial class Frm_MesInvItemIns
{
@@ -63,7 +66,7 @@
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
this.bandedGridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UserControls.Data.UcPageBar();
+ this.pageBar1 = new UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -998,7 +1001,7 @@
// gridColumn2
//
this.gridColumn2.Caption = "鐗╂枡缂栧彿";
- this.gridColumn2.FieldName = "itemNo";
+ this.gridColumn2.FieldName = "itemNo2";
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Visible = true;
this.gridColumn2.VisibleIndex = 0;
@@ -1180,8 +1183,6 @@
this.gvMx1urgentFlag.MinWidth = 50;
this.gvMx1urgentFlag.Name = "gvMx1urgentFlag";
this.gvMx1urgentFlag.Tag = "query_a.URGENT_FLAG";
- this.gvMx1urgentFlag.Visible = true;
- this.gvMx1urgentFlag.VisibleIndex = 0;
this.gvMx1urgentFlag.Width = 94;
//
// gvMx1itemBarcode
@@ -1192,7 +1193,7 @@
this.gvMx1itemBarcode.Name = "gvMx1itemBarcode";
this.gvMx1itemBarcode.Tag = "query_a.ITEM_BARCODE";
this.gvMx1itemBarcode.Visible = true;
- this.gvMx1itemBarcode.VisibleIndex = 1;
+ this.gvMx1itemBarcode.VisibleIndex = 0;
this.gvMx1itemBarcode.Width = 250;
//
// gvMx1workNo
@@ -1203,7 +1204,7 @@
this.gvMx1workNo.Name = "gvMx1workNo";
this.gvMx1workNo.Tag = "query_a.WORK_NO";
this.gvMx1workNo.Visible = true;
- this.gvMx1workNo.VisibleIndex = 2;
+ this.gvMx1workNo.VisibleIndex = 1;
this.gvMx1workNo.Width = 100;
//
// gvMx1cItemCode
@@ -1214,7 +1215,7 @@
this.gvMx1cItemCode.Name = "gvMx1cItemCode";
this.gvMx1cItemCode.Tag = "query_a.C_ITEM_CODE";
this.gvMx1cItemCode.Visible = true;
- this.gvMx1cItemCode.VisibleIndex = 3;
+ this.gvMx1cItemCode.VisibleIndex = 2;
this.gvMx1cItemCode.Width = 100;
//
// gvMx1itemSname
@@ -1225,7 +1226,7 @@
this.gvMx1itemSname.Name = "gvMx1itemSname";
this.gvMx1itemSname.Tag = "query_a.ITEM_SNAME";
this.gvMx1itemSname.Visible = true;
- this.gvMx1itemSname.VisibleIndex = 4;
+ this.gvMx1itemSname.VisibleIndex = 3;
this.gvMx1itemSname.Width = 250;
//
// gvMx1itemNo
@@ -1236,7 +1237,7 @@
this.gvMx1itemNo.Name = "gvMx1itemNo";
this.gvMx1itemNo.Tag = "query_a.ITEM_NO";
this.gvMx1itemNo.Visible = true;
- this.gvMx1itemNo.VisibleIndex = 5;
+ this.gvMx1itemNo.VisibleIndex = 4;
this.gvMx1itemNo.Width = 250;
//
// gvMx1quantity
@@ -1247,7 +1248,7 @@
this.gvMx1quantity.Name = "gvMx1quantity";
this.gvMx1quantity.Tag = "query_a.QUANTITY";
this.gvMx1quantity.Visible = true;
- this.gvMx1quantity.VisibleIndex = 6;
+ this.gvMx1quantity.VisibleIndex = 5;
this.gvMx1quantity.Width = 94;
//
// gvMx1unit
@@ -1258,7 +1259,7 @@
this.gvMx1unit.Name = "gvMx1unit";
this.gvMx1unit.Tag = "query_a.UNIT";
this.gvMx1unit.Visible = true;
- this.gvMx1unit.VisibleIndex = 7;
+ this.gvMx1unit.VisibleIndex = 6;
this.gvMx1unit.Width = 94;
//
// gvMx1rbillNo
@@ -1269,7 +1270,7 @@
this.gvMx1rbillNo.Name = "gvMx1rbillNo";
this.gvMx1rbillNo.Tag = "query_a.RBILL_NO";
this.gvMx1rbillNo.Visible = true;
- this.gvMx1rbillNo.VisibleIndex = 8;
+ this.gvMx1rbillNo.VisibleIndex = 7;
this.gvMx1rbillNo.Width = 94;
//
// gvMx1depotSectionCode
@@ -1280,7 +1281,7 @@
this.gvMx1depotSectionCode.Name = "gvMx1depotSectionCode";
this.gvMx1depotSectionCode.Tag = "query_a.DEPOT_SECTION_CODE";
this.gvMx1depotSectionCode.Visible = true;
- this.gvMx1depotSectionCode.VisibleIndex = 9;
+ this.gvMx1depotSectionCode.VisibleIndex = 8;
this.gvMx1depotSectionCode.Width = 94;
//
// gvMx1depotCode
@@ -1291,7 +1292,7 @@
this.gvMx1depotCode.Name = "gvMx1depotCode";
this.gvMx1depotCode.Tag = "query_a.DEPOT_CODE";
this.gvMx1depotCode.Visible = true;
- this.gvMx1depotCode.VisibleIndex = 10;
+ this.gvMx1depotCode.VisibleIndex = 9;
this.gvMx1depotCode.Width = 94;
//
// gvMx1ebelnK3id
@@ -1319,7 +1320,7 @@
this.gridColumn7.MinWidth = 25;
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.Visible = true;
- this.gridColumn7.VisibleIndex = 11;
+ this.gridColumn7.VisibleIndex = 10;
this.gridColumn7.Width = 94;
//
// gridColumn8
@@ -1329,7 +1330,7 @@
this.gridColumn8.MinWidth = 25;
this.gridColumn8.Name = "gridColumn8";
this.gridColumn8.Visible = true;
- this.gridColumn8.VisibleIndex = 12;
+ this.gridColumn8.VisibleIndex = 11;
this.gridColumn8.Width = 94;
//
// gridColumn12
@@ -1445,7 +1446,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_suppNo;
private DevExpress.XtraGrid.Columns.GridColumn gv_depotsId;
private DevExpress.XtraGrid.Columns.GridColumn bandedGridColumn2;
- private UserControls.Data.UcPageBar pageBar1;
+ private UcPageBar pageBar1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private DevExpress.XtraLayout.LayoutControl layoutMx1;
--
Gitblit v1.9.3