From 8dfc8d054b5b14e3fcde6415dd22cedf10c09915 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期二, 05 十一月 2024 14:13:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.Designer.cs | 134 +++++++++++++++-----------------------------
1 files changed, 45 insertions(+), 89 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.Designer.cs
index ae35a1e..1ff8454 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.Designer.cs
@@ -62,9 +62,6 @@
this.lb_fnumber = new DevExpress.XtraEditors.LabelControl();
this.txt_fnumber = new DevExpress.XtraEditors.TextEdit();
this.gv_fnumber = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_factory = new DevExpress.XtraEditors.LabelControl();
- this.txt_factory = new DevExpress.XtraEditors.TextEdit();
- this.gv_factory = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_lastupdate_by = new DevExpress.XtraEditors.LabelControl();
this.txt_lastupdateBy = new DevExpress.XtraEditors.TextEdit();
this.lb_lastupdate_date = new DevExpress.XtraEditors.LabelControl();
@@ -109,7 +106,6 @@
((System.ComponentModel.ISupportInitialize)(this.txt_funitgroupid.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fname.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fnumber.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_factory.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateBy.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
@@ -132,7 +128,7 @@
//
this.lb_fforbidstatus.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_fforbidstatus.Appearance.Options.UseFont = true;
- this.lb_fforbidstatus.Location = new System.Drawing.Point(533, 208);
+ this.lb_fforbidstatus.Location = new System.Drawing.Point(283, 286);
this.lb_fforbidstatus.Name = "lb_fforbidstatus";
this.lb_fforbidstatus.Size = new System.Drawing.Size(85, 21);
this.lb_fforbidstatus.TabIndex = 298;
@@ -140,7 +136,7 @@
//
// txt_fforbidstatus
//
- this.txt_fforbidstatus.Location = new System.Drawing.Point(618, 204);
+ this.txt_fforbidstatus.Location = new System.Drawing.Point(368, 282);
this.txt_fforbidstatus.Name = "txt_fforbidstatus";
this.txt_fforbidstatus.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_fforbidstatus.Properties.Appearance.Options.UseFont = true;
@@ -158,22 +154,22 @@
this.gv_fforbidstatus.OptionsColumn.AllowEdit = false;
this.gv_fforbidstatus.Tag = "query_a.fforbidstatus";
this.gv_fforbidstatus.Visible = true;
- this.gv_fforbidstatus.VisibleIndex = 16;
+ this.gv_fforbidstatus.VisibleIndex = 15;
this.gv_fforbidstatus.Width = 94;
//
// lb_fdescription
//
this.lb_fdescription.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_fdescription.Appearance.Options.UseFont = true;
- this.lb_fdescription.Location = new System.Drawing.Point(315, 247);
+ this.lb_fdescription.Location = new System.Drawing.Point(13, 283);
this.lb_fdescription.Name = "lb_fdescription";
- this.lb_fdescription.Size = new System.Drawing.Size(51, 21);
+ this.lb_fdescription.Size = new System.Drawing.Size(85, 21);
this.lb_fdescription.TabIndex = 291;
- this.lb_fdescription.Text = "鎻忚堪锛�";
+ this.lb_fdescription.Text = "鍗曚綅鎻忚堪锛�";
//
// txt_fdescription
//
- this.txt_fdescription.Location = new System.Drawing.Point(368, 243);
+ this.txt_fdescription.Location = new System.Drawing.Point(100, 279);
this.txt_fdescription.Name = "txt_fdescription";
this.txt_fdescription.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_fdescription.Properties.Appearance.Options.UseFont = true;
@@ -191,18 +187,18 @@
this.gv_fdescription.OptionsColumn.AllowEdit = false;
this.gv_fdescription.Tag = "query_a.fdescription";
this.gv_fdescription.Visible = true;
- this.gv_fdescription.VisibleIndex = 15;
+ this.gv_fdescription.VisibleIndex = 14;
this.gv_fdescription.Width = 94;
//
// lb_fprecision
//
this.lb_fprecision.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_fprecision.Appearance.Options.UseFont = true;
- this.lb_fprecision.Location = new System.Drawing.Point(47, 247);
+ this.lb_fprecision.Location = new System.Drawing.Point(13, 247);
this.lb_fprecision.Name = "lb_fprecision";
- this.lb_fprecision.Size = new System.Drawing.Size(51, 21);
+ this.lb_fprecision.Size = new System.Drawing.Size(85, 21);
this.lb_fprecision.TabIndex = 285;
- this.lb_fprecision.Text = "绮惧害锛�";
+ this.lb_fprecision.Text = "鍗曚綅绮惧害锛�";
//
// txt_fprecision
//
@@ -264,7 +260,7 @@
//
this.lb_fbaseunit.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_fbaseunit.Appearance.Options.UseFont = true;
- this.lb_fbaseunit.Location = new System.Drawing.Point(281, 85);
+ this.lb_fbaseunit.Location = new System.Drawing.Point(283, 85);
this.lb_fbaseunit.Name = "lb_fbaseunit";
this.lb_fbaseunit.Size = new System.Drawing.Size(85, 21);
this.lb_fbaseunit.TabIndex = 273;
@@ -297,7 +293,7 @@
//
this.lb_fconvertnumerator.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_fconvertnumerator.Appearance.Options.UseFont = true;
- this.lb_fconvertnumerator.Location = new System.Drawing.Point(13, 85);
+ this.lb_fconvertnumerator.Location = new System.Drawing.Point(13, 126);
this.lb_fconvertnumerator.Name = "lb_fconvertnumerator";
this.lb_fconvertnumerator.Size = new System.Drawing.Size(85, 21);
this.lb_fconvertnumerator.TabIndex = 267;
@@ -305,7 +301,7 @@
//
// txt_fconvertnumerator
//
- this.txt_fconvertnumerator.Location = new System.Drawing.Point(98, 81);
+ this.txt_fconvertnumerator.Location = new System.Drawing.Point(98, 122);
this.txt_fconvertnumerator.Name = "txt_fconvertnumerator";
this.txt_fconvertnumerator.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_fconvertnumerator.Properties.Appearance.Options.UseFont = true;
@@ -330,7 +326,7 @@
//
this.lb_fcurrentunitid.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_fcurrentunitid.Appearance.Options.UseFont = true;
- this.lb_fcurrentunitid.Location = new System.Drawing.Point(6, 163);
+ this.lb_fcurrentunitid.Location = new System.Drawing.Point(13, 204);
this.lb_fcurrentunitid.Name = "lb_fcurrentunitid";
this.lb_fcurrentunitid.Size = new System.Drawing.Size(85, 21);
this.lb_fcurrentunitid.TabIndex = 262;
@@ -338,7 +334,7 @@
//
// txt_fcurrentunitid
//
- this.txt_fcurrentunitid.Location = new System.Drawing.Point(98, 159);
+ this.txt_fcurrentunitid.Location = new System.Drawing.Point(98, 200);
this.txt_fcurrentunitid.Name = "txt_fcurrentunitid";
this.txt_fcurrentunitid.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_fcurrentunitid.Properties.Appearance.Options.UseFont = true;
@@ -429,11 +425,11 @@
//
this.lb_fname.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_fname.Appearance.Options.UseFont = true;
- this.lb_fname.Location = new System.Drawing.Point(315, 43);
+ this.lb_fname.Location = new System.Drawing.Point(283, 43);
this.lb_fname.Name = "lb_fname";
- this.lb_fname.Size = new System.Drawing.Size(51, 21);
+ this.lb_fname.Size = new System.Drawing.Size(85, 21);
this.lb_fname.TabIndex = 247;
- this.lb_fname.Text = "鍚嶇О锛�";
+ this.lb_fname.Text = "鍗曚綅鍚嶇О锛�";
//
// txt_fname
//
@@ -462,15 +458,15 @@
//
this.lb_fnumber.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_fnumber.Appearance.Options.UseFont = true;
- this.lb_fnumber.Location = new System.Drawing.Point(47, 43);
+ this.lb_fnumber.Location = new System.Drawing.Point(13, 84);
this.lb_fnumber.Name = "lb_fnumber";
- this.lb_fnumber.Size = new System.Drawing.Size(51, 21);
+ this.lb_fnumber.Size = new System.Drawing.Size(85, 21);
this.lb_fnumber.TabIndex = 243;
- this.lb_fnumber.Text = "缂栫爜锛�";
+ this.lb_fnumber.Text = "鍗曚綅缂栫爜锛�";
//
// txt_fnumber
//
- this.txt_fnumber.Location = new System.Drawing.Point(98, 39);
+ this.txt_fnumber.Location = new System.Drawing.Point(98, 80);
this.txt_fnumber.Name = "txt_fnumber";
this.txt_fnumber.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_fnumber.Properties.Appearance.Options.UseFont = true;
@@ -491,44 +487,11 @@
this.gv_fnumber.VisibleIndex = 1;
this.gv_fnumber.Width = 94;
//
- // lb_factory
- //
- this.lb_factory.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_factory.Appearance.Options.UseFont = true;
- this.lb_factory.Location = new System.Drawing.Point(13, 207);
- this.lb_factory.Name = "lb_factory";
- this.lb_factory.Size = new System.Drawing.Size(85, 21);
- this.lb_factory.TabIndex = 240;
- this.lb_factory.Text = "宸ュ巶缂栧彿锛�";
- //
- // txt_factory
- //
- this.txt_factory.Location = new System.Drawing.Point(98, 203);
- this.txt_factory.Name = "txt_factory";
- this.txt_factory.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_factory.Properties.Appearance.Options.UseFont = true;
- this.txt_factory.Size = new System.Drawing.Size(150, 28);
- this.txt_factory.TabIndex = 240;
- //
- // gv_factory
- //
- this.gv_factory.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_factory.AppearanceCell.Options.UseFont = true;
- this.gv_factory.Caption = "宸ュ巶";
- this.gv_factory.FieldName = "factory";
- this.gv_factory.MinWidth = 50;
- this.gv_factory.Name = "gv_factory";
- this.gv_factory.OptionsColumn.AllowEdit = false;
- this.gv_factory.Tag = "query_a.factory";
- this.gv_factory.Visible = true;
- this.gv_factory.VisibleIndex = 0;
- this.gv_factory.Width = 94;
- //
// lb_lastupdate_by
//
this.lb_lastupdate_by.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_lastupdate_by.Appearance.Options.UseFont = true;
- this.lb_lastupdate_by.Location = new System.Drawing.Point(298, 283);
+ this.lb_lastupdate_by.Location = new System.Drawing.Point(300, 204);
this.lb_lastupdate_by.Name = "lb_lastupdate_by";
this.lb_lastupdate_by.Size = new System.Drawing.Size(68, 21);
this.lb_lastupdate_by.TabIndex = 231;
@@ -536,7 +499,7 @@
//
// txt_lastupdateBy
//
- this.txt_lastupdateBy.Location = new System.Drawing.Point(368, 279);
+ this.txt_lastupdateBy.Location = new System.Drawing.Point(368, 200);
this.txt_lastupdateBy.Name = "txt_lastupdateBy";
this.txt_lastupdateBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_lastupdateBy.Properties.Appearance.Options.UseFont = true;
@@ -547,7 +510,7 @@
//
this.lb_lastupdate_date.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_lastupdate_date.Appearance.Options.UseFont = true;
- this.lb_lastupdate_date.Location = new System.Drawing.Point(8, 283);
+ this.lb_lastupdate_date.Location = new System.Drawing.Point(278, 247);
this.lb_lastupdate_date.Name = "lb_lastupdate_date";
this.lb_lastupdate_date.Size = new System.Drawing.Size(90, 21);
this.lb_lastupdate_date.TabIndex = 228;
@@ -555,7 +518,7 @@
//
// txt_lastupdateDate
//
- this.txt_lastupdateDate.Location = new System.Drawing.Point(98, 279);
+ this.txt_lastupdateDate.Location = new System.Drawing.Point(368, 243);
this.txt_lastupdateDate.Name = "txt_lastupdateDate";
this.txt_lastupdateDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_lastupdateDate.Properties.Appearance.Options.UseFont = true;
@@ -566,7 +529,7 @@
//
this.lb_create_by.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_create_by.Appearance.Options.UseFont = true;
- this.lb_create_by.Location = new System.Drawing.Point(550, 249);
+ this.lb_create_by.Location = new System.Drawing.Point(550, 204);
this.lb_create_by.Name = "lb_create_by";
this.lb_create_by.Size = new System.Drawing.Size(68, 21);
this.lb_create_by.TabIndex = 226;
@@ -574,7 +537,7 @@
//
// txt_createBy
//
- this.txt_createBy.Location = new System.Drawing.Point(618, 245);
+ this.txt_createBy.Location = new System.Drawing.Point(618, 200);
this.txt_createBy.Name = "txt_createBy";
this.txt_createBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_createBy.Properties.Appearance.Options.UseFont = true;
@@ -585,7 +548,7 @@
//
this.lb_create_date.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_create_date.Appearance.Options.UseFont = true;
- this.lb_create_date.Location = new System.Drawing.Point(533, 283);
+ this.lb_create_date.Location = new System.Drawing.Point(533, 247);
this.lb_create_date.Name = "lb_create_date";
this.lb_create_date.Size = new System.Drawing.Size(85, 21);
this.lb_create_date.TabIndex = 222;
@@ -593,7 +556,7 @@
//
// txt_createDate
//
- this.txt_createDate.Location = new System.Drawing.Point(618, 279);
+ this.txt_createDate.Location = new System.Drawing.Point(618, 243);
this.txt_createDate.Name = "txt_createDate";
this.txt_createDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_createDate.Properties.Appearance.Options.UseFont = true;
@@ -604,7 +567,7 @@
//
this.lb_newqty.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_newqty.Appearance.Options.UseFont = true;
- this.lb_newqty.Location = new System.Drawing.Point(247, 164);
+ this.lb_newqty.Location = new System.Drawing.Point(249, 164);
this.lb_newqty.Name = "lb_newqty";
this.lb_newqty.Size = new System.Drawing.Size(119, 21);
this.lb_newqty.TabIndex = 219;
@@ -637,7 +600,7 @@
//
this.lb_oldqty.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_oldqty.Appearance.Options.UseFont = true;
- this.lb_oldqty.Location = new System.Drawing.Point(264, 125);
+ this.lb_oldqty.Location = new System.Drawing.Point(266, 125);
this.lb_oldqty.Name = "lb_oldqty";
this.lb_oldqty.Size = new System.Drawing.Size(102, 21);
this.lb_oldqty.TabIndex = 217;
@@ -703,7 +666,7 @@
//
this.lb_oldunit.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_oldunit.Appearance.Options.UseFont = true;
- this.lb_oldunit.Location = new System.Drawing.Point(30, 125);
+ this.lb_oldunit.Location = new System.Drawing.Point(30, 166);
this.lb_oldunit.Name = "lb_oldunit";
this.lb_oldunit.Size = new System.Drawing.Size(68, 21);
this.lb_oldunit.TabIndex = 213;
@@ -711,7 +674,7 @@
//
// txt_oldunit
//
- this.txt_oldunit.Location = new System.Drawing.Point(98, 121);
+ this.txt_oldunit.Location = new System.Drawing.Point(98, 162);
this.txt_oldunit.Name = "txt_oldunit";
this.txt_oldunit.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_oldunit.Properties.Appearance.Options.UseFont = true;
@@ -736,15 +699,15 @@
//
this.lb_id.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_id.Appearance.Options.UseFont = true;
- this.lb_id.Location = new System.Drawing.Point(271, 207);
+ this.lb_id.Location = new System.Drawing.Point(29, 43);
this.lb_id.Name = "lb_id";
- this.lb_id.Size = new System.Drawing.Size(95, 21);
+ this.lb_id.Size = new System.Drawing.Size(69, 21);
this.lb_id.TabIndex = 211;
- this.lb_id.Text = "BASEINFO锛�";
+ this.lb_id.Text = "鍗曚綅ID锛�";
//
// txt_id
//
- this.txt_id.Location = new System.Drawing.Point(368, 203);
+ this.txt_id.Location = new System.Drawing.Point(98, 39);
this.txt_id.Name = "txt_id";
this.txt_id.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_id.Properties.Appearance.Options.UseFont = true;
@@ -755,14 +718,14 @@
//
this.gv_id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_id.AppearanceCell.Options.UseFont = true;
- this.gv_id.Caption = "BASEINFO ";
+ this.gv_id.Caption = "ID";
this.gv_id.FieldName = "id";
this.gv_id.MinWidth = 50;
this.gv_id.Name = "gv_id";
this.gv_id.OptionsColumn.AllowEdit = false;
this.gv_id.Tag = "query_a.id";
this.gv_id.Visible = true;
- this.gv_id.VisibleIndex = 14;
+ this.gv_id.VisibleIndex = 0;
this.gv_id.Width = 94;
//
// toolBarMenu1
@@ -773,10 +736,11 @@
this.toolBarMenu1.isSetBtn = false;
this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
this.toolBarMenu1.Name = "toolBarMenu1";
-
+ this.toolBarMenu1.rptParameter = null;
this.toolBarMenu1.Size = new System.Drawing.Size(972, 80);
this.toolBarMenu1.TabIndex = 0;
-
+ this.toolBarMenu1.xlsInService = null;
+ this.toolBarMenu1.xlsOutParameter = "xlsOut_unit{}";
//
// gcMain
//
@@ -795,7 +759,7 @@
this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
this.gridView1.Appearance.Row.Options.UseFont = true;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
- this.gv_factory,
+ this.gv_id,
this.gv_fnumber,
this.gv_fname,
this.gv_funitgroupid,
@@ -809,7 +773,6 @@
this.gv_oldqty,
this.gv_newunit,
this.gv_newqty,
- this.gv_id,
this.gv_fdescription,
this.gv_fforbidstatus});
this.gridView1.GridControl = this.gcMain;
@@ -887,8 +850,6 @@
this.panel1.Controls.Add(this.txt_fname);
this.panel1.Controls.Add(this.lb_fnumber);
this.panel1.Controls.Add(this.txt_fnumber);
- this.panel1.Controls.Add(this.lb_factory);
- this.panel1.Controls.Add(this.txt_factory);
this.panel1.Controls.Add(this.lb_lastupdate_by);
this.panel1.Controls.Add(this.txt_lastupdateBy);
this.panel1.Controls.Add(this.lb_lastupdate_date);
@@ -951,7 +912,6 @@
((System.ComponentModel.ISupportInitialize)(this.txt_funitgroupid.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fname.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fnumber.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_factory.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateBy.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
@@ -1027,10 +987,6 @@
private DevExpress.XtraEditors.LabelControl lb_fnumber;
private DevExpress.XtraEditors.TextEdit txt_fnumber;
private DevExpress.XtraGrid.Columns.GridColumn gv_fnumber;
-
-private DevExpress.XtraEditors.LabelControl lb_factory;
-private DevExpress.XtraEditors.TextEdit txt_factory;
- private DevExpress.XtraGrid.Columns.GridColumn gv_factory;
private DevExpress.XtraEditors.LabelControl lb_lastupdate_by;
private DevExpress.XtraEditors.TextEdit txt_lastupdateBy;
--
Gitblit v1.9.3