From 342b5740dded9d8bdb4a6bc5917d79b724b59aec Mon Sep 17 00:00:00 2001
From: cnf <3283105747@qq.com>
Date: 星期五, 12 十二月 2025 17:05:53 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~cnf/JH/JH_MesCilent
---
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.Designer.cs | 144 +++++++++++++++++++++++++++++++++---------------
1 files changed, 99 insertions(+), 45 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.Designer.cs
index d1cc259..aec7bcf 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.Designer.cs
@@ -125,10 +125,13 @@
this.gridColumn51 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn52 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn53 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn57 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn58 = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
+ this.txt_productCode = new DevExpress.XtraEditors.TextEdit();
this.btnCopyXls = new DevExpress.XtraEditors.SimpleButton();
this.txt_djtype = new DevExpress.XtraEditors.ComboBoxEdit();
this.lbGuid = new System.Windows.Forms.Label();
@@ -186,6 +189,7 @@
this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem30 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem31 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -237,13 +241,13 @@
this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn54 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn55 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn56 = new DevExpress.XtraGrid.Columns.GridColumn();
this.btnTest1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
this.btnSelect1 = new DevExpress.XtraEditors.SimpleButton();
this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
- this.gridColumn56 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -263,6 +267,7 @@
this.splitMx1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
this.layoutMx1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_productCode.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_djtype.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fRemarks.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fOwnerTypeInIdHead.Properties)).BeginInit();
@@ -315,6 +320,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -450,7 +456,9 @@
this.gv_id,
this.gridColumn51,
this.gridColumn52,
- this.gridColumn53});
+ this.gridColumn53,
+ this.gridColumn57,
+ this.gridColumn58});
this.gridView1.DetailHeight = 427;
this.gridView1.GridControl = this.gcMain1;
this.gridView1.IndicatorWidth = 61;
@@ -495,7 +503,7 @@
this.gv_billno.OptionsColumn.AllowEdit = false;
this.gv_billno.Tag = "query_a.billno";
this.gv_billno.Visible = true;
- this.gv_billno.VisibleIndex = 3;
+ this.gv_billno.VisibleIndex = 2;
this.gv_billno.Width = 124;
//
// gridColumn25
@@ -505,7 +513,7 @@
this.gridColumn25.MinWidth = 31;
this.gridColumn25.Name = "gridColumn25";
this.gridColumn25.Visible = true;
- this.gridColumn25.VisibleIndex = 4;
+ this.gridColumn25.VisibleIndex = 3;
this.gridColumn25.Width = 117;
//
// gridColumn26
@@ -515,7 +523,7 @@
this.gridColumn26.MinWidth = 31;
this.gridColumn26.Name = "gridColumn26";
this.gridColumn26.Visible = true;
- this.gridColumn26.VisibleIndex = 5;
+ this.gridColumn26.VisibleIndex = 4;
this.gridColumn26.Width = 117;
//
// gridColumn27
@@ -525,7 +533,7 @@
this.gridColumn27.MinWidth = 31;
this.gridColumn27.Name = "gridColumn27";
this.gridColumn27.Visible = true;
- this.gridColumn27.VisibleIndex = 6;
+ this.gridColumn27.VisibleIndex = 5;
this.gridColumn27.Width = 117;
//
// gridColumn28
@@ -535,7 +543,7 @@
this.gridColumn28.MinWidth = 31;
this.gridColumn28.Name = "gridColumn28";
this.gridColumn28.Visible = true;
- this.gridColumn28.VisibleIndex = 7;
+ this.gridColumn28.VisibleIndex = 6;
this.gridColumn28.Width = 117;
//
// gridColumn29
@@ -545,7 +553,7 @@
this.gridColumn29.MinWidth = 31;
this.gridColumn29.Name = "gridColumn29";
this.gridColumn29.Visible = true;
- this.gridColumn29.VisibleIndex = 8;
+ this.gridColumn29.VisibleIndex = 7;
this.gridColumn29.Width = 117;
//
// gridColumn30
@@ -555,7 +563,7 @@
this.gridColumn30.MinWidth = 31;
this.gridColumn30.Name = "gridColumn30";
this.gridColumn30.Visible = true;
- this.gridColumn30.VisibleIndex = 9;
+ this.gridColumn30.VisibleIndex = 8;
this.gridColumn30.Width = 117;
//
// gridColumn31
@@ -565,7 +573,7 @@
this.gridColumn31.MinWidth = 31;
this.gridColumn31.Name = "gridColumn31";
this.gridColumn31.Visible = true;
- this.gridColumn31.VisibleIndex = 10;
+ this.gridColumn31.VisibleIndex = 9;
this.gridColumn31.Width = 117;
//
// gridColumn32
@@ -575,7 +583,7 @@
this.gridColumn32.MinWidth = 31;
this.gridColumn32.Name = "gridColumn32";
this.gridColumn32.Visible = true;
- this.gridColumn32.VisibleIndex = 11;
+ this.gridColumn32.VisibleIndex = 10;
this.gridColumn32.Width = 117;
//
// gridColumn33
@@ -593,7 +601,7 @@
this.gridColumn34.MinWidth = 31;
this.gridColumn34.Name = "gridColumn34";
this.gridColumn34.Visible = true;
- this.gridColumn34.VisibleIndex = 12;
+ this.gridColumn34.VisibleIndex = 11;
this.gridColumn34.Width = 117;
//
// gridColumn35
@@ -621,7 +629,7 @@
this.gridColumn37.MinWidth = 31;
this.gridColumn37.Name = "gridColumn37";
this.gridColumn37.Visible = true;
- this.gridColumn37.VisibleIndex = 14;
+ this.gridColumn37.VisibleIndex = 15;
this.gridColumn37.Width = 117;
//
// gridColumn38
@@ -631,7 +639,7 @@
this.gridColumn38.MinWidth = 31;
this.gridColumn38.Name = "gridColumn38";
this.gridColumn38.Visible = true;
- this.gridColumn38.VisibleIndex = 15;
+ this.gridColumn38.VisibleIndex = 16;
this.gridColumn38.Width = 117;
//
// gridColumn39
@@ -641,7 +649,7 @@
this.gridColumn39.MinWidth = 31;
this.gridColumn39.Name = "gridColumn39";
this.gridColumn39.Visible = true;
- this.gridColumn39.VisibleIndex = 18;
+ this.gridColumn39.VisibleIndex = 17;
this.gridColumn39.Width = 117;
//
// gridColumn40
@@ -691,7 +699,7 @@
this.gridColumn45.MinWidth = 31;
this.gridColumn45.Name = "gridColumn45";
this.gridColumn45.Visible = true;
- this.gridColumn45.VisibleIndex = 19;
+ this.gridColumn45.VisibleIndex = 18;
this.gridColumn45.Width = 117;
//
// gridColumn46
@@ -701,7 +709,7 @@
this.gridColumn46.MinWidth = 31;
this.gridColumn46.Name = "gridColumn46";
this.gridColumn46.Visible = true;
- this.gridColumn46.VisibleIndex = 20;
+ this.gridColumn46.VisibleIndex = 12;
this.gridColumn46.Width = 117;
//
// gridColumn47
@@ -711,7 +719,7 @@
this.gridColumn47.MinWidth = 31;
this.gridColumn47.Name = "gridColumn47";
this.gridColumn47.Visible = true;
- this.gridColumn47.VisibleIndex = 21;
+ this.gridColumn47.VisibleIndex = 19;
this.gridColumn47.Width = 117;
//
// gridColumn48
@@ -721,7 +729,7 @@
this.gridColumn48.MinWidth = 31;
this.gridColumn48.Name = "gridColumn48";
this.gridColumn48.Visible = true;
- this.gridColumn48.VisibleIndex = 22;
+ this.gridColumn48.VisibleIndex = 14;
this.gridColumn48.Width = 117;
//
// gridColumn49
@@ -731,7 +739,7 @@
this.gridColumn49.MinWidth = 31;
this.gridColumn49.Name = "gridColumn49";
this.gridColumn49.Visible = true;
- this.gridColumn49.VisibleIndex = 23;
+ this.gridColumn49.VisibleIndex = 20;
this.gridColumn49.Width = 117;
//
// gridColumn50
@@ -741,7 +749,7 @@
this.gridColumn50.MinWidth = 31;
this.gridColumn50.Name = "gridColumn50";
this.gridColumn50.Visible = true;
- this.gridColumn50.VisibleIndex = 24;
+ this.gridColumn50.VisibleIndex = 21;
this.gridColumn50.Width = 117;
//
// gv_id
@@ -758,8 +766,6 @@
this.gridColumn51.FieldName = "qt026Chk";
this.gridColumn51.MinWidth = 31;
this.gridColumn51.Name = "gridColumn51";
- this.gridColumn51.Visible = true;
- this.gridColumn51.VisibleIndex = 2;
this.gridColumn51.Width = 117;
//
// gridColumn52
@@ -768,8 +774,6 @@
this.gridColumn52.FieldName = "qt028";
this.gridColumn52.MinWidth = 31;
this.gridColumn52.Name = "gridColumn52";
- this.gridColumn52.Visible = true;
- this.gridColumn52.VisibleIndex = 16;
this.gridColumn52.Width = 117;
//
// gridColumn53
@@ -778,9 +782,27 @@
this.gridColumn53.FieldName = "qt027";
this.gridColumn53.MinWidth = 31;
this.gridColumn53.Name = "gridColumn53";
- this.gridColumn53.Visible = true;
- this.gridColumn53.VisibleIndex = 17;
this.gridColumn53.Width = 117;
+ //
+ // gridColumn57
+ //
+ this.gridColumn57.Caption = "宸ュ崟鍗曞彿";
+ this.gridColumn57.FieldName = "workOrderNumber";
+ this.gridColumn57.MinWidth = 30;
+ this.gridColumn57.Name = "gridColumn57";
+ this.gridColumn57.Visible = true;
+ this.gridColumn57.VisibleIndex = 22;
+ this.gridColumn57.Width = 112;
+ //
+ // gridColumn58
+ //
+ this.gridColumn58.Caption = "浜у搧缂栫爜";
+ this.gridColumn58.FieldName = "productCode";
+ this.gridColumn58.MinWidth = 30;
+ this.gridColumn58.Name = "gridColumn58";
+ this.gridColumn58.Visible = true;
+ this.gridColumn58.VisibleIndex = 23;
+ this.gridColumn58.Width = 112;
//
// pageBar1
//
@@ -826,6 +848,7 @@
//
// layoutMx1
//
+ this.layoutMx1.Controls.Add(this.txt_productCode);
this.layoutMx1.Controls.Add(this.btnCopyXls);
this.layoutMx1.Controls.Add(this.txt_djtype);
this.layoutMx1.Controls.Add(this.lbGuid);
@@ -870,6 +893,15 @@
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
+ // txt_productCode
+ //
+ this.txt_productCode.Location = new System.Drawing.Point(1209, 252);
+ this.txt_productCode.Name = "txt_productCode";
+ this.txt_productCode.Size = new System.Drawing.Size(237, 28);
+ this.txt_productCode.StyleController = this.layoutMx1;
+ this.txt_productCode.TabIndex = 446;
+ this.txt_productCode.Tag = "readonly";
+ //
// btnCopyXls
//
this.btnCopyXls.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnCopyXls.ImageOptions.Image")));
@@ -891,7 +923,8 @@
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
this.txt_djtype.Properties.Items.AddRange(new object[] {
"鏍囧噯鐩存帴璋冩嫧鍗�(ZJDB01_SYS)",
- "濮斿鐩存帴璋冩嫧鍗�(WWDB01_SYS)"});
+ "濮斿鐩存帴璋冩嫧鍗�(WWDB01_SYS)",
+ "鐢熶骇鐩存帴璋冩嫧鍗�(SCDB01_SYS)"});
this.txt_djtype.Properties.ReadOnly = true;
this.txt_djtype.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
this.txt_djtype.Size = new System.Drawing.Size(235, 28);
@@ -973,7 +1006,8 @@
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
this.txt_fBusinessType.Properties.Items.AddRange(new object[] {
"鏍囧噯(NORMAL)",
- "濮斿(WW)"});
+ "濮斿(WW)",
+ "鐢熶骇(SC)"});
this.txt_fBusinessType.Properties.ReadOnly = true;
this.txt_fBusinessType.Properties.Tag = "readonly";
this.txt_fBusinessType.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
@@ -1055,7 +1089,8 @@
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
this.txt_fBillTypeID.Properties.Items.AddRange(new object[] {
"鏍囧噯璋冩嫧鐢宠鍗�(DBSQD01_SYS)",
- "濮斿璋冩嫧鐢宠鍗�(DBSQD02_WW)"});
+ "濮斿璋冩嫧鐢宠鍗�(DBSQD02_WW)",
+ "鐢熶骇璋冩嫧鐢宠鍗�(DBSQD03_SC)"});
this.txt_fBillTypeID.Properties.SuppressMouseEventOnOuterMouseClick = true;
this.txt_fBillTypeID.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
this.txt_fBillTypeID.Properties.EditValueChanged += new System.EventHandler(this.txt_fBillTypeID_EditValueChanged);
@@ -1301,7 +1336,8 @@
this.layoutControlItem11,
this.layoutControlItem27,
this.layoutControlItem30,
- this.layoutControlItem1});
+ this.layoutControlItem1,
+ this.layoutControlItem31});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -1597,6 +1633,17 @@
this.layoutControlItem1.Text = "鐢宠鍗曞彿";
this.layoutControlItem1.TextSize = new System.Drawing.Size(108, 22);
//
+ // layoutControlItem31
+ //
+ this.layoutControlItem31.Control = this.txt_productCode;
+ this.layoutControlItem31.Location = new System.Drawing.Point(1077, 240);
+ this.layoutControlItem31.Name = "layoutControlItem31";
+ this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem31.OptionsTableLayoutItem.RowIndex = 5;
+ this.layoutControlItem31.Size = new System.Drawing.Size(361, 50);
+ this.layoutControlItem31.Text = "浜у搧缂栫爜";
+ this.layoutControlItem31.TextSize = new System.Drawing.Size(108, 22);
+ //
// tabMx
//
this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -1676,6 +1723,7 @@
this.gridColumn54,
this.gridColumn55,
this.gridColumn56});
+ this.gvMx1.CustomizationFormBounds = new System.Drawing.Rectangle(1141, 492, 389, 299);
this.gvMx1.DetailHeight = 427;
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
@@ -2092,7 +2140,7 @@
this.gvMxDel.MinWidth = 31;
this.gvMxDel.Name = "gvMxDel";
this.gvMxDel.Visible = true;
- this.gvMxDel.VisibleIndex = 16;
+ this.gvMxDel.VisibleIndex = 14;
this.gvMxDel.Width = 117;
//
// repositoryItemButtonEdit1
@@ -2186,8 +2234,8 @@
this.gridColumn54.MinWidth = 30;
this.gridColumn54.Name = "gridColumn54";
this.gridColumn54.Visible = true;
- this.gridColumn54.VisibleIndex = 14;
- this.gridColumn54.Width = 112;
+ this.gridColumn54.VisibleIndex = 15;
+ this.gridColumn54.Width = 111;
//
// gridColumn55
//
@@ -2195,7 +2243,17 @@
this.gridColumn55.FieldName = "dabErpId";
this.gridColumn55.MinWidth = 30;
this.gridColumn55.Name = "gridColumn55";
- this.gridColumn55.Width = 112;
+ this.gridColumn55.Width = 111;
+ //
+ // gridColumn56
+ //
+ this.gridColumn56.Caption = "鐗╂枡瀵瑰簲浠撶";
+ this.gridColumn56.FieldName = "depotMan";
+ this.gridColumn56.MinWidth = 30;
+ this.gridColumn56.Name = "gridColumn56";
+ this.gridColumn56.Visible = true;
+ this.gridColumn56.VisibleIndex = 16;
+ this.gridColumn56.Width = 111;
//
// btnTest1
//
@@ -2250,16 +2308,6 @@
this.layoutControlItem28.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem28.TextVisible = false;
//
- // gridColumn56
- //
- this.gridColumn56.Caption = "鐗╂枡瀵瑰簲浠撶";
- this.gridColumn56.FieldName = "depotMan";
- this.gridColumn56.MinWidth = 30;
- this.gridColumn56.Name = "gridColumn56";
- this.gridColumn56.Visible = true;
- this.gridColumn56.VisibleIndex = 15;
- this.gridColumn56.Width = 112;
- //
// Frm_MesDbck
//
this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);
@@ -2290,6 +2338,7 @@
this.splitMx1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
this.layoutMx1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.txt_productCode.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_djtype.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fRemarks.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fOwnerTypeInIdHead.Properties)).EndInit();
@@ -2342,6 +2391,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -2524,5 +2574,9 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn54;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn55;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn56;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn57;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn58;
+ private DevExpress.XtraEditors.TextEdit txt_productCode;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem31;
}
}
\ No newline at end of file
--
Gitblit v1.9.3