bug

lu

4 天以前 73488352cf894aead2198683e8e6836bf321b48c

bug

 DevApp/Gs.DevApp/DevFrm/Rpt/UcRptCgdhdPrint.Designer.cs

@@ -39,7 +39,6 @@
            this.gv_quantity = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_depotId = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_ownerType = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_ownerId = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -49,6 +48,7 @@
            this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.pageBar1 = new UserControls.Data.UcPageBar();
            this.tips = new DevExpress.Utils.ToolTipController(this.components);
            ((System.ComponentModel.ISupportInitialize)(this.gcMain1Report)).BeginInit();
@@ -78,7 +78,6 @@
            this.gv_quantity,
            this.gv_depotId,
            this.gridColumn6,
            this.gridColumn1,
            this.gv_ownerType,
            this.gv_ownerId,
            this.gridColumn5,
@@ -87,7 +86,8 @@
            this.gridColumn7,
            this.gridColumn8,
            this.gridColumn11,
            this.gridColumn9});
            this.gridColumn9,
            this.gridColumn10});
            this.gridView1Report.GridControl = this.gcMain1Report;
            this.gridView1Report.IndicatorWidth = 50;
            this.gridView1Report.Name = "gridView1Report";
@@ -125,7 +125,7 @@
            this.gridColumn3.MinWidth = 25;
            this.gridColumn3.Name = "gridColumn3";
            this.gridColumn3.Visible = true;
            this.gridColumn3.VisibleIndex = 6;
            this.gridColumn3.VisibleIndex = 7;
            this.gridColumn3.Width = 74;
            // 
            // gridColumn2
@@ -135,7 +135,7 @@
            this.gridColumn2.MinWidth = 25;
            this.gridColumn2.Name = "gridColumn2";
            this.gridColumn2.Visible = true;
            this.gridColumn2.VisibleIndex = 7;
            this.gridColumn2.VisibleIndex = 8;
            this.gridColumn2.Width = 74;
            // 
            // gridColumn4
@@ -145,7 +145,7 @@
            this.gridColumn4.MinWidth = 25;
            this.gridColumn4.Name = "gridColumn4";
            this.gridColumn4.Visible = true;
            this.gridColumn4.VisibleIndex = 9;
            this.gridColumn4.VisibleIndex = 10;
            this.gridColumn4.Width = 74;
            // 
            // gv_quantity
@@ -187,18 +187,8 @@
            this.gridColumn6.MinWidth = 25;
            this.gridColumn6.Name = "gridColumn6";
            this.gridColumn6.Visible = true;
            this.gridColumn6.VisibleIndex = 11;
            this.gridColumn6.VisibleIndex = 12;
            this.gridColumn6.Width = 74;
            // 
            // gridColumn1
            // 
            this.gridColumn1.Caption = "退货";
            this.gridColumn1.FieldName = "returnFlag";
            this.gridColumn1.MinWidth = 25;
            this.gridColumn1.Name = "gridColumn1";
            this.gridColumn1.Visible = true;
            this.gridColumn1.VisibleIndex = 14;
            this.gridColumn1.Width = 74;
            // 
            // gv_ownerType
            // 
@@ -246,7 +236,7 @@
            this.gv_indepUserCode.OptionsColumn.AllowEdit = false;
            this.gv_indepUserCode.Tag = "query_a.INDEP_USER_CODE";
            this.gv_indepUserCode.Visible = true;
            this.gv_indepUserCode.VisibleIndex = 12;
            this.gv_indepUserCode.VisibleIndex = 13;
            this.gv_indepUserCode.Width = 74;
            // 
            // gv_indepDate
@@ -259,7 +249,7 @@
            this.gv_indepDate.OptionsColumn.AllowEdit = false;
            this.gv_indepDate.Tag = "query_a.INDEP_DATE";
            this.gv_indepDate.Visible = true;
            this.gv_indepDate.VisibleIndex = 13;
            this.gv_indepDate.VisibleIndex = 14;
            this.gv_indepDate.Width = 80;
            // 
            // gridColumn7
@@ -293,7 +283,7 @@
            this.gridColumn11.MinWidth = 25;
            this.gridColumn11.Name = "gridColumn11";
            this.gridColumn11.Visible = true;
            this.gridColumn11.VisibleIndex = 8;
            this.gridColumn11.VisibleIndex = 9;
            this.gridColumn11.Width = 94;
            // 
            // gridColumn9
@@ -303,8 +293,18 @@
            this.gridColumn9.MinWidth = 25;
            this.gridColumn9.Name = "gridColumn9";
            this.gridColumn9.Visible = true;
            this.gridColumn9.VisibleIndex = 10;
            this.gridColumn9.VisibleIndex = 11;
            this.gridColumn9.Width = 94;
            // 
            // gridColumn10
            // 
            this.gridColumn10.Caption = "打印条码";
            this.gridColumn10.FieldName = "itemBarcode";
            this.gridColumn10.MinWidth = 25;
            this.gridColumn10.Name = "gridColumn10";
            this.gridColumn10.Visible = true;
            this.gridColumn10.VisibleIndex = 6;
            this.gridColumn10.Width = 94;
            // 
            // pageBar1
            // 
@@ -342,7 +342,6 @@
        private DevExpress.XtraGrid.Columns.GridColumn gv_quantity;
        private DevExpress.XtraGrid.Columns.GridColumn gv_depotId;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
        private DevExpress.XtraGrid.Columns.GridColumn gv_ownerType;
        private DevExpress.XtraGrid.Columns.GridColumn gv_ownerId;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
@@ -354,5 +353,6 @@
        private DevExpress.Utils.ToolTipController tips;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
    }
}

 DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs

@@ -389,6 +389,7 @@
            dataTable.Rows.Add("WWCL(委外超领)");
            dataTable.Rows.Add("WWBLSQ(委外补料申请)");
            dataTable.Rows.Add("WWBL(委外补料)");
            dataTable.Rows.Add("WWLLSQ(委外领料申请)");
            dataTable.Rows.Add("SJJYSQ(首检申请)");
            dataTable.Rows.Add("SJJY(首检检验)");
            dataTable.Rows.Add("XJJYSQ(巡检申请)");