首检

lu

2 天以前 f27cfedfc3cbe9b448319f9bdfc93b3ae817b21a

首检

 DevApp/Gs.DevApp/App.config

@@ -42,7 +42,7 @@
    <add key="ProductName" value="G-MES V2.0" />
    <add key="PageSize" value="50" />
    <add key="Version" value="0.1" />
    <add key="IsAutoUpdater" value="1" />
    <add key="IsAutoUpdater" value="0" />
    <add key="AutoUpdaterXml" value="http://192.168.1.145:86/AutoUpdater/AutoUpdater.xml" />
  </appSettings>
  <userSettings>

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

@@ -45,8 +45,8 @@
            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_depotSectionsCode = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_ownerType = new DevExpress.XtraGrid.Columns.GridColumn();
            this.pageBar1 = new UserControls.Data.UcPageBar();
            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.pageBar1 = new UserControls.Data.UcPageBar();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
            this.xtraTabControl1.SuspendLayout();
            this.xtraTabPage1.SuspendLayout();
@@ -278,6 +278,16 @@
            this.gv_ownerType.VisibleIndex = 10;
            this.gv_ownerType.Width = 73;
            // 
            // gridColumn5
            // 
            this.gridColumn5.Caption = "到货单号";
            this.gridColumn5.FieldName = "dhdh";
            this.gridColumn5.MinWidth = 25;
            this.gridColumn5.Name = "gridColumn5";
            this.gridColumn5.Visible = true;
            this.gridColumn5.VisibleIndex = 1;
            this.gridColumn5.Width = 94;
            // 
            // pageBar1
            // 
            this.pageBar1.CurrentPage = 1;
@@ -290,16 +300,6 @@
            this.pageBar1.TabIndex = 4;
            this.pageBar1.TotalPages = 0;
            // 
            // gridColumn5
            // 
            this.gridColumn5.Caption = "到货单号";
            this.gridColumn5.FieldName = "dhdh";
            this.gridColumn5.MinWidth = 25;
            this.gridColumn5.Name = "gridColumn5";
            this.gridColumn5.Visible = true;
            this.gridColumn5.VisibleIndex = 1;
            this.gridColumn5.Width = 94;
            // 
            // CkYtmx
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -309,7 +309,7 @@
            this.Controls.Add(this.toolBarMenu1);
            this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
            this.Name = "CkYtmx";
            this.Text = "条码库存";
            this.Text = "验退明细";
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
            this.xtraTabControl1.ResumeLayout(false);
            this.xtraTabPage1.ResumeLayout(false);

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

@@ -34,36 +34,36 @@
            this.split1 = new DevExpress.XtraEditors.SplitContainerControl();
            this.gcMain1 = new DevExpress.XtraGrid.GridControl();
            this.gridView1 = new DevExpress.XtraGrid.Views.BandedGrid.AdvBandedGridView();
            this.gv_guid = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
            this.gv_itemBarcode = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
            this.gv_itemId = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
            this.gridColumn3 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
            this.gridColumn2 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
            this.gridColumn4 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
            this.gv_depotId = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
            this.gv_quantity = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
            this.gridColumn6 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
            this.gridColumn1 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
            this.bandedGridColumn1 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
            this.gv_ownerType = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
            this.gridColumn5 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
            this.gv_ownerId = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
            this.pageBar1 = new UserControls.Data.UcPageBar();
            this.gridBand1 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
            this.gv_guid = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
            this.gridBand4 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
            this.gv_itemBarcode = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
            this.gridBand7 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
            this.gv_itemId = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
            this.gridBand8 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
            this.gridColumn3 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
            this.gridBand9 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
            this.gridColumn2 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
            this.gridBand10 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
            this.gridColumn4 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
            this.gridBand11 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
            this.gv_depotId = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
            this.gridBand12 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
            this.gv_quantity = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
            this.gridBand13 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
            this.gridColumn6 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
            this.gridBand14 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
            this.gridColumn1 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
            this.gridBand15 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
            this.bandedGridColumn1 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
            this.gridBand3 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
            this.gridBand2 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
            this.gv_ownerType = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
            this.gridBand6 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
            this.gridColumn5 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
            this.gridBand5 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
            this.gv_ownerId = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
            this.pageBar1 = new UserControls.Data.UcPageBar();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
            this.xtraTabControl1.SuspendLayout();
            this.xtraTabPage1.SuspendLayout();
@@ -183,6 +183,18 @@
            this.gridView1.OptionsView.ShowFooter = true;
            this.gridView1.OptionsView.ShowGroupPanel = false;
            // 
            // gridBand1
            // 
            this.gridBand1.AppearanceHeader.Options.UseTextOptions = true;
            this.gridBand1.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
            this.gridBand1.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
            this.gridBand1.Caption = "采购明细GUID";
            this.gridBand1.Columns.Add(this.gv_guid);
            this.gridBand1.Name = "gridBand1";
            this.gridBand1.Visible = false;
            this.gridBand1.VisibleIndex = -1;
            this.gridBand1.Width = 95;
            // 
            // gv_guid
            // 
            this.gv_guid.AppearanceCell.Options.UseFont = true;
@@ -194,6 +206,16 @@
            this.gv_guid.Tag = "query_a.guid";
            this.gv_guid.Visible = true;
            this.gv_guid.Width = 95;
            // 
            // gridBand4
            // 
            this.gridBand4.AppearanceHeader.Options.UseTextOptions = true;
            this.gridBand4.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
            this.gridBand4.Caption = "采购单号";
            this.gridBand4.Columns.Add(this.gv_itemBarcode);
            this.gridBand4.Name = "gridBand4";
            this.gridBand4.VisibleIndex = 0;
            this.gridBand4.Width = 77;
            // 
            // gv_itemBarcode
            // 
@@ -207,6 +229,15 @@
            this.gv_itemBarcode.Visible = true;
            this.gv_itemBarcode.Width = 77;
            // 
            // gridBand7
            // 
            this.gridBand7.Caption = "物料ID";
            this.gridBand7.Columns.Add(this.gv_itemId);
            this.gridBand7.Name = "gridBand7";
            this.gridBand7.Visible = false;
            this.gridBand7.VisibleIndex = -1;
            this.gridBand7.Width = 74;
            // 
            // gv_itemId
            // 
            this.gv_itemId.AppearanceCell.Options.UseFont = true;
@@ -219,6 +250,14 @@
            this.gv_itemId.Visible = true;
            this.gv_itemId.Width = 74;
            // 
            // gridBand8
            // 
            this.gridBand8.Caption = "物料编码";
            this.gridBand8.Columns.Add(this.gridColumn3);
            this.gridBand8.Name = "gridBand8";
            this.gridBand8.VisibleIndex = 1;
            this.gridBand8.Width = 77;
            // 
            // gridColumn3
            // 
            this.gridColumn3.Caption = "物料编码";
@@ -227,6 +266,14 @@
            this.gridColumn3.Name = "gridColumn3";
            this.gridColumn3.Visible = true;
            this.gridColumn3.Width = 77;
            // 
            // gridBand9
            // 
            this.gridBand9.Caption = "物料名称";
            this.gridBand9.Columns.Add(this.gridColumn2);
            this.gridBand9.Name = "gridBand9";
            this.gridBand9.VisibleIndex = 2;
            this.gridBand9.Width = 77;
            // 
            // gridColumn2
            // 
@@ -237,6 +284,14 @@
            this.gridColumn2.Visible = true;
            this.gridColumn2.Width = 77;
            // 
            // gridBand10
            // 
            this.gridBand10.Caption = "规格型号";
            this.gridBand10.Columns.Add(this.gridColumn4);
            this.gridBand10.Name = "gridBand10";
            this.gridBand10.VisibleIndex = 3;
            this.gridBand10.Width = 77;
            // 
            // gridColumn4
            // 
            this.gridColumn4.Caption = "规格型号";
@@ -245,6 +300,17 @@
            this.gridColumn4.Name = "gridColumn4";
            this.gridColumn4.Visible = true;
            this.gridColumn4.Width = 77;
            // 
            // gridBand11
            // 
            this.gridBand11.AppearanceHeader.Options.UseTextOptions = true;
            this.gridBand11.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
            this.gridBand11.Caption = "采购单位";
            this.gridBand11.Columns.Add(this.gv_depotId);
            this.gridBand11.MinWidth = 30;
            this.gridBand11.Name = "gridBand11";
            this.gridBand11.VisibleIndex = 4;
            this.gridBand11.Width = 77;
            // 
            // gv_depotId
            // 
@@ -257,6 +323,19 @@
            this.gv_depotId.Tag = "query_a.DEPOT_ID";
            this.gv_depotId.Visible = true;
            this.gv_depotId.Width = 77;
            // 
            // gridBand12
            // 
            this.gridBand12.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
            this.gridBand12.AppearanceHeader.Options.UseForeColor = true;
            this.gridBand12.AppearanceHeader.Options.UseTextOptions = true;
            this.gridBand12.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
            this.gridBand12.Caption = "采购单数量";
            this.gridBand12.Columns.Add(this.gv_quantity);
            this.gridBand12.MinWidth = 50;
            this.gridBand12.Name = "gridBand12";
            this.gridBand12.VisibleIndex = 5;
            this.gridBand12.Width = 60;
            // 
            // gv_quantity
            // 
@@ -274,6 +353,19 @@
            this.gv_quantity.Visible = true;
            this.gv_quantity.Width = 60;
            // 
            // gridBand13
            // 
            this.gridBand13.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
            this.gridBand13.AppearanceHeader.Options.UseForeColor = true;
            this.gridBand13.AppearanceHeader.Options.UseTextOptions = true;
            this.gridBand13.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
            this.gridBand13.Caption = "累计实入库";
            this.gridBand13.Columns.Add(this.gridColumn6);
            this.gridBand13.MinWidth = 50;
            this.gridBand13.Name = "gridBand13";
            this.gridBand13.VisibleIndex = 6;
            this.gridBand13.Width = 60;
            // 
            // gridColumn6
            // 
            this.gridColumn6.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
@@ -286,6 +378,19 @@
            new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Sum, "qtySjrk", "合计={0:0.##}")});
            this.gridColumn6.Visible = true;
            this.gridColumn6.Width = 60;
            // 
            // gridBand14
            // 
            this.gridBand14.AppearanceHeader.ForeColor = System.Drawing.Color.Red;
            this.gridBand14.AppearanceHeader.Options.UseForeColor = true;
            this.gridBand14.AppearanceHeader.Options.UseTextOptions = true;
            this.gridBand14.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
            this.gridBand14.Caption = "总欠料";
            this.gridBand14.Columns.Add(this.gridColumn1);
            this.gridBand14.MinWidth = 50;
            this.gridBand14.Name = "gridBand14";
            this.gridBand14.VisibleIndex = 7;
            this.gridBand14.Width = 60;
            // 
            // gridColumn1
            // 
@@ -302,6 +407,15 @@
            this.gridColumn1.Visible = true;
            this.gridColumn1.Width = 60;
            // 
            // gridBand15
            // 
            this.gridBand15.Caption = "交货进度";
            this.gridBand15.Columns.Add(this.bandedGridColumn1);
            this.gridBand15.MinWidth = 300;
            this.gridBand15.Name = "gridBand15";
            this.gridBand15.VisibleIndex = 8;
            this.gridBand15.Width = 327;
            // 
            // bandedGridColumn1
            // 
            this.bandedGridColumn1.Caption = "比例";
@@ -311,165 +425,6 @@
            this.bandedGridColumn1.Tag = "query_a.guid";
            this.bandedGridColumn1.Visible = true;
            this.bandedGridColumn1.Width = 327;
            // 
            // gv_ownerType
            // 
            this.gv_ownerType.AppearanceCell.Options.UseFont = true;
            this.gv_ownerType.Caption = "累计收料数量";
            this.gv_ownerType.FieldName = "sl";
            this.gv_ownerType.MinWidth = 50;
            this.gv_ownerType.Name = "gv_ownerType";
            this.gv_ownerType.OptionsColumn.AllowEdit = false;
            this.gv_ownerType.Tag = "query_a.Owner_Type";
            this.gv_ownerType.Visible = true;
            this.gv_ownerType.Width = 105;
            // 
            // gridColumn5
            // 
            this.gridColumn5.Caption = "累计仓退";
            this.gridColumn5.FieldName = "ct";
            this.gridColumn5.MinWidth = 25;
            this.gridColumn5.Name = "gridColumn5";
            this.gridColumn5.Visible = true;
            this.gridColumn5.Width = 105;
            // 
            // gv_ownerId
            // 
            this.gv_ownerId.AppearanceCell.Options.UseFont = true;
            this.gv_ownerId.Caption = "累计验退";
            this.gv_ownerId.FieldName = "yt";
            this.gv_ownerId.MinWidth = 50;
            this.gv_ownerId.Name = "gv_ownerId";
            this.gv_ownerId.OptionsColumn.AllowEdit = false;
            this.gv_ownerId.Tag = "query_a.Owner_Id";
            this.gv_ownerId.Visible = true;
            this.gv_ownerId.Width = 130;
            // 
            // pageBar1
            // 
            this.pageBar1.CurrentPage = 1;
            this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
            this.pageBar1.Location = new System.Drawing.Point(0, 519);
            this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
            this.pageBar1.Name = "pageBar1";
            this.pageBar1.RecordCount = 0;
            this.pageBar1.Size = new System.Drawing.Size(1310, 39);
            this.pageBar1.TabIndex = 4;
            this.pageBar1.TotalPages = 0;
            // 
            // gridBand1
            // 
            this.gridBand1.AppearanceHeader.Options.UseTextOptions = true;
            this.gridBand1.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
            this.gridBand1.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
            this.gridBand1.Caption = "采购明细GUID";
            this.gridBand1.Columns.Add(this.gv_guid);
            this.gridBand1.Name = "gridBand1";
            this.gridBand1.Visible = false;
            this.gridBand1.VisibleIndex = -1;
            this.gridBand1.Width = 95;
            // 
            // gridBand4
            // 
            this.gridBand4.AppearanceHeader.Options.UseTextOptions = true;
            this.gridBand4.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
            this.gridBand4.Caption = "采购单号";
            this.gridBand4.Columns.Add(this.gv_itemBarcode);
            this.gridBand4.Name = "gridBand4";
            this.gridBand4.VisibleIndex = 0;
            this.gridBand4.Width = 77;
            // 
            // gridBand7
            // 
            this.gridBand7.Caption = "物料ID";
            this.gridBand7.Columns.Add(this.gv_itemId);
            this.gridBand7.Name = "gridBand7";
            this.gridBand7.Visible = false;
            this.gridBand7.VisibleIndex = -1;
            this.gridBand7.Width = 74;
            // 
            // gridBand8
            // 
            this.gridBand8.Caption = "物料编码";
            this.gridBand8.Columns.Add(this.gridColumn3);
            this.gridBand8.Name = "gridBand8";
            this.gridBand8.VisibleIndex = 1;
            this.gridBand8.Width = 77;
            // 
            // gridBand9
            // 
            this.gridBand9.Caption = "物料名称";
            this.gridBand9.Columns.Add(this.gridColumn2);
            this.gridBand9.Name = "gridBand9";
            this.gridBand9.VisibleIndex = 2;
            this.gridBand9.Width = 77;
            // 
            // gridBand10
            // 
            this.gridBand10.Caption = "规格型号";
            this.gridBand10.Columns.Add(this.gridColumn4);
            this.gridBand10.Name = "gridBand10";
            this.gridBand10.VisibleIndex = 3;
            this.gridBand10.Width = 77;
            // 
            // gridBand11
            // 
            this.gridBand11.AppearanceHeader.Options.UseTextOptions = true;
            this.gridBand11.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
            this.gridBand11.Caption = "采购单位";
            this.gridBand11.Columns.Add(this.gv_depotId);
            this.gridBand11.MinWidth = 30;
            this.gridBand11.Name = "gridBand11";
            this.gridBand11.VisibleIndex = 4;
            this.gridBand11.Width = 77;
            // 
            // gridBand12
            // 
            this.gridBand12.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
            this.gridBand12.AppearanceHeader.Options.UseForeColor = true;
            this.gridBand12.AppearanceHeader.Options.UseTextOptions = true;
            this.gridBand12.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
            this.gridBand12.Caption = "采购单数量";
            this.gridBand12.Columns.Add(this.gv_quantity);
            this.gridBand12.MinWidth = 50;
            this.gridBand12.Name = "gridBand12";
            this.gridBand12.VisibleIndex = 5;
            this.gridBand12.Width = 60;
            // 
            // gridBand13
            // 
            this.gridBand13.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
            this.gridBand13.AppearanceHeader.Options.UseForeColor = true;
            this.gridBand13.AppearanceHeader.Options.UseTextOptions = true;
            this.gridBand13.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
            this.gridBand13.Caption = "累计实入库";
            this.gridBand13.Columns.Add(this.gridColumn6);
            this.gridBand13.MinWidth = 50;
            this.gridBand13.Name = "gridBand13";
            this.gridBand13.VisibleIndex = 6;
            this.gridBand13.Width = 60;
            // 
            // gridBand14
            // 
            this.gridBand14.AppearanceHeader.ForeColor = System.Drawing.Color.Red;
            this.gridBand14.AppearanceHeader.Options.UseForeColor = true;
            this.gridBand14.AppearanceHeader.Options.UseTextOptions = true;
            this.gridBand14.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
            this.gridBand14.Caption = "总欠料";
            this.gridBand14.Columns.Add(this.gridColumn1);
            this.gridBand14.MinWidth = 50;
            this.gridBand14.Name = "gridBand14";
            this.gridBand14.VisibleIndex = 7;
            this.gridBand14.Width = 60;
            // 
            // gridBand15
            // 
            this.gridBand15.Caption = "交货进度";
            this.gridBand15.Columns.Add(this.bandedGridColumn1);
            this.gridBand15.MinWidth = 300;
            this.gridBand15.Name = "gridBand15";
            this.gridBand15.VisibleIndex = 8;
            this.gridBand15.Width = 327;
            // 
            // gridBand3
            // 
@@ -495,6 +450,18 @@
            this.gridBand2.VisibleIndex = 0;
            this.gridBand2.Width = 105;
            // 
            // gv_ownerType
            // 
            this.gv_ownerType.AppearanceCell.Options.UseFont = true;
            this.gv_ownerType.Caption = "累计收料数量";
            this.gv_ownerType.FieldName = "sl";
            this.gv_ownerType.MinWidth = 50;
            this.gv_ownerType.Name = "gv_ownerType";
            this.gv_ownerType.OptionsColumn.AllowEdit = false;
            this.gv_ownerType.Tag = "query_a.Owner_Type";
            this.gv_ownerType.Visible = true;
            this.gv_ownerType.Width = 105;
            // 
            // gridBand6
            // 
            this.gridBand6.AppearanceHeader.Options.UseTextOptions = true;
@@ -504,6 +471,15 @@
            this.gridBand6.Name = "gridBand6";
            this.gridBand6.VisibleIndex = 1;
            this.gridBand6.Width = 105;
            // 
            // gridColumn5
            // 
            this.gridColumn5.Caption = "累计仓退";
            this.gridColumn5.FieldName = "ct";
            this.gridColumn5.MinWidth = 25;
            this.gridColumn5.Name = "gridColumn5";
            this.gridColumn5.Visible = true;
            this.gridColumn5.Width = 105;
            // 
            // gridBand5
            // 
@@ -515,6 +491,30 @@
            this.gridBand5.VisibleIndex = 2;
            this.gridBand5.Width = 130;
            // 
            // gv_ownerId
            // 
            this.gv_ownerId.AppearanceCell.Options.UseFont = true;
            this.gv_ownerId.Caption = "累计验退";
            this.gv_ownerId.FieldName = "yt";
            this.gv_ownerId.MinWidth = 50;
            this.gv_ownerId.Name = "gv_ownerId";
            this.gv_ownerId.OptionsColumn.AllowEdit = false;
            this.gv_ownerId.Tag = "query_a.Owner_Id";
            this.gv_ownerId.Visible = true;
            this.gv_ownerId.Width = 130;
            // 
            // pageBar1
            // 
            this.pageBar1.CurrentPage = 1;
            this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
            this.pageBar1.Location = new System.Drawing.Point(0, 519);
            this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
            this.pageBar1.Name = "pageBar1";
            this.pageBar1.RecordCount = 0;
            this.pageBar1.Size = new System.Drawing.Size(1310, 39);
            this.pageBar1.TabIndex = 4;
            this.pageBar1.TotalPages = 0;
            // 
            // Ckcgmx
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -524,7 +524,7 @@
            this.Controls.Add(this.toolBarMenu1);
            this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
            this.Name = "Ckcgmx";
            this.Text = "条码库存";
            this.Text = "采购明细";
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
            this.xtraTabControl1.ResumeLayout(false);
            this.xtraTabPage1.ResumeLayout(false);

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

@@ -35,8 +35,6 @@
            this.split1 = new DevExpress.XtraEditors.SplitContainerControl();
            this.gcMain1 = new DevExpress.XtraGrid.GridControl();
            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.pageBar1 = new UserControls.Data.UcPageBar();
            this.tips = new DevExpress.Utils.ToolTipController(this.components);
            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -44,6 +42,8 @@
            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.pageBar1 = new UserControls.Data.UcPageBar();
            this.tips = new DevExpress.Utils.ToolTipController(this.components);
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
            this.xtraTabControl1.SuspendLayout();
            this.xtraTabPage1.SuspendLayout();
@@ -65,10 +65,10 @@
            this.toolBarMenu1.guidKey = null;
            this.toolBarMenu1.isSetBtn = false;
            this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
            this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(5);
            this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.toolBarMenu1.Name = "toolBarMenu1";
            this.toolBarMenu1.rptParameter = null;
            this.toolBarMenu1.Size = new System.Drawing.Size(1450, 98);
            this.toolBarMenu1.Size = new System.Drawing.Size(1160, 80);
            this.toolBarMenu1.TabIndex = 0;
            this.toolBarMenu1.xlsInService = null;
            this.toolBarMenu1.xlsOutParameter = "xlsOut_items{}";
@@ -76,11 +76,10 @@
            // xtraTabControl1
            // 
            this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.xtraTabControl1.Location = new System.Drawing.Point(0, 98);
            this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(4);
            this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
            this.xtraTabControl1.Name = "xtraTabControl1";
            this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
            this.xtraTabControl1.Size = new System.Drawing.Size(1450, 736);
            this.xtraTabControl1.Size = new System.Drawing.Size(1160, 602);
            this.xtraTabControl1.TabIndex = 3;
            this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
            this.xtraTabPage1});
@@ -88,9 +87,8 @@
            // xtraTabPage1
            // 
            this.xtraTabPage1.Controls.Add(this.split1);
            this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(4);
            this.xtraTabPage1.Name = "xtraTabPage1";
            this.xtraTabPage1.Size = new System.Drawing.Size(1448, 698);
            this.xtraTabPage1.Size = new System.Drawing.Size(1158, 570);
            this.xtraTabPage1.Text = "数据列表";
            // 
            // split1
@@ -99,7 +97,6 @@
            this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
            this.split1.Horizontal = false;
            this.split1.Location = new System.Drawing.Point(0, 0);
            this.split1.Margin = new System.Windows.Forms.Padding(4);
            this.split1.Name = "split1";
            // 
            // split1.Panel1
@@ -112,19 +109,17 @@
            // 
            this.split1.Panel2.Text = "Panel2";
            this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
            this.split1.Size = new System.Drawing.Size(1448, 698);
            this.split1.Size = new System.Drawing.Size(1158, 570);
            this.split1.SplitterPosition = 0;
            this.split1.TabIndex = 0;
            // 
            // gcMain1
            // 
            this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.gcMain1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4);
            this.gcMain1.Location = new System.Drawing.Point(0, 0);
            this.gcMain1.MainView = this.gridView1;
            this.gcMain1.Margin = new System.Windows.Forms.Padding(4);
            this.gcMain1.Name = "gcMain1";
            this.gcMain1.Size = new System.Drawing.Size(1448, 635);
            this.gcMain1.Size = new System.Drawing.Size(1158, 519);
            this.gcMain1.TabIndex = 2;
            this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gridView1});
@@ -136,7 +131,7 @@
            this.gridView1.Appearance.Row.Options.UseFont = true;
            this.gridView1.Appearance.Row.Options.UseTextOptions = true;
            this.gridView1.Appearance.Row.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
            this.gridView1.ColumnPanelRowHeight = 61;
            this.gridView1.ColumnPanelRowHeight = 50;
            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gridColumn1,
            this.gridColumn2,
@@ -145,108 +140,106 @@
            this.gridColumn5,
            this.gridColumn6,
            this.gridColumn7});
            this.gridView1.DetailHeight = 428;
            this.gridView1.GridControl = this.gcMain1;
            this.gridView1.HorzScrollVisibility = DevExpress.XtraGrid.Views.Base.ScrollVisibility.Always;
            this.gridView1.IndicatorWidth = 62;
            this.gridView1.IndicatorWidth = 50;
            this.gridView1.Name = "gridView1";
            this.gridView1.OptionsFind.ShowSearchNavButtons = false;
            this.gridView1.OptionsView.RowAutoHeight = true;
            this.gridView1.OptionsView.ShowAutoFilterRow = true;
            this.gridView1.OptionsView.ShowGroupPanel = false;
            // 
            // pageBar1
            // 
            this.pageBar1.CurrentPage = 1;
            this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
            this.pageBar1.Location = new System.Drawing.Point(0, 635);
            this.pageBar1.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6);
            this.pageBar1.Name = "pageBar1";
            this.pageBar1.RecordCount = 0;
            this.pageBar1.Size = new System.Drawing.Size(1448, 48);
            this.pageBar1.TabIndex = 4;
            this.pageBar1.TotalPages = 0;
            // 
            // gridColumn1
            // 
            this.gridColumn1.Caption = "物料编码";
            this.gridColumn1.FieldName = "物料编码";
            this.gridColumn1.MinWidth = 30;
            this.gridColumn1.MinWidth = 24;
            this.gridColumn1.Name = "gridColumn1";
            this.gridColumn1.Visible = true;
            this.gridColumn1.VisibleIndex = 0;
            this.gridColumn1.Width = 112;
            this.gridColumn1.Width = 90;
            // 
            // gridColumn2
            // 
            this.gridColumn2.Caption = "物料名称";
            this.gridColumn2.FieldName = "物料名称";
            this.gridColumn2.MinWidth = 30;
            this.gridColumn2.MinWidth = 24;
            this.gridColumn2.Name = "gridColumn2";
            this.gridColumn2.Visible = true;
            this.gridColumn2.VisibleIndex = 1;
            this.gridColumn2.Width = 112;
            this.gridColumn2.Width = 90;
            // 
            // gridColumn3
            // 
            this.gridColumn3.Caption = "物料规格";
            this.gridColumn3.FieldName = "物料规格";
            this.gridColumn3.MinWidth = 30;
            this.gridColumn3.MinWidth = 24;
            this.gridColumn3.Name = "gridColumn3";
            this.gridColumn3.Visible = true;
            this.gridColumn3.VisibleIndex = 2;
            this.gridColumn3.Width = 112;
            this.gridColumn3.Width = 90;
            // 
            // gridColumn4
            // 
            this.gridColumn4.Caption = "总需领量";
            this.gridColumn4.FieldName = "总需领量";
            this.gridColumn4.MinWidth = 30;
            this.gridColumn4.MinWidth = 24;
            this.gridColumn4.Name = "gridColumn4";
            this.gridColumn4.Visible = true;
            this.gridColumn4.VisibleIndex = 3;
            this.gridColumn4.Width = 112;
            this.gridColumn4.Width = 90;
            // 
            // gridColumn5
            // 
            this.gridColumn5.Caption = "总已领量";
            this.gridColumn5.FieldName = "总已领量";
            this.gridColumn5.MinWidth = 30;
            this.gridColumn5.MinWidth = 24;
            this.gridColumn5.Name = "gridColumn5";
            this.gridColumn5.Visible = true;
            this.gridColumn5.VisibleIndex = 4;
            this.gridColumn5.Width = 112;
            this.gridColumn5.Width = 90;
            // 
            // gridColumn6
            // 
            this.gridColumn6.Caption = "当前库存";
            this.gridColumn6.FieldName = "当前库存";
            this.gridColumn6.MinWidth = 30;
            this.gridColumn6.MinWidth = 24;
            this.gridColumn6.Name = "gridColumn6";
            this.gridColumn6.Visible = true;
            this.gridColumn6.VisibleIndex = 5;
            this.gridColumn6.Width = 112;
            this.gridColumn6.Width = 90;
            // 
            // gridColumn7
            // 
            this.gridColumn7.Caption = "总欠料数量";
            this.gridColumn7.FieldName = "总欠料数量";
            this.gridColumn7.MinWidth = 30;
            this.gridColumn7.MinWidth = 24;
            this.gridColumn7.Name = "gridColumn7";
            this.gridColumn7.Visible = true;
            this.gridColumn7.VisibleIndex = 6;
            this.gridColumn7.Width = 112;
            this.gridColumn7.Width = 90;
            // 
            // pageBar1
            // 
            this.pageBar1.CurrentPage = 1;
            this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
            this.pageBar1.Location = new System.Drawing.Point(0, 519);
            this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
            this.pageBar1.Name = "pageBar1";
            this.pageBar1.RecordCount = 0;
            this.pageBar1.Size = new System.Drawing.Size(1158, 39);
            this.pageBar1.TabIndex = 4;
            this.pageBar1.TotalPages = 0;
            // 
            // Frm_MesQL
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
            this.ClientSize = new System.Drawing.Size(1450, 834);
            this.ClientSize = new System.Drawing.Size(1160, 682);
            this.Controls.Add(this.xtraTabControl1);
            this.Controls.Add(this.toolBarMenu1);
            this.Margin = new System.Windows.Forms.Padding(4);
            this.Name = "Frm_MesQL";
            this.Text = "物料信息";
            this.Text = "欠料表";
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
            this.xtraTabControl1.ResumeLayout(false);
            this.xtraTabPage1.ResumeLayout(false);

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,38 @@
namespace Gs.DevApp.DevFrm.Rpt
{
    partial class WomShjh
    {
        /// <summary>
        /// Required designer variable.
        /// </summary>
        private System.ComponentModel.IContainer components = null;

        /// <summary>
        /// Clean up any resources being used.
        /// </summary>
        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
        protected override void Dispose(bool disposing)
        {
            if (disposing && (components != null))
            {
                components.Dispose();
            }
            base.Dispose(disposing);
        }

        #region Windows Form Designer generated code

        /// <summary>
        /// Required method for Designer support - do not modify
        /// the contents of this method with the code editor.
        /// </summary>
        private void InitializeComponent()
        {
            this.components = new System.ComponentModel.Container();
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
            this.Text = "WomShjh";
        }

        #endregion
    }
}

 DevApp/Gs.DevApp/DevFrm/Rpt/WomShjh.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,21 @@
using DevExpress.XtraEditors;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;

namespace Gs.DevApp.DevFrm.Rpt
{
    public partial class WomShjh : DevExpress.XtraEditors.XtraForm
    {
        public WomShjh()
        {
            InitializeComponent();
        }
    }
}

 DevApp/Gs.DevApp/Gs.DevApp.csproj

@@ -695,6 +695,12 @@
    <Compile Include="DevFrm\Rpt\QLCX.Designer.cs">
      <DependentUpon>QLCX.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\Rpt\WomShjh.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\Rpt\WomShjh.Designer.cs">
      <DependentUpon>WomShjh.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\Sales\Frm_SalesDeliverDj.cs">
      <SubType>Form</SubType>
    </Compile>

 DevApp/Gs.DevApp/UserControl/ShowUp.cs

@@ -1,12 +1,9 @@
using CefSharp;
using DevExpress.XtraEditors;
using DevExpress.XtraEditors;
using Gs.DevApp.ToolBox;
using System;
using System.Collections.Generic;
using System.Configuration;
using System.Data;
using System.Net;
using System.Windows.Documents;
using System.Windows.Forms;

namespace Gs.DevApp.UserControl
@@ -33,7 +30,6 @@
            this.parentGuid = _parentGuid;
            this.ucUpFile1.parentGuid = _parentGuid;
            ucUpFile1.UpChanged += UcUpFile1_UpChanged;

            getBtn();
        }

@@ -81,10 +77,10 @@
                btn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.printarea_32x32;
                btn.ImageOptions.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.TopCenter;
                btn.Name = Guid.NewGuid().ToString();
                btn.Size = new System.Drawing.Size(120, 120);
                btn.Size = new System.Drawing.Size(180, 140);
                btn.TabIndex = 1;
                btn.Text = obj.btnTxt;
                btn.Margin = new System.Windows.Forms.Padding(10);
                btn.Margin = new System.Windows.Forms.Padding(5);
                btn.Tag = obj.xls;
                this.flowLayoutPanel1.Controls.Add(btn);
                btn.Click += Btn_Click;

 DevApp/GsDevSolution.sln

@@ -5,8 +5,6 @@
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Gs.DevApp", "Gs.DevApp\Gs.DevApp.csproj", "{A7EB5F78-699E-4514-8905-30842765E673}"
EndProject
Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Gs.Setup", "Gs.Setup\Gs.Setup.vdproj", "{F3C81646-6D3A-F3FA-71B8-C96D2224C585}"
EndProject
Global
    GlobalSection(SolutionConfigurationPlatforms) = preSolution
        Debug|Any CPU = Debug|Any CPU
@@ -17,10 +15,6 @@
        {A7EB5F78-699E-4514-8905-30842765E673}.Debug|Any CPU.Build.0 = Debug|Any CPU
        {A7EB5F78-699E-4514-8905-30842765E673}.Release|Any CPU.ActiveCfg = Release|Any CPU
        {A7EB5F78-699E-4514-8905-30842765E673}.Release|Any CPU.Build.0 = Release|Any CPU
        {F3C81646-6D3A-F3FA-71B8-C96D2224C585}.Debug|Any CPU.ActiveCfg = Debug
        {F3C81646-6D3A-F3FA-71B8-C96D2224C585}.Debug|Any CPU.Build.0 = Debug
        {F3C81646-6D3A-F3FA-71B8-C96D2224C585}.Release|Any CPU.ActiveCfg = Release
        {F3C81646-6D3A-F3FA-71B8-C96D2224C585}.Release|Any CPU.Build.0 = Release
    EndGlobalSection
    GlobalSection(SolutionProperties) = preSolution
        HideSolutionNode = FALSE