From dd3064d7f5bb6c7d570f21e87b29012bfd95b1d2 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期一, 17 二月 2025 11:29:12 +0800
Subject: [PATCH] 生产退料
---
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs | 104 +++++++++++++++++++++++++++++++++-------------------
1 files changed, 66 insertions(+), 38 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
index 517ff74..0fcf852 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
@@ -29,11 +29,11 @@
/// </summary>
private void InitializeComponent()
{
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
this.gvMx2itemSname = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx2unit = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx2createDate = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -144,6 +144,8 @@
this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
this.pageBar1 = new UserControls.Data.UcPageBar();
@@ -233,7 +235,7 @@
this.gvMx2itemSname.Name = "gvMx2itemSname";
this.gvMx2itemSname.Tag = "query_a.ITEM_SNAME";
this.gvMx2itemSname.Visible = true;
- this.gvMx2itemSname.VisibleIndex = 8;
+ this.gvMx2itemSname.VisibleIndex = 6;
this.gvMx2itemSname.Width = 94;
//
// gvMx2unit
@@ -246,7 +248,7 @@
this.gvMx2unit.Name = "gvMx2unit";
this.gvMx2unit.Tag = "query_a.UNIT";
this.gvMx2unit.Visible = true;
- this.gvMx2unit.VisibleIndex = 6;
+ this.gvMx2unit.VisibleIndex = 4;
this.gvMx2unit.Width = 94;
//
// gvMx2createDate
@@ -259,7 +261,7 @@
this.gvMx2createDate.Name = "gvMx2createDate";
this.gvMx2createDate.Tag = "query_a.CREATE_DATE";
this.gvMx2createDate.Visible = true;
- this.gvMx2createDate.VisibleIndex = 5;
+ this.gvMx2createDate.VisibleIndex = 9;
this.gvMx2createDate.Width = 94;
//
// gvMx2createBy
@@ -272,7 +274,7 @@
this.gvMx2createBy.Name = "gvMx2createBy";
this.gvMx2createBy.Tag = "query_a.CREATE_BY";
this.gvMx2createBy.Visible = true;
- this.gvMx2createBy.VisibleIndex = 4;
+ this.gvMx2createBy.VisibleIndex = 8;
this.gvMx2createBy.Width = 94;
//
// gvMx2quantity
@@ -343,12 +345,12 @@
this.gridColumn19,
this.gvMx2itemBarcode,
this.gvMx2quantity,
- this.gvMx2createBy,
- this.gvMx2createDate,
this.gvMx2unit,
this.gridColumn18,
this.gvMx2itemSname,
this.gridColumn17,
+ this.gvMx2createBy,
+ this.gvMx2createDate,
this.gvBtnAlawys});
this.gvMx2.GridControl = this.gcMx2;
this.gvMx2.Name = "gvMx2";
@@ -359,6 +361,7 @@
// gridColumn20
//
this.gridColumn20.Caption = "鎶ュ伐鏍囪瘑";
+ this.gridColumn20.FieldName = "isBg";
this.gridColumn20.MaxWidth = 50;
this.gridColumn20.MinWidth = 50;
this.gridColumn20.Name = "gridColumn20";
@@ -369,6 +372,7 @@
// gridColumn19
//
this.gridColumn19.Caption = "鍏ュ簱鏍囪瘑";
+ this.gridColumn19.FieldName = "isRk";
this.gridColumn19.MaxWidth = 50;
this.gridColumn19.MinWidth = 50;
this.gridColumn19.Name = "gridColumn19";
@@ -383,7 +387,7 @@
this.gridColumn18.MinWidth = 25;
this.gridColumn18.Name = "gridColumn18";
this.gridColumn18.Visible = true;
- this.gridColumn18.VisibleIndex = 7;
+ this.gridColumn18.VisibleIndex = 5;
this.gridColumn18.Width = 94;
//
// gridColumn17
@@ -393,7 +397,7 @@
this.gridColumn17.MinWidth = 25;
this.gridColumn17.Name = "gridColumn17";
this.gridColumn17.Visible = true;
- this.gridColumn17.VisibleIndex = 9;
+ this.gridColumn17.VisibleIndex = 7;
this.gridColumn17.Width = 94;
//
// gvBtnAlawys
@@ -409,10 +413,10 @@
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -895,7 +899,7 @@
this.txt_daa014.Name = "txt_daa014";
this.txt_daa014.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_daa014.Properties.Appearance.Options.UseFont = true;
- this.txt_daa014.Size = new System.Drawing.Size(167, 28);
+ this.txt_daa014.Size = new System.Drawing.Size(173, 28);
this.txt_daa014.TabIndex = 327;
this.txt_daa014.Tag = "readonly";
//
@@ -999,7 +1003,7 @@
//
this.lb_daa015.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_daa015.Appearance.Options.UseFont = true;
- this.lb_daa015.Location = new System.Drawing.Point(263, 115);
+ this.lb_daa015.Location = new System.Drawing.Point(269, 115);
this.lb_daa015.Name = "lb_daa015";
this.lb_daa015.Size = new System.Drawing.Size(68, 21);
this.lb_daa015.TabIndex = 267;
@@ -1007,7 +1011,7 @@
//
// txt_daa015
//
- this.txt_daa015.Location = new System.Drawing.Point(337, 111);
+ this.txt_daa015.Location = new System.Drawing.Point(343, 111);
this.txt_daa015.Name = "txt_daa015";
this.txt_daa015.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_daa015.Properties.Appearance.Options.UseFont = true;
@@ -1033,7 +1037,7 @@
//
this.lb_daa013.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_daa013.Appearance.Options.UseFont = true;
- this.lb_daa013.Location = new System.Drawing.Point(263, 179);
+ this.lb_daa013.Location = new System.Drawing.Point(269, 179);
this.lb_daa013.Name = "lb_daa013";
this.lb_daa013.Size = new System.Drawing.Size(68, 21);
this.lb_daa013.TabIndex = 258;
@@ -1041,7 +1045,7 @@
//
// txt_dptName
//
- this.txt_dptName.Location = new System.Drawing.Point(337, 175);
+ this.txt_dptName.Location = new System.Drawing.Point(343, 175);
this.txt_dptName.Name = "txt_dptName";
this.txt_dptName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_dptName.Properties.Appearance.Options.UseFont = true;
@@ -1123,7 +1127,7 @@
//
this.lb_daa009.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_daa009.Appearance.Options.UseFont = true;
- this.lb_daa009.Location = new System.Drawing.Point(263, 211);
+ this.lb_daa009.Location = new System.Drawing.Point(269, 211);
this.lb_daa009.Name = "lb_daa009";
this.lb_daa009.Size = new System.Drawing.Size(68, 21);
this.lb_daa009.TabIndex = 240;
@@ -1131,7 +1135,7 @@
//
// txt_daa009
//
- this.txt_daa009.Location = new System.Drawing.Point(337, 207);
+ this.txt_daa009.Location = new System.Drawing.Point(343, 207);
this.txt_daa009.Name = "txt_daa009";
this.txt_daa009.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_daa009.Properties.Appearance.Options.UseFont = true;
@@ -1239,7 +1243,7 @@
this.txt_daa004.Name = "txt_daa004";
this.txt_daa004.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_daa004.Properties.Appearance.Options.UseFont = true;
- this.txt_daa004.Size = new System.Drawing.Size(167, 28);
+ this.txt_daa004.Size = new System.Drawing.Size(173, 28);
this.txt_daa004.TabIndex = 222;
this.txt_daa004.Tag = "readonly";
//
@@ -1273,7 +1277,7 @@
this.txt_daa003.Name = "txt_daa003";
this.txt_daa003.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_daa003.Properties.Appearance.Options.UseFont = true;
- this.txt_daa003.Size = new System.Drawing.Size(167, 28);
+ this.txt_daa003.Size = new System.Drawing.Size(173, 28);
this.txt_daa003.TabIndex = 219;
this.txt_daa003.Tag = "readonly";
//
@@ -1307,7 +1311,7 @@
this.txt_daa029.Name = "txt_daa029";
this.txt_daa029.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_daa029.Properties.Appearance.Options.UseFont = true;
- this.txt_daa029.Size = new System.Drawing.Size(167, 28);
+ this.txt_daa029.Size = new System.Drawing.Size(173, 28);
this.txt_daa029.TabIndex = 217;
this.txt_daa029.Tag = "readonly";
//
@@ -1327,7 +1331,7 @@
this.txt_daa001.Name = "txt_daa001";
this.txt_daa001.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_daa001.Properties.Appearance.Options.UseFont = true;
- this.txt_daa001.Size = new System.Drawing.Size(167, 28);
+ this.txt_daa001.Size = new System.Drawing.Size(173, 28);
this.txt_daa001.TabIndex = 216;
this.txt_daa001.Tag = "readonly";
//
@@ -1411,7 +1415,9 @@
this.gv_daa016,
this.gv_daa017,
this.gv_mesStartProd,
- this.gv_mesEndProd});
+ this.gv_mesEndProd,
+ this.gridColumn21,
+ this.gridColumn22});
this.gridView1.GridControl = this.gcMain;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -1565,6 +1571,26 @@
this.gridColumn2.VisibleIndex = 25;
this.gridColumn2.Width = 94;
//
+ // gridColumn21
+ //
+ this.gridColumn21.Caption = "鎺掍骇浜�";
+ this.gridColumn21.FieldName = "pcUser";
+ this.gridColumn21.MinWidth = 25;
+ this.gridColumn21.Name = "gridColumn21";
+ this.gridColumn21.Visible = true;
+ this.gridColumn21.VisibleIndex = 32;
+ this.gridColumn21.Width = 94;
+ //
+ // gridColumn22
+ //
+ this.gridColumn22.Caption = "鎺掍骇鏃堕棿";
+ this.gridColumn22.FieldName = "pcDate";
+ this.gridColumn22.MinWidth = 25;
+ this.gridColumn22.Name = "gridColumn22";
+ this.gridColumn22.Visible = true;
+ this.gridColumn22.VisibleIndex = 33;
+ this.gridColumn22.Width = 94;
+ //
// xtraTabControl1
//
this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -1688,7 +1714,7 @@
//
this.labelControl9.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.labelControl9.Appearance.Options.UseFont = true;
- this.labelControl9.Location = new System.Drawing.Point(263, 147);
+ this.labelControl9.Location = new System.Drawing.Point(269, 147);
this.labelControl9.Name = "labelControl9";
this.labelControl9.Size = new System.Drawing.Size(68, 21);
this.labelControl9.TabIndex = 473;
@@ -1696,7 +1722,7 @@
//
// txt_daa013
//
- this.txt_daa013.Location = new System.Drawing.Point(337, 143);
+ this.txt_daa013.Location = new System.Drawing.Point(343, 143);
this.txt_daa013.Name = "txt_daa013";
this.txt_daa013.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_daa013.Properties.Appearance.Options.UseFont = true;
@@ -1744,7 +1770,7 @@
//
// textEdit1
//
- this.textEdit1.Location = new System.Drawing.Point(338, 16);
+ this.textEdit1.Location = new System.Drawing.Point(344, 16);
this.textEdit1.Name = "textEdit1";
this.textEdit1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.textEdit1.Properties.Appearance.Options.UseFont = true;
@@ -1756,7 +1782,7 @@
//
this.labelControl7.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.labelControl7.Appearance.Options.UseFont = true;
- this.labelControl7.Location = new System.Drawing.Point(265, 20);
+ this.labelControl7.Location = new System.Drawing.Point(271, 20);
this.labelControl7.Name = "labelControl7";
this.labelControl7.Size = new System.Drawing.Size(68, 21);
this.labelControl7.TabIndex = 466;
@@ -1778,7 +1804,7 @@
this.txt_saleOrderNo.Name = "txt_saleOrderNo";
this.txt_saleOrderNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_saleOrderNo.Properties.Appearance.Options.UseFont = true;
- this.txt_saleOrderNo.Size = new System.Drawing.Size(167, 28);
+ this.txt_saleOrderNo.Size = new System.Drawing.Size(173, 28);
this.txt_saleOrderNo.TabIndex = 465;
this.txt_saleOrderNo.Tag = "readonly";
//
@@ -1793,7 +1819,7 @@
//
// txt_daa022
//
- this.txt_daa022.Location = new System.Drawing.Point(338, 48);
+ this.txt_daa022.Location = new System.Drawing.Point(344, 48);
this.txt_daa022.Name = "txt_daa022";
this.txt_daa022.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_daa022.Properties.Appearance.Options.UseFont = true;
@@ -1805,7 +1831,7 @@
//
this.lb_tbl013.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_tbl013.Appearance.Options.UseFont = true;
- this.lb_tbl013.Location = new System.Drawing.Point(263, 52);
+ this.lb_tbl013.Location = new System.Drawing.Point(269, 52);
this.lb_tbl013.Name = "lb_tbl013";
this.lb_tbl013.Size = new System.Drawing.Size(68, 21);
this.lb_tbl013.TabIndex = 461;
@@ -1813,7 +1839,7 @@
//
// txt_daa028
//
- this.txt_daa028.Location = new System.Drawing.Point(338, 80);
+ this.txt_daa028.Location = new System.Drawing.Point(344, 80);
this.txt_daa028.Name = "txt_daa028";
this.txt_daa028.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_daa028.Properties.Appearance.Options.UseFont = true;
@@ -1825,7 +1851,7 @@
//
this.labelControl5.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.labelControl5.Appearance.Options.UseFont = true;
- this.labelControl5.Location = new System.Drawing.Point(263, 84);
+ this.labelControl5.Location = new System.Drawing.Point(269, 84);
this.labelControl5.Name = "labelControl5";
this.labelControl5.Size = new System.Drawing.Size(68, 21);
this.labelControl5.TabIndex = 340;
@@ -1886,7 +1912,7 @@
this.txt_sjXt.IsReadly = false;
this.txt_sjXt.Location = new System.Drawing.Point(90, 207);
this.txt_sjXt.Name = "txt_sjXt";
- this.txt_sjXt.Size = new System.Drawing.Size(167, 28);
+ this.txt_sjXt.Size = new System.Drawing.Size(173, 28);
this.txt_sjXt.TabIndex = 334;
//
// labelControl1
@@ -2179,5 +2205,7 @@
private DevExpress.XtraEditors.TextEdit txt_daa013;
private DevExpress.XtraGrid.Columns.GridColumn gvBtnAlawys;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn21;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn22;
}
}
\ No newline at end of file
--
Gitblit v1.9.3