1

lu

2025-01-14 3c97c383d25bdab9eab249b4d44b3539f67ba6db

1

 DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.Designer.cs

@@ -52,6 +52,9 @@
            this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
            this.gcMx1 = new DevExpress.XtraGrid.GridControl();
            this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_remark = new DevExpress.XtraEditors.LabelControl();
            this.txt_remark = new DevExpress.XtraEditors.TextEdit();
            this.gv_remark = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -113,9 +116,6 @@
            this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
            this.lbGuid = new System.Windows.Forms.Label();
            this.picCheckBox = new System.Windows.Forms.PictureBox();
            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.tabMxPage1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
@@ -152,12 +152,13 @@
            this.gvMx1dab002.AppearanceCell.Options.UseFont = true;
            this.gvMx1dab002.Caption = "序号 ";
            this.gvMx1dab002.FieldName = "dab002";
            this.gvMx1dab002.MaxWidth = 50;
            this.gvMx1dab002.MinWidth = 50;
            this.gvMx1dab002.Name = "gvMx1dab002";
            this.gvMx1dab002.Tag = "query_a.dab002";
            this.gvMx1dab002.Visible = true;
            this.gvMx1dab002.VisibleIndex = 15;
            this.gvMx1dab002.Width = 94;
            this.gvMx1dab002.Width = 50;
            // 
            // gvMx1dab012
            // 
@@ -165,12 +166,13 @@
            this.gvMx1dab012.AppearanceCell.Options.UseFont = true;
            this.gvMx1dab012.Caption = "组成用量 ";
            this.gvMx1dab012.FieldName = "dab012";
            this.gvMx1dab012.MaxWidth = 50;
            this.gvMx1dab012.MinWidth = 50;
            this.gvMx1dab012.Name = "gvMx1dab012";
            this.gvMx1dab012.Tag = "query_a.dab012";
            this.gvMx1dab012.Visible = true;
            this.gvMx1dab012.VisibleIndex = 14;
            this.gvMx1dab012.Width = 94;
            this.gvMx1dab012.Width = 50;
            // 
            // gvMx1dab001
            // 
@@ -252,12 +254,13 @@
            this.gvMx1dab023.AppearanceCell.Options.UseFont = true;
            this.gvMx1dab023.Caption = "超领数量 ";
            this.gvMx1dab023.FieldName = "dab023";
            this.gvMx1dab023.MaxWidth = 50;
            this.gvMx1dab023.MinWidth = 50;
            this.gvMx1dab023.Name = "gvMx1dab023";
            this.gvMx1dab023.Tag = "query_a.dab023";
            this.gvMx1dab023.Visible = true;
            this.gvMx1dab023.VisibleIndex = 9;
            this.gvMx1dab023.Width = 94;
            this.gvMx1dab023.Width = 50;
            // 
            // gvMx1dab022
            // 
@@ -265,12 +268,13 @@
            this.gvMx1dab022.AppearanceCell.Options.UseFont = true;
            this.gvMx1dab022.Caption = "退料数量 ";
            this.gvMx1dab022.FieldName = "dab022";
            this.gvMx1dab022.MaxWidth = 50;
            this.gvMx1dab022.MinWidth = 50;
            this.gvMx1dab022.Name = "gvMx1dab022";
            this.gvMx1dab022.Tag = "query_a.dab022";
            this.gvMx1dab022.Visible = true;
            this.gvMx1dab022.VisibleIndex = 8;
            this.gvMx1dab022.Width = 94;
            this.gvMx1dab022.Width = 50;
            // 
            // gvMx1dab021
            // 
@@ -278,12 +282,13 @@
            this.gvMx1dab021.AppearanceCell.Options.UseFont = true;
            this.gvMx1dab021.Caption = "补领数量 ";
            this.gvMx1dab021.FieldName = "dab021";
            this.gvMx1dab021.MaxWidth = 50;
            this.gvMx1dab021.MinWidth = 50;
            this.gvMx1dab021.Name = "gvMx1dab021";
            this.gvMx1dab021.Tag = "query_a.dab021";
            this.gvMx1dab021.Visible = true;
            this.gvMx1dab021.VisibleIndex = 7;
            this.gvMx1dab021.Width = 94;
            this.gvMx1dab021.Width = 50;
            // 
            // gvMx1dab020
            // 
@@ -291,12 +296,13 @@
            this.gvMx1dab020.AppearanceCell.Options.UseFont = true;
            this.gvMx1dab020.Caption = "实领用量 ";
            this.gvMx1dab020.FieldName = "dab020";
            this.gvMx1dab020.MaxWidth = 50;
            this.gvMx1dab020.MinWidth = 50;
            this.gvMx1dab020.Name = "gvMx1dab020";
            this.gvMx1dab020.Tag = "query_a.dab020";
            this.gvMx1dab020.Visible = true;
            this.gvMx1dab020.VisibleIndex = 6;
            this.gvMx1dab020.Width = 94;
            this.gvMx1dab020.Width = 50;
            // 
            // gvMx1dab009
            // 
@@ -304,12 +310,13 @@
            this.gvMx1dab009.AppearanceCell.Options.UseFont = true;
            this.gvMx1dab009.Caption = "单位 ";
            this.gvMx1dab009.FieldName = "dwName";
            this.gvMx1dab009.MaxWidth = 50;
            this.gvMx1dab009.MinWidth = 50;
            this.gvMx1dab009.Name = "gvMx1dab009";
            this.gvMx1dab009.Tag = "query_a.dab009";
            this.gvMx1dab009.Visible = true;
            this.gvMx1dab009.VisibleIndex = 5;
            this.gvMx1dab009.Width = 94;
            this.gvMx1dab009.Width = 50;
            // 
            // gvMx1dab007
            // 
@@ -317,12 +324,13 @@
            this.gvMx1dab007.AppearanceCell.Options.UseFont = true;
            this.gvMx1dab007.Caption = "已领 ";
            this.gvMx1dab007.FieldName = "dab007";
            this.gvMx1dab007.MaxWidth = 50;
            this.gvMx1dab007.MinWidth = 50;
            this.gvMx1dab007.Name = "gvMx1dab007";
            this.gvMx1dab007.Tag = "query_a.dab007";
            this.gvMx1dab007.Visible = true;
            this.gvMx1dab007.VisibleIndex = 4;
            this.gvMx1dab007.Width = 94;
            this.gvMx1dab007.Width = 50;
            // 
            // gvMx1dab006
            // 
@@ -330,12 +338,13 @@
            this.gvMx1dab006.AppearanceCell.Options.UseFont = true;
            this.gvMx1dab006.Caption = "需领 ";
            this.gvMx1dab006.FieldName = "dab006";
            this.gvMx1dab006.MaxWidth = 50;
            this.gvMx1dab006.MinWidth = 50;
            this.gvMx1dab006.Name = "gvMx1dab006";
            this.gvMx1dab006.Tag = "query_a.dab006";
            this.gvMx1dab006.Visible = true;
            this.gvMx1dab006.VisibleIndex = 3;
            this.gvMx1dab006.Width = 94;
            this.gvMx1dab006.Width = 50;
            // 
            // gvMx1eid
            // 
@@ -401,6 +410,9 @@
            // 
            // gvMx1
            // 
            this.gvMx1.Appearance.HeaderPanel.Options.UseTextOptions = true;
            this.gvMx1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
            this.gvMx1.ColumnPanelRowHeight = 50;
            this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gvMx1id,
            this.gvMx1pid,
@@ -430,6 +442,36 @@
            this.gvMx1.OptionsFind.ShowSearchNavButtons = false;
            this.gvMx1.OptionsView.NewItemRowPosition = DevExpress.XtraGrid.Views.Grid.NewItemRowPosition.Bottom;
            this.gvMx1.OptionsView.ShowGroupPanel = false;
            // 
            // gridColumn6
            // 
            this.gridColumn6.Caption = "物料编号";
            this.gridColumn6.FieldName = "itemNo";
            this.gridColumn6.MinWidth = 25;
            this.gridColumn6.Name = "gridColumn6";
            this.gridColumn6.Visible = true;
            this.gridColumn6.VisibleIndex = 0;
            this.gridColumn6.Width = 94;
            // 
            // gridColumn5
            // 
            this.gridColumn5.Caption = "物料名称";
            this.gridColumn5.FieldName = "itemName";
            this.gridColumn5.MinWidth = 25;
            this.gridColumn5.Name = "gridColumn5";
            this.gridColumn5.Visible = true;
            this.gridColumn5.VisibleIndex = 1;
            this.gridColumn5.Width = 94;
            // 
            // gridColumn4
            // 
            this.gridColumn4.Caption = "物料规格";
            this.gridColumn4.FieldName = "itemModel";
            this.gridColumn4.MinWidth = 25;
            this.gridColumn4.Name = "gridColumn4";
            this.gridColumn4.Visible = true;
            this.gridColumn4.VisibleIndex = 2;
            this.gridColumn4.Width = 94;
            // 
            // lb_remark
            // 
@@ -471,7 +513,7 @@
            this.gv_pcTime.AppearanceCell.Options.UseFont = true;
            this.gv_pcTime.Caption = "排产时间 ";
            this.gv_pcTime.FieldName = "pcTime";
            this.gv_pcTime.MinWidth = 180;
            this.gv_pcTime.MinWidth = 50;
            this.gv_pcTime.Name = "gv_pcTime";
            this.gv_pcTime.OptionsColumn.AllowEdit = false;
            this.gv_pcTime.Tag = "query_a.pc_time";
@@ -554,7 +596,7 @@
            this.gv_wgTime.AppearanceCell.Options.UseFont = true;
            this.gv_wgTime.Caption = "完工时间 ";
            this.gv_wgTime.FieldName = "wgTime";
            this.gv_wgTime.MinWidth = 180;
            this.gv_wgTime.MinWidth = 50;
            this.gv_wgTime.Name = "gv_wgTime";
            this.gv_wgTime.OptionsColumn.AllowEdit = false;
            this.gv_wgTime.Tag = "query_a.wg_time";
@@ -656,7 +698,7 @@
            this.gv_blTime.AppearanceCell.Options.UseFont = true;
            this.gv_blTime.Caption = "备料时间 ";
            this.gv_blTime.FieldName = "blTime";
            this.gv_blTime.MinWidth = 180;
            this.gv_blTime.MinWidth = 50;
            this.gv_blTime.Name = "gv_blTime";
            this.gv_blTime.OptionsColumn.AllowEdit = false;
            this.gv_blTime.Tag = "query_a.bl_time";
@@ -724,7 +766,7 @@
            this.gv_mesEndProd.AppearanceCell.Options.UseFont = true;
            this.gv_mesEndProd.Caption = "预计完工时间 ";
            this.gv_mesEndProd.FieldName = "mesEndProd";
            this.gv_mesEndProd.MinWidth = 180;
            this.gv_mesEndProd.MinWidth = 50;
            this.gv_mesEndProd.Name = "gv_mesEndProd";
            this.gv_mesEndProd.OptionsColumn.AllowEdit = false;
            this.gv_mesEndProd.Tag = "query_a.mes_end_prod";
@@ -758,7 +800,7 @@
            this.gv_mesStartProd.AppearanceCell.Options.UseFont = true;
            this.gv_mesStartProd.Caption = "预计开工时间 ";
            this.gv_mesStartProd.FieldName = "mesStartProd";
            this.gv_mesStartProd.MinWidth = 180;
            this.gv_mesStartProd.MinWidth = 50;
            this.gv_mesStartProd.Name = "gv_mesStartProd";
            this.gv_mesStartProd.OptionsColumn.AllowEdit = false;
            this.gv_mesStartProd.Tag = "query_a.mes_start_prod";
@@ -792,13 +834,14 @@
            this.gv_daa011.AppearanceCell.Options.UseFont = true;
            this.gv_daa011.Caption = "生产数 ";
            this.gv_daa011.FieldName = "daa011";
            this.gv_daa011.MaxWidth = 50;
            this.gv_daa011.MinWidth = 50;
            this.gv_daa011.Name = "gv_daa011";
            this.gv_daa011.OptionsColumn.AllowEdit = false;
            this.gv_daa011.Tag = "query_a.daa011";
            this.gv_daa011.Visible = true;
            this.gv_daa011.VisibleIndex = 8;
            this.gv_daa011.Width = 94;
            this.gv_daa011.Width = 50;
            // 
            // lb_daa014
            // 
@@ -826,7 +869,7 @@
            this.gv_daa014.AppearanceCell.Options.UseFont = true;
            this.gv_daa014.Caption = "委外订单号 ";
            this.gv_daa014.FieldName = "daa014";
            this.gv_daa014.MinWidth = 100;
            this.gv_daa014.MinWidth = 50;
            this.gv_daa014.Name = "gv_daa014";
            this.gv_daa014.OptionsColumn.AllowEdit = false;
            this.gv_daa014.Tag = "query_a.daa014";
@@ -860,13 +903,14 @@
            this.gv_unit.AppearanceCell.Options.UseFont = true;
            this.gv_unit.Caption = "单位";
            this.gv_unit.FieldName = "dwName";
            this.gv_unit.MaxWidth = 50;
            this.gv_unit.MinWidth = 50;
            this.gv_unit.Name = "gv_unit";
            this.gv_unit.OptionsColumn.AllowEdit = false;
            this.gv_unit.Tag = "query_a.unit";
            this.gv_unit.Visible = true;
            this.gv_unit.VisibleIndex = 6;
            this.gv_unit.Width = 94;
            this.gv_unit.Width = 50;
            // 
            // lb_daa008
            // 
@@ -894,13 +938,14 @@
            this.gv_daa008.AppearanceCell.Options.UseFont = true;
            this.gv_daa008.Caption = "工单数量 ";
            this.gv_daa008.FieldName = "daa008";
            this.gv_daa008.MaxWidth = 50;
            this.gv_daa008.MinWidth = 50;
            this.gv_daa008.Name = "gv_daa008";
            this.gv_daa008.OptionsColumn.AllowEdit = false;
            this.gv_daa008.Tag = "query_a.daa008";
            this.gv_daa008.Visible = true;
            this.gv_daa008.VisibleIndex = 5;
            this.gv_daa008.Width = 94;
            this.gv_daa008.Width = 50;
            // 
            // lb_daa003
            // 
@@ -948,7 +993,7 @@
            this.gv_daa001.AppearanceCell.Options.UseFont = true;
            this.gv_daa001.Caption = "工单号 ";
            this.gv_daa001.FieldName = "daa001";
            this.gv_daa001.MinWidth = 100;
            this.gv_daa001.MinWidth = 50;
            this.gv_daa001.Name = "gv_daa001";
            this.gv_daa001.OptionsColumn.AllowEdit = false;
            this.gv_daa001.Tag = "query_a.daa001";
@@ -1021,7 +1066,7 @@
            // 
            this.gridColumn3.Caption = "物料编码";
            this.gridColumn3.FieldName = "wlbm";
            this.gridColumn3.MinWidth = 80;
            this.gridColumn3.MinWidth = 50;
            this.gridColumn3.Name = "gridColumn3";
            this.gridColumn3.Visible = true;
            this.gridColumn3.VisibleIndex = 2;
@@ -1031,7 +1076,7 @@
            // 
            this.gridColumn2.Caption = "物料名称";
            this.gridColumn2.FieldName = "wlmc";
            this.gridColumn2.MinWidth = 150;
            this.gridColumn2.MinWidth = 50;
            this.gridColumn2.Name = "gridColumn2";
            this.gridColumn2.Visible = true;
            this.gridColumn2.VisibleIndex = 3;
@@ -1041,7 +1086,7 @@
            // 
            this.gridColumn1.Caption = "物料规格";
            this.gridColumn1.FieldName = "wlgg";
            this.gridColumn1.MinWidth = 150;
            this.gridColumn1.MinWidth = 50;
            this.gridColumn1.Name = "gridColumn1";
            this.gridColumn1.Visible = true;
            this.gridColumn1.VisibleIndex = 4;
@@ -1169,36 +1214,6 @@
            this.picCheckBox.TabIndex = 9;
            this.picCheckBox.TabStop = false;
            this.picCheckBox.Visible = false;
            // 
            // gridColumn4
            // 
            this.gridColumn4.Caption = "物料规格";
            this.gridColumn4.FieldName = "itemModel";
            this.gridColumn4.MinWidth = 25;
            this.gridColumn4.Name = "gridColumn4";
            this.gridColumn4.Visible = true;
            this.gridColumn4.VisibleIndex = 2;
            this.gridColumn4.Width = 94;
            // 
            // gridColumn5
            // 
            this.gridColumn5.Caption = "物料名称";
            this.gridColumn5.FieldName = "itemName";
            this.gridColumn5.MinWidth = 25;
            this.gridColumn5.Name = "gridColumn5";
            this.gridColumn5.Visible = true;
            this.gridColumn5.VisibleIndex = 1;
            this.gridColumn5.Width = 94;
            // 
            // gridColumn6
            // 
            this.gridColumn6.Caption = "物料编号";
            this.gridColumn6.FieldName = "itemNo";
            this.gridColumn6.MinWidth = 25;
            this.gridColumn6.Name = "gridColumn6";
            this.gridColumn6.Visible = true;
            this.gridColumn6.VisibleIndex = 0;
            this.gridColumn6.Width = 94;
            // 
            // Frm_WwGd
            // 

 DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.cs

@@ -219,6 +219,7 @@
                    {
                        gcMain.DataSource = dt;
                        gcMain.ForceInitialize();
                        gridView1.BestFitColumns();
                    }
                    else
                        UtilityHelper.SetDefaultTable(gcMain, gridView1);
@@ -278,6 +279,7 @@
                        gcMx1.BindingContext = new BindingContext();
                        gcMx1.DataSource = dt;
                        gcMx1.ForceInitialize();
                        gvMx1.BestFitColumns();
                    }
                    else
                    {

 DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs

@@ -28,8 +28,6 @@
            this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
            toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
            toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
            //toolBarMenu1.btnReportClick += ToolBarMenu1_btnReportClick;
            //toolBarMenu1.btnDesignClick += ToolBarMenu1_btnDesignClick;
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "tbl013", "", (value) =>
            {
@@ -447,6 +445,7 @@
                    {
                        gcMain.DataSource = dt;
                        gcMain.ForceInitialize();
                        gridView1.BestFitColumns();
                    }
                    else
                        UtilityHelper.SetDefaultTable(gcMain, gridView1);
@@ -504,6 +503,7 @@
                        gcMx1.BindingContext = new BindingContext();
                        gcMx1.DataSource = dt;
                        gcMx1.ForceInitialize();
                        gvMx1.BestFitColumns();
                    }
                    else
                    {
@@ -520,6 +520,7 @@
                        gcMx2.BindingContext = new BindingContext();
                        gcMx2.DataSource = dt2;
                        gcMx2.ForceInitialize();
                        gvMx2.BestFitColumns();
                    }
                    else
                    {