33e40a739ef06ee82f6c1869ce4f5088b57ed769..9516ce1ad9e8be1b9d33f7961c91a5683cc83f07
2025-06-07 lu
采购报表
9516ce 对比 | 目录
2025-06-07 lu
报表
aef15a 对比 | 目录
2025-06-07 lu
基础信息
22ea52 对比 | 目录
已添加3个文件
已修改8个文件
913 ■■■■ 文件已修改
DevApp/Gs.DevApp/App.config 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.Designer.cs 24 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.Designer.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Rpt/CKTmkc.Designer.cs 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Rpt/Ckcgmx.Designer.cs 411 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Rpt/Ckcgmx.cs 136 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Rpt/Ckcgmx.resx 120 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs 176 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/Gs.DevApp.csproj 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/UcLookOrg.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/App.config
@@ -29,8 +29,8 @@
    </runtime>
    <appSettings>
         <!--<add key="WebApiUrl" value="http://localhost:5263/" />-->
        <!--<add key="WebApiUrl" value="http://192.168.1.145:8081/" />-->
        <add key="WebApiUrl" value="http://192.168.1.145:81/" />
        <add key="WebApiUrl" value="http://192.168.1.145:8081/" />
        <!--<add key="WebApiUrl" value="http://192.168.1.145:81/" />-->
        <add key="LogPath" value="logs" />
        <add key="ProductName" value="G-MES V2.0" />
        <add key="PageSize" value="50" />
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.Designer.cs
@@ -320,8 +320,6 @@
            this.gv_isFinish.Name = "gv_isFinish";
            this.gv_isFinish.OptionsColumn.AllowEdit = false;
            this.gv_isFinish.Tag = "query_a.IS_FINISH";
            this.gv_isFinish.Visible = true;
            this.gv_isFinish.VisibleIndex = 2;
            this.gv_isFinish.Width = 50;
            // 
            // gv_isOut
@@ -335,7 +333,7 @@
            this.gv_isOut.OptionsColumn.AllowEdit = false;
            this.gv_isOut.Tag = "query_a.IS_OUT";
            this.gv_isOut.Visible = true;
            this.gv_isOut.VisibleIndex = 3;
            this.gv_isOut.VisibleIndex = 2;
            this.gv_isOut.Width = 50;
            // 
            // gv_billNo
@@ -347,7 +345,7 @@
            this.gv_billNo.OptionsColumn.AllowEdit = false;
            this.gv_billNo.Tag = "query_a.BILL_NO";
            this.gv_billNo.Visible = true;
            this.gv_billNo.VisibleIndex = 4;
            this.gv_billNo.VisibleIndex = 3;
            this.gv_billNo.Width = 120;
            // 
            // gv_lastUpdateUser
@@ -359,7 +357,7 @@
            this.gv_lastUpdateUser.OptionsColumn.AllowEdit = false;
            this.gv_lastUpdateUser.Tag = "query_a.LAST_UPDATE_USER";
            this.gv_lastUpdateUser.Visible = true;
            this.gv_lastUpdateUser.VisibleIndex = 5;
            this.gv_lastUpdateUser.VisibleIndex = 4;
            this.gv_lastUpdateUser.Width = 94;
            // 
            // gv_lastUpdateTime
@@ -371,7 +369,7 @@
            this.gv_lastUpdateTime.OptionsColumn.AllowEdit = false;
            this.gv_lastUpdateTime.Tag = "query_a.LAST_UPDATE_TIME";
            this.gv_lastUpdateTime.Visible = true;
            this.gv_lastUpdateTime.VisibleIndex = 6;
            this.gv_lastUpdateTime.VisibleIndex = 5;
            this.gv_lastUpdateTime.Width = 180;
            // 
            // gv_checkUser
@@ -383,7 +381,7 @@
            this.gv_checkUser.OptionsColumn.AllowEdit = false;
            this.gv_checkUser.Tag = "query_a.CHECK_USER";
            this.gv_checkUser.Visible = true;
            this.gv_checkUser.VisibleIndex = 7;
            this.gv_checkUser.VisibleIndex = 6;
            this.gv_checkUser.Width = 94;
            // 
            // gv_checkDate
@@ -395,7 +393,7 @@
            this.gv_checkDate.OptionsColumn.AllowEdit = false;
            this.gv_checkDate.Tag = "query_a.CHECK_DATE";
            this.gv_checkDate.Visible = true;
            this.gv_checkDate.VisibleIndex = 8;
            this.gv_checkDate.VisibleIndex = 7;
            this.gv_checkDate.Width = 94;
            // 
            // gv_returnMethod
@@ -407,7 +405,7 @@
            this.gv_returnMethod.OptionsColumn.AllowEdit = false;
            this.gv_returnMethod.Tag = "query_a.RETURN_METHOD";
            this.gv_returnMethod.Visible = true;
            this.gv_returnMethod.VisibleIndex = 9;
            this.gv_returnMethod.VisibleIndex = 8;
            this.gv_returnMethod.Width = 94;
            // 
            // gv_returnType
@@ -419,7 +417,7 @@
            this.gv_returnType.OptionsColumn.AllowEdit = false;
            this.gv_returnType.Tag = "query_a.RETURN_TYPE";
            this.gv_returnType.Visible = true;
            this.gv_returnType.VisibleIndex = 10;
            this.gv_returnType.VisibleIndex = 9;
            this.gv_returnType.Width = 94;
            // 
            // gv_depotId
@@ -431,7 +429,7 @@
            this.gv_depotId.OptionsColumn.AllowEdit = false;
            this.gv_depotId.Tag = "query_a.DEPOT_ID";
            this.gv_depotId.Visible = true;
            this.gv_depotId.VisibleIndex = 11;
            this.gv_depotId.VisibleIndex = 10;
            this.gv_depotId.Width = 94;
            // 
            // gv_suppId
@@ -443,7 +441,7 @@
            this.gv_suppId.OptionsColumn.AllowEdit = false;
            this.gv_suppId.Tag = "query_a.SUPP_ID";
            this.gv_suppId.Visible = true;
            this.gv_suppId.VisibleIndex = 12;
            this.gv_suppId.VisibleIndex = 11;
            this.gv_suppId.Width = 94;
            // 
            // gv_remark
@@ -455,7 +453,7 @@
            this.gv_remark.OptionsColumn.AllowEdit = false;
            this.gv_remark.Tag = "query_a.REMARK";
            this.gv_remark.Visible = true;
            this.gv_remark.VisibleIndex = 13;
            this.gv_remark.VisibleIndex = 12;
            this.gv_remark.Width = 94;
            // 
            // gridColumn7
DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs
@@ -977,6 +977,10 @@
            // 
            // gridColumn14
            // 
            this.gridColumn14.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
            this.gridColumn14.AppearanceCell.Options.UseForeColor = true;
            this.gridColumn14.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
            this.gridColumn14.AppearanceHeader.Options.UseForeColor = true;
            this.gridColumn14.Caption = "处置意见";
            this.gridColumn14.FieldName = "handResult";
            this.gridColumn14.MinWidth = 25;
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.Designer.cs
@@ -294,7 +294,7 @@
            // gv_ischeck
            // 
            this.gv_ischeck.AppearanceCell.Options.UseFont = true;
            this.gv_ischeck.Caption = "审核标识";
            this.gv_ischeck.Caption = "审核";
            this.gv_ischeck.FieldName = "checkStatus";
            this.gv_ischeck.Name = "gv_ischeck";
            this.gv_ischeck.OptionsColumn.AllowEdit = false;
@@ -305,7 +305,7 @@
            // 
            // gridColumn9
            // 
            this.gridColumn9.Caption = "委外标识";
            this.gridColumn9.Caption = "委外";
            this.gridColumn9.FieldName = "isWw";
            this.gridColumn9.MinWidth = 25;
            this.gridColumn9.Name = "gridColumn9";
DevApp/Gs.DevApp/DevFrm/Rpt/CKTmkc.Designer.cs
@@ -101,19 +101,21 @@
            // split1
            // 
            this.split1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
            this.split1.Horizontal = false;
            this.split1.Location = new System.Drawing.Point(0, 0);
            this.split1.Name = "split1";
            // 
            // split1.split1_Panel1
            // split1.Panel1
            // 
            this.split1.Panel1.Controls.Add(this.gcMain1);
            this.split1.Panel1.Controls.Add(this.pageBar1);
            this.split1.Panel1.Text = "Panel1";
            // 
            // split1.split1_Panel2
            // split1.Panel2
            // 
             this.split1.Panel2.Text = "Panel2";this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
            this.split1.Panel2.Text = "Panel2";
            this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
            this.split1.Size = new System.Drawing.Size(1126, 570);
            this.split1.SplitterPosition = 0;
            this.split1.TabIndex = 0;
@@ -121,7 +123,6 @@
            // gcMain1
            // 
            this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.gcMain1.Location = new System.Drawing.Point(0, 0);
            this.gcMain1.MainView = this.gridView1;
            this.gcMain1.Name = "gcMain1";
@@ -132,7 +133,6 @@
            // 
            // gridView1
            // 
            this.gridView1.Appearance.Row.Options.UseFont = true;
            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gv_guid,
@@ -156,11 +156,11 @@
            this.gridView1.Name = "gridView1";
            this.gridView1.OptionsFind.ShowSearchNavButtons = false;
            this.gridView1.OptionsView.ShowAutoFilterRow = true;
            this.gridView1.OptionsView.ShowFooter = true;
            this.gridView1.OptionsView.ShowGroupPanel = false;
            // 
            // gv_guid
            // 
            this.gv_guid.AppearanceCell.Options.UseFont = true;
            this.gv_guid.Caption = "主键GUID";
            this.gv_guid.FieldName = "guid";
@@ -172,7 +172,6 @@
            // 
            // gv_itemId
            // 
            this.gv_itemId.AppearanceCell.Options.UseFont = true;
            this.gv_itemId.Caption = "物料ID ";
            this.gv_itemId.FieldName = "itemId";
@@ -216,7 +215,6 @@
            // 
            // gv_itemBarcode
            // 
            this.gv_itemBarcode.AppearanceCell.Options.UseFont = true;
            this.gv_itemBarcode.Caption = "物料条码";
            this.gv_itemBarcode.FieldName = "itemBarcode";
@@ -230,13 +228,14 @@
            // 
            // gv_quantity
            // 
            this.gv_quantity.AppearanceCell.Options.UseFont = true;
            this.gv_quantity.Caption = "数量 ";
            this.gv_quantity.FieldName = "quantity";
            this.gv_quantity.MinWidth = 50;
            this.gv_quantity.Name = "gv_quantity";
            this.gv_quantity.OptionsColumn.AllowEdit = false;
            this.gv_quantity.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] {
            new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Sum, "quantity", "合计={0:0.##}")});
            this.gv_quantity.Tag = "query_a.QUANTITY";
            this.gv_quantity.Visible = true;
            this.gv_quantity.VisibleIndex = 5;
@@ -244,7 +243,6 @@
            // 
            // gv_depotId
            // 
            this.gv_depotId.AppearanceCell.Options.UseFont = true;
            this.gv_depotId.Caption = "仓库ID";
            this.gv_depotId.FieldName = "depotId";
@@ -278,7 +276,6 @@
            // 
            // gv_depotSectionsCode
            // 
            this.gv_depotSectionsCode.AppearanceCell.Options.UseFont = true;
            this.gv_depotSectionsCode.Caption = "货位编号";
            this.gv_depotSectionsCode.FieldName = "depotSectionsCode";
@@ -292,7 +289,6 @@
            // 
            // gv_ownerType
            // 
            this.gv_ownerType.AppearanceCell.Options.UseFont = true;
            this.gv_ownerType.Caption = "货主类型";
            this.gv_ownerType.FieldName = "ownerType";
@@ -306,7 +302,6 @@
            // 
            // gv_ownerId
            // 
            this.gv_ownerId.AppearanceCell.Options.UseFont = true;
            this.gv_ownerId.Caption = "货主ID";
            this.gv_ownerId.FieldName = "ownerId";
@@ -330,7 +325,6 @@
            // 
            // gv_indepUserCode
            // 
            this.gv_indepUserCode.AppearanceCell.Options.UseFont = true;
            this.gv_indepUserCode.Caption = "入库人";
            this.gv_indepUserCode.FieldName = "indepUserCode";
@@ -344,7 +338,6 @@
            // 
            // gv_indepDate
            // 
            this.gv_indepDate.AppearanceCell.Options.UseFont = true;
            this.gv_indepDate.Caption = "入库日期 ";
            this.gv_indepDate.FieldName = "indepDate";
DevApp/Gs.DevApp/DevFrm/Rpt/Ckcgmx.Designer.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,411 @@
namespace Gs.DevApp.DevFrm.Rpt
{
    partial class Ckcgmx
    {
        /// <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.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
            this.split1 = new DevExpress.XtraEditors.SplitContainerControl();
            this.gcMain1 = new DevExpress.XtraGrid.GridControl();
            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_itemId = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_itemBarcode = new DevExpress.XtraGrid.Columns.GridColumn();
            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_depotSectionsCode = 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();
            this.gv_indepUserCode = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_indepDate = new DevExpress.XtraGrid.Columns.GridColumn();
            this.pageBar1 = new UserControls.Data.UcPageBar();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
            this.xtraTabControl1.SuspendLayout();
            this.xtraTabPage1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.split1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).BeginInit();
            this.split1.Panel1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).BeginInit();
            this.split1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
            this.SuspendLayout();
            //
            // toolBarMenu1
            //
            this.toolBarMenu1.chkParameter = null;
            this.toolBarMenu1.currentAction = null;
            this.toolBarMenu1.defaultActions = "查询";
            this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
            this.toolBarMenu1.guidKey = null;
            this.toolBarMenu1.isSetBtn = false;
            this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
            this.toolBarMenu1.Name = "toolBarMenu1";
            this.toolBarMenu1.rptParameter = null;
            this.toolBarMenu1.Size = new System.Drawing.Size(1128, 80);
            this.toolBarMenu1.TabIndex = 0;
            this.toolBarMenu1.xlsInService = null;
            this.toolBarMenu1.xlsOutParameter = null;
            //
            // xtraTabControl1
            //
            this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
            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(1128, 602);
            this.xtraTabControl1.TabIndex = 3;
            this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
            this.xtraTabPage1});
            //
            // xtraTabPage1
            //
            this.xtraTabPage1.Controls.Add(this.split1);
            this.xtraTabPage1.Name = "xtraTabPage1";
            this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
            this.xtraTabPage1.Text = "数据列表";
            //
            // split1
            //
            this.split1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
            this.split1.Horizontal = false;
            this.split1.Location = new System.Drawing.Point(0, 0);
            this.split1.Name = "split1";
            //
            // split1.Panel1
            //
            this.split1.Panel1.Controls.Add(this.gcMain1);
            this.split1.Panel1.Controls.Add(this.pageBar1);
            this.split1.Panel1.Text = "Panel1";
            //
            // split1.Panel2
            //
            this.split1.Panel2.Text = "Panel2";
            this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
            this.split1.Size = new System.Drawing.Size(1126, 570);
            this.split1.SplitterPosition = 0;
            this.split1.TabIndex = 0;
            //
            // gcMain1
            //
            this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.gcMain1.Location = new System.Drawing.Point(0, 0);
            this.gcMain1.MainView = this.gridView1;
            this.gcMain1.Name = "gcMain1";
            this.gcMain1.Size = new System.Drawing.Size(1126, 519);
            this.gcMain1.TabIndex = 2;
            this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gridView1});
            //
            // gridView1
            //
            this.gridView1.Appearance.Row.Options.UseFont = true;
            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gv_guid,
            this.gv_itemBarcode,
            this.gv_itemId,
            this.gridColumn3,
            this.gridColumn2,
            this.gridColumn4,
            this.gv_quantity,
            this.gv_depotId,
            this.gridColumn6,
            this.gridColumn1,
            this.gv_depotSectionsCode,
            this.gv_ownerType,
            this.gv_ownerId,
            this.gridColumn5,
            this.gv_indepUserCode,
            this.gv_indepDate});
            this.gridView1.GridControl = this.gcMain1;
            this.gridView1.IndicatorWidth = 50;
            this.gridView1.Name = "gridView1";
            this.gridView1.OptionsFind.ShowSearchNavButtons = false;
            this.gridView1.OptionsView.ShowAutoFilterRow = true;
            this.gridView1.OptionsView.ShowFooter = true;
            this.gridView1.OptionsView.ShowGroupPanel = false;
            //
            // gv_guid
            //
            this.gv_guid.AppearanceCell.Options.UseFont = true;
            this.gv_guid.Caption = "采购明细GUID";
            this.gv_guid.FieldName = "guid";
            this.gv_guid.MinWidth = 50;
            this.gv_guid.Name = "gv_guid";
            this.gv_guid.OptionsColumn.AllowEdit = false;
            this.gv_guid.Tag = "query_a.guid";
            this.gv_guid.Width = 94;
            //
            // gv_itemId
            //
            this.gv_itemId.AppearanceCell.Options.UseFont = true;
            this.gv_itemId.Caption = "物料ID ";
            this.gv_itemId.FieldName = "itemId";
            this.gv_itemId.MinWidth = 50;
            this.gv_itemId.Name = "gv_itemId";
            this.gv_itemId.OptionsColumn.AllowEdit = false;
            this.gv_itemId.Tag = "query_a.ITEM_ID";
            this.gv_itemId.Visible = true;
            this.gv_itemId.VisibleIndex = 0;
            this.gv_itemId.Width = 73;
            //
            // gridColumn3
            //
            this.gridColumn3.Caption = "物料编码";
            this.gridColumn3.FieldName = "itemNo";
            this.gridColumn3.MinWidth = 25;
            this.gridColumn3.Name = "gridColumn3";
            this.gridColumn3.Visible = true;
            this.gridColumn3.VisibleIndex = 2;
            this.gridColumn3.Width = 73;
            //
            // gridColumn2
            //
            this.gridColumn2.Caption = "物料名称";
            this.gridColumn2.FieldName = "itemName";
            this.gridColumn2.MinWidth = 25;
            this.gridColumn2.Name = "gridColumn2";
            this.gridColumn2.Visible = true;
            this.gridColumn2.VisibleIndex = 3;
            this.gridColumn2.Width = 73;
            //
            // gridColumn4
            //
            this.gridColumn4.Caption = "规格型号";
            this.gridColumn4.FieldName = "itemModel";
            this.gridColumn4.MinWidth = 25;
            this.gridColumn4.Name = "gridColumn4";
            this.gridColumn4.Visible = true;
            this.gridColumn4.VisibleIndex = 4;
            this.gridColumn4.Width = 73;
            //
            // gv_itemBarcode
            //
            this.gv_itemBarcode.AppearanceCell.Options.UseFont = true;
            this.gv_itemBarcode.Caption = "采购单号";
            this.gv_itemBarcode.FieldName = "hNo";
            this.gv_itemBarcode.MinWidth = 50;
            this.gv_itemBarcode.Name = "gv_itemBarcode";
            this.gv_itemBarcode.OptionsColumn.AllowEdit = false;
            this.gv_itemBarcode.Tag = "query_a.ITEM_BARCODE";
            this.gv_itemBarcode.Visible = true;
            this.gv_itemBarcode.VisibleIndex = 1;
            this.gv_itemBarcode.Width = 73;
            //
            // gv_quantity
            //
            this.gv_quantity.AppearanceCell.Options.UseFont = true;
            this.gv_quantity.Caption = "采购单数量 ";
            this.gv_quantity.FieldName = "cgsl";
            this.gv_quantity.MinWidth = 50;
            this.gv_quantity.Name = "gv_quantity";
            this.gv_quantity.OptionsColumn.AllowEdit = false;
            this.gv_quantity.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] {
            new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Sum, "quantity", "合计={0:0.##}")});
            this.gv_quantity.Tag = "query_a.QUANTITY";
            this.gv_quantity.Visible = true;
            this.gv_quantity.VisibleIndex = 5;
            this.gv_quantity.Width = 73;
            //
            // gv_depotId
            //
            this.gv_depotId.AppearanceCell.Options.UseFont = true;
            this.gv_depotId.Caption = "仓库ID";
            this.gv_depotId.FieldName = "depotId";
            this.gv_depotId.MinWidth = 50;
            this.gv_depotId.Name = "gv_depotId";
            this.gv_depotId.OptionsColumn.AllowEdit = false;
            this.gv_depotId.Tag = "query_a.DEPOT_ID";
            this.gv_depotId.Visible = true;
            this.gv_depotId.VisibleIndex = 6;
            this.gv_depotId.Width = 73;
            //
            // gridColumn6
            //
            this.gridColumn6.Caption = "仓库编号";
            this.gridColumn6.FieldName = "depotNo";
            this.gridColumn6.MinWidth = 25;
            this.gridColumn6.Name = "gridColumn6";
            this.gridColumn6.Visible = true;
            this.gridColumn6.VisibleIndex = 7;
            this.gridColumn6.Width = 73;
            //
            // gridColumn1
            //
            this.gridColumn1.Caption = "仓库名称";
            this.gridColumn1.FieldName = "depotName";
            this.gridColumn1.MinWidth = 25;
            this.gridColumn1.Name = "gridColumn1";
            this.gridColumn1.Visible = true;
            this.gridColumn1.VisibleIndex = 8;
            this.gridColumn1.Width = 73;
            //
            // gv_depotSectionsCode
            //
            this.gv_depotSectionsCode.AppearanceCell.Options.UseFont = true;
            this.gv_depotSectionsCode.Caption = "货位编号";
            this.gv_depotSectionsCode.FieldName = "depotSectionsCode";
            this.gv_depotSectionsCode.MinWidth = 50;
            this.gv_depotSectionsCode.Name = "gv_depotSectionsCode";
            this.gv_depotSectionsCode.OptionsColumn.AllowEdit = false;
            this.gv_depotSectionsCode.Tag = "query_a.DEPOT_SECTIONS_CODE";
            this.gv_depotSectionsCode.Visible = true;
            this.gv_depotSectionsCode.VisibleIndex = 9;
            this.gv_depotSectionsCode.Width = 73;
            //
            // gv_ownerType
            //
            this.gv_ownerType.AppearanceCell.Options.UseFont = true;
            this.gv_ownerType.Caption = "货主类型";
            this.gv_ownerType.FieldName = "ownerType";
            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.VisibleIndex = 10;
            this.gv_ownerType.Width = 73;
            //
            // gv_ownerId
            //
            this.gv_ownerId.AppearanceCell.Options.UseFont = true;
            this.gv_ownerId.Caption = "货主ID";
            this.gv_ownerId.FieldName = "ownerId";
            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.VisibleIndex = 11;
            this.gv_ownerId.Width = 73;
            //
            // gridColumn5
            //
            this.gridColumn5.Caption = "货主名称";
            this.gridColumn5.FieldName = "ownerName";
            this.gridColumn5.MinWidth = 25;
            this.gridColumn5.Name = "gridColumn5";
            this.gridColumn5.Visible = true;
            this.gridColumn5.VisibleIndex = 12;
            this.gridColumn5.Width = 73;
            //
            // gv_indepUserCode
            //
            this.gv_indepUserCode.AppearanceCell.Options.UseFont = true;
            this.gv_indepUserCode.Caption = "入库人";
            this.gv_indepUserCode.FieldName = "indepUserCode";
            this.gv_indepUserCode.MinWidth = 50;
            this.gv_indepUserCode.Name = "gv_indepUserCode";
            this.gv_indepUserCode.OptionsColumn.AllowEdit = false;
            this.gv_indepUserCode.Tag = "query_a.INDEP_USER_CODE";
            this.gv_indepUserCode.Visible = true;
            this.gv_indepUserCode.VisibleIndex = 13;
            this.gv_indepUserCode.Width = 73;
            //
            // gv_indepDate
            //
            this.gv_indepDate.AppearanceCell.Options.UseFont = true;
            this.gv_indepDate.Caption = "入库日期 ";
            this.gv_indepDate.FieldName = "indepDate";
            this.gv_indepDate.MinWidth = 10;
            this.gv_indepDate.Name = "gv_indepDate";
            this.gv_indepDate.OptionsColumn.AllowEdit = false;
            this.gv_indepDate.Tag = "query_a.INDEP_DATE";
            this.gv_indepDate.Visible = true;
            this.gv_indepDate.VisibleIndex = 14;
            this.gv_indepDate.Width = 10;
            //
            // 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(1126, 39);
            this.pageBar1.TabIndex = 4;
            this.pageBar1.TotalPages = 0;
            //
            // Ckcgmx
            //
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
            this.ClientSize = new System.Drawing.Size(1128, 682);
            this.Controls.Add(this.xtraTabControl1);
            this.Controls.Add(this.toolBarMenu1);
            this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
            this.Name = "Ckcgmx";
            this.Text = "条码库存";
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
            this.xtraTabControl1.ResumeLayout(false);
            this.xtraTabPage1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).EndInit();
            this.split1.Panel1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.split1)).EndInit();
            this.split1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
            this.ResumeLayout(false);
        }
        #endregion
        private UserControl.UcToolBarMenu toolBarMenu1;
        private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
        private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
        private DevExpress.XtraEditors.SplitContainerControl split1;
        private DevExpress.XtraGrid.GridControl gcMain1;
        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
        private DevExpress.XtraGrid.Columns.GridColumn gv_guid;
        private DevExpress.XtraGrid.Columns.GridColumn gv_itemId;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
        private DevExpress.XtraGrid.Columns.GridColumn gv_itemBarcode;
        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_depotSectionsCode;
        private DevExpress.XtraGrid.Columns.GridColumn gv_ownerType;
        private DevExpress.XtraGrid.Columns.GridColumn gv_ownerId;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
        private DevExpress.XtraGrid.Columns.GridColumn gv_indepUserCode;
        private DevExpress.XtraGrid.Columns.GridColumn gv_indepDate;
        private UserControls.Data.UcPageBar pageBar1;
    }
}
DevApp/Gs.DevApp/DevFrm/Rpt/Ckcgmx.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,136 @@
using DevExpress.XtraEditors;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
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 Ckcgmx : DevExpress.XtraEditors.XtraForm
    {
        string _webServiceName = "Ck/";
        List<FilterEntity> _filterList = new List<FilterEntity>();
        public Ckcgmx()
        {
            InitializeComponent();
            this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
            this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
            this.toolBarMenu1.getXmlConfig();
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, this, "", "", (value) =>
            {
            });
            Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
            {
            }, (value) =>
            {
                getPageList(this.pageBar1.CurrentPage);
            });
            getPageList(1);
            pageBar1.PagerEvent += PageBar1_PagerEvent;
        }
        private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
        {
            _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
            await Task.Delay(100);
            getPageList(1);
        }
        /// <summary>
        /// åˆ†é¡µäº‹ä»¶
        /// </summary>
        /// <param name="curPage"></param>
        /// <param name="pageSize"></param>
        private void PageBar1_PagerEvent(int curPage, int pageSize)
        {
            getPageList(curPage);
        }
        /// <summary>
        /// æŸ¥è¯¢äº‹ä»¶
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
        {
            gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
            gridView1.ActiveFilter.Clear();
            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
            var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            frm.UpdateParent += Frm_UpdateParent;
            frm.ShowDialog();
        }
        /// <summary>
        /// æŸ¥è¯¢å›žè°ƒ
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void Frm_UpdateParent(object sender, UpdateParentEventArgs e)
        {
            _filterList = e.FilterList;
            getPageList(1);
        }
        /// <summary>
        /// åˆ·æ–°äº‹ä»¶
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
        {
            getPageList(this.pageBar1.CurrentPage);
        }
        /// <summary>
        ///
        /// </summary>
        /// <param name="curPage">第几页</param>
        /// <param name="pageSize">每页几条</param>
        private void getPageList(int curPage)
        {
            gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
            PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "a.INDEP_DATE", "asc", "", _sbSqlWhere.ToString());
            string json = JsonConvert.SerializeObject(pgq);
            try
            {
                var strReturn = UtilityHelper.HttpPost("", _webServiceName + "GetListPageCgmx", json);
                ReturnModel<PageListModel> dd = UtilityHelper.ReturnToTablePage(strReturn);
                if (dd.rtnCode > 0)
                {
                    DataTable dt = dd.rtnData.list;
                    gcMain1.BindingContext = new BindingContext();
                    gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
                    if (dt.Rows.Count > 0)
                    {
                        gcMain1.DataSource = dt;
                        gcMain1.ForceInitialize();
                        gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
                    }
                    else
                        UtilityHelper.SetDefaultTable(gcMain1, gridView1);
                    gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
                    pageBar1.TotalPages = dd.rtnData.pages;//总页
                    pageBar1.CurrentPage = curPage;//当前页
                    pageBar1.RecordCount = dd.rtnData.total;//总记录数
                }
                else
                {
                    ToolBox.MsgHelper.ShowError("提示:" + dd.rtnMsg);
                }
            }
            catch (Exception ex)
            {
                ToolBox.MsgHelper.ShowError("提示:" + ex.Message);
            }
        }
    }
}
DevApp/Gs.DevApp/DevFrm/Rpt/Ckcgmx.resx
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
  <!--
    Microsoft ResX Schema
    Version 2.0
    The primary goals of this format is to allow a simple XML format
    that is mostly human readable. The generation and parsing of the
    various data types are done through the TypeConverter classes
    associated with the data types.
    Example:
    ... ado.net/XML headers & schema ...
    <resheader name="resmimetype">text/microsoft-resx</resheader>
    <resheader name="version">2.0</resheader>
    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
        <value>[base64 mime encoded serialized .NET Framework object]</value>
    </data>
    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
        <comment>This is a comment</comment>
    </data>
    There are any number of "resheader" rows that contain simple
    name/value pairs.
    Each data row contains a name, and value. The row also contains a
    type or mimetype. Type corresponds to a .NET class that support
    text/value conversion through the TypeConverter architecture.
    Classes that don't support this are serialized and stored with the
    mimetype set.
    The mimetype is used for serialized objects, and tells the
    ResXResourceReader how to depersist the object. This is currently not
    extensible. For a given mimetype the value must be set accordingly:
    Note - application/x-microsoft.net.object.binary.base64 is the format
    that the ResXResourceWriter will generate, however the reader can
    read any of the formats listed below.
    mimetype: application/x-microsoft.net.object.binary.base64
    value   : The object must be serialized with
            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
            : and then encoded with base64 encoding.
    mimetype: application/x-microsoft.net.object.soap.base64
    value   : The object must be serialized with
            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
            : and then encoded with base64 encoding.
    mimetype: application/x-microsoft.net.object.bytearray.base64
    value   : The object must be serialized into a byte array
            : using a System.ComponentModel.TypeConverter
            : and then encoded with base64 encoding.
    -->
  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
    <xsd:element name="root" msdata:IsDataSet="true">
      <xsd:complexType>
        <xsd:choice maxOccurs="unbounded">
          <xsd:element name="metadata">
            <xsd:complexType>
              <xsd:sequence>
                <xsd:element name="value" type="xsd:string" minOccurs="0" />
              </xsd:sequence>
              <xsd:attribute name="name" use="required" type="xsd:string" />
              <xsd:attribute name="type" type="xsd:string" />
              <xsd:attribute name="mimetype" type="xsd:string" />
              <xsd:attribute ref="xml:space" />
            </xsd:complexType>
          </xsd:element>
          <xsd:element name="assembly">
            <xsd:complexType>
              <xsd:attribute name="alias" type="xsd:string" />
              <xsd:attribute name="name" type="xsd:string" />
            </xsd:complexType>
          </xsd:element>
          <xsd:element name="data">
            <xsd:complexType>
              <xsd:sequence>
                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
              </xsd:sequence>
              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
              <xsd:attribute ref="xml:space" />
            </xsd:complexType>
          </xsd:element>
          <xsd:element name="resheader">
            <xsd:complexType>
              <xsd:sequence>
                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
              </xsd:sequence>
              <xsd:attribute name="name" type="xsd:string" use="required" />
            </xsd:complexType>
          </xsd:element>
        </xsd:choice>
      </xsd:complexType>
    </xsd:element>
  </xsd:schema>
  <resheader name="resmimetype">
    <value>text/microsoft-resx</value>
  </resheader>
  <resheader name="version">
    <value>2.0</value>
  </resheader>
  <resheader name="reader">
    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
</root>
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
@@ -30,29 +30,29 @@
        private void InitializeComponent()
        {
            this.components = new System.ComponentModel.Container();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition21 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition22 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition23 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition24 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition17 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition18 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition19 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition20 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition25 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition26 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition21 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition27 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition28 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition29 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition30 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition22 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition23 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition24 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition11 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition12 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition13 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition14 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition10 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition11 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition12 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition15 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition16 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition13 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition17 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition18 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition19 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition20 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition14 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition15 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition16 = new DevExpress.XtraLayout.RowDefinition();
            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.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -381,7 +381,7 @@
            // gv_urgentFlag
            // 
            this.gv_urgentFlag.AppearanceCell.Options.UseFont = true;
            this.gv_urgentFlag.Caption = "急料标识";
            this.gv_urgentFlag.Caption = "急料";
            this.gv_urgentFlag.FieldName = "urgentFlag";
            this.gv_urgentFlag.MaxWidth = 50;
            this.gv_urgentFlag.MinWidth = 50;
@@ -394,7 +394,7 @@
            // 
            // gridColumn25
            // 
            this.gridColumn25.Caption = "委外标识";
            this.gridColumn25.Caption = "委外";
            this.gridColumn25.FieldName = "fType";
            this.gridColumn25.MinWidth = 25;
            this.gridColumn25.Name = "gridColumn25";
@@ -773,32 +773,32 @@
            this.layoutControlItem13});
            this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
            this.Root.Name = "Root";
            columnDefinition21.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition21.Width = 100D;
            columnDefinition22.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition22.Width = 100D;
            columnDefinition23.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition23.Width = 100D;
            columnDefinition24.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition24.Width = 100D;
            columnDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition11.Width = 100D;
            columnDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition12.Width = 100D;
            columnDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition13.Width = 100D;
            columnDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition14.Width = 100D;
            this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
            columnDefinition21,
            columnDefinition22,
            columnDefinition23,
            columnDefinition24});
            rowDefinition17.Height = 100D;
            rowDefinition17.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition18.Height = 100D;
            rowDefinition18.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition19.Height = 100D;
            rowDefinition19.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition20.Height = 100D;
            rowDefinition20.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition11,
            columnDefinition12,
            columnDefinition13,
            columnDefinition14});
            rowDefinition9.Height = 100D;
            rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition10.Height = 100D;
            rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition11.Height = 100D;
            rowDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition12.Height = 100D;
            rowDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
            this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
            rowDefinition17,
            rowDefinition18,
            rowDefinition19,
            rowDefinition20});
            rowDefinition9,
            rowDefinition10,
            rowDefinition11,
            rowDefinition12});
            this.Root.Size = new System.Drawing.Size(1344, 140);
            this.Root.TextVisible = false;
            // 
@@ -1036,17 +1036,17 @@
            this.layoutControlItem27});
            this.layoutControlGroup2.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
            this.layoutControlGroup2.Name = "layoutControlGroup2";
            columnDefinition25.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition25.Width = 100D;
            columnDefinition26.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition26.Width = 100D;
            columnDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition15.Width = 100D;
            columnDefinition16.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition16.Width = 100D;
            this.layoutControlGroup2.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
            columnDefinition25,
            columnDefinition26});
            rowDefinition21.Height = 100D;
            rowDefinition21.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition15,
            columnDefinition16});
            rowDefinition13.Height = 100D;
            rowDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
            this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
            rowDefinition21});
            rowDefinition13});
            this.layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
            this.layoutControlGroup2.Size = new System.Drawing.Size(336, 28);
            this.layoutControlGroup2.TextVisible = false;
@@ -1207,29 +1207,29 @@
            this.layoutControlItem25});
            this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
            this.layoutControlGroup1.Name = "Root";
            columnDefinition27.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition27.Width = 100D;
            columnDefinition28.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition28.Width = 100D;
            columnDefinition29.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition29.Width = 100D;
            columnDefinition30.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition30.Width = 100D;
            columnDefinition17.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition17.Width = 100D;
            columnDefinition18.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition18.Width = 100D;
            columnDefinition19.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition19.Width = 100D;
            columnDefinition20.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition20.Width = 100D;
            this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
            columnDefinition27,
            columnDefinition28,
            columnDefinition29,
            columnDefinition30});
            rowDefinition22.Height = 100D;
            rowDefinition22.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition23.Height = 100D;
            rowDefinition23.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition24.Height = 100D;
            rowDefinition24.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition17,
            columnDefinition18,
            columnDefinition19,
            columnDefinition20});
            rowDefinition14.Height = 100D;
            rowDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition15.Height = 100D;
            rowDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition16.Height = 100D;
            rowDefinition16.SizeType = System.Windows.Forms.SizeType.Percent;
            this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
            rowDefinition22,
            rowDefinition23,
            rowDefinition24});
            rowDefinition14,
            rowDefinition15,
            rowDefinition16});
            this.layoutControlGroup1.Size = new System.Drawing.Size(1380, 116);
            this.layoutControlGroup1.TextVisible = false;
            // 
@@ -1521,8 +1521,6 @@
            this.gridColumn5.MinWidth = 50;
            this.gridColumn5.Name = "gridColumn5";
            this.gridColumn5.OptionsColumn.ReadOnly = true;
            this.gridColumn5.Visible = true;
            this.gridColumn5.VisibleIndex = 9;
            this.gridColumn5.Width = 159;
            // 
            // gridColumn9
@@ -1533,7 +1531,7 @@
            this.gridColumn9.Name = "gridColumn9";
            this.gridColumn9.OptionsColumn.ReadOnly = true;
            this.gridColumn9.Visible = true;
            this.gridColumn9.VisibleIndex = 10;
            this.gridColumn9.VisibleIndex = 9;
            this.gridColumn9.Width = 83;
            // 
            // gridColumn7
@@ -1543,8 +1541,6 @@
            this.gridColumn7.MinWidth = 50;
            this.gridColumn7.Name = "gridColumn7";
            this.gridColumn7.OptionsColumn.ReadOnly = true;
            this.gridColumn7.Visible = true;
            this.gridColumn7.VisibleIndex = 11;
            this.gridColumn7.Width = 83;
            // 
            // gridColumn15
@@ -1554,7 +1550,7 @@
            this.gridColumn15.MinWidth = 50;
            this.gridColumn15.Name = "gridColumn15";
            this.gridColumn15.Visible = true;
            this.gridColumn15.VisibleIndex = 12;
            this.gridColumn15.VisibleIndex = 10;
            this.gridColumn15.Width = 83;
            // 
            // gridColumn19
@@ -1564,7 +1560,7 @@
            this.gridColumn19.MinWidth = 50;
            this.gridColumn19.Name = "gridColumn19";
            this.gridColumn19.Visible = true;
            this.gridColumn19.VisibleIndex = 13;
            this.gridColumn19.VisibleIndex = 11;
            this.gridColumn19.Width = 91;
            // 
            // gridColumn12
@@ -1574,7 +1570,7 @@
            this.gridColumn12.MinWidth = 25;
            this.gridColumn12.Name = "gridColumn12";
            this.gridColumn12.Visible = true;
            this.gridColumn12.VisibleIndex = 14;
            this.gridColumn12.VisibleIndex = 12;
            this.gridColumn12.Width = 94;
            // 
            // tabMxPage2
@@ -1774,10 +1770,10 @@
            // rptChongDa
            // 
            this.rptChongDa.AutoHeight = false;
            editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.printernetwork_16x16;
            editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.printernetwork_16x16;
            editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            this.rptChongDa.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "重打", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", 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.rptChongDa.Name = "rptChongDa";
            this.rptChongDa.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            this.rptChongDa.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -566,6 +566,12 @@
    <Compile Include="DevFrm\Rk\HistoryDhmxcs.Designer.cs">
      <DependentUpon>HistoryDhmxcs.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\Rpt\Ckcgmx.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\Rpt\Ckcgmx.Designer.cs">
      <DependentUpon>Ckcgmx.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\Rpt\CKTmkc.cs">
      <SubType>Form</SubType>
    </Compile>
@@ -1441,6 +1447,9 @@
    <EmbeddedResource Include="DevFrm\Rk\HistoryDhmxcs.resx">
      <DependentUpon>HistoryDhmxcs.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\Rpt\Ckcgmx.resx">
      <DependentUpon>Ckcgmx.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\Rpt\CKTmkc.resx">
      <DependentUpon>CKTmkc.cs</DependentUpon>
    </EmbeddedResource>
DevApp/Gs.DevApp/UserControl/UcLookOrg.cs
@@ -34,7 +34,7 @@
        private void getSuppler()
        {
            var pgq = new PageQueryModel(1, 999999, "FID", "asc", "", " and IS_STATUS=1");
            var pgq = new PageQueryModel(1, 999999, "fNumber", "asc", "", " and IS_STATUS=1");
            var json = JsonConvert.SerializeObject(pgq);
            try
            {