细节

lu

2025-01-17 b5c4e1d7e2b59baf984105c2489274163c97136b

细节

 DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.Designer.cs

@@ -103,6 +103,7 @@
            this.lbGuid = new System.Windows.Forms.Label();
            this.txt_itemName = new DevExpress.XtraEditors.MemoEdit();
            this.txt_itemModel = new DevExpress.XtraEditors.MemoEdit();
            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fissueType.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_ffinishreceiptoverrate.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_materialProperti.Properties)).BeginInit();
@@ -204,7 +205,7 @@
            this.gv_materialGroup.AppearanceCell.Options.UseFont = true;
            this.gv_materialGroup.Caption = "物料分组";
            this.gv_materialGroup.FieldName = "remarks";
            this.gv_materialGroup.MinWidth = 130;
            this.gv_materialGroup.MinWidth = 50;
            this.gv_materialGroup.Name = "gv_materialGroup";
            this.gv_materialGroup.OptionsColumn.AllowEdit = false;
            this.gv_materialGroup.Tag = "query_a.materialGroup";
@@ -757,7 +758,7 @@
            this.gv_itemNo.AppearanceCell.Options.UseFont = true;
            this.gv_itemNo.Caption = "物料编码";
            this.gv_itemNo.FieldName = "itemNo";
            this.gv_itemNo.MinWidth = 100;
            this.gv_itemNo.MinWidth = 50;
            this.gv_itemNo.Name = "gv_itemNo";
            this.gv_itemNo.OptionsColumn.AllowEdit = false;
            this.gv_itemNo.Tag = "query_a.item_no";
@@ -803,6 +804,7 @@
            this.gridView1.ColumnPanelRowHeight = 50;
            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gridColumn4,
            this.gridColumn2,
            this.gv_itemNo,
            this.gv_itemName,
            this.gv_itemModel,
@@ -833,7 +835,7 @@
            // 
            this.gridColumn4.Caption = "使用组织";
            this.gridColumn4.FieldName = "fSubsidiary";
            this.gridColumn4.MinWidth = 250;
            this.gridColumn4.MinWidth = 50;
            this.gridColumn4.Name = "gridColumn4";
            this.gridColumn4.OptionsColumn.AllowEdit = false;
            this.gridColumn4.Tag = "org.FNumber";
@@ -847,7 +849,7 @@
            this.gridColumn1.DisplayFormat.FormatString = "d";
            this.gridColumn1.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
            this.gridColumn1.FieldName = "lastupdateDate";
            this.gridColumn1.MinWidth = 180;
            this.gridColumn1.MinWidth = 50;
            this.gridColumn1.Name = "gridColumn1";
            this.gridColumn1.OptionsFilter.FilterPopupMode = DevExpress.XtraGrid.Columns.FilterPopupMode.Date;
            this.gridColumn1.Tag = "query_a.lastupdate_date";
@@ -1060,6 +1062,16 @@
            this.txt_itemModel.TabIndex = 219;
            this.txt_itemModel.Tag = "itemModel";
            // 
            // gridColumn2
            // 
            this.gridColumn2.Caption = "物料ID";
            this.gridColumn2.FieldName = "id";
            this.gridColumn2.MinWidth = 25;
            this.gridColumn2.Name = "gridColumn2";
            this.gridColumn2.Visible = true;
            this.gridColumn2.VisibleIndex = 0;
            this.gridColumn2.Width = 94;
            // 
            // Frm_MesItems
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1201,5 +1213,6 @@
        private DevExpress.XtraEditors.TextEdit txt_wlName;
        private DevExpress.XtraEditors.TextEdit txt_kfName;
        private DevExpress.XtraEditors.TextEdit txt_wwName;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
    }
}

 DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.cs

@@ -109,7 +109,7 @@
        private void getPageList(int curPage)
        {
            var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
            var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "fname", "asc", "",
            var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "a.fnumber", "asc", "",
                _sbSqlWhere.ToString());
            var json = JsonConvert.SerializeObject(pgq);
            try
@@ -126,6 +126,7 @@
                    {
                        gcMain.DataSource = dt;
                        gcMain.ForceInitialize();
                        gridView1.BestFitColumns();
                    }
                    else
                        UtilityHelper.SetDefaultTable(gcMain, gridView1);

 DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.Designer.cs

@@ -116,6 +116,7 @@
            this.gv_fforbidStatus.AppearanceCell.Options.UseFont = true;
            this.gv_fforbidStatus.Caption = "禁用状态";
            this.gv_fforbidStatus.FieldName = "fforbidStatus";
            this.gv_fforbidStatus.MaxWidth = 50;
            this.gv_fforbidStatus.MinWidth = 50;
            this.gv_fforbidStatus.Name = "gv_fforbidStatus";
            this.gv_fforbidStatus.OptionsColumn.AllowEdit = false;
@@ -201,7 +202,7 @@
            this.gv_startDate.AppearanceCell.Options.UseFont = true;
            this.gv_startDate.Caption = "任岗开始日期";
            this.gv_startDate.FieldName = "startDate";
            this.gv_startDate.MinWidth = 180;
            this.gv_startDate.MinWidth = 50;
            this.gv_startDate.Name = "gv_startDate";
            this.gv_startDate.OptionsColumn.AllowEdit = false;
            this.gv_startDate.Tag = "query_a.start_date";
@@ -475,7 +476,7 @@
            // 
            this.gridColumn1.Caption = "使用组织";
            this.gridColumn1.FieldName = "fSubsidiary";
            this.gridColumn1.MinWidth = 250;
            this.gridColumn1.MinWidth = 50;
            this.gridColumn1.Name = "gridColumn1";
            this.gridColumn1.OptionsColumn.AllowEdit = false;
            this.gridColumn1.Tag = "org.Fnamber";

 DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.cs

@@ -110,7 +110,7 @@
        private   void getPageList(int curPage)
        {
            var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
            var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "a.create_date",
            var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "org.FNumber asc ,a.staff_no",
                "asc", "", _sbSqlWhere.ToString());
            var json = JsonConvert.SerializeObject(pgq);
            try
@@ -127,6 +127,7 @@
                    {
                        gcMain.DataSource = dt;
                        gcMain.ForceInitialize();
                        gridView1.BestFitColumns();
                    }
                    else
                        UtilityHelper.SetDefaultTable(gcMain, gridView1);

 DevApp/Gs.DevApp/DevFrm/FrmMain.Designer.cs

@@ -278,7 +278,7 @@
            // barOrg
            // 
            this.barOrg.Alignment = DevExpress.XtraBars.BarItemLinkAlignment.Right;
            this.barOrg.Caption = "选择组织";
            this.barOrg.Caption = "切换组织";
            this.barOrg.Edit = this.repositoryItemCheckedComboBoxEdit1;
            this.barOrg.EditValue = "切换组织";
            this.barOrg.EditWidth = 120;

 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.Designer.cs

@@ -30,10 +30,8 @@
        private void InitializeComponent()
        {
            this.gvMx1trLotno = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1lotDate = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1createBy = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1quantity = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1lotNo = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1itemBarcode = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1guid = new DevExpress.XtraGrid.Columns.GridColumn();
            this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -68,10 +66,13 @@
            this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
            this.tabMx = new DevExpress.XtraTab.XtraTabControl();
            this.panel1 = new System.Windows.Forms.Panel();
            this.txt_tc_1 = new DevExpress.XtraEditors.CheckEdit();
            this.txt_suppNo_1 = new Gs.DevApp.UserControl.UcLookSupplier();
            this.txt_fSubsidiary = new DevExpress.XtraEditors.TextEdit();
            this.labelControl6 = new DevExpress.XtraEditors.LabelControl();
            this.txt_iCount_1 = new DevExpress.XtraEditors.TextEdit();
            this.txt_psnQty_1 = new DevExpress.XtraEditors.TextEdit();
            this.ucBtnPrint1 = new Gs.DevApp.UserControl.UcBtnPrint();
            this.txt_tc_1 = new DevExpress.XtraEditors.CheckEdit();
            this.txt_suppNo_1 = new Gs.DevApp.UserControl.UcLookSupplier();
            this.labelControl5 = new DevExpress.XtraEditors.LabelControl();
            this.labelControl4 = new DevExpress.XtraEditors.LabelControl();
            this.labelControl3 = new DevExpress.XtraEditors.LabelControl();
@@ -97,9 +98,10 @@
            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
            this.tabMx.SuspendLayout();
            this.panel1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.txt_tc_1.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fSubsidiary.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_tc_1.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_suppId.Properties)).BeginInit();
            this.SuspendLayout();
            // 
@@ -109,25 +111,12 @@
            this.gvMx1trLotno.AppearanceCell.Options.UseFont = true;
            this.gvMx1trLotno.Caption = "供应商";
            this.gvMx1trLotno.FieldName = "suppID";
            this.gvMx1trLotno.MinWidth = 150;
            this.gvMx1trLotno.MinWidth = 50;
            this.gvMx1trLotno.Name = "gvMx1trLotno";
            this.gvMx1trLotno.Tag = "query_a.TR_LOTNO";
            this.gvMx1trLotno.Visible = true;
            this.gvMx1trLotno.VisibleIndex = 2;
            this.gvMx1trLotno.Width = 150;
            // 
            // gvMx1lotDate
            // 
            this.gvMx1lotDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gvMx1lotDate.AppearanceCell.Options.UseFont = true;
            this.gvMx1lotDate.Caption = "生产日期 ";
            this.gvMx1lotDate.FieldName = "lotDate";
            this.gvMx1lotDate.MinWidth = 50;
            this.gvMx1lotDate.Name = "gvMx1lotDate";
            this.gvMx1lotDate.Tag = "query_a.LOT_DATE";
            this.gvMx1lotDate.Visible = true;
            this.gvMx1lotDate.VisibleIndex = 4;
            this.gvMx1lotDate.Width = 94;
            // 
            // gvMx1createBy
            // 
@@ -139,7 +128,7 @@
            this.gvMx1createBy.Name = "gvMx1createBy";
            this.gvMx1createBy.Tag = "query_a.CREATE_BY";
            this.gvMx1createBy.Visible = true;
            this.gvMx1createBy.VisibleIndex = 8;
            this.gvMx1createBy.VisibleIndex = 6;
            this.gvMx1createBy.Width = 94;
            // 
            // gvMx1quantity
@@ -155,26 +144,13 @@
            this.gvMx1quantity.VisibleIndex = 1;
            this.gvMx1quantity.Width = 94;
            // 
            // gvMx1lotNo
            // 
            this.gvMx1lotNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gvMx1lotNo.AppearanceCell.Options.UseFont = true;
            this.gvMx1lotNo.Caption = "批次 ";
            this.gvMx1lotNo.FieldName = "lotNo";
            this.gvMx1lotNo.MinWidth = 50;
            this.gvMx1lotNo.Name = "gvMx1lotNo";
            this.gvMx1lotNo.Tag = "query_a.LOT_NO";
            this.gvMx1lotNo.Visible = true;
            this.gvMx1lotNo.VisibleIndex = 3;
            this.gvMx1lotNo.Width = 94;
            // 
            // gvMx1itemBarcode
            // 
            this.gvMx1itemBarcode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gvMx1itemBarcode.AppearanceCell.Options.UseFont = true;
            this.gvMx1itemBarcode.Caption = "物料条码 ";
            this.gvMx1itemBarcode.FieldName = "itemBarcode";
            this.gvMx1itemBarcode.MinWidth = 300;
            this.gvMx1itemBarcode.MinWidth = 50;
            this.gvMx1itemBarcode.Name = "gvMx1itemBarcode";
            this.gvMx1itemBarcode.Tag = "query_a.ITEM_BARCODE";
            this.gvMx1itemBarcode.Visible = true;
@@ -196,7 +172,7 @@
            // 
            this.tabMxPage1.Controls.Add(this.gcMx1);
            this.tabMxPage1.Name = "tabMxPage1";
            this.tabMxPage1.Size = new System.Drawing.Size(1124, 390);
            this.tabMxPage1.Size = new System.Drawing.Size(1124, 397);
            this.tabMxPage1.Text = "条码明细";
            // 
            // gcMx1
@@ -205,7 +181,7 @@
            this.gcMx1.Location = new System.Drawing.Point(0, 0);
            this.gcMx1.MainView = this.gvMx1;
            this.gcMx1.Name = "gcMx1";
            this.gcMx1.Size = new System.Drawing.Size(1124, 390);
            this.gcMx1.Size = new System.Drawing.Size(1124, 397);
            this.gcMx1.TabIndex = 0;
            this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gvMx1});
@@ -217,8 +193,6 @@
            this.gvMx1itemBarcode,
            this.gvMx1quantity,
            this.gvMx1trLotno,
            this.gvMx1lotNo,
            this.gvMx1lotDate,
            this.gridColumn1,
            this.gridColumn2,
            this.gridColumn3,
@@ -237,7 +211,7 @@
            this.gridColumn1.MinWidth = 25;
            this.gridColumn1.Name = "gridColumn1";
            this.gridColumn1.Visible = true;
            this.gridColumn1.VisibleIndex = 5;
            this.gridColumn1.VisibleIndex = 3;
            this.gridColumn1.Width = 94;
            // 
            // gridColumn2
@@ -247,7 +221,7 @@
            this.gridColumn2.MinWidth = 25;
            this.gridColumn2.Name = "gridColumn2";
            this.gridColumn2.Visible = true;
            this.gridColumn2.VisibleIndex = 6;
            this.gridColumn2.VisibleIndex = 4;
            this.gridColumn2.Width = 94;
            // 
            // gridColumn3
@@ -257,24 +231,24 @@
            this.gridColumn3.MinWidth = 25;
            this.gridColumn3.Name = "gridColumn3";
            this.gridColumn3.Visible = true;
            this.gridColumn3.VisibleIndex = 7;
            this.gridColumn3.VisibleIndex = 5;
            this.gridColumn3.Width = 94;
            // 
            // gridColumn5
            // 
            this.gridColumn5.Caption = "建立日期";
            this.gridColumn5.FieldName = "createDate";
            this.gridColumn5.MinWidth = 180;
            this.gridColumn5.MinWidth = 50;
            this.gridColumn5.Name = "gridColumn5";
            this.gridColumn5.Visible = true;
            this.gridColumn5.VisibleIndex = 9;
            this.gridColumn5.VisibleIndex = 7;
            this.gridColumn5.Width = 180;
            // 
            // lb_createDate1
            // 
            this.lb_createDate1.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_createDate1.Appearance.Options.UseFont = true;
            this.lb_createDate1.Location = new System.Drawing.Point(271, 50);
            this.lb_createDate1.Location = new System.Drawing.Point(332, 47);
            this.lb_createDate1.Name = "lb_createDate1";
            this.lb_createDate1.Size = new System.Drawing.Size(68, 21);
            this.lb_createDate1.TabIndex = 252;
@@ -282,11 +256,11 @@
            // 
            // txt_createDate1
            // 
            this.txt_createDate1.Location = new System.Drawing.Point(349, 46);
            this.txt_createDate1.Location = new System.Drawing.Point(404, 43);
            this.txt_createDate1.Name = "txt_createDate1";
            this.txt_createDate1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_createDate1.Properties.Appearance.Options.UseFont = true;
            this.txt_createDate1.Size = new System.Drawing.Size(185, 28);
            this.txt_createDate1.Size = new System.Drawing.Size(129, 28);
            this.txt_createDate1.TabIndex = 252;
            this.txt_createDate1.Tag = "";
            // 
@@ -294,7 +268,7 @@
            // 
            this.lb_itemUnit.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_itemUnit.Appearance.Options.UseFont = true;
            this.lb_itemUnit.Location = new System.Drawing.Point(11, 117);
            this.lb_itemUnit.Location = new System.Drawing.Point(332, 79);
            this.lb_itemUnit.Name = "lb_itemUnit";
            this.lb_itemUnit.Size = new System.Drawing.Size(68, 21);
            this.lb_itemUnit.TabIndex = 231;
@@ -302,11 +276,11 @@
            // 
            // txt_itemUnit
            // 
            this.txt_itemUnit.Location = new System.Drawing.Point(85, 113);
            this.txt_itemUnit.Location = new System.Drawing.Point(404, 75);
            this.txt_itemUnit.Name = "txt_itemUnit";
            this.txt_itemUnit.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_itemUnit.Properties.Appearance.Options.UseFont = true;
            this.txt_itemUnit.Size = new System.Drawing.Size(150, 28);
            this.txt_itemUnit.Size = new System.Drawing.Size(129, 28);
            this.txt_itemUnit.TabIndex = 231;
            this.txt_itemUnit.Tag = "";
            // 
@@ -328,7 +302,7 @@
            // 
            this.lb_itemModel.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_itemModel.Appearance.Options.UseFont = true;
            this.lb_itemModel.Location = new System.Drawing.Point(11, 84);
            this.lb_itemModel.Location = new System.Drawing.Point(13, 112);
            this.lb_itemModel.Name = "lb_itemModel";
            this.lb_itemModel.Size = new System.Drawing.Size(68, 21);
            this.lb_itemModel.TabIndex = 226;
@@ -336,7 +310,7 @@
            // 
            // txt_itemModel
            // 
            this.txt_itemModel.Location = new System.Drawing.Point(85, 80);
            this.txt_itemModel.Location = new System.Drawing.Point(85, 108);
            this.txt_itemModel.Name = "txt_itemModel";
            this.txt_itemModel.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_itemModel.Properties.Appearance.Options.UseFont = true;
@@ -362,7 +336,7 @@
            // 
            this.lb_itemName.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_itemName.Appearance.Options.UseFont = true;
            this.lb_itemName.Location = new System.Drawing.Point(11, 50);
            this.lb_itemName.Location = new System.Drawing.Point(13, 79);
            this.lb_itemName.Name = "lb_itemName";
            this.lb_itemName.Size = new System.Drawing.Size(68, 21);
            this.lb_itemName.TabIndex = 219;
@@ -370,11 +344,11 @@
            // 
            // txt_itemName
            // 
            this.txt_itemName.Location = new System.Drawing.Point(85, 46);
            this.txt_itemName.Location = new System.Drawing.Point(85, 75);
            this.txt_itemName.Name = "txt_itemName";
            this.txt_itemName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_itemName.Properties.Appearance.Options.UseFont = true;
            this.txt_itemName.Size = new System.Drawing.Size(150, 28);
            this.txt_itemName.Size = new System.Drawing.Size(224, 28);
            this.txt_itemName.TabIndex = 219;
            this.txt_itemName.Tag = "";
            // 
@@ -396,7 +370,7 @@
            // 
            this.lb_itemNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_itemNo.Appearance.Options.UseFont = true;
            this.lb_itemNo.Location = new System.Drawing.Point(11, 15);
            this.lb_itemNo.Location = new System.Drawing.Point(13, 47);
            this.lb_itemNo.Name = "lb_itemNo";
            this.lb_itemNo.Size = new System.Drawing.Size(68, 21);
            this.lb_itemNo.TabIndex = 217;
@@ -404,11 +378,11 @@
            // 
            // txt_itemNo
            // 
            this.txt_itemNo.Location = new System.Drawing.Point(85, 12);
            this.txt_itemNo.Location = new System.Drawing.Point(85, 43);
            this.txt_itemNo.Name = "txt_itemNo";
            this.txt_itemNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
            this.txt_itemNo.Size = new System.Drawing.Size(150, 28);
            this.txt_itemNo.Size = new System.Drawing.Size(224, 28);
            this.txt_itemNo.TabIndex = 217;
            this.txt_itemNo.Tag = "";
            // 
@@ -540,10 +514,10 @@
            // tabMx
            // 
            this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
            this.tabMx.Location = new System.Drawing.Point(0, 148);
            this.tabMx.Location = new System.Drawing.Point(0, 141);
            this.tabMx.Name = "tabMx";
            this.tabMx.SelectedTabPage = this.tabMxPage1;
            this.tabMx.Size = new System.Drawing.Size(1126, 422);
            this.tabMx.Size = new System.Drawing.Size(1126, 429);
            this.tabMx.TabIndex = 2;
            this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
            this.tabMxPage1});
@@ -551,10 +525,13 @@
            // panel1
            // 
            this.panel1.BackColor = System.Drawing.Color.White;
            this.panel1.Controls.Add(this.txt_tc_1);
            this.panel1.Controls.Add(this.txt_suppNo_1);
            this.panel1.Controls.Add(this.txt_fSubsidiary);
            this.panel1.Controls.Add(this.labelControl6);
            this.panel1.Controls.Add(this.txt_iCount_1);
            this.panel1.Controls.Add(this.txt_psnQty_1);
            this.panel1.Controls.Add(this.ucBtnPrint1);
            this.panel1.Controls.Add(this.txt_tc_1);
            this.panel1.Controls.Add(this.txt_suppNo_1);
            this.panel1.Controls.Add(this.labelControl5);
            this.panel1.Controls.Add(this.labelControl4);
            this.panel1.Controls.Add(this.labelControl3);
@@ -577,12 +554,71 @@
            this.panel1.Font = new System.Drawing.Font("Tahoma", 10F);
            this.panel1.Location = new System.Drawing.Point(0, 0);
            this.panel1.Name = "panel1";
            this.panel1.Size = new System.Drawing.Size(1126, 148);
            this.panel1.Size = new System.Drawing.Size(1126, 141);
            this.panel1.TabIndex = 1;
            // 
            // txt_fSubsidiary
            // 
            this.txt_fSubsidiary.Location = new System.Drawing.Point(85, 11);
            this.txt_fSubsidiary.Name = "txt_fSubsidiary";
            this.txt_fSubsidiary.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_fSubsidiary.Properties.Appearance.Options.UseFont = true;
            this.txt_fSubsidiary.Size = new System.Drawing.Size(224, 28);
            this.txt_fSubsidiary.TabIndex = 270;
            this.txt_fSubsidiary.Tag = "";
            // 
            // labelControl6
            // 
            this.labelControl6.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.labelControl6.Appearance.Options.UseFont = true;
            this.labelControl6.Location = new System.Drawing.Point(13, 15);
            this.labelControl6.Name = "labelControl6";
            this.labelControl6.Size = new System.Drawing.Size(68, 21);
            this.labelControl6.TabIndex = 269;
            this.labelControl6.Text = "使用组织";
            // 
            // txt_iCount_1
            // 
            this.txt_iCount_1.Location = new System.Drawing.Point(649, 43);
            this.txt_iCount_1.Name = "txt_iCount_1";
            this.txt_iCount_1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_iCount_1.Properties.Appearance.Options.UseFont = true;
            this.txt_iCount_1.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.RegExpMaskManager));
            this.txt_iCount_1.Properties.MaskSettings.Set("mask", "\\d+");
            this.txt_iCount_1.Properties.MaskSettings.Set("placeholder", '\0');
            this.txt_iCount_1.Properties.UseMaskAsDisplayFormat = true;
            this.txt_iCount_1.Size = new System.Drawing.Size(94, 28);
            this.txt_iCount_1.TabIndex = 268;
            this.txt_iCount_1.Tag = "readOnly-1";
            this.txt_iCount_1.ToolTip = "请输入条码张数";
            // 
            // txt_psnQty_1
            // 
            this.txt_psnQty_1.Location = new System.Drawing.Point(649, 75);
            this.txt_psnQty_1.Name = "txt_psnQty_1";
            this.txt_psnQty_1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true;
            this.txt_psnQty_1.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.RegExpMaskManager));
            this.txt_psnQty_1.Properties.MaskSettings.Set("mask", "\\d+");
            this.txt_psnQty_1.Properties.MaskSettings.Set("placeholder", '\0');
            this.txt_psnQty_1.Properties.UseMaskAsDisplayFormat = true;
            this.txt_psnQty_1.Size = new System.Drawing.Size(94, 28);
            this.txt_psnQty_1.TabIndex = 267;
            this.txt_psnQty_1.Tag = "readOnly-1";
            this.txt_psnQty_1.ToolTip = "请输入每张条码的数量";
            // 
            // ucBtnPrint1
            // 
            this.ucBtnPrint1.guidKey = null;
            this.ucBtnPrint1.Location = new System.Drawing.Point(534, 102);
            this.ucBtnPrint1.Name = "ucBtnPrint1";
            this.ucBtnPrint1.rptParameter = null;
            this.ucBtnPrint1.Size = new System.Drawing.Size(214, 36);
            this.ucBtnPrint1.TabIndex = 266;
            // 
            // txt_tc_1
            // 
            this.txt_tc_1.Location = new System.Drawing.Point(854, 48);
            this.txt_tc_1.Location = new System.Drawing.Point(860, 45);
            this.txt_tc_1.Name = "txt_tc_1";
            this.txt_tc_1.Properties.Caption = "";
            this.txt_tc_1.Size = new System.Drawing.Size(24, 24);
@@ -591,45 +627,17 @@
            // txt_suppNo_1
            // 
            this.txt_suppNo_1.IsReadly = false;
            this.txt_suppNo_1.Location = new System.Drawing.Point(645, 10);
            this.txt_suppNo_1.Location = new System.Drawing.Point(649, 10);
            this.txt_suppNo_1.Margin = new System.Windows.Forms.Padding(0);
            this.txt_suppNo_1.Name = "txt_suppNo_1";
            this.txt_suppNo_1.Size = new System.Drawing.Size(228, 30);
            this.txt_suppNo_1.Size = new System.Drawing.Size(229, 30);
            this.txt_suppNo_1.TabIndex = 264;
            // 
            // txt_iCount_1
            // 
            this.txt_iCount_1.Location = new System.Drawing.Point(645, 46);
            this.txt_iCount_1.Name = "txt_iCount_1";
            this.txt_iCount_1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_iCount_1.Properties.Appearance.Options.UseFont = true;
            this.txt_iCount_1.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.RegExpMaskManager));
            this.txt_iCount_1.Properties.MaskSettings.Set("mask", "\\d+");
            this.txt_iCount_1.Properties.UseMaskAsDisplayFormat = true;
            this.txt_iCount_1.Size = new System.Drawing.Size(94, 28);
            this.txt_iCount_1.TabIndex = 262;
            this.txt_iCount_1.Tag = "readOnly-1";
            this.txt_iCount_1.ToolTip = "请输入条码张数";
            // 
            // txt_psnQty_1
            // 
            this.txt_psnQty_1.Location = new System.Drawing.Point(645, 80);
            this.txt_psnQty_1.Name = "txt_psnQty_1";
            this.txt_psnQty_1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true;
            this.txt_psnQty_1.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.RegExpMaskManager));
            this.txt_psnQty_1.Properties.MaskSettings.Set("mask", "\\d+");
            this.txt_psnQty_1.Properties.UseMaskAsDisplayFormat = true;
            this.txt_psnQty_1.Size = new System.Drawing.Size(94, 28);
            this.txt_psnQty_1.TabIndex = 258;
            this.txt_psnQty_1.Tag = "readOnly-1";
            this.txt_psnQty_1.ToolTip = "请输入每张条码的数量";
            // 
            // labelControl5
            // 
            this.labelControl5.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.labelControl5.Appearance.Options.UseFont = true;
            this.labelControl5.Location = new System.Drawing.Point(538, 50);
            this.labelControl5.Location = new System.Drawing.Point(542, 47);
            this.labelControl5.Name = "labelControl5";
            this.labelControl5.Size = new System.Drawing.Size(102, 21);
            this.labelControl5.TabIndex = 261;
@@ -639,7 +647,7 @@
            // 
            this.labelControl4.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.labelControl4.Appearance.Options.UseFont = true;
            this.labelControl4.Location = new System.Drawing.Point(812, 50);
            this.labelControl4.Location = new System.Drawing.Point(818, 47);
            this.labelControl4.Name = "labelControl4";
            this.labelControl4.Size = new System.Drawing.Size(34, 21);
            this.labelControl4.TabIndex = 259;
@@ -649,7 +657,7 @@
            // 
            this.labelControl3.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.labelControl3.Appearance.Options.UseFont = true;
            this.labelControl3.Location = new System.Drawing.Point(538, 84);
            this.labelControl3.Location = new System.Drawing.Point(542, 79);
            this.labelControl3.Name = "labelControl3";
            this.labelControl3.Size = new System.Drawing.Size(102, 21);
            this.labelControl3.TabIndex = 257;
@@ -659,7 +667,7 @@
            // 
            this.labelControl2.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.labelControl2.Appearance.Options.UseFont = true;
            this.labelControl2.Location = new System.Drawing.Point(257, 16);
            this.labelControl2.Location = new System.Drawing.Point(315, 15);
            this.labelControl2.Name = "labelControl2";
            this.labelControl2.Size = new System.Drawing.Size(85, 21);
            this.labelControl2.TabIndex = 255;
@@ -667,11 +675,11 @@
            // 
            // txt_suppId
            // 
            this.txt_suppId.Location = new System.Drawing.Point(349, 12);
            this.txt_suppId.Location = new System.Drawing.Point(404, 11);
            this.txt_suppId.Name = "txt_suppId";
            this.txt_suppId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_suppId.Properties.Appearance.Options.UseFont = true;
            this.txt_suppId.Size = new System.Drawing.Size(185, 28);
            this.txt_suppId.Size = new System.Drawing.Size(129, 28);
            this.txt_suppId.TabIndex = 256;
            this.txt_suppId.Tag = "";
            // 
@@ -679,7 +687,7 @@
            // 
            this.labelControl1.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.labelControl1.Appearance.Options.UseFont = true;
            this.labelControl1.Location = new System.Drawing.Point(538, 15);
            this.labelControl1.Location = new System.Drawing.Point(542, 15);
            this.labelControl1.Name = "labelControl1";
            this.labelControl1.Size = new System.Drawing.Size(102, 21);
            this.labelControl1.TabIndex = 253;
@@ -728,9 +736,10 @@
            this.tabMx.ResumeLayout(false);
            this.panel1.ResumeLayout(false);
            this.panel1.PerformLayout();
            ((System.ComponentModel.ISupportInitialize)(this.txt_tc_1.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fSubsidiary.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_tc_1.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_suppId.Properties)).EndInit();
            this.ResumeLayout(false);

@@ -748,10 +757,8 @@
        private DevExpress.XtraEditors.LabelControl labelControl11;
  private DevExpress.XtraTab.XtraTabControl tabMx;
 private DevExpress.XtraGrid.Columns.GridColumn gvMx1trLotno;
 private DevExpress.XtraGrid.Columns.GridColumn gvMx1lotDate;
 private DevExpress.XtraGrid.Columns.GridColumn gvMx1createBy;
 private DevExpress.XtraGrid.Columns.GridColumn gvMx1quantity;
 private DevExpress.XtraGrid.Columns.GridColumn gvMx1lotNo;
 private DevExpress.XtraGrid.Columns.GridColumn gvMx1itemBarcode;
 private DevExpress.XtraGrid.Columns.GridColumn gvMx1guid;
 private DevExpress.XtraTab.XtraTabPage tabMxPage1;
@@ -789,8 +796,11 @@
        private UserControl.UcLookSupplier txt_suppNo_1;
        private DevExpress.XtraEditors.CheckEdit txt_tc_1;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
        private UserControl.UcBtnPrint ucBtnPrint1;
        private DevExpress.XtraEditors.TextEdit txt_iCount_1;
        private DevExpress.XtraEditors.TextEdit txt_psnQty_1;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
        private DevExpress.XtraEditors.TextEdit txt_fSubsidiary;
        private DevExpress.XtraEditors.LabelControl labelControl6;
    }
}

 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.cs

@@ -20,8 +20,6 @@
            InitializeComponent();
            this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
            this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
            toolBarMenu1.btnReportClick += ToolBarMenu1_btnReportClick;
            toolBarMenu1.btnDesignClick += ToolBarMenu1_btnDesignClick;
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, "", "", (value) =>
            {
@@ -36,16 +34,56 @@
            });
            getPageList(1);
            pageBar1.PagerEvent += PageBar1_PagerEvent;
            txt_suppNo_1.getSuppler("");
            
            this.txt_suppNo_1.EditChanged += (s, e) =>
            {
                txt_suppId.Text = this.txt_suppNo_1.GetCode();
            };

            this.ucBtnPrint1.btnDesignClick += (s, e) =>
            {
                ucBtnPrint1.rptParameter = "rpt_ItemInv{}";

            };
            this.ucBtnPrint1.btnReportClick += (s, e) =>
            {
                string rowGuid, rowName;
                (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
                    lbGuid, txt_itemName, gridView1);
                ucBtnPrint1.guidKey = rowGuid;
                if (string.IsNullOrEmpty(txt_suppNo_1.GetCode()))
                {
                    Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择供应商！");
                    txt_suppNo_1.Focus();
                    this.ucBtnPrint1.rptParameter = "return false";
                    return;
                }
                if (string.IsNullOrEmpty(txt_iCount_1.Text.Trim()))
                {
                    Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择打印条码张数！");
                    txt_iCount_1.Focus();
                    this.ucBtnPrint1.rptParameter = "return false";
                    return;
                }
                if (string.IsNullOrEmpty(txt_psnQty_1.Text.Trim()))
                {
                    Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择打印条码数量！");
                    txt_psnQty_1.Focus();
                    this.ucBtnPrint1.rptParameter = "return false";
                    return;
                }
                this.ucBtnPrint1.rptParameter = "rpt_ItemInv{" + txt_createDate1.Text.Trim()
                       + "," + txt_tc_1.Checked.ToString().ToUpper()
                       + "," + txt_suppNo_1.GetId()
                       + "," + txt_iCount_1.Text.Trim()
                       + "," + txt_psnQty_1.Text.Trim()
                       + "}";
            };
        }
        private   void GridView1_ColumnFilterChanged(object sender, EventArgs e)
        {
            Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
           Task.Delay(100);
            _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
            Task.Delay(100);
            getPageList(1);
        }
       
@@ -105,57 +143,6 @@
                getPageList(this.pageBar1.CurrentPage);
            }
        }
        private void ToolBarMenu1_btnDesignClick(object sender, EventArgs e)
        {
            toolBarMenu1.guidKey = "";
            string rowGuid, rowName;
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
                lbGuid, txt_itemName, gridView1);
            toolBarMenu1.guidKey = rowGuid;
            toolBarMenu1.rptParameter = "rpt_ItemInv{}";
        }
        private void ToolBarMenu1_btnReportClick(object sender, EventArgs e)
        {
            toolBarMenu1.guidKey = "";
            string rowGuid, rowName;
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
                lbGuid, txt_itemName, gridView1);
            toolBarMenu1.guidKey = rowGuid;
            if (xtraTabControl1.SelectedTabPageIndex == 0)
            {
                Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 5);
                this.toolBarMenu1.rptParameter = "return false";
                return;
            }
            if (string.IsNullOrEmpty(txt_suppNo_1.GetCode()))
            {
                Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择供应商！");
                txt_suppNo_1.Focus();
                this.toolBarMenu1.rptParameter = "return false";
                return;
            }
            if (string.IsNullOrEmpty(txt_iCount_1.Text.Trim()))
            {
                Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择打印条码张数！");
                txt_iCount_1.Focus();
                this.toolBarMenu1.rptParameter = "return false";
                return;
            }
            if (string.IsNullOrEmpty(txt_psnQty_1.Text.Trim()))
            {
                Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择打印条码数量！");
                txt_psnQty_1.Focus();
                this.toolBarMenu1.rptParameter = "return false";
                return;
            }
            this.toolBarMenu1.rptParameter = "rpt_ItemInv{" + txt_createDate1.Text.Trim()
                   + "," + txt_tc_1.Checked.ToString().ToUpper()
                   + "," + txt_suppNo_1.GetId()
                   + "," + txt_iCount_1.Text.Trim()
                   + "," + txt_psnQty_1.Text.Trim()
                   + "}";
        }

        /// <summary>
        /// 
        /// </summary>
@@ -164,7 +151,7 @@
        private   void getPageList(int curPage)
        {
            var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
            PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
            PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, " org.FNumber asc ,a.item_no ", "asc", "", _sbSqlWhere.ToString());
            string json = JsonConvert.SerializeObject(pgq);
            try
            {
@@ -224,6 +211,7 @@
                {
                    dynamic dy = _rtn.rtnData;
                    lbGuid.Text = strGuid;
                    txt_suppNo_1.getSuppler(dy["from"]["fSubsidiaryFId"].ToString());
                    List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
                    gvList.Add(gvMx1);
                    //主表赋值
@@ -241,6 +229,7 @@
                        gcMx1.BindingContext = new BindingContext();
                        gcMx1.DataSource = dt;
                        gcMx1.ForceInitialize();
                        gvMx1.BestFitColumns();
                    }
                    else
                    {

 DevApp/Gs.DevApp/UserControl/UcLookSupplier.cs

@@ -55,9 +55,8 @@
                lookSearchSupplier.Properties.DataSource = dt;
                lookSearchSupplier.Properties.DisplayMember = "suppName";
                lookSearchSupplier.Properties.ValueMember = "id";
                //MessageBox.Show(dt.Rows.Count.ToString());
                //SetIdOrCode("143895".ToString().Trim());
                //MessageBox.Show("2");
                lookSearchSupplier.ForceInitialize();
                lookSearchSupplier.Properties.BestFitMode = DevExpress.XtraEditors.Controls.BestFitMode.BestFitResizePopup;
            }
            catch (Exception ex)
            {