Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient

lu

9 天以前 2caa1d97437e4089a7d6547c2efb87c7990b3b16

 DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs

@@ -105,6 +105,7 @@
            this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn25 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn52 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.pageBar1 = new UserControls.Data.UcPageBar();
            this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
            this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -214,19 +215,17 @@
            this.gvMx1daa002 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1daa010 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1daa004 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn63 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn64 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn65 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.xtraTabPage8 = new DevExpress.XtraTab.XtraTabPage();
            this.gcMx8 = new DevExpress.XtraGrid.GridControl();
            this.gvMx8 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gridColumn53 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx2status = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx2pbillNo = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx2itemNo = 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.gvMx2tlQty = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn57 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn58 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn59 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn60 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn61 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -601,7 +600,8 @@
            this.gridColumn22,
            this.gridColumn23,
            this.gridColumn24,
            this.gridColumn25});
            this.gridColumn25,
            this.gridColumn52});
            this.gridView1.GridControl = this.gcMain1;
            this.gridView1.IndicatorWidth = 50;
            this.gridView1.Name = "gridView1";
@@ -676,7 +676,7 @@
            this.gridColumn27.MinWidth = 25;
            this.gridColumn27.Name = "gridColumn27";
            this.gridColumn27.Visible = true;
            this.gridColumn27.VisibleIndex = 18;
            this.gridColumn27.VisibleIndex = 19;
            this.gridColumn27.Width = 94;
            // 
            // gv_daa018
@@ -700,7 +700,7 @@
            this.gridColoun100.Name = "gridColoun100";
            this.gridColoun100.Tag = "org.fnamber";
            this.gridColoun100.Visible = true;
            this.gridColoun100.VisibleIndex = 28;
            this.gridColoun100.VisibleIndex = 29;
            this.gridColoun100.Width = 250;
            // 
            // gv_daa001
@@ -736,7 +736,7 @@
            this.gridColumn3.MinWidth = 50;
            this.gridColumn3.Name = "gridColumn3";
            this.gridColumn3.Visible = true;
            this.gridColumn3.VisibleIndex = 9;
            this.gridColumn3.VisibleIndex = 10;
            this.gridColumn3.Width = 94;
            // 
            // gv_daa003
@@ -749,7 +749,7 @@
            this.gv_daa003.OptionsColumn.AllowEdit = false;
            this.gv_daa003.Tag = "query_a.daa003";
            this.gv_daa003.Visible = true;
            this.gv_daa003.VisibleIndex = 10;
            this.gv_daa003.VisibleIndex = 11;
            this.gv_daa003.Width = 150;
            // 
            // gv_daa004
@@ -762,7 +762,7 @@
            this.gv_daa004.OptionsColumn.AllowEdit = false;
            this.gv_daa004.Tag = "query_a.daa004";
            this.gv_daa004.Visible = true;
            this.gv_daa004.VisibleIndex = 11;
            this.gv_daa004.VisibleIndex = 12;
            this.gv_daa004.Width = 150;
            // 
            // gv_daa008
@@ -776,7 +776,7 @@
            this.gv_daa008.OptionsColumn.AllowEdit = false;
            this.gv_daa008.Tag = "query_a.daa008";
            this.gv_daa008.Visible = true;
            this.gv_daa008.VisibleIndex = 12;
            this.gv_daa008.VisibleIndex = 13;
            this.gv_daa008.Width = 50;
            // 
            // gv_daa011
@@ -790,7 +790,7 @@
            this.gv_daa011.OptionsColumn.AllowEdit = false;
            this.gv_daa011.Tag = "query_a.daa011";
            this.gv_daa011.Visible = true;
            this.gv_daa011.VisibleIndex = 13;
            this.gv_daa011.VisibleIndex = 14;
            this.gv_daa011.Width = 50;
            // 
            // gridColumn4
@@ -805,7 +805,7 @@
            this.gridColumn4.MinWidth = 50;
            this.gridColumn4.Name = "gridColumn4";
            this.gridColumn4.Visible = true;
            this.gridColumn4.VisibleIndex = 14;
            this.gridColumn4.VisibleIndex = 15;
            this.gridColumn4.Width = 50;
            // 
            // gv_daa010
@@ -819,7 +819,7 @@
            this.gv_daa010.OptionsColumn.AllowEdit = false;
            this.gv_daa010.Tag = "query_a.daa010";
            this.gv_daa010.Visible = true;
            this.gv_daa010.VisibleIndex = 16;
            this.gv_daa010.VisibleIndex = 17;
            this.gv_daa010.Width = 50;
            // 
            // gv_daa005
@@ -833,7 +833,7 @@
            this.gv_daa005.OptionsColumn.AllowEdit = false;
            this.gv_daa005.Tag = "query_a.daa005";
            this.gv_daa005.Visible = true;
            this.gv_daa005.VisibleIndex = 17;
            this.gv_daa005.VisibleIndex = 18;
            this.gv_daa005.Width = 50;
            // 
            // gv_cust
@@ -854,7 +854,7 @@
            this.gridColumn1.MinWidth = 50;
            this.gridColumn1.Name = "gridColumn1";
            this.gridColumn1.Visible = true;
            this.gridColumn1.VisibleIndex = 19;
            this.gridColumn1.VisibleIndex = 20;
            this.gridColumn1.Width = 94;
            // 
            // gv_daa015
@@ -880,7 +880,7 @@
            this.gv_daa009.OptionsColumn.AllowEdit = false;
            this.gv_daa009.Tag = "query_a.daa009";
            this.gv_daa009.Visible = true;
            this.gv_daa009.VisibleIndex = 15;
            this.gv_daa009.VisibleIndex = 16;
            this.gv_daa009.Width = 94;
            // 
            // gv_prepareTime
@@ -915,7 +915,7 @@
            this.gv_daa016.OptionsColumn.AllowEdit = false;
            this.gv_daa016.Tag = "query_a.daa016";
            this.gv_daa016.Visible = true;
            this.gv_daa016.VisibleIndex = 20;
            this.gv_daa016.VisibleIndex = 21;
            this.gv_daa016.Width = 180;
            // 
            // gv_daa017
@@ -928,7 +928,7 @@
            this.gv_daa017.OptionsColumn.AllowEdit = false;
            this.gv_daa017.Tag = "query_a.daa017";
            this.gv_daa017.Visible = true;
            this.gv_daa017.VisibleIndex = 21;
            this.gv_daa017.VisibleIndex = 22;
            this.gv_daa017.Width = 180;
            // 
            // gv_mesStartProd
@@ -941,7 +941,7 @@
            this.gv_mesStartProd.OptionsColumn.AllowEdit = false;
            this.gv_mesStartProd.Tag = "query_a.mes_start_prod";
            this.gv_mesStartProd.Visible = true;
            this.gv_mesStartProd.VisibleIndex = 22;
            this.gv_mesStartProd.VisibleIndex = 23;
            this.gv_mesStartProd.Width = 180;
            // 
            // gv_mesEndProd
@@ -954,7 +954,7 @@
            this.gv_mesEndProd.OptionsColumn.AllowEdit = false;
            this.gv_mesEndProd.Tag = "query_a.mes_end_prod";
            this.gv_mesEndProd.Visible = true;
            this.gv_mesEndProd.VisibleIndex = 23;
            this.gv_mesEndProd.VisibleIndex = 24;
            this.gv_mesEndProd.Width = 180;
            // 
            // gridColumn21
@@ -964,7 +964,7 @@
            this.gridColumn21.MinWidth = 25;
            this.gridColumn21.Name = "gridColumn21";
            this.gridColumn21.Visible = true;
            this.gridColumn21.VisibleIndex = 24;
            this.gridColumn21.VisibleIndex = 25;
            this.gridColumn21.Width = 94;
            // 
            // gridColumn22
@@ -974,7 +974,7 @@
            this.gridColumn22.MinWidth = 25;
            this.gridColumn22.Name = "gridColumn22";
            this.gridColumn22.Visible = true;
            this.gridColumn22.VisibleIndex = 25;
            this.gridColumn22.VisibleIndex = 26;
            this.gridColumn22.Width = 94;
            // 
            // gridColumn23
@@ -992,7 +992,7 @@
            this.gridColumn24.MinWidth = 25;
            this.gridColumn24.Name = "gridColumn24";
            this.gridColumn24.Visible = true;
            this.gridColumn24.VisibleIndex = 26;
            this.gridColumn24.VisibleIndex = 27;
            this.gridColumn24.Width = 94;
            // 
            // gridColumn25
@@ -1002,8 +1002,18 @@
            this.gridColumn25.MinWidth = 25;
            this.gridColumn25.Name = "gridColumn25";
            this.gridColumn25.Visible = true;
            this.gridColumn25.VisibleIndex = 27;
            this.gridColumn25.VisibleIndex = 28;
            this.gridColumn25.Width = 94;
            // 
            // gridColumn52
            // 
            this.gridColumn52.Caption = "生产类型";
            this.gridColumn52.FieldName = "daa025";
            this.gridColumn52.MinWidth = 25;
            this.gridColumn52.Name = "gridColumn52";
            this.gridColumn52.Visible = true;
            this.gridColumn52.VisibleIndex = 9;
            this.gridColumn52.Width = 94;
            // 
            // pageBar1
            // 
@@ -1319,6 +1329,7 @@
            this.txt_isQiTao.Size = new System.Drawing.Size(405, 24);
            this.txt_isQiTao.StyleController = this.layoutMx1;
            this.txt_isQiTao.TabIndex = 476;
            this.txt_isQiTao.Tag = "readonly";
            // 
            // txt_daa018
            // 
@@ -1339,7 +1350,7 @@
            "F-量产",
            "S-试产",
            "C-拆机返工",
            "W-维修返工，",
            "W-维修返工",
            "G-返工",
            "O-外发"});
            this.txt_daa025.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
@@ -2267,7 +2278,10 @@
            this.gvMx7.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gvMx1daa002,
            this.gvMx1daa010,
            this.gvMx1daa004});
            this.gvMx1daa004,
            this.gridColumn63,
            this.gridColumn64,
            this.gridColumn65});
            this.gvMx7.GridControl = this.gcMx7;
            this.gvMx7.Name = "gvMx7";
            this.gvMx7.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
@@ -2282,7 +2296,7 @@
            this.gvMx1daa002.MinWidth = 50;
            this.gvMx1daa002.Name = "gvMx1daa002";
            this.gvMx1daa002.OptionsColumn.ReadOnly = true;
            this.gvMx1daa002.Tag = "edit";
            this.gvMx1daa002.Tag = "query_a.daa010";
            this.gvMx1daa002.Visible = true;
            this.gvMx1daa002.VisibleIndex = 0;
            this.gvMx1daa002.Width = 54;
@@ -2308,10 +2322,46 @@
            this.gvMx1daa004.MinWidth = 150;
            this.gvMx1daa004.Name = "gvMx1daa004";
            this.gvMx1daa004.OptionsColumn.ReadOnly = true;
            this.gvMx1daa004.Tag = "edit";
            this.gvMx1daa004.Tag = "query_a.daa010";
            this.gvMx1daa004.Visible = true;
            this.gvMx1daa004.VisibleIndex = 2;
            this.gvMx1daa004.Width = 150;
            // 
            // gridColumn63
            // 
            this.gridColumn63.Caption = "是否可返工";
            this.gridColumn63.FieldName = "isBack";
            this.gridColumn63.MinWidth = 25;
            this.gridColumn63.Name = "gridColumn63";
            this.gridColumn63.OptionsColumn.ReadOnly = true;
            this.gridColumn63.Tag = "query_a.daa010";
            this.gridColumn63.Visible = true;
            this.gridColumn63.VisibleIndex = 3;
            this.gridColumn63.Width = 94;
            // 
            // gridColumn64
            // 
            this.gridColumn64.Caption = "是否返追溯码";
            this.gridColumn64.FieldName = "isZsm";
            this.gridColumn64.MinWidth = 25;
            this.gridColumn64.Name = "gridColumn64";
            this.gridColumn64.OptionsColumn.ReadOnly = true;
            this.gridColumn64.Tag = "query_a.daa010";
            this.gridColumn64.Visible = true;
            this.gridColumn64.VisibleIndex = 4;
            this.gridColumn64.Width = 94;
            // 
            // gridColumn65
            // 
            this.gridColumn65.Caption = "是否返托板码";
            this.gridColumn65.FieldName = "isTbm";
            this.gridColumn65.MinWidth = 25;
            this.gridColumn65.Name = "gridColumn65";
            this.gridColumn65.OptionsColumn.ReadOnly = true;
            this.gridColumn65.Tag = "query_a.daa010";
            this.gridColumn65.Visible = true;
            this.gridColumn65.VisibleIndex = 5;
            this.gridColumn65.Width = 94;
            // 
            // xtraTabPage8
            // 
@@ -2340,13 +2390,8 @@
            this.gridColumn53,
            this.gvMx2status,
            this.gvMx2pbillNo,
            this.gvMx2itemNo,
            this.gridColumn54,
            this.gridColumn55,
            this.gridColumn56,
            this.gvMx2tlQty,
            this.gridColumn57,
            this.gridColumn58,
            this.gridColumn59,
            this.gridColumn60,
            this.gridColumn61,
@@ -2391,38 +2436,6 @@
            this.gvMx2pbillNo.VisibleIndex = 1;
            this.gvMx2pbillNo.Width = 94;
            // 
            // gvMx2itemNo
            // 
            this.gvMx2itemNo.AppearanceCell.Options.UseFont = true;
            this.gvMx2itemNo.Caption = "物料编码";
            this.gvMx2itemNo.FieldName = "itemNo";
            this.gvMx2itemNo.Name = "gvMx2itemNo";
            this.gvMx2itemNo.OptionsColumn.ReadOnly = true;
            this.gvMx2itemNo.Tag = "query_a.item_no";
            this.gvMx2itemNo.Visible = true;
            this.gvMx2itemNo.VisibleIndex = 2;
            this.gvMx2itemNo.Width = 94;
            // 
            // gridColumn54
            // 
            this.gridColumn54.Caption = "物料名称";
            this.gridColumn54.FieldName = "itemName";
            this.gridColumn54.Name = "gridColumn54";
            this.gridColumn54.OptionsColumn.ReadOnly = true;
            this.gridColumn54.Visible = true;
            this.gridColumn54.VisibleIndex = 3;
            this.gridColumn54.Width = 94;
            // 
            // gridColumn55
            // 
            this.gridColumn55.Caption = "规格型号";
            this.gridColumn55.FieldName = "itemModel";
            this.gridColumn55.Name = "gridColumn55";
            this.gridColumn55.OptionsColumn.ReadOnly = true;
            this.gridColumn55.Visible = true;
            this.gridColumn55.VisibleIndex = 4;
            this.gridColumn55.Width = 94;
            // 
            // gridColumn56
            // 
            this.gridColumn56.Caption = "数量";
@@ -2431,20 +2444,8 @@
            this.gridColumn56.Name = "gridColumn56";
            this.gridColumn56.OptionsColumn.ReadOnly = true;
            this.gridColumn56.Visible = true;
            this.gridColumn56.VisibleIndex = 6;
            this.gridColumn56.VisibleIndex = 2;
            this.gridColumn56.Width = 94;
            // 
            // gvMx2tlQty
            // 
            this.gvMx2tlQty.AppearanceCell.Options.UseFont = true;
            this.gvMx2tlQty.Caption = "单位";
            this.gvMx2tlQty.FieldName = "dwName";
            this.gvMx2tlQty.Name = "gvMx2tlQty";
            this.gvMx2tlQty.OptionsColumn.ReadOnly = true;
            this.gvMx2tlQty.Tag = "query_a.tl_qty";
            this.gvMx2tlQty.Visible = true;
            this.gvMx2tlQty.VisibleIndex = 5;
            this.gvMx2tlQty.Width = 94;
            // 
            // gridColumn57
            // 
@@ -2454,17 +2455,8 @@
            this.gridColumn57.Name = "gridColumn57";
            this.gridColumn57.OptionsColumn.ReadOnly = true;
            this.gridColumn57.Visible = true;
            this.gridColumn57.VisibleIndex = 7;
            this.gridColumn57.VisibleIndex = 3;
            this.gridColumn57.Width = 94;
            // 
            // gridColumn58
            // 
            this.gridColumn58.Caption = "不良描述";
            this.gridColumn58.FieldName = "badDescription";
            this.gridColumn58.MinWidth = 25;
            this.gridColumn58.Name = "gridColumn58";
            this.gridColumn58.OptionsColumn.ReadOnly = true;
            this.gridColumn58.Width = 94;
            // 
            // gridColumn59
            // 
@@ -2474,7 +2466,7 @@
            this.gridColumn59.Name = "gridColumn59";
            this.gridColumn59.OptionsColumn.ReadOnly = true;
            this.gridColumn59.Visible = true;
            this.gridColumn59.VisibleIndex = 8;
            this.gridColumn59.VisibleIndex = 4;
            this.gridColumn59.Width = 94;
            // 
            // gridColumn60
@@ -2485,7 +2477,7 @@
            this.gridColumn60.Name = "gridColumn60";
            this.gridColumn60.OptionsColumn.ReadOnly = true;
            this.gridColumn60.Visible = true;
            this.gridColumn60.VisibleIndex = 9;
            this.gridColumn60.VisibleIndex = 5;
            this.gridColumn60.Width = 94;
            // 
            // gridColumn61
@@ -2496,18 +2488,18 @@
            this.gridColumn61.Name = "gridColumn61";
            this.gridColumn61.OptionsColumn.ReadOnly = true;
            this.gridColumn61.Visible = true;
            this.gridColumn61.VisibleIndex = 10;
            this.gridColumn61.VisibleIndex = 6;
            this.gridColumn61.Width = 94;
            // 
            // gridColumn62
            // 
            this.gridColumn62.Caption = "数据状态";
            this.gridColumn62.FieldName = "barCodeStatusTxt";
            this.gridColumn62.FieldName = "barCodeRemark";
            this.gridColumn62.MinWidth = 25;
            this.gridColumn62.Name = "gridColumn62";
            this.gridColumn62.OptionsColumn.ReadOnly = true;
            this.gridColumn62.Visible = true;
            this.gridColumn62.VisibleIndex = 11;
            this.gridColumn62.VisibleIndex = 7;
            this.gridColumn62.Width = 94;
            // 
            // tabMxPage2
@@ -4163,13 +4155,8 @@
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn53;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx2status;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx2pbillNo;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx2itemNo;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn54;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn55;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn56;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx2tlQty;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn57;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn58;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn59;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn60;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn61;
@@ -4180,5 +4167,9 @@
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem40;
        private DevExpress.XtraEditors.ComboBoxEdit txt_daa025;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn52;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn63;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn64;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn65;
    }
}