From 50863ec3601b9fabcc6952357b1ec1064c090750 Mon Sep 17 00:00:00 2001
From: cnf <3283105747@qq.com>
Date: 星期四, 06 十一月 2025 17:19:03 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~kyy/LB_MesClient
---
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArnDt.Designer.cs | 70 +++++++++++++++++-----------------
1 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArnDt.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArnDt.Designer.cs
index 25d85dc..5e51ef6 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArnDt.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArnDt.Designer.cs
@@ -43,9 +43,7 @@
this.ebeln_line = new DevExpress.XtraGrid.Columns.GridColumn();
this.ebeln_qty = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_quantity = new DevExpress.XtraGrid.Columns.GridColumn();
- this.ok_rkqty = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UserControls.Data.UcPageBar();
- this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
+ this.gv_rk = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -66,6 +64,8 @@
this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
+ this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.split1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).BeginInit();
@@ -148,7 +148,7 @@
this.ebeln_line,
this.ebeln_qty,
this.gv_quantity,
- this.ok_rkqty,
+ this.gv_rk,
this.gridColumn1,
this.gridColumn2,
this.gridColumn3,
@@ -252,37 +252,14 @@
this.gv_quantity.VisibleIndex = 5;
this.gv_quantity.Width = 78;
//
- // ok_rkqty
+ // gv_rk
//
- this.ok_rkqty.Caption = "宸插叆搴撴暟閲�";
- this.ok_rkqty.FieldName = "okRkqty";
- this.ok_rkqty.MinWidth = 21;
- this.ok_rkqty.Name = "ok_rkqty";
- this.ok_rkqty.Tag = "createTime";
- this.ok_rkqty.Width = 78;
- //
- // pageBar1
- //
- this.pageBar1.CurrentPage = 1;
- this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.pageBar1.Location = new System.Drawing.Point(0, 402);
- this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
- this.pageBar1.Name = "pageBar1";
- this.pageBar1.RecordCount = 0;
- this.pageBar1.Size = new System.Drawing.Size(985, 31);
- this.pageBar1.TabIndex = 4;
- this.pageBar1.TotalPages = 0;
- //
- // xtraTabControl1
- //
- this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.xtraTabControl1.Location = new System.Drawing.Point(0, 62);
- this.xtraTabControl1.Name = "xtraTabControl1";
- this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
- this.xtraTabControl1.Size = new System.Drawing.Size(987, 469);
- this.xtraTabControl1.TabIndex = 3;
- this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
- this.xtraTabPage1});
+ this.gv_rk.Caption = "宸插叆搴撴暟閲�";
+ this.gv_rk.FieldName = "okRkqty";
+ this.gv_rk.MinWidth = 21;
+ this.gv_rk.Name = "gv_rk";
+ this.gv_rk.Tag = "createTime";
+ this.gv_rk.Width = 78;
//
// gridColumn1
//
@@ -444,6 +421,29 @@
this.gridColumn20.Visible = true;
this.gridColumn20.VisibleIndex = 25;
//
+ // pageBar1
+ //
+ this.pageBar1.CurrentPage = 1;
+ this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.pageBar1.Location = new System.Drawing.Point(0, 402);
+ this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.pageBar1.Name = "pageBar1";
+ this.pageBar1.RecordCount = 0;
+ this.pageBar1.Size = new System.Drawing.Size(985, 31);
+ this.pageBar1.TabIndex = 4;
+ this.pageBar1.TotalPages = 0;
+ //
+ // xtraTabControl1
+ //
+ this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.xtraTabControl1.Location = new System.Drawing.Point(0, 62);
+ this.xtraTabControl1.Name = "xtraTabControl1";
+ this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
+ this.xtraTabControl1.Size = new System.Drawing.Size(987, 469);
+ this.xtraTabControl1.TabIndex = 3;
+ this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
+ this.xtraTabPage1});
+ //
// Frm_MesInvItemArnDt
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
@@ -483,7 +483,7 @@
private DevExpress.XtraGrid.Columns.GridColumn ebeln_line;
private DevExpress.XtraGrid.Columns.GridColumn ebeln_qty;
private DevExpress.XtraGrid.Columns.GridColumn gv_quantity;
- private DevExpress.XtraGrid.Columns.GridColumn ok_rkqty;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_rk;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
--
Gitblit v1.9.3