lu
2025-04-13 90c199edf9c98a66f0ba3f42577bff797073fce1
打印按钮自动计算,选择窗体取消分页
已重命名8个文件
已修改42个文件
已复制1个文件
已删除7个文件
3852 ■■■■■ 文件已修改
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.Designer.cs 26 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.Designer.cs 144 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQtDj.Designer.cs 31 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.Designer.cs 141 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Ck/UcBlclDj.Designer.cs 115 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcItem.Designer.cs 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcItem.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/PDA/SelectCk.cs 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/PDA/SelectPage.cs 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/PDA/SelectPrint.cs 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs 243 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.Designer.cs 70 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Rk/SelectItemTbl.Designer.cs 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Rk/SelectItemTbl.cs 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Rk/SelectItemTbl.resx 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs 228 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs 33 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs 123 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.Designer.cs 229 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs 29 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/WW/SelectWwPc.Designer.cs 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/WW/SelectWwPc.cs 32 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/WW/SelectWwPc.resx 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/WW/SelectWwTbl.Designer.cs 70 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/WW/SelectWwTbl.cs 27 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs 117 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs 28 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.Designer.cs 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbckDj.Designer.cs 118 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.Designer.cs 100 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.Designer.cs 107 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.cs 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Warehouse/SelectShuoTuiSq.Designer.cs 74 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Warehouse/SelectShuoTuiSq.cs 30 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Warehouse/SelectShuoTuiSq.resx 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Work/SelectProcess.cs 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/Gs.DevApp.csproj 36 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/SelectCgMx.cs 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/SelectCgOutMx.Designer.cs 417 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/SelectCgOutMx.cs 109 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/SelectCgOutMx.resx 120 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/SelectCk.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/SelectCw.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/SelectHz.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/SelectMesCgthSq.Designer.cs 68 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/SelectMesCgthSq.cs 33 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/SelectOrg.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/SelectWomdaahb.Designer.cs 401 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/SelectWomdaahb.cs 104 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/SelectWomdaahb.resx 120 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/SelectWwPc.cs 99 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.Designer.cs
@@ -444,7 +444,7 @@
            // gv_remark
            // 
            this.gv_remark.AppearanceCell.Options.UseFont = true;
            this.gv_remark.Caption = "备注 ";
            this.gv_remark.Caption = "申请备注";
            this.gv_remark.FieldName = "remark";
            this.gv_remark.Name = "gv_remark";
            this.gv_remark.OptionsColumn.AllowEdit = false;
@@ -912,7 +912,7 @@
            this.layoutControlItem7.OptionsTableLayoutItem.ColumnSpan = 2;
            this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem7.Size = new System.Drawing.Size(552, 31);
            this.layoutControlItem7.Text = "退货备注";
            this.layoutControlItem7.Text = "申请备注";
            this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem11
@@ -1034,8 +1034,6 @@
            this.gvMx1isFinish.MinWidth = 50;
            this.gvMx1isFinish.Name = "gvMx1isFinish";
            this.gvMx1isFinish.Tag = "query_a.IS_FINISH";
            this.gvMx1isFinish.Visible = true;
            this.gvMx1isFinish.VisibleIndex = 0;
            this.gvMx1isFinish.Width = 94;
            // 
            // gvMx1invBillNo
@@ -1047,7 +1045,7 @@
            this.gvMx1invBillNo.Name = "gvMx1invBillNo";
            this.gvMx1invBillNo.Tag = "query_a.INV_BILL_NO";
            this.gvMx1invBillNo.Visible = true;
            this.gvMx1invBillNo.VisibleIndex = 1;
            this.gvMx1invBillNo.VisibleIndex = 0;
            this.gvMx1invBillNo.Width = 94;
            // 
            // gvMx1ebeln
@@ -1059,7 +1057,7 @@
            this.gvMx1ebeln.Name = "gvMx1ebeln";
            this.gvMx1ebeln.Tag = "query_a.EBELN";
            this.gvMx1ebeln.Visible = true;
            this.gvMx1ebeln.VisibleIndex = 2;
            this.gvMx1ebeln.VisibleIndex = 1;
            this.gvMx1ebeln.Width = 94;
            // 
            // gvMx1itemId
@@ -1079,7 +1077,7 @@
            this.gridColumn2.MinWidth = 25;
            this.gridColumn2.Name = "gridColumn2";
            this.gridColumn2.Visible = true;
            this.gridColumn2.VisibleIndex = 3;
            this.gridColumn2.VisibleIndex = 2;
            this.gridColumn2.Width = 94;
            // 
            // gridColumn5
@@ -1089,7 +1087,7 @@
            this.gridColumn5.MinWidth = 25;
            this.gridColumn5.Name = "gridColumn5";
            this.gridColumn5.Visible = true;
            this.gridColumn5.VisibleIndex = 4;
            this.gridColumn5.VisibleIndex = 3;
            this.gridColumn5.Width = 94;
            // 
            // gridColumn3
@@ -1099,7 +1097,7 @@
            this.gridColumn3.MinWidth = 25;
            this.gridColumn3.Name = "gridColumn3";
            this.gridColumn3.Visible = true;
            this.gridColumn3.VisibleIndex = 5;
            this.gridColumn3.VisibleIndex = 4;
            this.gridColumn3.Width = 94;
            // 
            // gridColumn4
@@ -1109,7 +1107,7 @@
            this.gridColumn4.MinWidth = 25;
            this.gridColumn4.Name = "gridColumn4";
            this.gridColumn4.Visible = true;
            this.gridColumn4.VisibleIndex = 6;
            this.gridColumn4.VisibleIndex = 5;
            this.gridColumn4.Width = 94;
            // 
            // gvMx1sqNum
@@ -1125,7 +1123,7 @@
            this.gvMx1sqNum.Name = "gvMx1sqNum";
            this.gvMx1sqNum.Tag = "yz_quantity_0_edit";
            this.gvMx1sqNum.Visible = true;
            this.gvMx1sqNum.VisibleIndex = 7;
            this.gvMx1sqNum.VisibleIndex = 6;
            this.gvMx1sqNum.Width = 94;
            // 
            // gvMx1ysNum
@@ -1137,7 +1135,7 @@
            this.gvMx1ysNum.Name = "gvMx1ysNum";
            this.gvMx1ysNum.Tag = "query_a.YS_NUM";
            this.gvMx1ysNum.Visible = true;
            this.gvMx1ysNum.VisibleIndex = 8;
            this.gvMx1ysNum.VisibleIndex = 7;
            this.gvMx1ysNum.Width = 94;
            // 
            // gvMx1remark
@@ -1153,7 +1151,7 @@
            this.gvMx1remark.Name = "gvMx1remark";
            this.gvMx1remark.Tag = "edit";
            this.gvMx1remark.Visible = true;
            this.gvMx1remark.VisibleIndex = 9;
            this.gvMx1remark.VisibleIndex = 8;
            this.gvMx1remark.Width = 94;
            // 
            // gvMx1orderNo
@@ -1203,7 +1201,7 @@
            this.gvMxDel.MinWidth = 25;
            this.gvMxDel.Name = "gvMxDel";
            this.gvMxDel.Visible = true;
            this.gvMxDel.VisibleIndex = 10;
            this.gvMxDel.VisibleIndex = 9;
            this.gvMxDel.Width = 94;
            // 
            // repositoryItemButtonEdit1
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.Designer.cs
@@ -30,14 +30,14 @@
        private void InitializeComponent()
        {
            this.components = new System.ComponentModel.Container();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -74,7 +74,7 @@
            this.txt_fmrmode = new DevExpress.XtraEditors.ComboBoxEdit();
            this.txt_itemOutNo = new DevExpress.XtraEditors.TextEdit();
            this.txt_fType = new DevExpress.XtraEditors.CheckEdit();
            this.txt_remark = new DevExpress.XtraEditors.TextEdit();
            this.txt_sqRemark = new DevExpress.XtraEditors.TextEdit();
            this.txt_status = new DevExpress.XtraEditors.CheckEdit();
            this.txt_guid = new DevExpress.XtraEditors.TextEdit();
            this.txt_sqdNo = new DevExpress.XtraEditors.TextEdit();
@@ -101,7 +101,6 @@
            this.gcMx1 = new DevExpress.XtraGrid.GridControl();
            this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx2status = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx2pbillNo = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx2workLine = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -163,7 +162,7 @@
            ((System.ComponentModel.ISupportInitialize)(this.txt_fmrmode.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_itemOutNo.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fType.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_sqRemark.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_sqdNo.Properties)).BeginInit();
@@ -389,8 +388,8 @@
            // gv_remark
            // 
            this.gv_remark.AppearanceCell.Options.UseFont = true;
            this.gv_remark.Caption = "备注信息 ";
            this.gv_remark.FieldName = "remark";
            this.gv_remark.Caption = "申请备注";
            this.gv_remark.FieldName = "sqRemark";
            this.gv_remark.Name = "gv_remark";
            this.gv_remark.OptionsColumn.AllowEdit = false;
            this.gv_remark.Tag = "query_a.remark";
@@ -534,7 +533,7 @@
            this.layoutMx1.Controls.Add(this.txt_fmrmode);
            this.layoutMx1.Controls.Add(this.txt_itemOutNo);
            this.layoutMx1.Controls.Add(this.txt_fType);
            this.layoutMx1.Controls.Add(this.txt_remark);
            this.layoutMx1.Controls.Add(this.txt_sqRemark);
            this.layoutMx1.Controls.Add(this.txt_status);
            this.layoutMx1.Controls.Add(this.txt_guid);
            this.layoutMx1.Controls.Add(this.txt_sqdNo);
@@ -644,14 +643,14 @@
            this.txt_fType.TabIndex = 525;
            this.txt_fType.Tag = "readOnly";
            // 
            // txt_remark
            // txt_sqRemark
            // 
            this.txt_remark.Location = new System.Drawing.Point(84, 99);
            this.txt_remark.Name = "txt_remark";
            this.txt_remark.Properties.Appearance.Options.UseFont = true;
            this.txt_remark.Size = new System.Drawing.Size(476, 24);
            this.txt_remark.StyleController = this.layoutMx1;
            this.txt_remark.TabIndex = 235;
            this.txt_sqRemark.Location = new System.Drawing.Point(84, 99);
            this.txt_sqRemark.Name = "txt_sqRemark";
            this.txt_sqRemark.Properties.Appearance.Options.UseFont = true;
            this.txt_sqRemark.Size = new System.Drawing.Size(476, 24);
            this.txt_sqRemark.StyleController = this.layoutMx1;
            this.txt_sqRemark.TabIndex = 235;
            // 
            // txt_status
            // 
@@ -737,32 +736,32 @@
            this.layoutControlItem15});
            this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
            this.Root.Name = "Root";
            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition1.Width = 100D;
            columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition2.Width = 100D;
            columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition3.Width = 100D;
            columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition4.Width = 100D;
            columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition5.Width = 100D;
            columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition6.Width = 100D;
            columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition7.Width = 100D;
            columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition8.Width = 100D;
            this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
            columnDefinition1,
            columnDefinition2,
            columnDefinition3,
            columnDefinition4});
            rowDefinition1.Height = 100D;
            rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition2.Height = 100D;
            rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition3.Height = 100D;
            rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition4.Height = 100D;
            rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition5,
            columnDefinition6,
            columnDefinition7,
            columnDefinition8});
            rowDefinition5.Height = 100D;
            rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition6.Height = 100D;
            rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition7.Height = 100D;
            rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition8.Height = 100D;
            rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
            this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
            rowDefinition1,
            rowDefinition2,
            rowDefinition3,
            rowDefinition4});
            rowDefinition5,
            rowDefinition6,
            rowDefinition7,
            rowDefinition8});
            this.Root.Size = new System.Drawing.Size(1126, 137);
            this.Root.TextVisible = false;
            // 
@@ -830,13 +829,13 @@
            // 
            // layoutControlItem8
            // 
            this.layoutControlItem8.Control = this.txt_remark;
            this.layoutControlItem8.Control = this.txt_sqRemark;
            this.layoutControlItem8.Location = new System.Drawing.Point(0, 87);
            this.layoutControlItem8.Name = "layoutControlItem8";
            this.layoutControlItem8.OptionsTableLayoutItem.ColumnSpan = 2;
            this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem8.Size = new System.Drawing.Size(552, 30);
            this.layoutControlItem8.Text = "备注信息";
            this.layoutControlItem8.Text = "申请备注";
            this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem9
@@ -939,7 +938,6 @@
            this.gvMx1.Appearance.Row.Options.UseFont = true;
            this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gridColumn12,
            this.gridColumn11,
            this.gvMx2status,
            this.gvMx2pbillNo,
            this.gvMx2workLine,
@@ -963,21 +961,12 @@
            // 
            // gridColumn12
            // 
            this.gridColumn12.Caption = "guid";
            this.gridColumn12.Caption = "明细主键";
            this.gridColumn12.FieldName = "guid";
            this.gridColumn12.MinWidth = 25;
            this.gridColumn12.Name = "gridColumn12";
            this.gridColumn12.OptionsColumn.ReadOnly = true;
            this.gridColumn12.Width = 94;
            //
            // gridColumn11
            //
            this.gridColumn11.Caption = "aboutGuid";
            this.gridColumn11.FieldName = "aboutGuid";
            this.gridColumn11.MinWidth = 25;
            this.gridColumn11.Name = "gridColumn11";
            this.gridColumn11.OptionsColumn.ReadOnly = true;
            this.gridColumn11.Width = 94;
            // 
            // gvMx2status
            // 
@@ -989,8 +978,6 @@
            this.gvMx2status.Name = "gvMx2status";
            this.gvMx2status.OptionsColumn.ReadOnly = true;
            this.gvMx2status.Tag = "query_a.status";
            this.gvMx2status.Visible = true;
            this.gvMx2status.VisibleIndex = 0;
            this.gvMx2status.Width = 50;
            // 
            // gvMx2pbillNo
@@ -1002,7 +989,7 @@
            this.gvMx2pbillNo.OptionsColumn.ReadOnly = true;
            this.gvMx2pbillNo.Tag = "query_a.pbill_no";
            this.gvMx2pbillNo.Visible = true;
            this.gvMx2pbillNo.VisibleIndex = 1;
            this.gvMx2pbillNo.VisibleIndex = 0;
            this.gvMx2pbillNo.Width = 94;
            // 
            // gvMx2workLine
@@ -1014,7 +1001,7 @@
            this.gvMx2workLine.OptionsColumn.ReadOnly = true;
            this.gvMx2workLine.Tag = "query_a.work_line";
            this.gvMx2workLine.Visible = true;
            this.gvMx2workLine.VisibleIndex = 2;
            this.gvMx2workLine.VisibleIndex = 1;
            this.gvMx2workLine.Width = 94;
            // 
            // gvMx2itemNo
@@ -1026,7 +1013,7 @@
            this.gvMx2itemNo.OptionsColumn.ReadOnly = true;
            this.gvMx2itemNo.Tag = "query_a.item_no";
            this.gvMx2itemNo.Visible = true;
            this.gvMx2itemNo.VisibleIndex = 3;
            this.gvMx2itemNo.VisibleIndex = 2;
            this.gvMx2itemNo.Width = 94;
            // 
            // gridColumn5
@@ -1036,7 +1023,7 @@
            this.gridColumn5.Name = "gridColumn5";
            this.gridColumn5.OptionsColumn.ReadOnly = true;
            this.gridColumn5.Visible = true;
            this.gridColumn5.VisibleIndex = 4;
            this.gridColumn5.VisibleIndex = 3;
            this.gridColumn5.Width = 94;
            // 
            // gridColumn6
@@ -1046,7 +1033,7 @@
            this.gridColumn6.Name = "gridColumn6";
            this.gridColumn6.OptionsColumn.ReadOnly = true;
            this.gridColumn6.Visible = true;
            this.gridColumn6.VisibleIndex = 5;
            this.gridColumn6.VisibleIndex = 4;
            this.gridColumn6.Width = 94;
            // 
            // gvMx2quantity
@@ -1061,7 +1048,7 @@
            this.gvMx2quantity.Name = "gvMx2quantity";
            this.gvMx2quantity.Tag = "query_a.quantity";
            this.gvMx2quantity.Visible = true;
            this.gvMx2quantity.VisibleIndex = 6;
            this.gvMx2quantity.VisibleIndex = 5;
            this.gvMx2quantity.Width = 94;
            // 
            // gvMx2tlQty
@@ -1073,7 +1060,7 @@
            this.gvMx2tlQty.OptionsColumn.ReadOnly = true;
            this.gvMx2tlQty.Tag = "query_a.tl_qty";
            this.gvMx2tlQty.Visible = true;
            this.gvMx2tlQty.VisibleIndex = 7;
            this.gvMx2tlQty.VisibleIndex = 6;
            this.gvMx2tlQty.Width = 94;
            // 
            // gvMx2depotCode
@@ -1085,19 +1072,19 @@
            this.gvMx2depotCode.OptionsColumn.ReadOnly = true;
            this.gvMx2depotCode.Tag = "query_a.depot_code";
            this.gvMx2depotCode.Visible = true;
            this.gvMx2depotCode.VisibleIndex = 8;
            this.gvMx2depotCode.VisibleIndex = 7;
            this.gvMx2depotCode.Width = 94;
            // 
            // gvMx2remark
            // 
            this.gvMx2remark.AppearanceCell.Options.UseFont = true;
            this.gvMx2remark.Caption = "备注信息 ";
            this.gvMx2remark.FieldName = "remark";
            this.gvMx2remark.Caption = "申请备注";
            this.gvMx2remark.FieldName = "sqRemark";
            this.gvMx2remark.Name = "gvMx2remark";
            this.gvMx2remark.OptionsColumn.ReadOnly = true;
            this.gvMx2remark.Tag = "query_a.remark";
            this.gvMx2remark.Visible = true;
            this.gvMx2remark.VisibleIndex = 9;
            this.gvMx2remark.VisibleIndex = 8;
            this.gvMx2remark.Width = 94;
            // 
            // gvMx2ebelnK3id
@@ -1109,7 +1096,7 @@
            this.gvMx2ebelnK3id.OptionsColumn.ReadOnly = true;
            this.gvMx2ebelnK3id.Tag = "query_a.ebeln_k3id";
            this.gvMx2ebelnK3id.Visible = true;
            this.gvMx2ebelnK3id.VisibleIndex = 10;
            this.gvMx2ebelnK3id.VisibleIndex = 9;
            this.gvMx2ebelnK3id.Width = 94;
            // 
            // gvMx2lineK3id
@@ -1121,13 +1108,13 @@
            this.gvMx2lineK3id.OptionsColumn.ReadOnly = true;
            this.gvMx2lineK3id.Tag = "query_a.line_k3id";
            this.gvMx2lineK3id.Visible = true;
            this.gvMx2lineK3id.VisibleIndex = 11;
            this.gvMx2lineK3id.VisibleIndex = 10;
            this.gvMx2lineK3id.Width = 94;
            // 
            // gvMx2itemOutId
            // 
            this.gvMx2itemOutId.AppearanceCell.Options.UseFont = true;
            this.gvMx2itemOutId.Caption = "出库ID ";
            this.gvMx2itemOutId.Caption = "主表主键";
            this.gvMx2itemOutId.FieldName = "itemOutId";
            this.gvMx2itemOutId.Name = "gvMx2itemOutId";
            this.gvMx2itemOutId.OptionsColumn.ReadOnly = true;
@@ -1141,7 +1128,7 @@
            this.gridColumn14.MinWidth = 25;
            this.gridColumn14.Name = "gridColumn14";
            this.gridColumn14.Visible = true;
            this.gridColumn14.VisibleIndex = 12;
            this.gridColumn14.VisibleIndex = 11;
            this.gridColumn14.Width = 94;
            // 
            // gridColumn15
@@ -1151,7 +1138,7 @@
            this.gridColumn15.MinWidth = 25;
            this.gridColumn15.Name = "gridColumn15";
            this.gridColumn15.Visible = true;
            this.gridColumn15.VisibleIndex = 13;
            this.gridColumn15.VisibleIndex = 12;
            this.gridColumn15.Width = 94;
            // 
            // xtraTabPage3
@@ -1387,7 +1374,7 @@
            ((System.ComponentModel.ISupportInitialize)(this.txt_fmrmode.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_itemOutNo.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fType.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_sqRemark.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_sqdNo.Properties)).EndInit();
@@ -1456,7 +1443,7 @@
        private DevExpress.XtraEditors.ComboBoxEdit txt_reason;
        private DevExpress.XtraEditors.TextEdit txt_checkUser;
        private DevExpress.XtraEditors.TextEdit txt_checkDate;
        private DevExpress.XtraEditors.TextEdit txt_remark;
        private DevExpress.XtraEditors.TextEdit txt_sqRemark;
        private DevExpress.XtraEditors.TextEdit txt_itemOutNo;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
@@ -1478,7 +1465,6 @@
        private DevExpress.XtraGrid.GridControl gcMx1;
        private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx2status;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx2pbillNo;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx2workLine;
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs
@@ -387,7 +387,7 @@
            // gv_qt010
            // 
            this.gv_qt010.AppearanceCell.Options.UseFont = true;
            this.gv_qt010.Caption = "出库原因 ";
            this.gv_qt010.Caption = "申请备注";
            this.gv_qt010.FieldName = "qt010";
            this.gv_qt010.MinWidth = 25;
            this.gv_qt010.Name = "gv_qt010";
@@ -817,7 +817,7 @@
            this.layoutControlItem13.OptionsTableLayoutItem.ColumnSpan = 2;
            this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem13.Size = new System.Drawing.Size(552, 29);
            this.layoutControlItem13.Text = "出库备注";
            this.layoutControlItem13.Text = "申请备注";
            this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem9
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQtDj.Designer.cs
@@ -61,7 +61,6 @@
            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -292,7 +291,6 @@
            this.gridColumn1,
            this.gridColumn6,
            this.gridColumn8,
            this.gridColumn9,
            this.gridColumn10,
            this.gridColumn11,
            this.gridColumn12,
@@ -453,7 +451,7 @@
            // gv_remark
            // 
            this.gv_remark.AppearanceCell.Options.UseFont = true;
            this.gv_remark.Caption = "备注信息 ";
            this.gv_remark.Caption = "申请备注";
            this.gv_remark.FieldName = "sqRemark";
            this.gv_remark.MinWidth = 25;
            this.gv_remark.Name = "gv_remark";
@@ -491,16 +489,6 @@
            this.gridColumn8.VisibleIndex = 13;
            this.gridColumn8.Width = 94;
            // 
            // gridColumn9
            //
            this.gridColumn9.Caption = "出库原因";
            this.gridColumn9.FieldName = "sqRemark";
            this.gridColumn9.MinWidth = 25;
            this.gridColumn9.Name = "gridColumn9";
            this.gridColumn9.Visible = true;
            this.gridColumn9.VisibleIndex = 14;
            this.gridColumn9.Width = 94;
            //
            // gridColumn10
            // 
            this.gridColumn10.Caption = "库存组织";
@@ -508,7 +496,7 @@
            this.gridColumn10.MinWidth = 25;
            this.gridColumn10.Name = "gridColumn10";
            this.gridColumn10.Visible = true;
            this.gridColumn10.VisibleIndex = 15;
            this.gridColumn10.VisibleIndex = 14;
            this.gridColumn10.Width = 94;
            // 
            // gridColumn11
@@ -518,7 +506,7 @@
            this.gridColumn11.MinWidth = 25;
            this.gridColumn11.Name = "gridColumn11";
            this.gridColumn11.Visible = true;
            this.gridColumn11.VisibleIndex = 16;
            this.gridColumn11.VisibleIndex = 15;
            this.gridColumn11.Width = 94;
            // 
            // gridColumn12
@@ -528,7 +516,7 @@
            this.gridColumn12.MinWidth = 25;
            this.gridColumn12.Name = "gridColumn12";
            this.gridColumn12.Visible = true;
            this.gridColumn12.VisibleIndex = 17;
            this.gridColumn12.VisibleIndex = 16;
            this.gridColumn12.Width = 94;
            // 
            // gridColumn13
@@ -538,7 +526,7 @@
            this.gridColumn13.MinWidth = 25;
            this.gridColumn13.Name = "gridColumn13";
            this.gridColumn13.Visible = true;
            this.gridColumn13.VisibleIndex = 18;
            this.gridColumn13.VisibleIndex = 17;
            this.gridColumn13.Width = 94;
            // 
            // gridColumn7
@@ -548,7 +536,7 @@
            this.gridColumn7.MinWidth = 25;
            this.gridColumn7.Name = "gridColumn7";
            this.gridColumn7.Visible = true;
            this.gridColumn7.VisibleIndex = 19;
            this.gridColumn7.VisibleIndex = 18;
            this.gridColumn7.Width = 94;
            // 
            // gridColumn14
@@ -558,7 +546,7 @@
            this.gridColumn14.MinWidth = 25;
            this.gridColumn14.Name = "gridColumn14";
            this.gridColumn14.Visible = true;
            this.gridColumn14.VisibleIndex = 20;
            this.gridColumn14.VisibleIndex = 19;
            this.gridColumn14.Width = 94;
            // 
            // pageBar1
@@ -1036,7 +1024,7 @@
            this.layoutControlItem15.OptionsTableLayoutItem.ColumnSpan = 2;
            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 4;
            this.layoutControlItem15.Size = new System.Drawing.Size(552, 28);
            this.layoutControlItem15.Text = "备注信息";
            this.layoutControlItem15.Text = "申请备注";
            this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
            // 
            // tabMx
@@ -1186,7 +1174,7 @@
            // gvMx1remark
            // 
            this.gvMx1remark.AppearanceCell.Options.UseFont = true;
            this.gvMx1remark.Caption = "备注信息 ";
            this.gvMx1remark.Caption = "申请备注";
            this.gvMx1remark.FieldName = "sqRemark";
            this.gvMx1remark.MinWidth = 50;
            this.gvMx1remark.Name = "gvMx1remark";
@@ -1534,7 +1522,6 @@
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.Designer.cs
@@ -28,20 +28,20 @@
        private void InitializeComponent()
        {
            this.components = new System.ComponentModel.Container();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition10 = 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();
@@ -129,7 +129,10 @@
            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1bld002 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1bld003 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -691,6 +694,7 @@
            // 
            // txt_aboutGuid
            // 
            this.txt_aboutGuid.category = null;
            this.txt_aboutGuid.IsReadly = false;
            this.txt_aboutGuid.Location = new System.Drawing.Point(89, 78);
            this.txt_aboutGuid.Name = "txt_aboutGuid";
@@ -898,35 +902,35 @@
            this.layoutControlItem4});
            this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
            this.Root.Name = "Root";
            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition1.Width = 100D;
            columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition2.Width = 100D;
            columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition3.Width = 100D;
            columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition4.Width = 100D;
            columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition5.Width = 100D;
            columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition6.Width = 100D;
            columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition7.Width = 100D;
            columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition8.Width = 100D;
            this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
            columnDefinition1,
            columnDefinition2,
            columnDefinition3,
            columnDefinition4});
            rowDefinition1.Height = 100D;
            rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition2.Height = 100D;
            rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition3.Height = 100D;
            rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition4.Height = 100D;
            rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition5.Height = 100D;
            rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition5,
            columnDefinition6,
            columnDefinition7,
            columnDefinition8});
            rowDefinition6.Height = 100D;
            rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition7.Height = 100D;
            rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition8.Height = 100D;
            rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition9.Height = 100D;
            rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition10.Height = 100D;
            rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
            this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
            rowDefinition1,
            rowDefinition2,
            rowDefinition3,
            rowDefinition4,
            rowDefinition5});
            rowDefinition6,
            rowDefinition7,
            rowDefinition8,
            rowDefinition9,
            rowDefinition10});
            this.Root.Size = new System.Drawing.Size(1126, 187);
            this.Root.TextVisible = false;
            // 
@@ -998,7 +1002,7 @@
            this.layoutControlItem14.OptionsTableLayoutItem.ColumnSpan = 2;
            this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 4;
            this.layoutControlItem14.Size = new System.Drawing.Size(552, 35);
            this.layoutControlItem14.Text = "补料原因";
            this.layoutControlItem14.Text = "申请原因";
            this.layoutControlItem14.TextSize = new System.Drawing.Size(65, 18);
            // 
            // layoutControlItem11
@@ -1069,11 +1073,12 @@
            // layoutControlItem18
            // 
            this.layoutControlItem18.Control = this.txt_bl004;
            this.layoutControlItem18.CustomizationFormText = "申请人员";
            this.layoutControlItem18.Location = new System.Drawing.Point(828, 0);
            this.layoutControlItem18.Name = "layoutControlItem18";
            this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem18.Size = new System.Drawing.Size(278, 33);
            this.layoutControlItem18.Text = "申请人";
            this.layoutControlItem18.Text = "申请人员";
            this.layoutControlItem18.TextSize = new System.Drawing.Size(65, 18);
            // 
            // layoutControlItem3
@@ -1118,7 +1123,7 @@
            this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem4.Size = new System.Drawing.Size(278, 33);
            this.layoutControlItem4.Text = "审核人";
            this.layoutControlItem4.Text = "审核人员";
            this.layoutControlItem4.TextSize = new System.Drawing.Size(65, 18);
            // 
            // tabMx
@@ -1183,7 +1188,7 @@
            // gvMx1id
            // 
            this.gvMx1id.AppearanceCell.Options.UseFont = true;
            this.gvMx1id.Caption = "ID ";
            this.gvMx1id.Caption = "明细主键";
            this.gvMx1id.FieldName = "guid";
            this.gvMx1id.MinWidth = 50;
            this.gvMx1id.Name = "gvMx1id";
@@ -1194,7 +1199,7 @@
            // gvMx1mid
            // 
            this.gvMx1mid.AppearanceCell.Options.UseFont = true;
            this.gvMx1mid.Caption = "MID ";
            this.gvMx1mid.Caption = "主表主键";
            this.gvMx1mid.FieldName = "mid";
            this.gvMx1mid.MinWidth = 50;
            this.gvMx1mid.Name = "gvMx1mid";
@@ -1239,7 +1244,10 @@
            this.gridColumn3,
            this.gridColumn4,
            this.gridColumn5,
            this.gridColumn14,
            this.gridColumn15,
            this.gridColumn6,
            this.gridColumn16,
            this.gridColumn7});
            this.gridView2.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus;
            this.gridView2.Name = "gridView2";
@@ -1295,13 +1303,37 @@
            this.gridColumn5.Visible = true;
            this.gridColumn5.VisibleIndex = 5;
            // 
            // gridColumn14
            //
            this.gridColumn14.Caption = "需领用量";
            this.gridColumn14.FieldName = "dab006";
            this.gridColumn14.Name = "gridColumn14";
            this.gridColumn14.Visible = true;
            this.gridColumn14.VisibleIndex = 6;
            //
            // gridColumn15
            //
            this.gridColumn15.Caption = "已领用量";
            this.gridColumn15.FieldName = "ylQty";
            this.gridColumn15.Name = "gridColumn15";
            this.gridColumn15.Visible = true;
            this.gridColumn15.VisibleIndex = 7;
            //
            // gridColumn6
            // 
            this.gridColumn6.Caption = "可领数量";
            this.gridColumn6.FieldName = "dab006";
            this.gridColumn6.Caption = "补料数量";
            this.gridColumn6.FieldName = "blQty";
            this.gridColumn6.Name = "gridColumn6";
            this.gridColumn6.Visible = true;
            this.gridColumn6.VisibleIndex = 6;
            this.gridColumn6.VisibleIndex = 8;
            //
            // gridColumn16
            //
            this.gridColumn16.Caption = "超领数量";
            this.gridColumn16.FieldName = "clQty";
            this.gridColumn16.Name = "gridColumn16";
            this.gridColumn16.Visible = true;
            this.gridColumn16.VisibleIndex = 9;
            // 
            // gridColumn7
            // 
@@ -1429,7 +1461,7 @@
            // 
            // dabGuid
            // 
            this.dabGuid.Caption = "gridColumn1";
            this.dabGuid.Caption = "dab表明细键";
            this.dabGuid.FieldName = "dabGuid";
            this.dabGuid.MinWidth = 25;
            this.dabGuid.Name = "dabGuid";
@@ -1461,10 +1493,10 @@
            // repositoryItemButtonEdit1
            // 
            this.repositoryItemButtonEdit1.AutoHeight = false;
            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "移出", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", 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.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
            this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -1680,5 +1712,8 @@
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
        private DevExpress.Utils.ToolTipController tips;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
    }
}
DevApp/Gs.DevApp/DevFrm/Ck/UcBlclDj.Designer.cs
@@ -28,14 +28,14 @@
        private void InitializeComponent()
        {
            this.components = new System.ComponentModel.Container();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition9 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition10 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition11 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition12 = 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();
            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
            this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
@@ -68,7 +68,7 @@
            this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
            this.lbGuid = new System.Windows.Forms.Label();
            this.txt_outType = new DevExpress.XtraEditors.TextEdit();
            this.txt_remark = new DevExpress.XtraEditors.TextEdit();
            this.txt_sqRemark = new DevExpress.XtraEditors.TextEdit();
            this.txt_itemOutNo = new DevExpress.XtraEditors.TextEdit();
            this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
            this.txt_checkDate = new DevExpress.XtraEditors.TextEdit();
@@ -128,6 +128,7 @@
            this.gvMx2remark = new DevExpress.XtraGrid.Columns.GridColumn();
            this.picCheckBox = new System.Windows.Forms.PictureBox();
            this.tips = new DevExpress.Utils.ToolTipController(this.components);
            this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
            this.xtraTabControl1.SuspendLayout();
            this.xtraTabPage3.SuspendLayout();
@@ -148,7 +149,7 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
            this.layoutMx1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.txt_outType.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_sqRemark.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_itemOutNo.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
@@ -485,8 +486,8 @@
            // gv_remark
            // 
            this.gv_remark.AppearanceCell.Options.UseFont = true;
            this.gv_remark.Caption = "备注信息 ";
            this.gv_remark.FieldName = "remark";
            this.gv_remark.Caption = "申请原因";
            this.gv_remark.FieldName = "sqRemark";
            this.gv_remark.MinWidth = 25;
            this.gv_remark.Name = "gv_remark";
            this.gv_remark.OptionsColumn.AllowEdit = false;
@@ -576,7 +577,7 @@
            // 
            this.layoutMx1.Controls.Add(this.lbGuid);
            this.layoutMx1.Controls.Add(this.txt_outType);
            this.layoutMx1.Controls.Add(this.txt_remark);
            this.layoutMx1.Controls.Add(this.txt_sqRemark);
            this.layoutMx1.Controls.Add(this.txt_itemOutNo);
            this.layoutMx1.Controls.Add(this.txt_createBy);
            this.layoutMx1.Controls.Add(this.txt_checkDate);
@@ -619,14 +620,14 @@
            this.txt_outType.StyleController = this.layoutMx1;
            this.txt_outType.TabIndex = 450;
            // 
            // txt_remark
            // txt_sqRemark
            // 
            this.txt_remark.Location = new System.Drawing.Point(89, 96);
            this.txt_remark.Name = "txt_remark";
            this.txt_remark.Properties.Appearance.Options.UseFont = true;
            this.txt_remark.Size = new System.Drawing.Size(471, 24);
            this.txt_remark.StyleController = this.layoutMx1;
            this.txt_remark.TabIndex = 243;
            this.txt_sqRemark.Location = new System.Drawing.Point(89, 96);
            this.txt_sqRemark.Name = "txt_sqRemark";
            this.txt_sqRemark.Properties.Appearance.Options.UseFont = true;
            this.txt_sqRemark.Size = new System.Drawing.Size(471, 24);
            this.txt_sqRemark.StyleController = this.layoutMx1;
            this.txt_sqRemark.TabIndex = 243;
            // 
            // txt_itemOutNo
            // 
@@ -774,32 +775,32 @@
            this.layoutControlItem16});
            this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
            this.Root.Name = "Root";
            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition1.Width = 100D;
            columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition2.Width = 100D;
            columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition3.Width = 100D;
            columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition4.Width = 100D;
            columnDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition9.Width = 100D;
            columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition10.Width = 100D;
            columnDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition11.Width = 100D;
            columnDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition12.Width = 100D;
            this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
            columnDefinition1,
            columnDefinition2,
            columnDefinition3,
            columnDefinition4});
            rowDefinition1.Height = 100D;
            rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition2.Height = 100D;
            rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition3.Height = 100D;
            rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition4.Height = 100D;
            rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition9,
            columnDefinition10,
            columnDefinition11,
            columnDefinition12});
            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[] {
            rowDefinition1,
            rowDefinition2,
            rowDefinition3,
            rowDefinition4});
            rowDefinition9,
            rowDefinition10,
            rowDefinition11,
            rowDefinition12});
            this.Root.Size = new System.Drawing.Size(1126, 133);
            this.Root.TextVisible = false;
            // 
@@ -879,13 +880,13 @@
            // 
            // layoutControlItem11
            // 
            this.layoutControlItem11.Control = this.txt_remark;
            this.layoutControlItem11.Control = this.txt_sqRemark;
            this.layoutControlItem11.Location = new System.Drawing.Point(0, 84);
            this.layoutControlItem11.Name = "layoutControlItem11";
            this.layoutControlItem11.OptionsTableLayoutItem.ColumnSpan = 2;
            this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem11.Size = new System.Drawing.Size(552, 29);
            this.layoutControlItem11.Text = "备注信息";
            this.layoutControlItem11.Text = "申请原因";
            this.layoutControlItem11.TextSize = new System.Drawing.Size(65, 18);
            // 
            // layoutControlItem2
@@ -1006,7 +1007,8 @@
            this.gvMx1tlQty,
            this.gvMx1remark,
            this.gridColumn4,
            this.gridColumn5});
            this.gridColumn5,
            this.gridColumn11});
            this.gvMx1.GridControl = this.gcMx1;
            this.gvMx1.Name = "gvMx1";
            this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -1016,7 +1018,7 @@
            // gvMx1guid
            // 
            this.gvMx1guid.AppearanceCell.Options.UseFont = true;
            this.gvMx1guid.Caption = "guid ";
            this.gvMx1guid.Caption = "明细主键";
            this.gvMx1guid.FieldName = "guid";
            this.gvMx1guid.MinWidth = 50;
            this.gvMx1guid.Name = "gvMx1guid";
@@ -1110,8 +1112,8 @@
            // gvMx1remark
            // 
            this.gvMx1remark.AppearanceCell.Options.UseFont = true;
            this.gvMx1remark.Caption = "备注信息 ";
            this.gvMx1remark.FieldName = "remark";
            this.gvMx1remark.Caption = "申请原因";
            this.gvMx1remark.FieldName = "sqRemark";
            this.gvMx1remark.MinWidth = 50;
            this.gvMx1remark.Name = "gvMx1remark";
            this.gvMx1remark.Tag = "query_a.remark";
@@ -1291,6 +1293,14 @@
            this.picCheckBox.TabStop = false;
            this.picCheckBox.Visible = false;
            // 
            // gridColumn11
            //
            this.gridColumn11.Caption = "相关主键";
            this.gridColumn11.FieldName = "itemDabid";
            this.gridColumn11.MinWidth = 25;
            this.gridColumn11.Name = "gridColumn11";
            this.gridColumn11.Width = 94;
            //
            // UcBlclDj
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1320,7 +1330,7 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
            this.layoutMx1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.txt_outType.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_sqRemark.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_itemOutNo.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
@@ -1395,7 +1405,7 @@
        private DevExpress.XtraEditors.TextEdit txt_workNo;
        private DevExpress.XtraEditors.TextEdit txt_checkDate;
        private DevExpress.XtraEditors.TextEdit txt_checkUser;
        private DevExpress.XtraEditors.TextEdit txt_remark;
        private DevExpress.XtraEditors.TextEdit txt_sqRemark;
        private DevExpress.XtraEditors.TextEdit txt_createDate;
        private DevExpress.XtraEditors.TextEdit txt_createBy;
        private DevExpress.XtraEditors.TextEdit txt_taskNo;
@@ -1456,5 +1466,6 @@
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
        private DevExpress.Utils.ToolTipController tips;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
    }
}
DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcItem.Designer.cs
@@ -146,8 +146,6 @@
            this.gridColumn6.FieldName = "itemModel";
            this.gridColumn6.MinWidth = 25;
            this.gridColumn6.Name = "gridColumn6";
            this.gridColumn6.Visible = true;
            this.gridColumn6.VisibleIndex = 5;
            this.gridColumn6.Width = 94;
            // 
            // gv_Btn
@@ -157,7 +155,7 @@
            this.gv_Btn.MinWidth = 25;
            this.gv_Btn.Name = "gv_Btn";
            this.gv_Btn.Visible = true;
            this.gv_Btn.VisibleIndex = 6;
            this.gv_Btn.VisibleIndex = 5;
            this.gv_Btn.Width = 94;
            // 
            // repositoryItemButtonEdit1
DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcItem.cs
@@ -18,7 +18,7 @@
            InitializeComponent();
            this.lineId = _lineId;
            getPageList(1);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", null, null, false);
        }
      
        /// <summary>
DevApp/Gs.DevApp/DevFrm/PDA/SelectCk.cs
@@ -23,10 +23,7 @@
        {
            InitializeComponent();
            this.userGuid = _userGuid;
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", (value) =>
            {
            });
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", null, null, false);
            getPageList(1);
            btnIn.Click += (s, e) =>
            {
DevApp/Gs.DevApp/DevFrm/PDA/SelectPage.cs
@@ -21,10 +21,7 @@
        {
            InitializeComponent();
            this.userGuid = _userGuid;
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", (value) =>
            {
            },null);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", null, null, false);
            getPageList(1);
            btnIn.Click += (s, e) =>
            {
DevApp/Gs.DevApp/DevFrm/PDA/SelectPrint.cs
@@ -21,10 +21,7 @@
        {
            InitializeComponent();
            this.userGuid = _userGuid;
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", (value) =>
            {
            });
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", null, null, false);
            getPageList(1);
            btnIn.Click += (s, e) =>
            {
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs
@@ -30,24 +30,24 @@
        private void InitializeComponent()
        {
            this.components = new System.ComponentModel.Container();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
            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();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition8 = 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.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject13 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject();
            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -102,6 +102,9 @@
            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
            this.tabMx = new DevExpress.XtraTab.XtraTabControl();
            this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
            this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -129,6 +132,7 @@
            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.panelMx1 = new DevExpress.XtraEditors.PanelControl();
            this.radOut = new DevExpress.XtraEditors.RadioGroup();
            this.ucBtnPrint1 = new Gs.DevApp.UserControl.UcBtnPrint();
            this.lbMxGuid = new DevExpress.XtraEditors.LabelControl();
            this.txt_iCount_1 = new DevExpress.XtraEditors.TextEdit();
@@ -137,7 +141,7 @@
            this.labelControl12 = new DevExpress.XtraEditors.LabelControl();
            this.txt_kQty = new DevExpress.XtraEditors.TextEdit();
            this.labelControl13 = new DevExpress.XtraEditors.LabelControl();
            this.txtYdy = new DevExpress.XtraEditors.TextEdit();
            this.txt_yQty = new DevExpress.XtraEditors.TextEdit();
            this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
            this.txtQuantity = new DevExpress.XtraEditors.TextEdit();
            this.labelControl10 = new DevExpress.XtraEditors.LabelControl();
@@ -167,10 +171,6 @@
            this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            this.picCheckBox = new System.Windows.Forms.PictureBox();
            this.tips = new DevExpress.Utils.ToolTipController(this.components);
            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
            this.radOut = new DevExpress.XtraEditors.RadioGroup();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
            this.xtraTabControl1.SuspendLayout();
            this.xtraTabPage1.SuspendLayout();
@@ -212,6 +212,9 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
            this.tabMx.SuspendLayout();
            this.tabMxPage1.SuspendLayout();
@@ -222,10 +225,11 @@
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.panelMx1)).BeginInit();
            this.panelMx1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.radOut.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_kQty.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtYdy.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_yQty.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtQuantity.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtWlgg.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtWlmc.Properties)).BeginInit();
@@ -235,10 +239,6 @@
            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.radOut.Properties)).BeginInit();
            this.SuspendLayout();
            // 
            // toolBarMenu1
@@ -453,7 +453,7 @@
            // gv_qt010
            // 
            this.gv_qt010.AppearanceCell.Options.UseFont = true;
            this.gv_qt010.Caption = "入库原因 ";
            this.gv_qt010.Caption = "申请备注";
            this.gv_qt010.FieldName = "qt010";
            this.gv_qt010.MinWidth = 25;
            this.gv_qt010.Name = "gv_qt010";
@@ -775,32 +775,32 @@
            this.layoutControlItem2});
            this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
            this.Root.Name = "Root";
            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition1.Width = 100D;
            columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition2.Width = 100D;
            columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition3.Width = 100D;
            columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition4.Width = 100D;
            columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition5.Width = 100D;
            columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition6.Width = 100D;
            columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition7.Width = 100D;
            columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition8.Width = 100D;
            this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
            columnDefinition1,
            columnDefinition2,
            columnDefinition3,
            columnDefinition4});
            rowDefinition1.Height = 100D;
            rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition2.Height = 100D;
            rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition3.Height = 100D;
            rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition4.Height = 100D;
            rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition5,
            columnDefinition6,
            columnDefinition7,
            columnDefinition8});
            rowDefinition5.Height = 100D;
            rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition6.Height = 100D;
            rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition7.Height = 100D;
            rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition8.Height = 100D;
            rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
            this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
            rowDefinition1,
            rowDefinition2,
            rowDefinition3,
            rowDefinition4});
            rowDefinition5,
            rowDefinition6,
            rowDefinition7,
            rowDefinition8});
            this.Root.Size = new System.Drawing.Size(1167, 144);
            this.Root.TextVisible = false;
            // 
@@ -924,6 +924,39 @@
            this.layoutControlItem3.Text = "库存方向";
            this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem14
            //
            this.layoutControlItem14.Control = this.txt_qt005;
            this.layoutControlItem14.CustomizationFormText = "申请人";
            this.layoutControlItem14.Location = new System.Drawing.Point(573, 0);
            this.layoutControlItem14.Name = "layoutControlItem14";
            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem14.Size = new System.Drawing.Size(287, 31);
            this.layoutControlItem14.Text = "申请人员";
            this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem15
            //
            this.layoutControlItem15.Control = this.txt_qt001;
            this.layoutControlItem15.Location = new System.Drawing.Point(573, 31);
            this.layoutControlItem15.Name = "layoutControlItem15";
            this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem15.Size = new System.Drawing.Size(287, 31);
            this.layoutControlItem15.Text = "申请时间";
            this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem2
            //
            this.layoutControlItem2.Control = this.txt_qt003;
            this.layoutControlItem2.Location = new System.Drawing.Point(573, 62);
            this.layoutControlItem2.Name = "layoutControlItem2";
            this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem2.Size = new System.Drawing.Size(287, 31);
            this.layoutControlItem2.Text = "单据类型";
            this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
            //
            // tabMx
            // 
            this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -985,7 +1018,7 @@
            // gvMx1guid
            // 
            this.gvMx1guid.AppearanceCell.Options.UseFont = true;
            this.gvMx1guid.Caption = "guid ";
            this.gvMx1guid.Caption = "明细主键";
            this.gvMx1guid.FieldName = "guid";
            this.gvMx1guid.MinWidth = 25;
            this.gvMx1guid.Name = "gvMx1guid";
@@ -997,7 +1030,7 @@
            // gvMx1qtrkGuid
            // 
            this.gvMx1qtrkGuid.AppearanceCell.Options.UseFont = true;
            this.gvMx1qtrkGuid.Caption = "qtrkGuid ";
            this.gvMx1qtrkGuid.Caption = "外键";
            this.gvMx1qtrkGuid.FieldName = "qtrkGuid";
            this.gvMx1qtrkGuid.MinWidth = 25;
            this.gvMx1qtrkGuid.Name = "gvMx1qtrkGuid";
@@ -1231,10 +1264,10 @@
            // repositoryItemButtonEdit1
            // 
            this.repositoryItemButtonEdit1.AutoHeight = false;
            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "移出", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            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)});
            this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
            this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -1258,7 +1291,7 @@
            this.panelMx1.Controls.Add(this.labelControl12);
            this.panelMx1.Controls.Add(this.txt_kQty);
            this.panelMx1.Controls.Add(this.labelControl13);
            this.panelMx1.Controls.Add(this.txtYdy);
            this.panelMx1.Controls.Add(this.txt_yQty);
            this.panelMx1.Controls.Add(this.labelControl1);
            this.panelMx1.Controls.Add(this.txtQuantity);
            this.panelMx1.Controls.Add(this.labelControl10);
@@ -1273,6 +1306,19 @@
            this.panelMx1.Name = "panelMx1";
            this.panelMx1.Size = new System.Drawing.Size(1165, 102);
            this.panelMx1.TabIndex = 2;
            //
            // radOut
            //
            this.radOut.Location = new System.Drawing.Point(759, 27);
            this.radOut.Margin = new System.Windows.Forms.Padding(0);
            this.radOut.Name = "radOut";
            this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near;
            this.radOut.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.RadioGroupItem[] {
            new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "全自动"),
            new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "半自动"),
            new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "手动")});
            this.radOut.Size = new System.Drawing.Size(248, 31);
            this.radOut.TabIndex = 475;
            // 
            // ucBtnPrint1
            // 
@@ -1298,6 +1344,7 @@
            this.txt_iCount_1.Location = new System.Drawing.Point(651, 65);
            this.txt_iCount_1.Name = "txt_iCount_1";
            this.txt_iCount_1.Properties.Appearance.Options.UseFont = true;
            this.txt_iCount_1.Properties.ReadOnly = true;
            this.txt_iCount_1.Size = new System.Drawing.Size(96, 24);
            this.txt_iCount_1.TabIndex = 228;
            // 
@@ -1344,14 +1391,14 @@
            this.labelControl13.TabIndex = 223;
            this.labelControl13.Text = "可打印总数:";
            // 
            // txtYdy
            // txt_yQty
            // 
            this.txtYdy.Location = new System.Drawing.Point(430, 34);
            this.txtYdy.Name = "txtYdy";
            this.txtYdy.Properties.Appearance.Options.UseFont = true;
            this.txtYdy.Properties.ReadOnly = true;
            this.txtYdy.Size = new System.Drawing.Size(96, 24);
            this.txtYdy.TabIndex = 222;
            this.txt_yQty.Location = new System.Drawing.Point(430, 34);
            this.txt_yQty.Name = "txt_yQty";
            this.txt_yQty.Properties.Appearance.Options.UseFont = true;
            this.txt_yQty.Properties.ReadOnly = true;
            this.txt_yQty.Size = new System.Drawing.Size(96, 24);
            this.txt_yQty.TabIndex = 222;
            // 
            // labelControl1
            // 
@@ -1624,10 +1671,10 @@
            // repositoryItemButtonEdit2
            // 
            this.repositoryItemButtonEdit2.AutoHeight = false;
            editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            editorButtonImageOptions4.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions4.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            this.repositoryItemButtonEdit2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            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)});
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "移出", -1, true, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            this.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2";
            this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            this.repositoryItemButtonEdit2.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit2_ButtonClick);
@@ -1642,52 +1689,6 @@
            this.picCheckBox.TabIndex = 5;
            this.picCheckBox.TabStop = false;
            this.picCheckBox.Visible = false;
            //
            // layoutControlItem14
            //
            this.layoutControlItem14.Control = this.txt_qt005;
            this.layoutControlItem14.CustomizationFormText = "申请人";
            this.layoutControlItem14.Location = new System.Drawing.Point(573, 0);
            this.layoutControlItem14.Name = "layoutControlItem14";
            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem14.Size = new System.Drawing.Size(287, 31);
            this.layoutControlItem14.Text = "申请人员";
            this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem15
            //
            this.layoutControlItem15.Control = this.txt_qt001;
            this.layoutControlItem15.Location = new System.Drawing.Point(573, 31);
            this.layoutControlItem15.Name = "layoutControlItem15";
            this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem15.Size = new System.Drawing.Size(287, 31);
            this.layoutControlItem15.Text = "申请时间";
            this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem2
            //
            this.layoutControlItem2.Control = this.txt_qt003;
            this.layoutControlItem2.Location = new System.Drawing.Point(573, 62);
            this.layoutControlItem2.Name = "layoutControlItem2";
            this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem2.Size = new System.Drawing.Size(287, 31);
            this.layoutControlItem2.Text = "单据类型";
            this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
            //
            // radOut
            //
            this.radOut.Location = new System.Drawing.Point(759, 27);
            this.radOut.Margin = new System.Windows.Forms.Padding(0);
            this.radOut.Name = "radOut";
            this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near;
            this.radOut.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.RadioGroupItem[] {
            new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "全自动"),
            new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "半自动"),
            new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "手动")});
            this.radOut.Size = new System.Drawing.Size(248, 31);
            this.radOut.TabIndex = 475;
            // 
            // Frm_MesItemQtrk
            // 
@@ -1740,6 +1741,9 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
            this.tabMx.ResumeLayout(false);
            this.tabMxPage1.ResumeLayout(false);
@@ -1751,10 +1755,11 @@
            ((System.ComponentModel.ISupportInitialize)(this.panelMx1)).EndInit();
            this.panelMx1.ResumeLayout(false);
            this.panelMx1.PerformLayout();
            ((System.ComponentModel.ISupportInitialize)(this.radOut.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_kQty.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtYdy.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_yQty.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtQuantity.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtWlgg.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtWlmc.Properties)).EndInit();
@@ -1764,10 +1769,6 @@
            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.radOut.Properties)).EndInit();
            this.ResumeLayout(false);
        }
@@ -1853,7 +1854,7 @@
        private DevExpress.XtraEditors.LabelControl labelControl12;
        private DevExpress.XtraEditors.TextEdit txt_kQty;
        private DevExpress.XtraEditors.LabelControl labelControl13;
        private DevExpress.XtraEditors.TextEdit txtYdy;
        private DevExpress.XtraEditors.TextEdit txt_yQty;
        private DevExpress.XtraEditors.LabelControl labelControl1;
        private DevExpress.XtraEditors.TextEdit txtQuantity;
        private DevExpress.XtraEditors.LabelControl labelControl10;
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs
@@ -120,17 +120,12 @@
            //自动计算打印量
            txt_psnQty_1.TextChanged += (s, e) =>
            {
                Gs.DevApp.ToolBox.UtilityHelper.PrintJiSuan(this, txt_psnQty_1, txt_iCount_1, txt_kQty.Text.Trim(), radOut);
                Gs.DevApp.ToolBox.UtilityHelper.PrintJiSuan( txt_psnQty_1, txt_iCount_1, txt_kQty.Text.Trim(), radOut);
            };
            txt_iCount_1.TextChanged += (s, e) =>
            {
                Gs.DevApp.ToolBox.UtilityHelper.PrintJiSuan(this, txt_iCount_1, txt_psnQty_1, txt_kQty.Text.Trim(), radOut);
            };
            radOut.SelectedIndexChanged += (s, e) =>
            {
                txt_psnQty_1.Text = "";
                txt_iCount_1.Text = "";
                radOut.Properties.Items[0].Description = "全自动";
                Gs.DevApp.ToolBox.UtilityHelper.PrintAuto(txt_psnQty_1, txt_iCount_1, radOut);
            };
        }
        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
@@ -688,6 +683,7 @@
        }
        private void GvMx1_FocusedRowChanged(object sender, DevExpress.XtraGrid.Views.Base.FocusedRowChangedEventArgs e)
        {
            if (e.FocusedRowHandle >= 0)
            {
                DataRow row = gvMx1.GetDataRow(e.FocusedRowHandle);
@@ -697,9 +693,22 @@
                txtWlgg.Text = row["qd004"].ToString();
                txtWlmc.Text = row["qd003"].ToString();
                txtQuantity.Text = row["qd007"].ToString();//申请总量
                txtYdy.Text = row["ydy"].ToString();//已打印总量
                txt_yQty.Text = row["ydy"].ToString();//已打印总量
                txt_kQty.Text = row["kdy"].ToString();//可打印总量
            }
            else
            {
                lbMxGuid.Text = "";
                ucBtnPrint1.guidKey = "";
                txtWlid.Text = "";
                txtWlgg.Text = "";
                txtWlmc.Text = "";
                txtQuantity.Text = "";
                txt_yQty.Text = "";
                txt_kQty.Text = "";
                txt_psnQty_1.Text = "";
                txt_iCount_1.Text = "";
            }
        }
        /// <summary>
        /// ç§»å‡ºæ¡ç 
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.Designer.cs
@@ -110,7 +110,7 @@
            this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
            this.tabMx = new DevExpress.XtraTab.XtraTabControl();
            this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
            this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
            this.gcMx2 = new DevExpress.XtraGrid.GridControl();
            this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gvMx1itemBarcode = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -123,7 +123,7 @@
            this.gvMx1depotSectionCode = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
            this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
            this.gcMx1 = new DevExpress.XtraGrid.GridControl();
            this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -135,6 +135,8 @@
            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.picCheckBox = new System.Windows.Forms.PictureBox();
            this.tips = new DevExpress.Utils.ToolTipController(this.components);
            this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
            this.xtraTabControl1.SuspendLayout();
            this.xtraTabPage1.SuspendLayout();
@@ -194,10 +196,10 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
            this.tabMx.SuspendLayout();
            this.tabMxPage1.SuspendLayout();
            this.tabMxPage2.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
            this.tabMxPage2.SuspendLayout();
            this.tabMxPage1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
@@ -1054,19 +1056,19 @@
            this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
            this.tabMx.Location = new System.Drawing.Point(0, 0);
            this.tabMx.Name = "tabMx";
            this.tabMx.SelectedTabPage = this.tabMxPage1;
            this.tabMx.SelectedTabPage = this.tabMxPage2;
            this.tabMx.Size = new System.Drawing.Size(1346, 382);
            this.tabMx.TabIndex = 3;
            this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
            this.tabMxPage2,
            this.tabMxPage1});
            this.tabMxPage1,
            this.tabMxPage2});
            // 
            // tabMxPage1
            // tabMxPage2
            // 
            this.tabMxPage1.Controls.Add(this.gcMx2);
            this.tabMxPage1.Name = "tabMxPage1";
            this.tabMxPage1.Size = new System.Drawing.Size(1344, 350);
            this.tabMxPage1.Text = "入库条码";
            this.tabMxPage2.Controls.Add(this.gcMx2);
            this.tabMxPage2.Name = "tabMxPage2";
            this.tabMxPage2.Size = new System.Drawing.Size(1344, 350);
            this.tabMxPage2.Text = "入库条码";
            // 
            // gcMx2
            // 
@@ -1216,12 +1218,12 @@
            this.gridColumn2.VisibleIndex = 9;
            this.gridColumn2.Width = 94;
            // 
            // tabMxPage2
            // tabMxPage1
            // 
            this.tabMxPage2.Controls.Add(this.gcMx1);
            this.tabMxPage2.Name = "tabMxPage2";
            this.tabMxPage2.Size = new System.Drawing.Size(1344, 350);
            this.tabMxPage2.Text = "物料明细";
            this.tabMxPage1.Controls.Add(this.gcMx1);
            this.tabMxPage1.Name = "tabMxPage1";
            this.tabMxPage1.Size = new System.Drawing.Size(1344, 350);
            this.tabMxPage1.Text = "物料明细";
            // 
            // gcMx1
            // 
@@ -1243,7 +1245,9 @@
            this.gvMx2quantity,
            this.gvMx2unit,
            this.gridColumn5,
            this.gridColumn6});
            this.gridColumn6,
            this.gridColumn11,
            this.gridColumn12});
            this.gvMx1.GridControl = this.gcMx1;
            this.gvMx1.Name = "gvMx1";
            this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -1339,6 +1343,26 @@
            this.picCheckBox.TabStop = false;
            this.picCheckBox.Visible = false;
            // 
            // gridColumn11
            //
            this.gridColumn11.Caption = "申请备注";
            this.gridColumn11.FieldName = "sqRemark";
            this.gridColumn11.MinWidth = 25;
            this.gridColumn11.Name = "gridColumn11";
            this.gridColumn11.Visible = true;
            this.gridColumn11.VisibleIndex = 7;
            this.gridColumn11.Width = 94;
            //
            // gridColumn12
            //
            this.gridColumn12.Caption = "物料ID";
            this.gridColumn12.FieldName = "itemId";
            this.gridColumn12.MinWidth = 25;
            this.gridColumn12.Name = "gridColumn12";
            this.gridColumn12.Visible = true;
            this.gridColumn12.VisibleIndex = 8;
            this.gridColumn12.Width = 94;
            //
            // Frm_MesItemQtrkDj
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1408,10 +1432,10 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
            this.tabMx.ResumeLayout(false);
            this.tabMxPage1.ResumeLayout(false);
            this.tabMxPage2.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
            this.tabMxPage2.ResumeLayout(false);
            this.tabMxPage1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
@@ -1487,7 +1511,7 @@
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
        private DevExpress.XtraTab.XtraTabControl tabMx;
        private DevExpress.XtraTab.XtraTabPage tabMxPage1;
        private DevExpress.XtraTab.XtraTabPage tabMxPage2;
        private DevExpress.XtraGrid.GridControl gcMx2;
        private DevExpress.XtraGrid.Views.Grid.GridView gvMx2;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1itemBarcode;
@@ -1500,7 +1524,7 @@
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1depotSectionCode;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
        private DevExpress.XtraTab.XtraTabPage tabMxPage2;
        private DevExpress.XtraTab.XtraTabPage tabMxPage1;
        private DevExpress.XtraGrid.GridControl gcMx1;
        private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
@@ -1515,5 +1539,7 @@
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
        private DevExpress.Utils.ToolTipController tips;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
    }
}
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs
@@ -1366,6 +1366,7 @@
            this.txt_iCount_1.Location = new System.Drawing.Point(649, 67);
            this.txt_iCount_1.Name = "txt_iCount_1";
            this.txt_iCount_1.Properties.Appearance.Options.UseFont = true;
            this.txt_iCount_1.Properties.ReadOnly = true;
            this.txt_iCount_1.Size = new System.Drawing.Size(96, 24);
            this.txt_iCount_1.TabIndex = 228;
            // 
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs
@@ -15,7 +15,7 @@
    {
        string _webServiceName = "MesItemTblManager/";
        List<FilterEntity> _filterList = new List<FilterEntity>();
        string _ucGg = "";
        string _ucGg = "";
        public Frm_MesItemTbl()
        {
            InitializeComponent();
@@ -143,17 +143,11 @@
            //自动计算打印量
            txt_psnQty_1.TextChanged += (s, e) =>
            {
                Gs.DevApp.ToolBox.UtilityHelper.PrintJiSuan(this, txt_psnQty_1, txt_iCount_1, txt_kQty.Text.Trim(), radOut);
            };
            txt_iCount_1.TextChanged += (s, e) =>
            {
                Gs.DevApp.ToolBox.UtilityHelper.PrintJiSuan(this, txt_iCount_1, txt_psnQty_1, txt_kQty.Text.Trim(), radOut);
                Gs.DevApp.ToolBox.UtilityHelper.PrintJiSuan(txt_psnQty_1, txt_iCount_1, txt_kQty.Text.Trim(), radOut);
            };
            radOut.SelectedIndexChanged += (s, e) =>
            {
                txt_psnQty_1.Text = "";
                txt_iCount_1.Text = "";
                radOut.Properties.Items[0].Description = "全自动";
                Gs.DevApp.ToolBox.UtilityHelper.PrintAuto(txt_psnQty_1, txt_iCount_1,radOut);
            };
        }
        private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
@@ -194,7 +188,7 @@
            gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
            gridView1.ActiveFilter.Clear();
            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
              var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            frm.UpdateParent += Frm_UpdateParent;
            frm.ShowDialog();
        }
@@ -552,7 +546,7 @@
                if (_rtn.rtnCode > 0)
                {
                    dynamic dy = _rtn.rtnData;
                    _ucGg= dy.tbl002;
                    _ucGg = dy.tbl002;
                    lbGuid.Text = strGuid;
                    List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
                    gvList.Add(gvMx1);
DevApp/Gs.DevApp/DevFrm/Rk/SelectItemTbl.Designer.cs
ÎļþÃû´Ó DevApp/Gs.DevApp/UserControl/SelectItemTbl.Designer.cs ÐÞ¸Ä
@@ -107,6 +107,7 @@
            this.gridColumn1.MinWidth = 80;
            this.gridColumn1.Name = "gridColumn1";
            this.gridColumn1.OptionsColumn.ReadOnly = true;
            this.gridColumn1.Tag = "itemId";
            this.gridColumn1.Visible = true;
            this.gridColumn1.VisibleIndex = 2;
            this.gridColumn1.Width = 94;
@@ -147,6 +148,7 @@
            this.gridColumn5.MinWidth = 250;
            this.gridColumn5.Name = "gridColumn5";
            this.gridColumn5.OptionsColumn.ReadOnly = true;
            this.gridColumn5.Tag = "dab005";
            this.gridColumn5.Visible = true;
            this.gridColumn5.VisibleIndex = 9;
            this.gridColumn5.Width = 250;
@@ -159,6 +161,7 @@
            this.gridColumn6.MinWidth = 60;
            this.gridColumn6.Name = "gridColumn6";
            this.gridColumn6.OptionsColumn.ReadOnly = true;
            this.gridColumn6.Tag = "fname";
            this.gridColumn6.Visible = true;
            this.gridColumn6.VisibleIndex = 5;
            this.gridColumn6.Width = 60;
@@ -170,6 +173,7 @@
            this.gridColumn4.MaxWidth = 50;
            this.gridColumn4.MinWidth = 50;
            this.gridColumn4.Name = "gridColumn4";
            this.gridColumn4.Tag = "ylsl";
            this.gridColumn4.Visible = true;
            this.gridColumn4.VisibleIndex = 6;
            this.gridColumn4.Width = 50;
@@ -180,6 +184,7 @@
            this.gridColumn7.FieldName = "ytsl";
            this.gridColumn7.MinWidth = 25;
            this.gridColumn7.Name = "gridColumn7";
            this.gridColumn7.Tag = "ytsl";
            this.gridColumn7.Visible = true;
            this.gridColumn7.VisibleIndex = 7;
            this.gridColumn7.Width = 94;
@@ -194,6 +199,7 @@
            this.gridColumn8.FieldName = "ktsl";
            this.gridColumn8.MinWidth = 25;
            this.gridColumn8.Name = "gridColumn8";
            this.gridColumn8.Tag = "ktsl";
            this.gridColumn8.Visible = true;
            this.gridColumn8.VisibleIndex = 8;
            this.gridColumn8.Width = 94;
@@ -204,6 +210,7 @@
            this.gridColumn3.FieldName = "erpid";
            this.gridColumn3.MinWidth = 25;
            this.gridColumn3.Name = "gridColumn3";
            this.gridColumn3.Tag = "erpid";
            this.gridColumn3.Visible = true;
            this.gridColumn3.VisibleIndex = 10;
            this.gridColumn3.Width = 94;
@@ -215,6 +222,7 @@
            this.gridColumn2.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left;
            this.gridColumn2.MinWidth = 25;
            this.gridColumn2.Name = "gridColumn2";
            this.gridColumn2.Tag = "dab001";
            this.gridColumn2.Visible = true;
            this.gridColumn2.VisibleIndex = 1;
            this.gridColumn2.Width = 94;
DevApp/Gs.DevApp/DevFrm/Rk/SelectItemTbl.cs
ÎļþÃû´Ó DevApp/Gs.DevApp/UserControl/SelectItemTbl.cs ÐÞ¸Ä
@@ -15,10 +15,7 @@
        {
            InitializeComponent();
            this.daaGuid = _daaGuid;
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", (value) =>
            {
            }, null, false);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", null, null, false);
            getPageList(1);
            btnIn.Click += (s, e) =>
            {
DevApp/Gs.DevApp/DevFrm/Rk/SelectItemTbl.resx
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs
@@ -30,25 +30,25 @@
        private void InitializeComponent()
        {
            this.components = new System.ComponentModel.Container();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
            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();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition10 = 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.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject13 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject();
            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -146,6 +146,7 @@
            this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1salesUnitId = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1salesQuantity = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn32 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1note = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1returnDate = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -160,15 +161,16 @@
            this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            this.panelMx1 = new DevExpress.XtraEditors.PanelControl();
            this.radOut = new DevExpress.XtraEditors.RadioGroup();
            this.ucBtnPrint1 = new Gs.DevApp.UserControl.UcBtnPrint();
            this.lbMxGuid = new DevExpress.XtraEditors.LabelControl();
            this.txt_iCount_1 = new DevExpress.XtraEditors.TextEdit();
            this.labelControl14 = new DevExpress.XtraEditors.LabelControl();
            this.txt_psnQty_1 = new DevExpress.XtraEditors.TextEdit();
            this.labelControl12 = new DevExpress.XtraEditors.LabelControl();
            this.txtKdy = new DevExpress.XtraEditors.TextEdit();
            this.txt_kQty = new DevExpress.XtraEditors.TextEdit();
            this.labelControl13 = new DevExpress.XtraEditors.LabelControl();
            this.txtYdy = new DevExpress.XtraEditors.TextEdit();
            this.txt_yQty = new DevExpress.XtraEditors.TextEdit();
            this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
            this.txtQuantity = new DevExpress.XtraEditors.TextEdit();
            this.labelControl10 = new DevExpress.XtraEditors.LabelControl();
@@ -198,7 +200,6 @@
            this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            this.picCheckBox = new System.Windows.Forms.PictureBox();
            this.tips = new DevExpress.Utils.ToolTipController(this.components);
            this.gridColumn32 = new DevExpress.XtraGrid.Columns.GridColumn();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
            this.xtraTabControl1.SuspendLayout();
            this.xtraTabPage1.SuspendLayout();
@@ -271,10 +272,11 @@
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.panelMx1)).BeginInit();
            this.panelMx1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.radOut.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtKdy.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtYdy.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_kQty.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_yQty.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtQuantity.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtWlgg.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtWlmc.Properties)).BeginInit();
@@ -965,35 +967,35 @@
            this.layoutControlItem21});
            this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
            this.Root.Name = "Root";
            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition1.Width = 100D;
            columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition2.Width = 100D;
            columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition3.Width = 100D;
            columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition4.Width = 100D;
            columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition5.Width = 100D;
            columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition6.Width = 100D;
            columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition7.Width = 100D;
            columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition8.Width = 100D;
            this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
            columnDefinition1,
            columnDefinition2,
            columnDefinition3,
            columnDefinition4});
            rowDefinition1.Height = 100D;
            rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition2.Height = 100D;
            rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition3.Height = 100D;
            rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition4.Height = 100D;
            rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition5.Height = 100D;
            rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition5,
            columnDefinition6,
            columnDefinition7,
            columnDefinition8});
            rowDefinition6.Height = 100D;
            rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition7.Height = 100D;
            rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition8.Height = 100D;
            rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition9.Height = 100D;
            rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition10.Height = 100D;
            rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
            this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
            rowDefinition1,
            rowDefinition2,
            rowDefinition3,
            rowDefinition4,
            rowDefinition5});
            rowDefinition6,
            rowDefinition7,
            rowDefinition8,
            rowDefinition9,
            rowDefinition10});
            this.Root.Size = new System.Drawing.Size(1105, 200);
            this.Root.TextVisible = false;
            // 
@@ -1162,12 +1164,13 @@
            // layoutControlItem9
            // 
            this.layoutControlItem9.Control = this.txt_returnReason;
            this.layoutControlItem9.CustomizationFormText = "申请原因";
            this.layoutControlItem9.Location = new System.Drawing.Point(0, 144);
            this.layoutControlItem9.Name = "layoutControlItem9";
            this.layoutControlItem9.OptionsTableLayoutItem.ColumnSpan = 2;
            this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 4;
            this.layoutControlItem9.Size = new System.Drawing.Size(542, 36);
            this.layoutControlItem9.Text = "退货原因";
            this.layoutControlItem9.Text = "申请原因";
            this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem20
@@ -1454,6 +1457,16 @@
            this.gvMx1salesQuantity.VisibleIndex = 5;
            this.gvMx1salesQuantity.Width = 94;
            // 
            // gridColumn32
            //
            this.gridColumn32.Caption = "发货总量";
            this.gridColumn32.FieldName = "fhQuantity";
            this.gridColumn32.MinWidth = 25;
            this.gridColumn32.Name = "gridColumn32";
            this.gridColumn32.Visible = true;
            this.gridColumn32.VisibleIndex = 15;
            this.gridColumn32.Width = 94;
            //
            // gvMx1note
            // 
            this.gvMx1note.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
@@ -1606,25 +1619,26 @@
            // repositoryItemButtonEdit1
            // 
            this.repositoryItemButtonEdit1.AutoHeight = false;
            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "移出", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            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)});
            this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
            this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
            // 
            // panelMx1
            // 
            this.panelMx1.Controls.Add(this.radOut);
            this.panelMx1.Controls.Add(this.ucBtnPrint1);
            this.panelMx1.Controls.Add(this.lbMxGuid);
            this.panelMx1.Controls.Add(this.txt_iCount_1);
            this.panelMx1.Controls.Add(this.labelControl14);
            this.panelMx1.Controls.Add(this.txt_psnQty_1);
            this.panelMx1.Controls.Add(this.labelControl12);
            this.panelMx1.Controls.Add(this.txtKdy);
            this.panelMx1.Controls.Add(this.txt_kQty);
            this.panelMx1.Controls.Add(this.labelControl13);
            this.panelMx1.Controls.Add(this.txtYdy);
            this.panelMx1.Controls.Add(this.txt_yQty);
            this.panelMx1.Controls.Add(this.labelControl1);
            this.panelMx1.Controls.Add(this.txtQuantity);
            this.panelMx1.Controls.Add(this.labelControl10);
@@ -1640,10 +1654,23 @@
            this.panelMx1.Size = new System.Drawing.Size(1124, 102);
            this.panelMx1.TabIndex = 3;
            // 
            // radOut
            //
            this.radOut.Location = new System.Drawing.Point(763, 29);
            this.radOut.Margin = new System.Windows.Forms.Padding(0);
            this.radOut.Name = "radOut";
            this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near;
            this.radOut.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.RadioGroupItem[] {
            new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "全自动"),
            new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "半自动"),
            new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "手动")});
            this.radOut.Size = new System.Drawing.Size(248, 31);
            this.radOut.TabIndex = 476;
            //
            // ucBtnPrint1
            // 
            this.ucBtnPrint1.guidKey = null;
            this.ucBtnPrint1.Location = new System.Drawing.Point(543, 65);
            this.ucBtnPrint1.Location = new System.Drawing.Point(762, 64);
            this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);
            this.ucBtnPrint1.Name = "ucBtnPrint1";
            this.ucBtnPrint1.rptParameter = null;
@@ -1652,7 +1679,7 @@
            // 
            // lbMxGuid
            // 
            this.lbMxGuid.Location = new System.Drawing.Point(835, 7);
            this.lbMxGuid.Location = new System.Drawing.Point(763, 8);
            this.lbMxGuid.Name = "lbMxGuid";
            this.lbMxGuid.Size = new System.Drawing.Size(58, 18);
            this.lbMxGuid.TabIndex = 229;
@@ -1661,15 +1688,16 @@
            // 
            // txt_iCount_1
            // 
            this.txt_iCount_1.Location = new System.Drawing.Point(654, 34);
            this.txt_iCount_1.Location = new System.Drawing.Point(652, 67);
            this.txt_iCount_1.Name = "txt_iCount_1";
            this.txt_iCount_1.Properties.Appearance.Options.UseFont = true;
            this.txt_iCount_1.Properties.ReadOnly = true;
            this.txt_iCount_1.Size = new System.Drawing.Size(96, 24);
            this.txt_iCount_1.TabIndex = 228;
            // 
            // labelControl14
            // 
            this.labelControl14.Location = new System.Drawing.Point(543, 39);
            this.labelControl14.Location = new System.Drawing.Point(541, 70);
            this.labelControl14.Name = "labelControl14";
            this.labelControl14.Size = new System.Drawing.Size(105, 18);
            this.labelControl14.TabIndex = 227;
@@ -1677,7 +1705,7 @@
            // 
            // txt_psnQty_1
            // 
            this.txt_psnQty_1.Location = new System.Drawing.Point(654, 4);
            this.txt_psnQty_1.Location = new System.Drawing.Point(652, 36);
            this.txt_psnQty_1.Name = "txt_psnQty_1";
            this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true;
            this.txt_psnQty_1.Size = new System.Drawing.Size(96, 24);
@@ -1685,39 +1713,39 @@
            // 
            // labelControl12
            // 
            this.labelControl12.Location = new System.Drawing.Point(543, 9);
            this.labelControl12.Location = new System.Drawing.Point(541, 39);
            this.labelControl12.Name = "labelControl12";
            this.labelControl12.Size = new System.Drawing.Size(105, 18);
            this.labelControl12.TabIndex = 225;
            this.labelControl12.Text = "每张条码数量:";
            // 
            // txtKdy
            // txt_kQty
            // 
            this.txtKdy.Location = new System.Drawing.Point(430, 65);
            this.txtKdy.Name = "txtKdy";
            this.txtKdy.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
            this.txtKdy.Properties.Appearance.Options.UseFont = true;
            this.txtKdy.Properties.Appearance.Options.UseForeColor = true;
            this.txtKdy.Properties.ReadOnly = true;
            this.txtKdy.Size = new System.Drawing.Size(96, 24);
            this.txtKdy.TabIndex = 224;
            this.txt_kQty.Location = new System.Drawing.Point(652, 6);
            this.txt_kQty.Name = "txt_kQty";
            this.txt_kQty.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
            this.txt_kQty.Properties.Appearance.Options.UseFont = true;
            this.txt_kQty.Properties.Appearance.Options.UseForeColor = true;
            this.txt_kQty.Properties.ReadOnly = true;
            this.txt_kQty.Size = new System.Drawing.Size(96, 24);
            this.txt_kQty.TabIndex = 224;
            // 
            // labelControl13
            // 
            this.labelControl13.Location = new System.Drawing.Point(346, 70);
            this.labelControl13.Location = new System.Drawing.Point(556, 9);
            this.labelControl13.Name = "labelControl13";
            this.labelControl13.Size = new System.Drawing.Size(80, 18);
            this.labelControl13.Size = new System.Drawing.Size(90, 18);
            this.labelControl13.TabIndex = 223;
            this.labelControl13.Text = "可打印总数:";
            this.labelControl13.Text = "可打印总数:";
            // 
            // txtYdy
            // txt_yQty
            // 
            this.txtYdy.Location = new System.Drawing.Point(430, 34);
            this.txtYdy.Name = "txtYdy";
            this.txtYdy.Properties.Appearance.Options.UseFont = true;
            this.txtYdy.Properties.ReadOnly = true;
            this.txtYdy.Size = new System.Drawing.Size(96, 24);
            this.txtYdy.TabIndex = 222;
            this.txt_yQty.Location = new System.Drawing.Point(430, 36);
            this.txt_yQty.Name = "txt_yQty";
            this.txt_yQty.Properties.Appearance.Options.UseFont = true;
            this.txt_yQty.Properties.ReadOnly = true;
            this.txt_yQty.Size = new System.Drawing.Size(96, 24);
            this.txt_yQty.TabIndex = 222;
            // 
            // labelControl1
            // 
@@ -1729,7 +1757,7 @@
            // 
            // txtQuantity
            // 
            this.txtQuantity.Location = new System.Drawing.Point(430, 4);
            this.txtQuantity.Location = new System.Drawing.Point(430, 6);
            this.txtQuantity.Name = "txtQuantity";
            this.txtQuantity.Properties.Appearance.Options.UseFont = true;
            this.txtQuantity.Properties.ReadOnly = true;
@@ -1746,11 +1774,11 @@
            // 
            // txtWlgg
            // 
            this.txtWlgg.Location = new System.Drawing.Point(90, 65);
            this.txtWlgg.Location = new System.Drawing.Point(90, 67);
            this.txtWlgg.Name = "txtWlgg";
            this.txtWlgg.Properties.Appearance.Options.UseFont = true;
            this.txtWlgg.Properties.ReadOnly = true;
            this.txtWlgg.Size = new System.Drawing.Size(236, 24);
            this.txtWlgg.Size = new System.Drawing.Size(436, 24);
            this.txtWlgg.TabIndex = 218;
            // 
            // labelControl9
@@ -1763,7 +1791,7 @@
            // 
            // txtWlmc
            // 
            this.txtWlmc.Location = new System.Drawing.Point(90, 34);
            this.txtWlmc.Location = new System.Drawing.Point(90, 36);
            this.txtWlmc.Name = "txtWlmc";
            this.txtWlmc.Properties.Appearance.Options.UseFont = true;
            this.txtWlmc.Properties.ReadOnly = true;
@@ -1780,7 +1808,7 @@
            // 
            // txtWlid
            // 
            this.txtWlid.Location = new System.Drawing.Point(90, 4);
            this.txtWlid.Location = new System.Drawing.Point(90, 6);
            this.txtWlid.Name = "txtWlid";
            this.txtWlid.Properties.Appearance.Options.UseFont = true;
            this.txtWlid.Properties.ReadOnly = true;
@@ -1990,10 +2018,10 @@
            // repositoryItemButtonEdit2
            // 
            this.repositoryItemButtonEdit2.AutoHeight = false;
            editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            editorButtonImageOptions4.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions4.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            this.repositoryItemButtonEdit2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            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)});
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "移出", -1, true, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            this.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2";
            this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            this.repositoryItemButtonEdit2.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit2_ButtonClick);
@@ -2008,16 +2036,6 @@
            this.picCheckBox.TabIndex = 451;
            this.picCheckBox.TabStop = false;
            this.picCheckBox.Visible = false;
            //
            // gridColumn32
            //
            this.gridColumn32.Caption = "发货总量";
            this.gridColumn32.FieldName = "fhQuantity";
            this.gridColumn32.MinWidth = 25;
            this.gridColumn32.Name = "gridColumn32";
            this.gridColumn32.Visible = true;
            this.gridColumn32.VisibleIndex = 15;
            this.gridColumn32.Width = 94;
            // 
            // Frm_SalesReturnNotice
            // 
@@ -2102,10 +2120,11 @@
            ((System.ComponentModel.ISupportInitialize)(this.panelMx1)).EndInit();
            this.panelMx1.ResumeLayout(false);
            this.panelMx1.PerformLayout();
            ((System.ComponentModel.ISupportInitialize)(this.radOut.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtKdy.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtYdy.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_kQty.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_yQty.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtQuantity.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtWlgg.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtWlmc.Properties)).EndInit();
@@ -2220,9 +2239,9 @@
        private DevExpress.XtraEditors.LabelControl labelControl14;
        private DevExpress.XtraEditors.TextEdit txt_psnQty_1;
        private DevExpress.XtraEditors.LabelControl labelControl12;
        private DevExpress.XtraEditors.TextEdit txtKdy;
        private DevExpress.XtraEditors.TextEdit txt_kQty;
        private DevExpress.XtraEditors.LabelControl labelControl13;
        private DevExpress.XtraEditors.TextEdit txtYdy;
        private DevExpress.XtraEditors.TextEdit txt_yQty;
        private DevExpress.XtraEditors.LabelControl labelControl1;
        private DevExpress.XtraEditors.TextEdit txtQuantity;
        private DevExpress.XtraEditors.LabelControl labelControl10;
@@ -2269,5 +2288,6 @@
        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit2;
        private DevExpress.Utils.ToolTipController tips;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn32;
        private DevExpress.XtraEditors.RadioGroup radOut;
    }
}
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs
@@ -106,10 +106,20 @@
                }
                this.ucBtnPrint1.rptParameter = "rpt_Xsth{" + lbMxGuid.Text.Trim()
                       + "," + ""
                       + "," + ""
                        + "," + Gs.DevApp.ToolBox.UtilityHelper.PrintYuLiang(radOut).ToString()
                       + "," + txt_iCount_1.Text.Trim()
                       + "," + txt_psnQty_1.Text.Trim()
                       + "}";
            };
            //自动计算打印量
            txt_psnQty_1.TextChanged += (s, e) =>
            {
                Gs.DevApp.ToolBox.UtilityHelper.PrintJiSuan(txt_psnQty_1, txt_iCount_1, txt_kQty.Text.Trim(), radOut);
            };
            radOut.SelectedIndexChanged += (s, e) =>
            {
                Gs.DevApp.ToolBox.UtilityHelper.PrintAuto(txt_psnQty_1, txt_iCount_1, radOut);
            };
        }
@@ -652,12 +662,25 @@
                DataRow row = gvMx1.GetDataRow(e.FocusedRowHandle);
                lbMxGuid.Text = row["guid"].ToString();
                ucBtnPrint1.guidKey = row["guid"].ToString();
                txtWlid.Text = row["itemId"].ToString();
                txtWlgg.Text = row["itemNo"].ToString();
                txtWlid.Text = row["itemNo"].ToString();
                txtWlgg.Text = row["itemModel"].ToString();
                txtWlmc.Text = row["itemName"].ToString();
                txtQuantity.Text = row["sqQty"].ToString();//申请总量
                txtYdy.Text = row["ydy"].ToString();//已打印总量
                txtKdy.Text = row["kdy"].ToString();//可打印总量
                txt_yQty.Text = row["ydy"].ToString();//已打印总量
                txt_kQty.Text = row["kdy"].ToString();//可打印总量
            }
            else
            {
                lbMxGuid.Text = "";
                ucBtnPrint1.guidKey = "";
                txtWlid.Text = "";
                txtWlgg.Text = "";
                txtWlmc.Text = "";
                txtQuantity.Text = "";
                txt_yQty.Text = "";
                txt_kQty.Text = "";
                txt_psnQty_1.Text = "";
                txt_iCount_1.Text = "";
            }
        }
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
@@ -220,8 +220,6 @@
            this.txt_zQty = new DevExpress.XtraEditors.TextEdit();
            this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
            this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem35 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -267,6 +265,8 @@
            this.panMx100 = new System.Windows.Forms.Panel();
            this.ucBtnPrint100 = new Gs.DevApp.UserControl.UcBtnPrint();
            this.tips = new DevExpress.Utils.ToolTipController(this.components);
            this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
            this.xtraTabControl1.SuspendLayout();
            this.xtraTabPage1.SuspendLayout();
@@ -353,8 +353,6 @@
            ((System.ComponentModel.ISupportInitialize)(this.txt_zQty.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit();
@@ -382,6 +380,8 @@
            ((System.ComponentModel.ISupportInitialize)(this.gcMx4)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx4)).BeginInit();
            this.panMx100.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit();
            this.SuspendLayout();
            // 
            // toolBarMenu1
@@ -1057,7 +1057,7 @@
            // 
            // txt_daa009
            // 
            this.txt_daa009.Location = new System.Drawing.Point(420, 152);
            this.txt_daa009.Location = new System.Drawing.Point(420, 147);
            this.txt_daa009.Name = "txt_daa009";
            this.txt_daa009.Properties.Appearance.Options.UseFont = true;
            this.txt_daa009.Size = new System.Drawing.Size(506, 24);
@@ -1067,7 +1067,7 @@
            // 
            // txt_daa013
            // 
            this.txt_daa013.Location = new System.Drawing.Point(726, 124);
            this.txt_daa013.Location = new System.Drawing.Point(726, 119);
            this.txt_daa013.Name = "txt_daa013";
            this.txt_daa013.Properties.Appearance.Options.UseFont = true;
            this.txt_daa013.Size = new System.Drawing.Size(200, 24);
@@ -1077,7 +1077,7 @@
            // 
            // txt_daa001
            // 
            this.txt_daa001.Location = new System.Drawing.Point(114, 12);
            this.txt_daa001.Location = new System.Drawing.Point(114, 7);
            this.txt_daa001.Name = "txt_daa001";
            this.txt_daa001.Properties.Appearance.Options.UseFont = true;
            this.txt_daa001.Size = new System.Drawing.Size(200, 24);
@@ -1087,7 +1087,7 @@
            // 
            // textEdit1
            // 
            this.textEdit1.Location = new System.Drawing.Point(420, 40);
            this.textEdit1.Location = new System.Drawing.Point(420, 35);
            this.textEdit1.Name = "textEdit1";
            this.textEdit1.Properties.Appearance.Options.UseFont = true;
            this.textEdit1.Size = new System.Drawing.Size(200, 24);
@@ -1097,7 +1097,7 @@
            // 
            // txt_daa008
            // 
            this.txt_daa008.Location = new System.Drawing.Point(726, 12);
            this.txt_daa008.Location = new System.Drawing.Point(726, 7);
            this.txt_daa008.Name = "txt_daa008";
            this.txt_daa008.Properties.Appearance.Options.UseFont = true;
            this.txt_daa008.Size = new System.Drawing.Size(200, 24);
@@ -1107,7 +1107,7 @@
            // 
            // txt_saleOrderNo
            // 
            this.txt_saleOrderNo.Location = new System.Drawing.Point(114, 68);
            this.txt_saleOrderNo.Location = new System.Drawing.Point(114, 63);
            this.txt_saleOrderNo.Name = "txt_saleOrderNo";
            this.txt_saleOrderNo.Properties.Appearance.Options.UseFont = true;
            this.txt_saleOrderNo.Size = new System.Drawing.Size(200, 24);
@@ -1117,7 +1117,7 @@
            // 
            // txt_daa028
            // 
            this.txt_daa028.Location = new System.Drawing.Point(420, 68);
            this.txt_daa028.Location = new System.Drawing.Point(420, 63);
            this.txt_daa028.Name = "txt_daa028";
            this.txt_daa028.Properties.Appearance.Options.UseFont = true;
            this.txt_daa028.Size = new System.Drawing.Size(200, 24);
@@ -1127,7 +1127,7 @@
            // 
            // txt_mesStartProd
            // 
            this.txt_mesStartProd.Location = new System.Drawing.Point(1032, 40);
            this.txt_mesStartProd.Location = new System.Drawing.Point(1032, 35);
            this.txt_mesStartProd.Name = "txt_mesStartProd";
            this.txt_mesStartProd.Properties.Appearance.Options.UseFont = true;
            this.txt_mesStartProd.Size = new System.Drawing.Size(202, 24);
@@ -1137,7 +1137,7 @@
            // 
            // txt_daa014
            // 
            this.txt_daa014.Location = new System.Drawing.Point(114, 40);
            this.txt_daa014.Location = new System.Drawing.Point(114, 35);
            this.txt_daa014.Name = "txt_daa014";
            this.txt_daa014.Properties.Appearance.Options.UseFont = true;
            this.txt_daa014.Size = new System.Drawing.Size(200, 24);
@@ -1147,7 +1147,7 @@
            // 
            // txt_daa022Remark
            // 
            this.txt_daa022Remark.Location = new System.Drawing.Point(420, 12);
            this.txt_daa022Remark.Location = new System.Drawing.Point(420, 7);
            this.txt_daa022Remark.Name = "txt_daa022Remark";
            this.txt_daa022Remark.Properties.Appearance.Options.UseFont = true;
            this.txt_daa022Remark.Size = new System.Drawing.Size(200, 24);
@@ -1157,7 +1157,7 @@
            // 
            // txt_daa010
            // 
            this.txt_daa010.Location = new System.Drawing.Point(726, 40);
            this.txt_daa010.Location = new System.Drawing.Point(726, 35);
            this.txt_daa010.Name = "txt_daa010";
            this.txt_daa010.Properties.Appearance.Options.UseFont = true;
            this.txt_daa010.Size = new System.Drawing.Size(200, 24);
@@ -1167,7 +1167,7 @@
            // 
            // txt_mesEndProd
            // 
            this.txt_mesEndProd.Location = new System.Drawing.Point(1032, 68);
            this.txt_mesEndProd.Location = new System.Drawing.Point(1032, 63);
            this.txt_mesEndProd.Name = "txt_mesEndProd";
            this.txt_mesEndProd.Properties.Appearance.Options.UseFont = true;
            this.txt_mesEndProd.Size = new System.Drawing.Size(202, 24);
@@ -1177,7 +1177,7 @@
            // 
            // txt_daa011
            // 
            this.txt_daa011.Location = new System.Drawing.Point(726, 68);
            this.txt_daa011.Location = new System.Drawing.Point(726, 63);
            this.txt_daa011.Name = "txt_daa011";
            this.txt_daa011.Properties.Appearance.Options.UseFont = true;
            this.txt_daa011.Size = new System.Drawing.Size(200, 24);
@@ -1187,7 +1187,7 @@
            // 
            // txt_dptName
            // 
            this.txt_dptName.Location = new System.Drawing.Point(726, 96);
            this.txt_dptName.Location = new System.Drawing.Point(726, 91);
            this.txt_dptName.Name = "txt_dptName";
            this.txt_dptName.Properties.Appearance.Options.UseFont = true;
            this.txt_dptName.Size = new System.Drawing.Size(200, 24);
@@ -1197,7 +1197,7 @@
            // 
            // txt_daa016
            // 
            this.txt_daa016.Location = new System.Drawing.Point(1032, 96);
            this.txt_daa016.Location = new System.Drawing.Point(1032, 91);
            this.txt_daa016.Name = "txt_daa016";
            this.txt_daa016.Properties.Appearance.Options.UseFont = true;
            this.txt_daa016.Size = new System.Drawing.Size(202, 24);
@@ -1207,7 +1207,7 @@
            // 
            // txt_daa029
            // 
            this.txt_daa029.Location = new System.Drawing.Point(114, 96);
            this.txt_daa029.Location = new System.Drawing.Point(114, 91);
            this.txt_daa029.Name = "txt_daa029";
            this.txt_daa029.Properties.Appearance.Options.UseFont = true;
            this.txt_daa029.Size = new System.Drawing.Size(200, 24);
@@ -1217,7 +1217,7 @@
            // 
            // txt_lineName
            // 
            this.txt_lineName.Location = new System.Drawing.Point(420, 96);
            this.txt_lineName.Location = new System.Drawing.Point(420, 91);
            this.txt_lineName.Name = "txt_lineName";
            this.txt_lineName.Properties.Appearance.Options.UseFont = true;
            this.txt_lineName.Size = new System.Drawing.Size(200, 24);
@@ -1227,7 +1227,7 @@
            // 
            // txt_daa017
            // 
            this.txt_daa017.Location = new System.Drawing.Point(1032, 124);
            this.txt_daa017.Location = new System.Drawing.Point(1032, 119);
            this.txt_daa017.Name = "txt_daa017";
            this.txt_daa017.Properties.Appearance.Options.UseFont = true;
            this.txt_daa017.Size = new System.Drawing.Size(202, 24);
@@ -1237,7 +1237,7 @@
            // 
            // txt_daa003
            // 
            this.txt_daa003.Location = new System.Drawing.Point(114, 152);
            this.txt_daa003.Location = new System.Drawing.Point(114, 147);
            this.txt_daa003.Name = "txt_daa003";
            this.txt_daa003.Properties.Appearance.Options.UseFont = true;
            this.txt_daa003.Size = new System.Drawing.Size(200, 24);
@@ -1247,7 +1247,7 @@
            // 
            // txt_dwName
            // 
            this.txt_dwName.Location = new System.Drawing.Point(1032, 12);
            this.txt_dwName.Location = new System.Drawing.Point(1032, 7);
            this.txt_dwName.Name = "txt_dwName";
            this.txt_dwName.Properties.Appearance.Options.UseFont = true;
            this.txt_dwName.Size = new System.Drawing.Size(202, 24);
@@ -1257,7 +1257,7 @@
            // 
            // txt_daa004
            // 
            this.txt_daa004.Location = new System.Drawing.Point(114, 124);
            this.txt_daa004.Location = new System.Drawing.Point(114, 119);
            this.txt_daa004.Name = "txt_daa004";
            this.txt_daa004.Properties.Appearance.Options.UseFont = true;
            this.txt_daa004.Size = new System.Drawing.Size(200, 24);
@@ -1267,7 +1267,7 @@
            // 
            // txt_daa015
            // 
            this.txt_daa015.Location = new System.Drawing.Point(420, 124);
            this.txt_daa015.Location = new System.Drawing.Point(420, 119);
            this.txt_daa015.Name = "txt_daa015";
            this.txt_daa015.Size = new System.Drawing.Size(200, 24);
            this.txt_daa015.StyleController = this.layoutMx1;
@@ -2253,6 +2253,7 @@
            this.txt_iCount_1.Location = new System.Drawing.Point(659, 43);
            this.txt_iCount_1.Name = "txt_iCount_1";
            this.txt_iCount_1.Properties.Appearance.Options.UseFont = true;
            this.txt_iCount_1.Properties.ReadOnly = true;
            this.txt_iCount_1.Size = new System.Drawing.Size(189, 24);
            this.txt_iCount_1.StyleController = this.layoutMx99;
            this.txt_iCount_1.TabIndex = 332;
@@ -2260,7 +2261,7 @@
            // 
            // txt_psnQty_1
            // 
            this.txt_psnQty_1.Location = new System.Drawing.Point(379, 43);
            this.txt_psnQty_1.Location = new System.Drawing.Point(659, 12);
            this.txt_psnQty_1.Name = "txt_psnQty_1";
            this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true;
            this.txt_psnQty_1.Size = new System.Drawing.Size(189, 24);
@@ -2270,7 +2271,7 @@
            // 
            // txt_printRemark
            // 
            this.txt_printRemark.Location = new System.Drawing.Point(659, 12);
            this.txt_printRemark.Location = new System.Drawing.Point(379, 43);
            this.txt_printRemark.Name = "txt_printRemark";
            this.txt_printRemark.Properties.Appearance.Options.UseFont = true;
            this.txt_printRemark.Size = new System.Drawing.Size(189, 24);
@@ -2316,13 +2317,13 @@
            this.layoutControlGroup1.GroupBordersVisible = false;
            this.layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
            this.layoutControlItem23,
            this.layoutControlItem21,
            this.layoutControlItem24,
            this.layoutControlItem25,
            this.layoutControlItem35,
            this.layoutControlItem26,
            this.layoutControlItem22,
            this.layoutControlItem36});
            this.layoutControlItem36,
            this.layoutControlItem21,
            this.layoutControlItem24});
            this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
            this.layoutControlGroup1.Name = "Root";
            columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -2362,32 +2363,6 @@
            this.layoutControlItem23.Size = new System.Drawing.Size(280, 31);
            this.layoutControlItem23.Text = "可打印数量";
            this.layoutControlItem23.TextSize = new System.Drawing.Size(75, 18);
            //
            // layoutControlItem21
            //
            this.layoutControlItem21.AppearanceItemCaption.Options.UseTextOptions = true;
            this.layoutControlItem21.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
            this.layoutControlItem21.Control = this.txt_printRemark;
            this.layoutControlItem21.Location = new System.Drawing.Point(560, 0);
            this.layoutControlItem21.Name = "layoutControlItem21";
            this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem21.Size = new System.Drawing.Size(280, 31);
            this.layoutControlItem21.Text = "打印备注";
            this.layoutControlItem21.TextSize = new System.Drawing.Size(75, 18);
            //
            // layoutControlItem24
            //
            this.layoutControlItem24.AppearanceItemCaption.Options.UseTextOptions = true;
            this.layoutControlItem24.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
            this.layoutControlItem24.Control = this.txt_psnQty_1;
            this.layoutControlItem24.CustomizationFormText = "内包装数量";
            this.layoutControlItem24.Location = new System.Drawing.Point(280, 31);
            this.layoutControlItem24.Name = "layoutControlItem24";
            this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem24.Size = new System.Drawing.Size(280, 31);
            this.layoutControlItem24.Text = "内包装数量";
            this.layoutControlItem24.TextSize = new System.Drawing.Size(75, 18);
            // 
            // layoutControlItem25
            // 
@@ -2912,6 +2887,32 @@
            this.ucBtnPrint100.Size = new System.Drawing.Size(232, 32);
            this.ucBtnPrint100.TabIndex = 0;
            // 
            // layoutControlItem21
            //
            this.layoutControlItem21.AppearanceItemCaption.Options.UseTextOptions = true;
            this.layoutControlItem21.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
            this.layoutControlItem21.Control = this.txt_printRemark;
            this.layoutControlItem21.Location = new System.Drawing.Point(280, 31);
            this.layoutControlItem21.Name = "layoutControlItem21";
            this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem21.Size = new System.Drawing.Size(280, 31);
            this.layoutControlItem21.Text = "打印备注";
            this.layoutControlItem21.TextSize = new System.Drawing.Size(75, 18);
            //
            // layoutControlItem24
            //
            this.layoutControlItem24.AppearanceItemCaption.Options.UseTextOptions = true;
            this.layoutControlItem24.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
            this.layoutControlItem24.Control = this.txt_psnQty_1;
            this.layoutControlItem24.CustomizationFormText = "内包装数量";
            this.layoutControlItem24.Location = new System.Drawing.Point(560, 0);
            this.layoutControlItem24.Name = "layoutControlItem24";
            this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem24.Size = new System.Drawing.Size(280, 31);
            this.layoutControlItem24.Text = "内包装数量";
            this.layoutControlItem24.TextSize = new System.Drawing.Size(75, 18);
            //
            // Frm_Womdaa
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -3007,8 +3008,6 @@
            ((System.ComponentModel.ISupportInitialize)(this.txt_zQty.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit();
@@ -3036,6 +3035,8 @@
            ((System.ComponentModel.ISupportInitialize)(this.gcMx4)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx4)).EndInit();
            this.panMx100.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit();
            this.ResumeLayout(false);
        }
@@ -3220,8 +3221,6 @@
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
        private DevExpress.XtraEditors.RadioGroup radOut;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem35;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26;
@@ -3248,5 +3247,7 @@
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem31;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem30;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem37;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24;
    }
}
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
@@ -78,17 +78,12 @@
            };
            txt_psnQty_1.TextChanged += (s, e) =>
            {
                Gs.DevApp.ToolBox.UtilityHelper.PrintJiSuan(this, txt_psnQty_1, txt_iCount_1, txt_kQty.Text.Trim(), radOut);
                Gs.DevApp.ToolBox.UtilityHelper.PrintJiSuan(txt_psnQty_1, txt_iCount_1, txt_kQty.Text.Trim(), radOut);
            };
            txt_iCount_1.TextChanged += (s, e) =>
            {
                Gs.DevApp.ToolBox.UtilityHelper.PrintJiSuan(this, txt_iCount_1, txt_psnQty_1, txt_kQty.Text.Trim(), radOut);
            };
            radOut.SelectedIndexChanged += (s, e) =>
            {
                txt_psnQty_1.Text = "";
                txt_iCount_1.Text = "";
                radOut.Properties.Items[0].Description = "全自动";
                Gs.DevApp.ToolBox.UtilityHelper.PrintAuto(txt_psnQty_1, txt_iCount_1, radOut);
            };
        }
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.Designer.cs
@@ -30,24 +30,24 @@
        private void InitializeComponent()
        {
            this.components = new System.ComponentModel.Container();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition13 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition14 = new DevExpress.XtraLayout.ColumnDefinition();
            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.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 editorButtonImageOptions7 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject25 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject26 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject27 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject28 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions8 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject29 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject30 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject31 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject32 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition8 = 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.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject13 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject();
            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -121,16 +121,18 @@
            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.panelMx1 = new DevExpress.XtraEditors.PanelControl();
            this.radOut = new DevExpress.XtraEditors.RadioGroup();
            this.ucBtnPrint1 = new Gs.DevApp.UserControl.UcBtnPrint();
            this.lbMxGuid = new DevExpress.XtraEditors.LabelControl();
            this.txt_iCount_1 = new DevExpress.XtraEditors.TextEdit();
            this.labelControl14 = new DevExpress.XtraEditors.LabelControl();
            this.txt_psnQty_1 = new DevExpress.XtraEditors.TextEdit();
            this.labelControl12 = new DevExpress.XtraEditors.LabelControl();
            this.txtKdy = new DevExpress.XtraEditors.TextEdit();
            this.txt_kQty = new DevExpress.XtraEditors.TextEdit();
            this.labelControl13 = new DevExpress.XtraEditors.LabelControl();
            this.txtYdy = new DevExpress.XtraEditors.TextEdit();
            this.txt_yQty = new DevExpress.XtraEditors.TextEdit();
            this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
            this.txtQuantity = new DevExpress.XtraEditors.TextEdit();
            this.labelControl10 = new DevExpress.XtraEditors.LabelControl();
@@ -156,7 +158,6 @@
            this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            this.picCheckBox = new System.Windows.Forms.PictureBox();
            this.tips = new DevExpress.Utils.ToolTipController(this.components);
            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
            this.xtraTabControl1.SuspendLayout();
            this.xtraTabPage1.SuspendLayout();
@@ -212,10 +213,11 @@
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.panelMx1)).BeginInit();
            this.panelMx1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.radOut.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtKdy.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtYdy.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_kQty.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_yQty.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtQuantity.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtWlgg.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtWlmc.Properties)).BeginInit();
@@ -748,32 +750,32 @@
            this.layoutControlItem12});
            this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
            this.Root.Name = "Root";
            columnDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition13.Width = 100D;
            columnDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition14.Width = 100D;
            columnDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition15.Width = 100D;
            columnDefinition16.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition16.Width = 100D;
            columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition5.Width = 100D;
            columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition6.Width = 100D;
            columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition7.Width = 100D;
            columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition8.Width = 100D;
            this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
            columnDefinition13,
            columnDefinition14,
            columnDefinition15,
            columnDefinition16});
            rowDefinition13.Height = 100D;
            rowDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
            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;
            columnDefinition5,
            columnDefinition6,
            columnDefinition7,
            columnDefinition8});
            rowDefinition5.Height = 100D;
            rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition6.Height = 100D;
            rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition7.Height = 100D;
            rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition8.Height = 100D;
            rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
            this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
            rowDefinition13,
            rowDefinition14,
            rowDefinition15,
            rowDefinition16});
            rowDefinition5,
            rowDefinition6,
            rowDefinition7,
            rowDefinition8});
            this.Root.Size = new System.Drawing.Size(1105, 144);
            this.Root.TextVisible = false;
            // 
@@ -1136,25 +1138,40 @@
            // repositoryItemButtonEdit1
            // 
            this.repositoryItemButtonEdit1.AutoHeight = false;
            editorButtonImageOptions7.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions7.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "移出", -1, true, true, false, editorButtonImageOptions7, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject25, serializableAppearanceObject26, serializableAppearanceObject27, serializableAppearanceObject28, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            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)});
            this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
            this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
            // 
            // gridColumn5
            //
            this.gridColumn5.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
            this.gridColumn5.AppearanceCell.Options.UseForeColor = true;
            this.gridColumn5.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
            this.gridColumn5.AppearanceHeader.Options.UseForeColor = true;
            this.gridColumn5.Caption = "备注";
            this.gridColumn5.FieldName = "tld014";
            this.gridColumn5.MinWidth = 25;
            this.gridColumn5.Name = "gridColumn5";
            this.gridColumn5.Visible = true;
            this.gridColumn5.VisibleIndex = 5;
            this.gridColumn5.Width = 94;
            //
            // panelMx1
            // 
            this.panelMx1.Controls.Add(this.radOut);
            this.panelMx1.Controls.Add(this.ucBtnPrint1);
            this.panelMx1.Controls.Add(this.lbMxGuid);
            this.panelMx1.Controls.Add(this.txt_iCount_1);
            this.panelMx1.Controls.Add(this.labelControl14);
            this.panelMx1.Controls.Add(this.txt_psnQty_1);
            this.panelMx1.Controls.Add(this.labelControl12);
            this.panelMx1.Controls.Add(this.txtKdy);
            this.panelMx1.Controls.Add(this.txt_kQty);
            this.panelMx1.Controls.Add(this.labelControl13);
            this.panelMx1.Controls.Add(this.txtYdy);
            this.panelMx1.Controls.Add(this.txt_yQty);
            this.panelMx1.Controls.Add(this.labelControl1);
            this.panelMx1.Controls.Add(this.txtQuantity);
            this.panelMx1.Controls.Add(this.labelControl10);
@@ -1170,19 +1187,32 @@
            this.panelMx1.Size = new System.Drawing.Size(1124, 98);
            this.panelMx1.TabIndex = 1;
            // 
            // radOut
            //
            this.radOut.Location = new System.Drawing.Point(772, 26);
            this.radOut.Margin = new System.Windows.Forms.Padding(0);
            this.radOut.Name = "radOut";
            this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near;
            this.radOut.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.RadioGroupItem[] {
            new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "全自动"),
            new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "半自动"),
            new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "手动")});
            this.radOut.Size = new System.Drawing.Size(248, 31);
            this.radOut.TabIndex = 476;
            //
            // ucBtnPrint1
            // 
            this.ucBtnPrint1.guidKey = null;
            this.ucBtnPrint1.Location = new System.Drawing.Point(543, 68);
            this.ucBtnPrint1.Location = new System.Drawing.Point(770, 60);
            this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);
            this.ucBtnPrint1.Name = "ucBtnPrint1";
            this.ucBtnPrint1.rptParameter = null;
            this.ucBtnPrint1.Size = new System.Drawing.Size(207, 25);
            this.ucBtnPrint1.Size = new System.Drawing.Size(207, 32);
            this.ucBtnPrint1.TabIndex = 231;
            // 
            // lbMxGuid
            // 
            this.lbMxGuid.Location = new System.Drawing.Point(821, 14);
            this.lbMxGuid.Location = new System.Drawing.Point(770, 0);
            this.lbMxGuid.Name = "lbMxGuid";
            this.lbMxGuid.Size = new System.Drawing.Size(58, 18);
            this.lbMxGuid.TabIndex = 229;
@@ -1191,15 +1221,16 @@
            // 
            // txt_iCount_1
            // 
            this.txt_iCount_1.Location = new System.Drawing.Point(654, 34);
            this.txt_iCount_1.Location = new System.Drawing.Point(653, 64);
            this.txt_iCount_1.Name = "txt_iCount_1";
            this.txt_iCount_1.Properties.Appearance.Options.UseFont = true;
            this.txt_iCount_1.Properties.ReadOnly = true;
            this.txt_iCount_1.Size = new System.Drawing.Size(96, 24);
            this.txt_iCount_1.TabIndex = 228;
            // 
            // labelControl14
            // 
            this.labelControl14.Location = new System.Drawing.Point(543, 39);
            this.labelControl14.Location = new System.Drawing.Point(542, 67);
            this.labelControl14.Name = "labelControl14";
            this.labelControl14.Size = new System.Drawing.Size(105, 18);
            this.labelControl14.TabIndex = 227;
@@ -1207,7 +1238,7 @@
            // 
            // txt_psnQty_1
            // 
            this.txt_psnQty_1.Location = new System.Drawing.Point(654, 4);
            this.txt_psnQty_1.Location = new System.Drawing.Point(653, 34);
            this.txt_psnQty_1.Name = "txt_psnQty_1";
            this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true;
            this.txt_psnQty_1.Size = new System.Drawing.Size(96, 24);
@@ -1215,43 +1246,43 @@
            // 
            // labelControl12
            // 
            this.labelControl12.Location = new System.Drawing.Point(543, 9);
            this.labelControl12.Location = new System.Drawing.Point(542, 37);
            this.labelControl12.Name = "labelControl12";
            this.labelControl12.Size = new System.Drawing.Size(105, 18);
            this.labelControl12.TabIndex = 225;
            this.labelControl12.Text = "每张条码数量:";
            // 
            // txtKdy
            // txt_kQty
            // 
            this.txtKdy.Location = new System.Drawing.Point(430, 65);
            this.txtKdy.Name = "txtKdy";
            this.txtKdy.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
            this.txtKdy.Properties.Appearance.Options.UseFont = true;
            this.txtKdy.Properties.Appearance.Options.UseForeColor = true;
            this.txtKdy.Properties.ReadOnly = true;
            this.txtKdy.Size = new System.Drawing.Size(96, 24);
            this.txtKdy.TabIndex = 224;
            this.txt_kQty.Location = new System.Drawing.Point(653, 6);
            this.txt_kQty.Name = "txt_kQty";
            this.txt_kQty.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
            this.txt_kQty.Properties.Appearance.Options.UseFont = true;
            this.txt_kQty.Properties.Appearance.Options.UseForeColor = true;
            this.txt_kQty.Properties.ReadOnly = true;
            this.txt_kQty.Size = new System.Drawing.Size(96, 24);
            this.txt_kQty.TabIndex = 224;
            // 
            // labelControl13
            // 
            this.labelControl13.Location = new System.Drawing.Point(332, 70);
            this.labelControl13.Location = new System.Drawing.Point(557, 9);
            this.labelControl13.Name = "labelControl13";
            this.labelControl13.Size = new System.Drawing.Size(90, 18);
            this.labelControl13.TabIndex = 223;
            this.labelControl13.Text = "可打印总数:";
            // 
            // txtYdy
            // txt_yQty
            // 
            this.txtYdy.Location = new System.Drawing.Point(430, 34);
            this.txtYdy.Name = "txtYdy";
            this.txtYdy.Properties.Appearance.Options.UseFont = true;
            this.txtYdy.Properties.ReadOnly = true;
            this.txtYdy.Size = new System.Drawing.Size(96, 24);
            this.txtYdy.TabIndex = 222;
            this.txt_yQty.Location = new System.Drawing.Point(430, 34);
            this.txt_yQty.Name = "txt_yQty";
            this.txt_yQty.Properties.Appearance.Options.UseFont = true;
            this.txt_yQty.Properties.ReadOnly = true;
            this.txt_yQty.Size = new System.Drawing.Size(96, 24);
            this.txt_yQty.TabIndex = 222;
            // 
            // labelControl1
            // 
            this.labelControl1.Location = new System.Drawing.Point(332, 39);
            this.labelControl1.Location = new System.Drawing.Point(332, 37);
            this.labelControl1.Name = "labelControl1";
            this.labelControl1.Size = new System.Drawing.Size(90, 18);
            this.labelControl1.TabIndex = 221;
@@ -1259,7 +1290,7 @@
            // 
            // txtQuantity
            // 
            this.txtQuantity.Location = new System.Drawing.Point(430, 4);
            this.txtQuantity.Location = new System.Drawing.Point(430, 6);
            this.txtQuantity.Name = "txtQuantity";
            this.txtQuantity.Properties.Appearance.Options.UseFont = true;
            this.txtQuantity.Properties.ReadOnly = true;
@@ -1276,16 +1307,16 @@
            // 
            // txtWlgg
            // 
            this.txtWlgg.Location = new System.Drawing.Point(90, 65);
            this.txtWlgg.Location = new System.Drawing.Point(90, 64);
            this.txtWlgg.Name = "txtWlgg";
            this.txtWlgg.Properties.Appearance.Options.UseFont = true;
            this.txtWlgg.Properties.ReadOnly = true;
            this.txtWlgg.Size = new System.Drawing.Size(215, 24);
            this.txtWlgg.Size = new System.Drawing.Size(436, 24);
            this.txtWlgg.TabIndex = 218;
            // 
            // labelControl9
            // 
            this.labelControl9.Location = new System.Drawing.Point(11, 70);
            this.labelControl9.Location = new System.Drawing.Point(11, 67);
            this.labelControl9.Name = "labelControl9";
            this.labelControl9.Size = new System.Drawing.Size(75, 18);
            this.labelControl9.TabIndex = 217;
@@ -1319,11 +1350,11 @@
            // 
            // labelControl7
            // 
            this.labelControl7.Location = new System.Drawing.Point(25, 9);
            this.labelControl7.Location = new System.Drawing.Point(11, 9);
            this.labelControl7.Name = "labelControl7";
            this.labelControl7.Size = new System.Drawing.Size(61, 18);
            this.labelControl7.Size = new System.Drawing.Size(75, 18);
            this.labelControl7.TabIndex = 213;
            this.labelControl7.Text = "物料ID:";
            this.labelControl7.Text = "物料编码:";
            // 
            // xtraTabPage3
            // 
@@ -1475,10 +1506,10 @@
            // repositoryItemButtonEdit2
            // 
            this.repositoryItemButtonEdit2.AutoHeight = false;
            editorButtonImageOptions8.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions8.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            editorButtonImageOptions4.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions4.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            this.repositoryItemButtonEdit2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "移出", -1, true, true, false, editorButtonImageOptions8, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject29, serializableAppearanceObject30, serializableAppearanceObject31, serializableAppearanceObject32, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "移出", -1, true, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            this.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2";
            this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            this.repositoryItemButtonEdit2.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit2_ButtonClick);
@@ -1493,20 +1524,6 @@
            this.picCheckBox.TabIndex = 5;
            this.picCheckBox.TabStop = false;
            this.picCheckBox.Visible = false;
            //
            // gridColumn5
            //
            this.gridColumn5.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
            this.gridColumn5.AppearanceCell.Options.UseForeColor = true;
            this.gridColumn5.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
            this.gridColumn5.AppearanceHeader.Options.UseForeColor = true;
            this.gridColumn5.Caption = "备注";
            this.gridColumn5.FieldName = "tld014";
            this.gridColumn5.MinWidth = 25;
            this.gridColumn5.Name = "gridColumn5";
            this.gridColumn5.Visible = true;
            this.gridColumn5.VisibleIndex = 5;
            this.gridColumn5.Width = 94;
            // 
            // Frm_WwTbl
            // 
@@ -1574,10 +1591,11 @@
            ((System.ComponentModel.ISupportInitialize)(this.panelMx1)).EndInit();
            this.panelMx1.ResumeLayout(false);
            this.panelMx1.PerformLayout();
            ((System.ComponentModel.ISupportInitialize)(this.radOut.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtKdy.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtYdy.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_kQty.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_yQty.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtQuantity.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtWlgg.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtWlmc.Properties)).EndInit();
@@ -1666,9 +1684,9 @@
        private DevExpress.XtraEditors.LabelControl labelControl14;
        private DevExpress.XtraEditors.TextEdit txt_psnQty_1;
        private DevExpress.XtraEditors.LabelControl labelControl12;
        private DevExpress.XtraEditors.TextEdit txtKdy;
        private DevExpress.XtraEditors.TextEdit txt_kQty;
        private DevExpress.XtraEditors.LabelControl labelControl13;
        private DevExpress.XtraEditors.TextEdit txtYdy;
        private DevExpress.XtraEditors.TextEdit txt_yQty;
        private DevExpress.XtraEditors.LabelControl labelControl1;
        private DevExpress.XtraEditors.TextEdit txtQuantity;
        private DevExpress.XtraEditors.LabelControl labelControl10;
@@ -1700,5 +1718,6 @@
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
        private DevExpress.Utils.ToolTipController tips;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
        private DevExpress.XtraEditors.RadioGroup radOut;
    }
}
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs
@@ -117,10 +117,20 @@
                }
                this.ucBtnPrint1.rptParameter = "rpt_wwtl{" + lbMxGuid.Text.Trim()
                       + "," + ""
                       + "," + ""
                          + "," + Gs.DevApp.ToolBox.UtilityHelper.PrintYuLiang(radOut).ToString()
                       + "," + txt_iCount_1.Text.Trim()
                       + "," + txt_psnQty_1.Text.Trim()
                       + "}";
            };
            //自动计算打印量
            txt_psnQty_1.TextChanged += (s, e) =>
            {
                Gs.DevApp.ToolBox.UtilityHelper.PrintJiSuan(txt_psnQty_1, txt_iCount_1, txt_kQty.Text.Trim(), radOut);
            };
            radOut.SelectedIndexChanged += (s, e) =>
            {
                Gs.DevApp.ToolBox.UtilityHelper.PrintAuto(txt_psnQty_1, txt_iCount_1, radOut);
            };
        }
@@ -672,8 +682,21 @@
                txtWlgg.Text = row["tld004"].ToString();
                txtWlmc.Text = row["tld003"].ToString();
                txtQuantity.Text = row["tld004"].ToString();//申请总量
                txtYdy.Text = row["ydy"].ToString();//已打印总量
                txtKdy.Text = row["kdy"].ToString();//可打印总量
                txt_yQty.Text = row["ydy"].ToString();//已打印总量
                txt_kQty.Text = row["kdy"].ToString();//可打印总量
            }
            else
            {
                lbMxGuid.Text = "";
                ucBtnPrint1.guidKey = "";
                txtWlid.Text = "";
                txtWlgg.Text = "";
                txtWlmc.Text = "";
                txtQuantity.Text = "";
                txt_yQty.Text = "";
                txt_kQty.Text = "";
                txt_psnQty_1.Text = "";
                txt_iCount_1.Text = "";
            }
        }
    }
DevApp/Gs.DevApp/DevFrm/WW/SelectWwPc.Designer.cs
ÎļþÃû´Ó DevApp/Gs.DevApp/UserControl/SelectWwPc.Designer.cs ÐÞ¸Ä
@@ -48,7 +48,6 @@
            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
            this.btnIn = new DevExpress.XtraEditors.SimpleButton();
            this.pageBar1 = new UserControls.Data.UcPageBar();
            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).BeginInit();
@@ -58,7 +57,6 @@
            // gcMain
            // 
            this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
            this.gcMain.Location = new System.Drawing.Point(0, 0);
            this.gcMain.MainView = this.gridView1;
            this.gcMain.Name = "gcMain";
@@ -71,7 +69,6 @@
            // 
            this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
            this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
            this.gridView1.Appearance.Row.Options.UseFont = true;
            this.gridView1.ColumnPanelRowHeight = 50;
            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
@@ -102,7 +99,6 @@
            // 
            // gv_guid
            // 
            this.gv_guid.AppearanceCell.Options.UseFont = true;
            this.gv_guid.Caption = "主键不能删除";
            this.gv_guid.FieldName = "guid";
@@ -125,7 +121,6 @@
            // 
            // gv_ebelnK3id
            // 
            this.gv_ebelnK3id.AppearanceCell.Options.UseFont = true;
            this.gv_ebelnK3id.Caption = "投料单号";
            this.gv_ebelnK3id.FieldName = "orderNo";
@@ -172,7 +167,6 @@
            // 
            // gv_billNo
            // 
            this.gv_billNo.AppearanceCell.ForeColor = System.Drawing.Color.Red;
            this.gv_billNo.AppearanceCell.Options.UseFont = true;
            this.gv_billNo.AppearanceCell.Options.UseForeColor = true;
@@ -192,7 +186,6 @@
            // 
            // gv_supplierItemCode
            // 
            this.gv_supplierItemCode.AppearanceCell.Options.UseFont = true;
            this.gv_supplierItemCode.Caption = "物料编码";
            this.gv_supplierItemCode.FieldName = "wlbm";
@@ -207,7 +200,6 @@
            // 
            // gv_supplierItemName
            // 
            this.gv_supplierItemName.AppearanceCell.Options.UseFont = true;
            this.gv_supplierItemName.Caption = "物料名称";
            this.gv_supplierItemName.FieldName = "wlmc";
@@ -277,7 +269,6 @@
            // 
            // gv_inventoryUnit
            // 
            this.gv_inventoryUnit.AppearanceCell.Options.UseFont = true;
            this.gv_inventoryUnit.Caption = "业务状态";
            this.gv_inventoryUnit.FieldName = "businessStatus";
@@ -304,7 +295,6 @@
            // panelControl1
            // 
            this.panelControl1.Controls.Add(this.btnIn);
            this.panelControl1.Controls.Add(this.pageBar1);
            this.panelControl1.Dock = System.Windows.Forms.DockStyle.Bottom;
            this.panelControl1.Location = new System.Drawing.Point(0, 552);
            this.panelControl1.Name = "panelControl1";
@@ -322,18 +312,6 @@
            this.btnIn.Size = new System.Drawing.Size(94, 39);
            this.btnIn.TabIndex = 4;
            this.btnIn.Text = "确定导入";
            //
            // pageBar1
            //
            this.pageBar1.CurrentPage = 1;
            this.pageBar1.Dock = System.Windows.Forms.DockStyle.Left;
            this.pageBar1.Location = new System.Drawing.Point(2, 2);
            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(889, 39);
            this.pageBar1.TabIndex = 3;
            this.pageBar1.TotalPages = 0;
            // 
            // SelectWwPc
            // 
@@ -376,6 +354,5 @@
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
        private DevExpress.XtraEditors.PanelControl panelControl1;
        private DevExpress.XtraEditors.SimpleButton btnIn;
        private UserControls.Data.UcPageBar pageBar1;
    }
}
DevApp/Gs.DevApp/DevFrm/WW/SelectWwPc.cs
copy from DevApp/Gs.DevApp/UserControl/SelectItemTbl.cs copy to DevApp/Gs.DevApp/DevFrm/WW/SelectWwPc.cs
Îļþ´Ó DevApp/Gs.DevApp/UserControl/SelectItemTbl.cs ¸´ÖÆ
@@ -1,24 +1,27 @@
using Gs.DevApp.ToolBox;
using DevExpress.XtraEditors;
using Gs.DevApp.ToolBox;
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.UserControl
{
    public partial class SelectItemTbl : DevExpress.XtraEditors.XtraForm
    public partial class SelectWwPc : DevExpress.XtraEditors.XtraForm
    {
        private readonly string _webServiceName = "MesItemTblManager/";
        private string daaGuid = "";
        public SelectItemTbl(string _daaGuid)
        private readonly string _webServiceName = "WWPCManager/";
        private string lineId = "";
        public SelectWwPc(string _lineId)
        {
            InitializeComponent();
            this.daaGuid = _daaGuid;
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", (value) =>
            {
            }, null, false);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", null, null, false);
            getPageList(1);
            btnIn.Click += (s, e) =>
            {
@@ -27,7 +30,7 @@
                DataTable dt = this.gcMain.DataSource as DataTable;//得到GridControl的数据源
                foreach (int idx in rows)
                {
                    string _guid = dt.Rows[idx]["dabGuid"].ToString();
                    string _guid = dt.Rows[idx]["guid"].ToString();
                    list.Add(_guid);
                }
                UpdateParent?.Invoke(this,
@@ -41,8 +44,6 @@
        /// </summary>
        public event EventHandler<UpdateParentEventArgs> UpdateParent;
        /// <summary>
        /// </summary>
        /// <param name="curPage">第几页</param>
@@ -55,13 +56,14 @@
                everyPageSize = 999999,
                sortName = "",
                keyWhere = "",
                daaGuid = daaGuid
                inBusType = "CG",
                lineId = this.lineId
            };
            var json = JsonConvert.SerializeObject(_obj);
            try
            {
                var strReturn = UtilityHelper.HttpPost("",
                    _webServiceName + "SelectPba", json);
                    _webServiceName + "SelectForm", json);
                var dd = UtilityHelper.ReturnToTablePage(strReturn);
                var dt = dd.rtnData.list;
                gcMain.BindingContext = new BindingContext();
DevApp/Gs.DevApp/DevFrm/WW/SelectWwPc.resx
DevApp/Gs.DevApp/DevFrm/WW/SelectWwTbl.Designer.cs
@@ -28,8 +28,6 @@
        /// </summary>
        private void InitializeComponent()
        {
            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
            this.gcMain = new DevExpress.XtraGrid.GridControl();
            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gv_chk = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -44,44 +42,20 @@
            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
            this.btnIn = new DevExpress.XtraEditors.SimpleButton();
            this.pageBar1 = new UserControls.Data.UcPageBar();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
            this.xtraTabControl1.SuspendLayout();
            this.xtraTabPage1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).BeginInit();
            this.panelControl1.SuspendLayout();
            this.SuspendLayout();
            // 
            // xtraTabControl1
            //
            this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.xtraTabControl1.Location = new System.Drawing.Point(0, 0);
            this.xtraTabControl1.Name = "xtraTabControl1";
            this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
            this.xtraTabControl1.Size = new System.Drawing.Size(1023, 465);
            this.xtraTabControl1.TabIndex = 5;
            this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
            this.xtraTabPage1});
            //
            // xtraTabPage1
            //
            this.xtraTabPage1.Controls.Add(this.gcMain);
            this.xtraTabPage1.Controls.Add(this.panelControl1);
            this.xtraTabPage1.Name = "xtraTabPage1";
            this.xtraTabPage1.Size = new System.Drawing.Size(1021, 433);
            this.xtraTabPage1.Text = "请选择需要退的数据";
            //
            // gcMain
            // 
            this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
            this.gcMain.Location = new System.Drawing.Point(0, 0);
            this.gcMain.MainView = this.gridView1;
            this.gcMain.Name = "gcMain";
            this.gcMain.Size = new System.Drawing.Size(1021, 390);
            this.gcMain.TabIndex = 1;
            this.gcMain.Size = new System.Drawing.Size(1023, 561);
            this.gcMain.TabIndex = 6;
            this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gridView1});
            // 
@@ -89,7 +63,6 @@
            // 
            this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
            this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
            this.gridView1.Appearance.Row.Options.UseFont = true;
            this.gridView1.ColumnPanelRowHeight = 50;
            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
@@ -124,7 +97,6 @@
            // 
            // gv_guid
            // 
            this.gv_guid.AppearanceCell.Options.UseFont = true;
            this.gv_guid.Caption = "主键不能删除";
            this.gv_guid.FieldName = "dabGuid";
@@ -148,7 +120,6 @@
            // 
            // gv_supplierItemCode
            // 
            this.gv_supplierItemCode.AppearanceCell.Options.UseFont = true;
            this.gv_supplierItemCode.Caption = "物料编码";
            this.gv_supplierItemCode.FieldName = "itemNo";
@@ -163,7 +134,6 @@
            // 
            // gv_supplierItemName
            // 
            this.gv_supplierItemName.AppearanceCell.Options.UseFont = true;
            this.gv_supplierItemName.Caption = "物料名称";
            this.gv_supplierItemName.FieldName = "dab004";
@@ -233,12 +203,11 @@
            // panelControl1
            // 
            this.panelControl1.Controls.Add(this.btnIn);
            this.panelControl1.Controls.Add(this.pageBar1);
            this.panelControl1.Dock = System.Windows.Forms.DockStyle.Bottom;
            this.panelControl1.Location = new System.Drawing.Point(0, 390);
            this.panelControl1.Location = new System.Drawing.Point(0, 561);
            this.panelControl1.Name = "panelControl1";
            this.panelControl1.Size = new System.Drawing.Size(1021, 43);
            this.panelControl1.TabIndex = 4;
            this.panelControl1.Size = new System.Drawing.Size(1023, 43);
            this.panelControl1.TabIndex = 8;
            // 
            // btnIn
            // 
@@ -250,31 +219,17 @@
            this.btnIn.TabIndex = 4;
            this.btnIn.Text = "确定导入";
            // 
            // pageBar1
            //
            this.pageBar1.CurrentPage = 1;
            this.pageBar1.Dock = System.Windows.Forms.DockStyle.Right;
            this.pageBar1.Location = new System.Drawing.Point(35, 2);
            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(984, 39);
            this.pageBar1.TabIndex = 3;
            this.pageBar1.TotalPages = 0;
            //
            // SelectWwTbl
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
            this.ClientSize = new System.Drawing.Size(1023, 465);
            this.Controls.Add(this.xtraTabControl1);
            this.ClientSize = new System.Drawing.Size(1023, 604);
            this.Controls.Add(this.gcMain);
            this.Controls.Add(this.panelControl1);
            this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
            this.Name = "SelectWwTbl";
            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
            this.Text = "生产退料申请选择物料";
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
            this.xtraTabControl1.ResumeLayout(false);
            this.xtraTabPage1.ResumeLayout(false);
            this.Text = "委外退料申请选择物料";
            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).EndInit();
@@ -285,8 +240,6 @@
        #endregion
        private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
        private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
        private DevExpress.XtraGrid.GridControl gcMain;
        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
        private DevExpress.XtraGrid.Columns.GridColumn gv_chk;
@@ -296,11 +249,10 @@
        private DevExpress.XtraGrid.Columns.GridColumn gv_supplierItemName;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
        private DevExpress.XtraEditors.PanelControl panelControl1;
        private DevExpress.XtraEditors.SimpleButton btnIn;
        private UserControls.Data.UcPageBar pageBar1;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
        private DevExpress.XtraEditors.PanelControl panelControl1;
        private DevExpress.XtraEditors.SimpleButton btnIn;
    }
}
DevApp/Gs.DevApp/DevFrm/WW/SelectWwTbl.cs
@@ -23,12 +23,8 @@
        {
            InitializeComponent();
            this.daaGuid = _daaGuid;
            pageBar1.PagerEvent += PageBar1_PagerEvent;
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1,null, null, null, "", (value) =>
            {
            });
            getPageList(1, UtilityHelper.GetPageSize());
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", null, null, false);
            getPageList(1);
            btnIn.Click += (s, e) =>
            {
                var list = new List<string>();
@@ -53,26 +49,17 @@
        /// </summary>
        public event EventHandler<UpdateParentEventArgs> UpdateParent;
        /// <summary>
        ///     åˆ†é¡µäº‹ä»¶
        /// </summary>
        /// <param name="curPage"></param>
        /// <param name="pageSize"></param>
        private void PageBar1_PagerEvent(int curPage, int pageSize)
        {
            getPageList(curPage, pageSize);
        }
        /// <summary>
        /// </summary>
        /// <param name="curPage">第几页</param>
        /// <param name="pageSize">每页几条</param>
        private void getPageList(int curPage, int pageSize)
        private void getPageList(int curPage)
        {
            var _obj = new
            {
                currentPage = curPage,
                everyPageSize = pageSize,
                everyPageSize = 999999,
                sortName = "",
                keyWhere = "",
                daaGuid = daaGuid
@@ -88,10 +75,6 @@
                gcMain.DataSource = dt;
                gcMain.ForceInitialize();
                gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
                var dddd = dd.rtnData.pages; //总页
                pageBar1.TotalPages = dddd;
                pageBar1.RecordCount = dd.rtnData.total; //记录总数
                pageBar1.CurrentPage = curPage; //当前页
            }
            catch (Exception ex)
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
@@ -118,16 +118,18 @@
            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.panelMx1 = new DevExpress.XtraEditors.PanelControl();
            this.radOut = new DevExpress.XtraEditors.RadioGroup();
            this.txt_iCount_1 = new DevExpress.XtraEditors.TextEdit();
            this.txt_psnQty_1 = new DevExpress.XtraEditors.TextEdit();
            this.ucBtnPrint1 = new Gs.DevApp.UserControl.UcBtnPrint();
            this.lbMxGuid = new DevExpress.XtraEditors.LabelControl();
            this.labelControl14 = new DevExpress.XtraEditors.LabelControl();
            this.labelControl12 = new DevExpress.XtraEditors.LabelControl();
            this.txtKdy = new DevExpress.XtraEditors.TextEdit();
            this.txt_kQty = new DevExpress.XtraEditors.TextEdit();
            this.labelControl13 = new DevExpress.XtraEditors.LabelControl();
            this.txtYdy = new DevExpress.XtraEditors.TextEdit();
            this.txt_yQty = new DevExpress.XtraEditors.TextEdit();
            this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
            this.txtQuantity = new DevExpress.XtraEditors.TextEdit();
            this.labelControl10 = new DevExpress.XtraEditors.LabelControl();
@@ -156,7 +158,6 @@
            this.gvBtnAlawys = new DevExpress.XtraGrid.Columns.GridColumn();
            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            this.tips = new DevExpress.Utils.ToolTipController(this.components);
            this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
            this.xtraTabControl1.SuspendLayout();
            this.xtraTabPage1.SuspendLayout();
@@ -211,10 +212,11 @@
            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.panelMx1)).BeginInit();
            this.panelMx1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.radOut.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtKdy.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtYdy.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_kQty.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_yQty.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtQuantity.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtWlgg.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtWlmc.Properties)).BeginInit();
@@ -1148,17 +1150,28 @@
            this.gridColumn19.VisibleIndex = 13;
            this.gridColumn19.Width = 91;
            // 
            // gridColumn12
            //
            this.gridColumn12.Caption = "判定结果";
            this.gridColumn12.FieldName = "pdjg";
            this.gridColumn12.MinWidth = 25;
            this.gridColumn12.Name = "gridColumn12";
            this.gridColumn12.Visible = true;
            this.gridColumn12.VisibleIndex = 14;
            this.gridColumn12.Width = 94;
            //
            // panelMx1
            // 
            this.panelMx1.Controls.Add(this.radOut);
            this.panelMx1.Controls.Add(this.txt_iCount_1);
            this.panelMx1.Controls.Add(this.txt_psnQty_1);
            this.panelMx1.Controls.Add(this.ucBtnPrint1);
            this.panelMx1.Controls.Add(this.lbMxGuid);
            this.panelMx1.Controls.Add(this.labelControl14);
            this.panelMx1.Controls.Add(this.labelControl12);
            this.panelMx1.Controls.Add(this.txtKdy);
            this.panelMx1.Controls.Add(this.txt_kQty);
            this.panelMx1.Controls.Add(this.labelControl13);
            this.panelMx1.Controls.Add(this.txtYdy);
            this.panelMx1.Controls.Add(this.txt_yQty);
            this.panelMx1.Controls.Add(this.labelControl11);
            this.panelMx1.Controls.Add(this.txtQuantity);
            this.panelMx1.Controls.Add(this.labelControl10);
@@ -1174,11 +1187,25 @@
            this.panelMx1.Size = new System.Drawing.Size(1342, 98);
            this.panelMx1.TabIndex = 0;
            // 
            // radOut
            //
            this.radOut.Location = new System.Drawing.Point(775, 26);
            this.radOut.Margin = new System.Windows.Forms.Padding(0);
            this.radOut.Name = "radOut";
            this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near;
            this.radOut.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.RadioGroupItem[] {
            new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "全自动"),
            new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "半自动"),
            new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "手动")});
            this.radOut.Size = new System.Drawing.Size(248, 31);
            this.radOut.TabIndex = 476;
            //
            // txt_iCount_1
            // 
            this.txt_iCount_1.Location = new System.Drawing.Point(656, 4);
            this.txt_iCount_1.Location = new System.Drawing.Point(656, 67);
            this.txt_iCount_1.Name = "txt_iCount_1";
            this.txt_iCount_1.Properties.Appearance.Options.UseFont = true;
            this.txt_iCount_1.Properties.ReadOnly = true;
            this.txt_iCount_1.Properties.UseMaskAsDisplayFormat = true;
            this.txt_iCount_1.Size = new System.Drawing.Size(94, 24);
            this.txt_iCount_1.TabIndex = 264;
@@ -1187,7 +1214,7 @@
            // 
            // txt_psnQty_1
            // 
            this.txt_psnQty_1.Location = new System.Drawing.Point(656, 34);
            this.txt_psnQty_1.Location = new System.Drawing.Point(656, 36);
            this.txt_psnQty_1.Name = "txt_psnQty_1";
            this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true;
            this.txt_psnQty_1.Properties.UseMaskAsDisplayFormat = true;
@@ -1199,16 +1226,16 @@
            // ucBtnPrint1
            // 
            this.ucBtnPrint1.guidKey = null;
            this.ucBtnPrint1.Location = new System.Drawing.Point(547, 65);
            this.ucBtnPrint1.Location = new System.Drawing.Point(774, 63);
            this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);
            this.ucBtnPrint1.Name = "ucBtnPrint1";
            this.ucBtnPrint1.rptParameter = "rpt_daa";
            this.ucBtnPrint1.Size = new System.Drawing.Size(203, 30);
            this.ucBtnPrint1.Size = new System.Drawing.Size(203, 32);
            this.ucBtnPrint1.TabIndex = 232;
            // 
            // lbMxGuid
            // 
            this.lbMxGuid.Location = new System.Drawing.Point(845, 7);
            this.lbMxGuid.Location = new System.Drawing.Point(1036, 10);
            this.lbMxGuid.Name = "lbMxGuid";
            this.lbMxGuid.Size = new System.Drawing.Size(58, 18);
            this.lbMxGuid.TabIndex = 229;
@@ -1217,7 +1244,7 @@
            // 
            // labelControl14
            // 
            this.labelControl14.Location = new System.Drawing.Point(545, 9);
            this.labelControl14.Location = new System.Drawing.Point(545, 70);
            this.labelControl14.Name = "labelControl14";
            this.labelControl14.Size = new System.Drawing.Size(105, 18);
            this.labelControl14.TabIndex = 227;
@@ -1231,33 +1258,33 @@
            this.labelControl12.TabIndex = 225;
            this.labelControl12.Text = "每张条码数量:";
            // 
            // txtKdy
            // txt_kQty
            // 
            this.txtKdy.Location = new System.Drawing.Point(430, 65);
            this.txtKdy.Name = "txtKdy";
            this.txtKdy.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
            this.txtKdy.Properties.Appearance.Options.UseFont = true;
            this.txtKdy.Properties.Appearance.Options.UseForeColor = true;
            this.txtKdy.Properties.ReadOnly = true;
            this.txtKdy.Size = new System.Drawing.Size(96, 24);
            this.txtKdy.TabIndex = 224;
            this.txt_kQty.Location = new System.Drawing.Point(656, 6);
            this.txt_kQty.Name = "txt_kQty";
            this.txt_kQty.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
            this.txt_kQty.Properties.Appearance.Options.UseFont = true;
            this.txt_kQty.Properties.Appearance.Options.UseForeColor = true;
            this.txt_kQty.Properties.ReadOnly = true;
            this.txt_kQty.Size = new System.Drawing.Size(96, 24);
            this.txt_kQty.TabIndex = 224;
            // 
            // labelControl13
            // 
            this.labelControl13.Location = new System.Drawing.Point(332, 70);
            this.labelControl13.Location = new System.Drawing.Point(560, 9);
            this.labelControl13.Name = "labelControl13";
            this.labelControl13.Size = new System.Drawing.Size(90, 18);
            this.labelControl13.TabIndex = 223;
            this.labelControl13.Text = "可打印总数:";
            // 
            // txtYdy
            // txt_yQty
            // 
            this.txtYdy.Location = new System.Drawing.Point(430, 34);
            this.txtYdy.Name = "txtYdy";
            this.txtYdy.Properties.Appearance.Options.UseFont = true;
            this.txtYdy.Properties.ReadOnly = true;
            this.txtYdy.Size = new System.Drawing.Size(96, 24);
            this.txtYdy.TabIndex = 222;
            this.txt_yQty.Location = new System.Drawing.Point(430, 36);
            this.txt_yQty.Name = "txt_yQty";
            this.txt_yQty.Properties.Appearance.Options.UseFont = true;
            this.txt_yQty.Properties.ReadOnly = true;
            this.txt_yQty.Size = new System.Drawing.Size(96, 24);
            this.txt_yQty.TabIndex = 222;
            // 
            // labelControl11
            // 
@@ -1269,7 +1296,7 @@
            // 
            // txtQuantity
            // 
            this.txtQuantity.Location = new System.Drawing.Point(430, 4);
            this.txtQuantity.Location = new System.Drawing.Point(430, 6);
            this.txtQuantity.Name = "txtQuantity";
            this.txtQuantity.Properties.Appearance.Options.UseFont = true;
            this.txtQuantity.Properties.ReadOnly = true;
@@ -1286,11 +1313,11 @@
            // 
            // txtWlgg
            // 
            this.txtWlgg.Location = new System.Drawing.Point(90, 65);
            this.txtWlgg.Location = new System.Drawing.Point(90, 67);
            this.txtWlgg.Name = "txtWlgg";
            this.txtWlgg.Properties.Appearance.Options.UseFont = true;
            this.txtWlgg.Properties.ReadOnly = true;
            this.txtWlgg.Size = new System.Drawing.Size(215, 24);
            this.txtWlgg.Size = new System.Drawing.Size(436, 24);
            this.txtWlgg.TabIndex = 218;
            // 
            // labelControl9
@@ -1303,7 +1330,7 @@
            // 
            // txtWlmc
            // 
            this.txtWlmc.Location = new System.Drawing.Point(90, 34);
            this.txtWlmc.Location = new System.Drawing.Point(90, 36);
            this.txtWlmc.Name = "txtWlmc";
            this.txtWlmc.Properties.Appearance.Options.UseFont = true;
            this.txtWlmc.Properties.ReadOnly = true;
@@ -1320,7 +1347,7 @@
            // 
            // txtWlid
            // 
            this.txtWlid.Location = new System.Drawing.Point(90, 4);
            this.txtWlid.Location = new System.Drawing.Point(90, 6);
            this.txtWlid.Name = "txtWlid";
            this.txtWlid.Properties.Appearance.Options.UseFont = true;
            this.txtWlid.Properties.ReadOnly = true;
@@ -1540,16 +1567,6 @@
            this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
            // 
            // gridColumn12
            //
            this.gridColumn12.Caption = "判定结果";
            this.gridColumn12.FieldName = "pdjg";
            this.gridColumn12.MinWidth = 25;
            this.gridColumn12.Name = "gridColumn12";
            this.gridColumn12.Visible = true;
            this.gridColumn12.VisibleIndex = 14;
            this.gridColumn12.Width = 94;
            //
            // Frm_ArrivalBarcode
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1614,10 +1631,11 @@
            ((System.ComponentModel.ISupportInitialize)(this.panelMx1)).EndInit();
            this.panelMx1.ResumeLayout(false);
            this.panelMx1.PerformLayout();
            ((System.ComponentModel.ISupportInitialize)(this.radOut.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtKdy.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtYdy.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_kQty.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_yQty.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtQuantity.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtWlgg.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtWlmc.Properties)).EndInit();
@@ -1703,9 +1721,9 @@
        private DevExpress.XtraEditors.LabelControl lbMxGuid;
        private DevExpress.XtraEditors.LabelControl labelControl14;
        private DevExpress.XtraEditors.LabelControl labelControl12;
        private DevExpress.XtraEditors.TextEdit txtKdy;
        private DevExpress.XtraEditors.TextEdit txt_kQty;
        private DevExpress.XtraEditors.LabelControl labelControl13;
        private DevExpress.XtraEditors.TextEdit txtYdy;
        private DevExpress.XtraEditors.TextEdit txt_yQty;
        private DevExpress.XtraEditors.LabelControl labelControl11;
        private DevExpress.XtraEditors.TextEdit txtQuantity;
        private DevExpress.XtraEditors.LabelControl labelControl10;
@@ -1744,5 +1762,6 @@
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
        private DevExpress.Utils.ToolTipController tips;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
        private DevExpress.XtraEditors.RadioGroup radOut;
    }
}
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs
@@ -66,7 +66,7 @@
                }
                this.ucBtnPrint1.rptParameter = "rpt_Arrival{" + lbMxGuid.Text.Trim()
                       + "," + ""
                       + "," + ""
                        + "," + Gs.DevApp.ToolBox.UtilityHelper.PrintYuLiang(radOut).ToString()
                       + "," + txt_iCount_1.Text.Trim()
                       + "," + txt_psnQty_1.Text.Trim()
                       + "}";
@@ -74,6 +74,15 @@
                txt_psnQty_1.Text = "";
            };
            gvMx1.FocusedRowChanged += GvMx1_FocusedRowChanged;
            //自动计算打印量
            txt_psnQty_1.TextChanged += (s, e) =>
            {
                Gs.DevApp.ToolBox.UtilityHelper.PrintJiSuan(txt_psnQty_1, txt_iCount_1, txt_kQty.Text.Trim(), radOut);
            };
            radOut.SelectedIndexChanged += (s, e) =>
            {
                Gs.DevApp.ToolBox.UtilityHelper.PrintAuto(txt_psnQty_1, txt_iCount_1, radOut);
            };
        }
        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
        {
@@ -91,8 +100,21 @@
                txtWlgg.Text = row["itemModel"].ToString();
                txtWlmc.Text = row["itemName"].ToString();
                txtQuantity.Text = row["quantity"].ToString();//本次收货总量
                txtYdy.Text = row["yQty"].ToString();//已打印总量
                txtKdy.Text = row["kQty"].ToString(); //可打印总量
                txt_yQty.Text = row["yQty"].ToString();//已打印总量
                txt_kQty.Text = row["kQty"].ToString(); //可打印总量
            }
            else
            {
                lbMxGuid.Text = "";
                ucBtnPrint1.guidKey = "";
                txtWlid.Text = "";
                txtWlgg.Text = "";
                txtWlmc.Text = "";
                txtQuantity.Text = "";
                txt_yQty.Text = "";
                txt_kQty.Text = "";
                txt_psnQty_1.Text = "";
                txt_iCount_1.Text = "";
            }
        }
        /// <summary>
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.Designer.cs
@@ -590,8 +590,6 @@
            this.gridColumn40.FieldNameSortGroup = "fCloserId";
            this.gridColumn40.MinWidth = 25;
            this.gridColumn40.Name = "gridColumn40";
            this.gridColumn40.Visible = true;
            this.gridColumn40.VisibleIndex = 16;
            this.gridColumn40.Width = 94;
            // 
            // gridColumn41
@@ -600,8 +598,6 @@
            this.gridColumn41.FieldNameSortGroup = "fCloseDate";
            this.gridColumn41.MinWidth = 25;
            this.gridColumn41.Name = "gridColumn41";
            this.gridColumn41.Visible = true;
            this.gridColumn41.VisibleIndex = 17;
            this.gridColumn41.Width = 94;
            // 
            // gridColumn42
@@ -635,7 +631,7 @@
            this.gridColumn45.MinWidth = 25;
            this.gridColumn45.Name = "gridColumn45";
            this.gridColumn45.Visible = true;
            this.gridColumn45.VisibleIndex = 18;
            this.gridColumn45.VisibleIndex = 16;
            this.gridColumn45.Width = 94;
            // 
            // gridColumn46
@@ -645,7 +641,7 @@
            this.gridColumn46.MinWidth = 25;
            this.gridColumn46.Name = "gridColumn46";
            this.gridColumn46.Visible = true;
            this.gridColumn46.VisibleIndex = 19;
            this.gridColumn46.VisibleIndex = 17;
            this.gridColumn46.Width = 94;
            // 
            // gridColumn47
@@ -655,7 +651,7 @@
            this.gridColumn47.MinWidth = 25;
            this.gridColumn47.Name = "gridColumn47";
            this.gridColumn47.Visible = true;
            this.gridColumn47.VisibleIndex = 20;
            this.gridColumn47.VisibleIndex = 18;
            this.gridColumn47.Width = 94;
            // 
            // gridColumn48
@@ -665,7 +661,7 @@
            this.gridColumn48.MinWidth = 25;
            this.gridColumn48.Name = "gridColumn48";
            this.gridColumn48.Visible = true;
            this.gridColumn48.VisibleIndex = 21;
            this.gridColumn48.VisibleIndex = 19;
            this.gridColumn48.Width = 94;
            // 
            // gridColumn49
@@ -675,17 +671,17 @@
            this.gridColumn49.MinWidth = 25;
            this.gridColumn49.Name = "gridColumn49";
            this.gridColumn49.Visible = true;
            this.gridColumn49.VisibleIndex = 22;
            this.gridColumn49.VisibleIndex = 20;
            this.gridColumn49.Width = 94;
            // 
            // gridColumn50
            // 
            this.gridColumn50.Caption = "源单类型";
            this.gridColumn50.FieldName = "fSrcType";
            this.gridColumn50.Caption = "来源";
            this.gridColumn50.FieldName = "source";
            this.gridColumn50.MinWidth = 25;
            this.gridColumn50.Name = "gridColumn50";
            this.gridColumn50.Visible = true;
            this.gridColumn50.VisibleIndex = 23;
            this.gridColumn50.VisibleIndex = 21;
            this.gridColumn50.Width = 94;
            // 
            // gv_id
@@ -1069,7 +1065,7 @@
            this.layoutControlItem3.Name = "layoutControlItem3";
            this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem3.Size = new System.Drawing.Size(276, 29);
            this.layoutControlItem3.Text = "申请人";
            this.layoutControlItem3.Text = "申请人员";
            this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem4
@@ -1132,7 +1128,7 @@
            this.layoutControlItem9.Name = "layoutControlItem9";
            this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem9.Size = new System.Drawing.Size(278, 29);
            this.layoutControlItem9.Text = "审核人";
            this.layoutControlItem9.Text = "审核人员";
            this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem10
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs
@@ -1,5 +1,4 @@
using DevExpress.XtraEditors;
using DevExpress.XtraEditors.Repository;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
@@ -70,6 +69,21 @@
                {
                    MsgHelper.Warning("提示:" + ex.Message);
                }
            };
            this.gvMx1.InitNewRow += (s, e) => {
                string _orgId = txt_fapporgid.GetId();
                string _orgName= txt_fapporgid.GetName();
                if (string.IsNullOrEmpty(_orgId)) return;
                gvMx1.SetFocusedRowCellValue("dcOrg", _orgName);
                gvMx1.SetFocusedRowCellValue("dcOrgGuid", _orgId);
                gvMx1.SetFocusedRowCellValue("drOrg", _orgName);
                gvMx1.SetFocusedRowCellValue("drOrgGuid", _orgId);
                gvMx1.SetFocusedRowCellValue("drHz", _orgName);
                gvMx1.SetFocusedRowCellValue("drHzGuid", _orgId);
                gvMx1.SetFocusedRowCellValue("dcHz", _orgName);
                gvMx1.SetFocusedRowCellValue("dcHzGuid", _orgId);
            };
        }
        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
@@ -559,8 +573,14 @@
            {
                MsgHelper.Warning("提示:" + ex.Message);
            }
        }
        /// <summary>
        /// é€‰æ‹©ç‰©æ–™
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void repositoryItemSearchLookUpEdit1_EditValueChanged(object sender, EventArgs e)
        {
            SearchLookUpEdit LookupEdit = sender as SearchLookUpEdit;
@@ -575,6 +595,11 @@
            gvMx1.UpdateCurrentRow();
        }
        /// <summary>
        /// åˆ é™¤ç‰©æ–™
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
        {
            var rowhandle = gvMx1.FocusedRowHandle;
@@ -799,6 +824,7 @@
                lst = ee.DynamicList;
                gvMx1.SetFocusedRowCellValue("drHz", lst[0].name);
                gvMx1.SetFocusedRowCellValue("drHzGuid", lst[0].guid);
            };
            frm.ShowDialog();
        }
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbckDj.Designer.cs
@@ -29,16 +29,16 @@
        private void InitializeComponent()
        {
            this.components = new System.ComponentModel.Container();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
            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();
            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -75,7 +75,7 @@
            this.txt_rkName = new DevExpress.XtraEditors.TextEdit();
            this.txt_fBusinessType = new DevExpress.XtraEditors.TextEdit();
            this.txt_fOwnerTypeOutIdHead = new DevExpress.XtraEditors.TextEdit();
            this.txt_fRemarks = new DevExpress.XtraEditors.TextEdit();
            this.txt_sqRemarks = new DevExpress.XtraEditors.TextEdit();
            this.txt_taskNo = new DevExpress.XtraEditors.TextEdit();
            this.txt_ftranstype = new DevExpress.XtraEditors.TextEdit();
            this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
@@ -177,7 +177,7 @@
            ((System.ComponentModel.ISupportInitialize)(this.txt_rkName.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fBusinessType.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fOwnerTypeOutIdHead.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fRemarks.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_sqRemarks.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_taskNo.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_ftranstype.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
@@ -578,7 +578,7 @@
            this.layoutMx1.Controls.Add(this.txt_rkName);
            this.layoutMx1.Controls.Add(this.txt_fBusinessType);
            this.layoutMx1.Controls.Add(this.txt_fOwnerTypeOutIdHead);
            this.layoutMx1.Controls.Add(this.txt_fRemarks);
            this.layoutMx1.Controls.Add(this.txt_sqRemarks);
            this.layoutMx1.Controls.Add(this.txt_taskNo);
            this.layoutMx1.Controls.Add(this.txt_ftranstype);
            this.layoutMx1.Controls.Add(this.txt_createDate);
@@ -675,14 +675,14 @@
            this.txt_fOwnerTypeOutIdHead.TabIndex = 431;
            this.txt_fOwnerTypeOutIdHead.Tag = "readonly";
            // 
            // txt_fRemarks
            // txt_sqRemarks
            // 
            this.txt_fRemarks.Location = new System.Drawing.Point(114, 132);
            this.txt_fRemarks.Name = "txt_fRemarks";
            this.txt_fRemarks.Properties.Appearance.Options.UseFont = true;
            this.txt_fRemarks.Size = new System.Drawing.Size(170, 24);
            this.txt_fRemarks.StyleController = this.layoutMx1;
            this.txt_fRemarks.TabIndex = 402;
            this.txt_sqRemarks.Location = new System.Drawing.Point(114, 132);
            this.txt_sqRemarks.Name = "txt_sqRemarks";
            this.txt_sqRemarks.Properties.Appearance.Options.UseFont = true;
            this.txt_sqRemarks.Size = new System.Drawing.Size(170, 24);
            this.txt_sqRemarks.StyleController = this.layoutMx1;
            this.txt_sqRemarks.TabIndex = 402;
            // 
            // txt_taskNo
            // 
@@ -889,38 +889,38 @@
            this.layoutControlItem25});
            this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
            this.Root.Name = "Root";
            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition1.Width = 100D;
            columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition2.Width = 100D;
            columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition3.Width = 100D;
            columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition4.Width = 100D;
            columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition5.Width = 100D;
            columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition6.Width = 100D;
            columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition7.Width = 100D;
            columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition8.Width = 100D;
            this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
            columnDefinition1,
            columnDefinition2,
            columnDefinition3,
            columnDefinition4});
            rowDefinition1.Height = 100D;
            rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition2.Height = 100D;
            rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition3.Height = 100D;
            rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition4.Height = 100D;
            rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition5.Height = 100D;
            rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition6.Height = 100D;
            rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition5,
            columnDefinition6,
            columnDefinition7,
            columnDefinition8});
            rowDefinition7.Height = 100D;
            rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition8.Height = 100D;
            rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
            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[] {
            rowDefinition1,
            rowDefinition2,
            rowDefinition3,
            rowDefinition4,
            rowDefinition5,
            rowDefinition6});
            rowDefinition7,
            rowDefinition8,
            rowDefinition9,
            rowDefinition10,
            rowDefinition11,
            rowDefinition12});
            this.Root.Size = new System.Drawing.Size(1126, 203);
            this.Root.TextVisible = false;
            // 
@@ -950,7 +950,7 @@
            this.layoutControlItem3.Name = "layoutControlItem3";
            this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem3.Size = new System.Drawing.Size(276, 30);
            this.layoutControlItem3.Text = "申请人";
            this.layoutControlItem3.Text = "申请人员";
            this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem4
@@ -960,7 +960,7 @@
            this.layoutControlItem4.Name = "layoutControlItem4";
            this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem4.Size = new System.Drawing.Size(278, 30);
            this.layoutControlItem4.Text = "创建人";
            this.layoutControlItem4.Text = "创建人员";
            this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem5
@@ -1035,7 +1035,7 @@
            this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem11.Size = new System.Drawing.Size(276, 30);
            this.layoutControlItem11.Text = "审核人";
            this.layoutControlItem11.Text = "审核人员";
            this.layoutControlItem11.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem12
@@ -1072,12 +1072,12 @@
            // 
            // layoutControlItem15
            // 
            this.layoutControlItem15.Control = this.txt_fRemarks;
            this.layoutControlItem15.Control = this.txt_sqRemarks;
            this.layoutControlItem15.Location = new System.Drawing.Point(0, 120);
            this.layoutControlItem15.Name = "layoutControlItem15";
            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 4;
            this.layoutControlItem15.Size = new System.Drawing.Size(276, 30);
            this.layoutControlItem15.Text = "备注";
            this.layoutControlItem15.Text = "申请备注";
            this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem16
@@ -1315,8 +1315,8 @@
            this.gvMx1bld010.AppearanceCell.Options.UseForeColor = true;
            this.gvMx1bld010.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
            this.gvMx1bld010.AppearanceHeader.Options.UseForeColor = true;
            this.gvMx1bld010.Caption = "备注";
            this.gvMx1bld010.FieldName = "remark";
            this.gvMx1bld010.Caption = "申请备注";
            this.gvMx1bld010.FieldName = "sqRemark";
            this.gvMx1bld010.MinWidth = 50;
            this.gvMx1bld010.Name = "gvMx1bld010";
            this.gvMx1bld010.Tag = "edit";
@@ -1585,7 +1585,7 @@
            ((System.ComponentModel.ISupportInitialize)(this.txt_rkName.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fBusinessType.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fOwnerTypeOutIdHead.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fRemarks.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_sqRemarks.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_taskNo.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_ftranstype.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
@@ -1678,7 +1678,7 @@
        private DevExpress.XtraEditors.TextEdit txt_billNo;
        private DevExpress.XtraEditors.TextEdit txt_fCreateDate;
        private DevExpress.XtraEditors.TextEdit txt_fCreatorId;
        private DevExpress.XtraEditors.TextEdit txt_fRemarks;
        private DevExpress.XtraEditors.TextEdit txt_sqRemarks;
        private DevExpress.XtraEditors.TextEdit txt_taskNo;
        private DevExpress.XtraEditors.TextEdit txt_djcheckdate;
        private DevExpress.XtraEditors.TextEdit txt_djcheckuser;
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.Designer.cs
@@ -504,23 +504,23 @@
            // txt_fIsLink
            // 
            this.txt_fIsLink.EditValue = "1";
            this.txt_fIsLink.Location = new System.Drawing.Point(390, 74);
            this.txt_fIsLink.Location = new System.Drawing.Point(385, 74);
            this.txt_fIsLink.Margin = new System.Windows.Forms.Padding(0);
            this.txt_fIsLink.Name = "txt_fIsLink";
            this.txt_fIsLink.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.RadioGroupItem[] {
            new DevExpress.XtraEditors.Controls.RadioGroupItem("1", "有源单"),
            new DevExpress.XtraEditors.Controls.RadioGroupItem("0", "无源单", false)});
            this.txt_fIsLink.Properties.Padding = new System.Windows.Forms.Padding(0);
            this.txt_fIsLink.Size = new System.Drawing.Size(170, 27);
            this.txt_fIsLink.Size = new System.Drawing.Size(165, 27);
            this.txt_fIsLink.StyleController = this.layoutMx1;
            this.txt_fIsLink.TabIndex = 533;
            // 
            // txt_fCustId
            // 
            this.txt_fCustId.IsReadly = false;
            this.txt_fCustId.Location = new System.Drawing.Point(390, 43);
            this.txt_fCustId.Location = new System.Drawing.Point(385, 43);
            this.txt_fCustId.Name = "txt_fCustId";
            this.txt_fCustId.Size = new System.Drawing.Size(170, 24);
            this.txt_fCustId.Size = new System.Drawing.Size(165, 24);
            this.txt_fCustId.TabIndex = 532;
            // 
            // btnSelect
@@ -547,7 +547,7 @@
            this.txt_fStockOrgId.IsReadly = false;
            this.txt_fStockOrgId.Location = new System.Drawing.Point(114, 43);
            this.txt_fStockOrgId.Name = "txt_fStockOrgId";
            this.txt_fStockOrgId.Size = new System.Drawing.Size(170, 24);
            this.txt_fStockOrgId.Size = new System.Drawing.Size(165, 24);
            this.txt_fStockOrgId.TabIndex = 526;
            // 
            // txt_billNo
@@ -555,7 +555,7 @@
            this.txt_billNo.Location = new System.Drawing.Point(114, 12);
            this.txt_billNo.Name = "txt_billNo";
            this.txt_billNo.Properties.Appearance.Options.UseFont = true;
            this.txt_billNo.Size = new System.Drawing.Size(170, 24);
            this.txt_billNo.Size = new System.Drawing.Size(165, 24);
            this.txt_billNo.StyleController = this.layoutMx1;
            this.txt_billNo.TabIndex = 211;
            this.txt_billNo.Tag = "readonly";
@@ -563,7 +563,7 @@
            // txt_fReturnStyle
            // 
            this.txt_fReturnStyle.EditValue = "-请选择-";
            this.txt_fReturnStyle.Location = new System.Drawing.Point(390, 12);
            this.txt_fReturnStyle.Location = new System.Drawing.Point(385, 12);
            this.txt_fReturnStyle.Name = "txt_fReturnStyle";
            this.txt_fReturnStyle.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -572,16 +572,16 @@
            "退料不补料(ReturnNoFeed)",
            "退料补料(ReturnFeed)"});
            this.txt_fReturnStyle.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
            this.txt_fReturnStyle.Size = new System.Drawing.Size(170, 24);
            this.txt_fReturnStyle.Size = new System.Drawing.Size(165, 24);
            this.txt_fReturnStyle.StyleController = this.layoutMx1;
            this.txt_fReturnStyle.TabIndex = 520;
            // 
            // txt_checkDate
            // 
            this.txt_checkDate.Location = new System.Drawing.Point(942, 43);
            this.txt_checkDate.Location = new System.Drawing.Point(927, 43);
            this.txt_checkDate.Name = "txt_checkDate";
            this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
            this.txt_checkDate.Size = new System.Drawing.Size(172, 24);
            this.txt_checkDate.Size = new System.Drawing.Size(166, 24);
            this.txt_checkDate.StyleController = this.layoutMx1;
            this.txt_checkDate.TabIndex = 226;
            this.txt_checkDate.Tag = "readonly";
@@ -592,62 +592,62 @@
            this.txt_fStockId.Location = new System.Drawing.Point(114, 74);
            this.txt_fStockId.Margin = new System.Windows.Forms.Padding(0);
            this.txt_fStockId.Name = "txt_fStockId";
            this.txt_fStockId.Size = new System.Drawing.Size(170, 24);
            this.txt_fStockId.Size = new System.Drawing.Size(165, 24);
            this.txt_fStockId.TabIndex = 260;
            // 
            // txt_remark
            // 
            this.txt_remark.Location = new System.Drawing.Point(390, 105);
            this.txt_remark.Location = new System.Drawing.Point(385, 105);
            this.txt_remark.Name = "txt_remark";
            this.txt_remark.Properties.Appearance.Options.UseFont = true;
            this.txt_remark.Size = new System.Drawing.Size(446, 24);
            this.txt_remark.Size = new System.Drawing.Size(436, 24);
            this.txt_remark.StyleController = this.layoutMx1;
            this.txt_remark.TabIndex = 252;
            // 
            // txt_checkUser
            // 
            this.txt_checkUser.Location = new System.Drawing.Point(942, 12);
            this.txt_checkUser.Location = new System.Drawing.Point(927, 12);
            this.txt_checkUser.Name = "txt_checkUser";
            this.txt_checkUser.Properties.Appearance.Options.UseFont = true;
            this.txt_checkUser.Size = new System.Drawing.Size(172, 24);
            this.txt_checkUser.Size = new System.Drawing.Size(166, 24);
            this.txt_checkUser.StyleController = this.layoutMx1;
            this.txt_checkUser.TabIndex = 222;
            this.txt_checkUser.Tag = "readonly";
            // 
            // txt_status
            // 
            this.txt_status.Location = new System.Drawing.Point(840, 74);
            this.txt_status.Location = new System.Drawing.Point(825, 74);
            this.txt_status.Name = "txt_status";
            this.txt_status.Properties.Caption = "审核标识";
            this.txt_status.Size = new System.Drawing.Size(274, 24);
            this.txt_status.Size = new System.Drawing.Size(268, 24);
            this.txt_status.StyleController = this.layoutMx1;
            this.txt_status.TabIndex = 528;
            this.txt_status.Tag = "readonly";
            // 
            // txt_isFinish
            // 
            this.txt_isFinish.Location = new System.Drawing.Point(564, 74);
            this.txt_isFinish.Location = new System.Drawing.Point(554, 74);
            this.txt_isFinish.Name = "txt_isFinish";
            this.txt_isFinish.Properties.Caption = "完结标识";
            this.txt_isFinish.Size = new System.Drawing.Size(272, 24);
            this.txt_isFinish.Size = new System.Drawing.Size(267, 24);
            this.txt_isFinish.StyleController = this.layoutMx1;
            this.txt_isFinish.TabIndex = 529;
            this.txt_isFinish.Tag = "readonly";
            // 
            // txt_lastUpdateUser
            // 
            this.txt_lastUpdateUser.Location = new System.Drawing.Point(666, 12);
            this.txt_lastUpdateUser.Location = new System.Drawing.Point(656, 12);
            this.txt_lastUpdateUser.Name = "txt_lastUpdateUser";
            this.txt_lastUpdateUser.Size = new System.Drawing.Size(170, 24);
            this.txt_lastUpdateUser.Size = new System.Drawing.Size(165, 24);
            this.txt_lastUpdateUser.StyleController = this.layoutMx1;
            this.txt_lastUpdateUser.TabIndex = 530;
            this.txt_lastUpdateUser.Tag = "readonly";
            // 
            // txt_lastUpdateTime
            // 
            this.txt_lastUpdateTime.Location = new System.Drawing.Point(666, 43);
            this.txt_lastUpdateTime.Location = new System.Drawing.Point(656, 43);
            this.txt_lastUpdateTime.Name = "txt_lastUpdateTime";
            this.txt_lastUpdateTime.Size = new System.Drawing.Size(170, 24);
            this.txt_lastUpdateTime.Size = new System.Drawing.Size(165, 24);
            this.txt_lastUpdateTime.StyleController = this.layoutMx1;
            this.txt_lastUpdateTime.TabIndex = 531;
            this.txt_lastUpdateTime.Tag = "readonly";
@@ -711,7 +711,7 @@
            rowDefinition2,
            rowDefinition3,
            rowDefinition4});
            this.Root.Size = new System.Drawing.Size(1126, 144);
            this.Root.Size = new System.Drawing.Size(1105, 144);
            this.Root.TextVisible = false;
            // 
            // layoutControlItem1
@@ -719,7 +719,7 @@
            this.layoutControlItem1.Control = this.txt_billNo;
            this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
            this.layoutControlItem1.Name = "layoutControlItem1";
            this.layoutControlItem1.Size = new System.Drawing.Size(276, 31);
            this.layoutControlItem1.Size = new System.Drawing.Size(271, 31);
            this.layoutControlItem1.Text = "申请单号";
            this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18);
            // 
@@ -729,7 +729,7 @@
            this.layoutControlItem2.Location = new System.Drawing.Point(0, 31);
            this.layoutControlItem2.Name = "layoutControlItem2";
            this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem2.Size = new System.Drawing.Size(276, 31);
            this.layoutControlItem2.Size = new System.Drawing.Size(271, 31);
            this.layoutControlItem2.Text = "选择组织";
            this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18);
            // 
@@ -739,49 +739,49 @@
            this.layoutControlItem3.Location = new System.Drawing.Point(0, 62);
            this.layoutControlItem3.Name = "layoutControlItem3";
            this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem3.Size = new System.Drawing.Size(276, 31);
            this.layoutControlItem3.Size = new System.Drawing.Size(271, 31);
            this.layoutControlItem3.Text = "选择仓库";
            this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem9
            // 
            this.layoutControlItem9.Control = this.txt_checkUser;
            this.layoutControlItem9.Location = new System.Drawing.Point(828, 0);
            this.layoutControlItem9.Location = new System.Drawing.Point(813, 0);
            this.layoutControlItem9.Name = "layoutControlItem9";
            this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem9.Size = new System.Drawing.Size(278, 31);
            this.layoutControlItem9.Size = new System.Drawing.Size(272, 31);
            this.layoutControlItem9.Text = "审核人";
            this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem10
            // 
            this.layoutControlItem10.Control = this.txt_checkDate;
            this.layoutControlItem10.Location = new System.Drawing.Point(828, 31);
            this.layoutControlItem10.Location = new System.Drawing.Point(813, 31);
            this.layoutControlItem10.Name = "layoutControlItem10";
            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem10.Size = new System.Drawing.Size(278, 31);
            this.layoutControlItem10.Size = new System.Drawing.Size(272, 31);
            this.layoutControlItem10.Text = "审核时间";
            this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem14
            // 
            this.layoutControlItem14.Control = this.txt_lastUpdateUser;
            this.layoutControlItem14.Location = new System.Drawing.Point(552, 0);
            this.layoutControlItem14.Location = new System.Drawing.Point(542, 0);
            this.layoutControlItem14.Name = "layoutControlItem14";
            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem14.Size = new System.Drawing.Size(276, 31);
            this.layoutControlItem14.Size = new System.Drawing.Size(271, 31);
            this.layoutControlItem14.Text = "最后更新人";
            this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem15
            // 
            this.layoutControlItem15.Control = this.txt_lastUpdateTime;
            this.layoutControlItem15.Location = new System.Drawing.Point(552, 31);
            this.layoutControlItem15.Location = new System.Drawing.Point(542, 31);
            this.layoutControlItem15.Name = "layoutControlItem15";
            this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem15.Size = new System.Drawing.Size(276, 31);
            this.layoutControlItem15.Size = new System.Drawing.Size(271, 31);
            this.layoutControlItem15.Text = "最后更新时间";
            this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18);
            // 
@@ -793,7 +793,7 @@
            this.layoutControlItem16.MinSize = new System.Drawing.Size(20, 31);
            this.layoutControlItem16.Name = "layoutControlItem16";
            this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem16.Size = new System.Drawing.Size(276, 31);
            this.layoutControlItem16.Size = new System.Drawing.Size(271, 31);
            this.layoutControlItem16.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
            this.layoutControlItem16.Text = "退货明细";
            this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
@@ -802,11 +802,11 @@
            // layoutControlItem12
            // 
            this.layoutControlItem12.Control = this.txt_isFinish;
            this.layoutControlItem12.Location = new System.Drawing.Point(552, 62);
            this.layoutControlItem12.Location = new System.Drawing.Point(542, 62);
            this.layoutControlItem12.Name = "layoutControlItem12";
            this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem12.Size = new System.Drawing.Size(276, 31);
            this.layoutControlItem12.Size = new System.Drawing.Size(271, 31);
            this.layoutControlItem12.Text = "完结标识";
            this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem12.TextVisible = false;
@@ -814,11 +814,11 @@
            // layoutControlItem11
            // 
            this.layoutControlItem11.Control = this.txt_status;
            this.layoutControlItem11.Location = new System.Drawing.Point(828, 62);
            this.layoutControlItem11.Location = new System.Drawing.Point(813, 62);
            this.layoutControlItem11.Name = "layoutControlItem11";
            this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem11.Size = new System.Drawing.Size(278, 31);
            this.layoutControlItem11.Size = new System.Drawing.Size(272, 31);
            this.layoutControlItem11.Text = "审核标识";
            this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem11.TextVisible = false;
@@ -826,33 +826,33 @@
            // layoutControlItem5
            // 
            this.layoutControlItem5.Control = this.txt_fReturnStyle;
            this.layoutControlItem5.Location = new System.Drawing.Point(276, 0);
            this.layoutControlItem5.Location = new System.Drawing.Point(271, 0);
            this.layoutControlItem5.Name = "layoutControlItem5";
            this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem5.Size = new System.Drawing.Size(276, 31);
            this.layoutControlItem5.Size = new System.Drawing.Size(271, 31);
            this.layoutControlItem5.Text = "退料方式";
            this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem4
            // 
            this.layoutControlItem4.Control = this.txt_fCustId;
            this.layoutControlItem4.Location = new System.Drawing.Point(276, 31);
            this.layoutControlItem4.Location = new System.Drawing.Point(271, 31);
            this.layoutControlItem4.Name = "layoutControlItem4";
            this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem4.Size = new System.Drawing.Size(276, 31);
            this.layoutControlItem4.Size = new System.Drawing.Size(271, 31);
            this.layoutControlItem4.Text = "选择客户";
            this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem6
            // 
            this.layoutControlItem6.Control = this.txt_fIsLink;
            this.layoutControlItem6.Location = new System.Drawing.Point(276, 62);
            this.layoutControlItem6.Location = new System.Drawing.Point(271, 62);
            this.layoutControlItem6.MinSize = new System.Drawing.Size(246, 30);
            this.layoutControlItem6.Name = "layoutControlItem6";
            this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem6.Size = new System.Drawing.Size(276, 31);
            this.layoutControlItem6.Size = new System.Drawing.Size(271, 31);
            this.layoutControlItem6.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
            this.layoutControlItem6.Text = "有无源单";
            this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18);
@@ -860,13 +860,13 @@
            // layoutControlItem7
            // 
            this.layoutControlItem7.Control = this.txt_remark;
            this.layoutControlItem7.Location = new System.Drawing.Point(276, 93);
            this.layoutControlItem7.Location = new System.Drawing.Point(271, 93);
            this.layoutControlItem7.Name = "layoutControlItem7";
            this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem7.OptionsTableLayoutItem.ColumnSpan = 2;
            this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem7.Size = new System.Drawing.Size(552, 31);
            this.layoutControlItem7.Text = "退货备注";
            this.layoutControlItem7.Size = new System.Drawing.Size(542, 31);
            this.layoutControlItem7.Text = "申请备注";
            this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
            // 
            // tabMx
@@ -1052,7 +1052,7 @@
            this.gvMx1remark.AppearanceCell.Options.UseForeColor = true;
            this.gvMx1remark.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
            this.gvMx1remark.AppearanceHeader.Options.UseForeColor = true;
            this.gvMx1remark.Caption = "备注";
            this.gvMx1remark.Caption = "申请备注";
            this.gvMx1remark.FieldName = "remark";
            this.gvMx1remark.MinWidth = 50;
            this.gvMx1remark.Name = "gvMx1remark";
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.Designer.cs
@@ -124,13 +124,14 @@
            this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            this.panelMx1 = new DevExpress.XtraEditors.PanelControl();
            this.radOut = new DevExpress.XtraEditors.RadioGroup();
            this.ucBtnPrint1 = new Gs.DevApp.UserControl.UcBtnPrint();
            this.lbMxGuid = new DevExpress.XtraEditors.LabelControl();
            this.txt_iCount_1 = new DevExpress.XtraEditors.TextEdit();
            this.labelControl14 = new DevExpress.XtraEditors.LabelControl();
            this.txt_psnQty_1 = new DevExpress.XtraEditors.TextEdit();
            this.labelControl12 = new DevExpress.XtraEditors.LabelControl();
            this.txtKdy = new DevExpress.XtraEditors.TextEdit();
            this.txt_kQty = new DevExpress.XtraEditors.TextEdit();
            this.labelControl13 = new DevExpress.XtraEditors.LabelControl();
            this.txtYdy = new DevExpress.XtraEditors.TextEdit();
            this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
@@ -210,9 +211,10 @@
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.panelMx1)).BeginInit();
            this.panelMx1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.radOut.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtKdy.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_kQty.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtYdy.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtQuantity.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtWlgg.Properties)).BeginInit();
@@ -334,8 +336,6 @@
            this.gridColumn21.FieldName = "isFinish";
            this.gridColumn21.MinWidth = 25;
            this.gridColumn21.Name = "gridColumn21";
            this.gridColumn21.Visible = true;
            this.gridColumn21.VisibleIndex = 1;
            this.gridColumn21.Width = 94;
            // 
            // gv_qtck
@@ -348,7 +348,7 @@
            this.gv_qtck.OptionsColumn.AllowEdit = false;
            this.gv_qtck.Tag = "query_a.qtck";
            this.gv_qtck.Visible = true;
            this.gv_qtck.VisibleIndex = 2;
            this.gv_qtck.VisibleIndex = 1;
            this.gv_qtck.Width = 180;
            // 
            // gridColumn14
@@ -366,7 +366,7 @@
            this.gridColumn17.MinWidth = 25;
            this.gridColumn17.Name = "gridColumn17";
            this.gridColumn17.Visible = true;
            this.gridColumn17.VisibleIndex = 3;
            this.gridColumn17.VisibleIndex = 2;
            this.gridColumn17.Width = 94;
            // 
            // gridColumn18
@@ -384,7 +384,7 @@
            this.gridColumn19.MinWidth = 25;
            this.gridColumn19.Name = "gridColumn19";
            this.gridColumn19.Visible = true;
            this.gridColumn19.VisibleIndex = 4;
            this.gridColumn19.VisibleIndex = 3;
            this.gridColumn19.Width = 94;
            // 
            // gv_qt005
@@ -397,7 +397,7 @@
            this.gv_qt005.OptionsColumn.AllowEdit = false;
            this.gv_qt005.Tag = "query_a.qt005";
            this.gv_qt005.Visible = true;
            this.gv_qt005.VisibleIndex = 5;
            this.gv_qt005.VisibleIndex = 4;
            this.gv_qt005.Width = 94;
            // 
            // gv_qt001
@@ -410,7 +410,7 @@
            this.gv_qt001.OptionsColumn.AllowEdit = false;
            this.gv_qt001.Tag = "query_a.qt001";
            this.gv_qt001.Visible = true;
            this.gv_qt001.VisibleIndex = 6;
            this.gv_qt001.VisibleIndex = 5;
            this.gv_qt001.Width = 200;
            // 
            // gv_qt016
@@ -423,7 +423,7 @@
            this.gv_qt016.OptionsColumn.AllowEdit = false;
            this.gv_qt016.Tag = "query_a.qt016";
            this.gv_qt016.Visible = true;
            this.gv_qt016.VisibleIndex = 7;
            this.gv_qt016.VisibleIndex = 6;
            this.gv_qt016.Width = 94;
            // 
            // gv_qt002
@@ -436,20 +436,20 @@
            this.gv_qt002.OptionsColumn.AllowEdit = false;
            this.gv_qt002.Tag = "query_a.qt002";
            this.gv_qt002.Visible = true;
            this.gv_qt002.VisibleIndex = 8;
            this.gv_qt002.VisibleIndex = 7;
            this.gv_qt002.Width = 180;
            // 
            // gv_qt010
            // 
            this.gv_qt010.AppearanceCell.Options.UseFont = true;
            this.gv_qt010.Caption = "入库原因 ";
            this.gv_qt010.Caption = "申请原因 ";
            this.gv_qt010.FieldName = "remark";
            this.gv_qt010.MinWidth = 25;
            this.gv_qt010.Name = "gv_qt010";
            this.gv_qt010.OptionsColumn.AllowEdit = false;
            this.gv_qt010.Tag = "query_a.qt010";
            this.gv_qt010.Visible = true;
            this.gv_qt010.VisibleIndex = 9;
            this.gv_qt010.VisibleIndex = 8;
            this.gv_qt010.Width = 94;
            // 
            // gridColumn13
@@ -459,7 +459,7 @@
            this.gridColumn13.MinWidth = 25;
            this.gridColumn13.Name = "gridColumn13";
            this.gridColumn13.Visible = true;
            this.gridColumn13.VisibleIndex = 10;
            this.gridColumn13.VisibleIndex = 9;
            this.gridColumn13.Width = 94;
            // 
            // gv18
@@ -748,7 +748,7 @@
            this.layoutControlItem9.Name = "layoutControlItem9";
            this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem9.Size = new System.Drawing.Size(287, 28);
            this.layoutControlItem9.Text = "审核人";
            this.layoutControlItem9.Text = "审核人员";
            this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem10
@@ -782,7 +782,7 @@
            this.layoutControlItem14.Name = "layoutControlItem14";
            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem14.Size = new System.Drawing.Size(287, 28);
            this.layoutControlItem14.Text = "申请人";
            this.layoutControlItem14.Text = "申请人员";
            this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem15
@@ -837,7 +837,7 @@
            this.layoutControlItem13.OptionsTableLayoutItem.ColumnSpan = 2;
            this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem13.Size = new System.Drawing.Size(573, 28);
            this.layoutControlItem13.Text = "入库原因";
            this.layoutControlItem13.Text = "申请原因";
            this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
            // 
            // tabMx
@@ -1150,13 +1150,14 @@
            // 
            // panelMx1
            // 
            this.panelMx1.Controls.Add(this.radOut);
            this.panelMx1.Controls.Add(this.ucBtnPrint1);
            this.panelMx1.Controls.Add(this.lbMxGuid);
            this.panelMx1.Controls.Add(this.txt_iCount_1);
            this.panelMx1.Controls.Add(this.labelControl14);
            this.panelMx1.Controls.Add(this.txt_psnQty_1);
            this.panelMx1.Controls.Add(this.labelControl12);
            this.panelMx1.Controls.Add(this.txtKdy);
            this.panelMx1.Controls.Add(this.txt_kQty);
            this.panelMx1.Controls.Add(this.labelControl13);
            this.panelMx1.Controls.Add(this.txtYdy);
            this.panelMx1.Controls.Add(this.labelControl1);
@@ -1174,19 +1175,32 @@
            this.panelMx1.Size = new System.Drawing.Size(1165, 102);
            this.panelMx1.TabIndex = 2;
            // 
            // radOut
            //
            this.radOut.Location = new System.Drawing.Point(779, 26);
            this.radOut.Margin = new System.Windows.Forms.Padding(0);
            this.radOut.Name = "radOut";
            this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near;
            this.radOut.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.RadioGroupItem[] {
            new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "全自动"),
            new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "半自动"),
            new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "手动")});
            this.radOut.Size = new System.Drawing.Size(248, 31);
            this.radOut.TabIndex = 476;
            //
            // ucBtnPrint1
            // 
            this.ucBtnPrint1.guidKey = null;
            this.ucBtnPrint1.Location = new System.Drawing.Point(543, 65);
            this.ucBtnPrint1.Location = new System.Drawing.Point(779, 63);
            this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);
            this.ucBtnPrint1.Name = "ucBtnPrint1";
            this.ucBtnPrint1.rptParameter = null;
            this.ucBtnPrint1.Size = new System.Drawing.Size(207, 29);
            this.ucBtnPrint1.Size = new System.Drawing.Size(207, 32);
            this.ucBtnPrint1.TabIndex = 230;
            // 
            // lbMxGuid
            // 
            this.lbMxGuid.Location = new System.Drawing.Point(835, 7);
            this.lbMxGuid.Location = new System.Drawing.Point(1046, 70);
            this.lbMxGuid.Name = "lbMxGuid";
            this.lbMxGuid.Size = new System.Drawing.Size(58, 18);
            this.lbMxGuid.TabIndex = 229;
@@ -1195,15 +1209,16 @@
            // 
            // txt_iCount_1
            // 
            this.txt_iCount_1.Location = new System.Drawing.Point(654, 34);
            this.txt_iCount_1.Location = new System.Drawing.Point(658, 67);
            this.txt_iCount_1.Name = "txt_iCount_1";
            this.txt_iCount_1.Properties.Appearance.Options.UseFont = true;
            this.txt_iCount_1.Properties.ReadOnly = true;
            this.txt_iCount_1.Size = new System.Drawing.Size(96, 24);
            this.txt_iCount_1.TabIndex = 228;
            // 
            // labelControl14
            // 
            this.labelControl14.Location = new System.Drawing.Point(543, 39);
            this.labelControl14.Location = new System.Drawing.Point(547, 70);
            this.labelControl14.Name = "labelControl14";
            this.labelControl14.Size = new System.Drawing.Size(105, 18);
            this.labelControl14.TabIndex = 227;
@@ -1211,7 +1226,7 @@
            // 
            // txt_psnQty_1
            // 
            this.txt_psnQty_1.Location = new System.Drawing.Point(654, 4);
            this.txt_psnQty_1.Location = new System.Drawing.Point(658, 33);
            this.txt_psnQty_1.Name = "txt_psnQty_1";
            this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true;
            this.txt_psnQty_1.Size = new System.Drawing.Size(96, 24);
@@ -1219,34 +1234,34 @@
            // 
            // labelControl12
            // 
            this.labelControl12.Location = new System.Drawing.Point(543, 9);
            this.labelControl12.Location = new System.Drawing.Point(547, 39);
            this.labelControl12.Name = "labelControl12";
            this.labelControl12.Size = new System.Drawing.Size(105, 18);
            this.labelControl12.TabIndex = 225;
            this.labelControl12.Text = "每张条码数量:";
            // 
            // txtKdy
            // txt_kQty
            // 
            this.txtKdy.Location = new System.Drawing.Point(430, 65);
            this.txtKdy.Name = "txtKdy";
            this.txtKdy.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
            this.txtKdy.Properties.Appearance.Options.UseFont = true;
            this.txtKdy.Properties.Appearance.Options.UseForeColor = true;
            this.txtKdy.Properties.ReadOnly = true;
            this.txtKdy.Size = new System.Drawing.Size(96, 24);
            this.txtKdy.TabIndex = 224;
            this.txt_kQty.Location = new System.Drawing.Point(658, 3);
            this.txt_kQty.Name = "txt_kQty";
            this.txt_kQty.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
            this.txt_kQty.Properties.Appearance.Options.UseFont = true;
            this.txt_kQty.Properties.Appearance.Options.UseForeColor = true;
            this.txt_kQty.Properties.ReadOnly = true;
            this.txt_kQty.Size = new System.Drawing.Size(96, 24);
            this.txt_kQty.TabIndex = 224;
            // 
            // labelControl13
            // 
            this.labelControl13.Location = new System.Drawing.Point(346, 70);
            this.labelControl13.Location = new System.Drawing.Point(562, 9);
            this.labelControl13.Name = "labelControl13";
            this.labelControl13.Size = new System.Drawing.Size(80, 18);
            this.labelControl13.Size = new System.Drawing.Size(90, 18);
            this.labelControl13.TabIndex = 223;
            this.labelControl13.Text = "可打印总数:";
            this.labelControl13.Text = "可打印总数:";
            // 
            // txtYdy
            // 
            this.txtYdy.Location = new System.Drawing.Point(430, 34);
            this.txtYdy.Location = new System.Drawing.Point(430, 36);
            this.txtYdy.Name = "txtYdy";
            this.txtYdy.Properties.Appearance.Options.UseFont = true;
            this.txtYdy.Properties.ReadOnly = true;
@@ -1263,7 +1278,7 @@
            // 
            // txtQuantity
            // 
            this.txtQuantity.Location = new System.Drawing.Point(430, 4);
            this.txtQuantity.Location = new System.Drawing.Point(430, 6);
            this.txtQuantity.Name = "txtQuantity";
            this.txtQuantity.Properties.Appearance.Options.UseFont = true;
            this.txtQuantity.Properties.ReadOnly = true;
@@ -1280,11 +1295,11 @@
            // 
            // txtWlgg
            // 
            this.txtWlgg.Location = new System.Drawing.Point(90, 65);
            this.txtWlgg.Location = new System.Drawing.Point(90, 67);
            this.txtWlgg.Name = "txtWlgg";
            this.txtWlgg.Properties.Appearance.Options.UseFont = true;
            this.txtWlgg.Properties.ReadOnly = true;
            this.txtWlgg.Size = new System.Drawing.Size(236, 24);
            this.txtWlgg.Size = new System.Drawing.Size(436, 24);
            this.txtWlgg.TabIndex = 218;
            // 
            // labelControl9
@@ -1297,7 +1312,7 @@
            // 
            // txtWlmc
            // 
            this.txtWlmc.Location = new System.Drawing.Point(90, 34);
            this.txtWlmc.Location = new System.Drawing.Point(90, 36);
            this.txtWlmc.Name = "txtWlmc";
            this.txtWlmc.Properties.Appearance.Options.UseFont = true;
            this.txtWlmc.Properties.ReadOnly = true;
@@ -1314,7 +1329,7 @@
            // 
            // txtWlid
            // 
            this.txtWlid.Location = new System.Drawing.Point(90, 4);
            this.txtWlid.Location = new System.Drawing.Point(90, 6);
            this.txtWlid.Name = "txtWlid";
            this.txtWlid.Properties.Appearance.Options.UseFont = true;
            this.txtWlid.Properties.ReadOnly = true;
@@ -1561,9 +1576,10 @@
            ((System.ComponentModel.ISupportInitialize)(this.panelMx1)).EndInit();
            this.panelMx1.ResumeLayout(false);
            this.panelMx1.PerformLayout();
            ((System.ComponentModel.ISupportInitialize)(this.radOut.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtKdy.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_kQty.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtYdy.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtQuantity.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtWlgg.Properties)).EndInit();
@@ -1642,7 +1658,7 @@
        private DevExpress.XtraEditors.LabelControl labelControl14;
        private DevExpress.XtraEditors.TextEdit txt_psnQty_1;
        private DevExpress.XtraEditors.LabelControl labelControl12;
        private DevExpress.XtraEditors.TextEdit txtKdy;
        private DevExpress.XtraEditors.TextEdit txt_kQty;
        private DevExpress.XtraEditors.LabelControl labelControl13;
        private DevExpress.XtraEditors.TextEdit txtYdy;
        private DevExpress.XtraEditors.LabelControl labelControl1;
@@ -1689,5 +1705,6 @@
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn20;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn21;
        private DevExpress.Utils.ToolTipController tips;
        private DevExpress.XtraEditors.RadioGroup radOut;
    }
}
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.cs
@@ -104,10 +104,20 @@
                }
                this.ucBtnPrint1.rptParameter = "rpt_Strk{" + lbMxGuid.Text.Trim()
                       + "," + ""
                       + "," + ""
                       + "," + Gs.DevApp.ToolBox.UtilityHelper.PrintYuLiang(radOut).ToString()
                       + "," + txt_iCount_1.Text.Trim()
                       + "," + txt_psnQty_1.Text.Trim()
                       + "}";
            };
            //自动计算打印量
            txt_psnQty_1.TextChanged += (s, e) =>
            {
                Gs.DevApp.ToolBox.UtilityHelper.PrintJiSuan(txt_psnQty_1, txt_iCount_1, txt_kQty.Text.Trim(), radOut);
            };
            radOut.SelectedIndexChanged += (s, e) =>
            {
                Gs.DevApp.ToolBox.UtilityHelper.PrintAuto(txt_psnQty_1, txt_iCount_1, radOut);
            };
        }
        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
@@ -635,7 +645,7 @@
                txtWlmc.Text = row["itemName"].ToString();
                txtQuantity.Text = row["sqsl"].ToString();//申请总量
                txtYdy.Text = row["ydy"].ToString();//已打印总量
                txtKdy.Text = row["kdy"].ToString();//可打印总量
                txt_kQty.Text = row["kdy"].ToString();//可打印总量
            }
            else {
                lbMxGuid.Text = "";
@@ -645,7 +655,7 @@
                txtWlmc.Text = "";
                txtQuantity.Text = "";
                txtYdy.Text = "";
                txtKdy.Text = "";
                txt_kQty.Text = "";
                txt_psnQty_1.Text = "";
                txt_iCount_1.Text = "";
            }
DevApp/Gs.DevApp/DevFrm/Warehouse/SelectShuoTuiSq.Designer.cs
ÎļþÃû´Ó DevApp/Gs.DevApp/UserControl/SelectShuoTuiSq.Designer.cs ÐÞ¸Ä
@@ -43,16 +43,10 @@
            this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
            this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
            this.btnIn = new DevExpress.XtraEditors.SimpleButton();
            this.pageBar1 = new UserControls.Data.UcPageBar();
            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
            this.xtraTabControl1.SuspendLayout();
            this.xtraTabPage1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).BeginInit();
            this.panelControl1.SuspendLayout();
            this.SuspendLayout();
@@ -63,8 +57,8 @@
            this.gcMain.Location = new System.Drawing.Point(0, 0);
            this.gcMain.MainView = this.gridView1;
            this.gcMain.Name = "gcMain";
            this.gcMain.Size = new System.Drawing.Size(1054, 607);
            this.gcMain.TabIndex = 1;
            this.gcMain.Size = new System.Drawing.Size(1056, 639);
            this.gcMain.TabIndex = 4;
            this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gridView1});
            // 
@@ -250,34 +244,14 @@
            this.gridColumn1.OptionsColumn.ReadOnly = true;
            this.gridColumn1.Width = 94;
            // 
            // xtraTabControl1
            //
            this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.xtraTabControl1.Location = new System.Drawing.Point(0, 0);
            this.xtraTabControl1.Name = "xtraTabControl1";
            this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
            this.xtraTabControl1.Size = new System.Drawing.Size(1056, 682);
            this.xtraTabControl1.TabIndex = 3;
            this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
            this.xtraTabPage1});
            //
            // xtraTabPage1
            //
            this.xtraTabPage1.Controls.Add(this.gcMain);
            this.xtraTabPage1.Controls.Add(this.panelControl1);
            this.xtraTabPage1.Name = "xtraTabPage1";
            this.xtraTabPage1.Size = new System.Drawing.Size(1054, 650);
            this.xtraTabPage1.Text = "请选择采需要退货的明细";
            //
            // panelControl1
            // 
            this.panelControl1.Controls.Add(this.btnIn);
            this.panelControl1.Controls.Add(this.pageBar1);
            this.panelControl1.Dock = System.Windows.Forms.DockStyle.Bottom;
            this.panelControl1.Location = new System.Drawing.Point(0, 607);
            this.panelControl1.Location = new System.Drawing.Point(0, 639);
            this.panelControl1.Name = "panelControl1";
            this.panelControl1.Size = new System.Drawing.Size(1054, 43);
            this.panelControl1.TabIndex = 4;
            this.panelControl1.Size = new System.Drawing.Size(1056, 43);
            this.panelControl1.TabIndex = 5;
            // 
            // btnIn
            // 
@@ -289,24 +263,13 @@
            this.btnIn.TabIndex = 4;
            this.btnIn.Text = "确定导入";
            // 
            // pageBar1
            //
            this.pageBar1.CurrentPage = 1;
            this.pageBar1.Dock = System.Windows.Forms.DockStyle.Right;
            this.pageBar1.Location = new System.Drawing.Point(68, 2);
            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(984, 39);
            this.pageBar1.TabIndex = 3;
            this.pageBar1.TotalPages = 0;
            //
            // SelectShuoTuiSq
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
            this.ClientSize = new System.Drawing.Size(1056, 682);
            this.Controls.Add(this.xtraTabControl1);
            this.Controls.Add(this.gcMain);
            this.Controls.Add(this.panelControl1);
            this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
            this.MaximizeBox = false;
            this.MinimizeBox = false;
@@ -316,34 +279,29 @@
            this.TopMost = true;
            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
            this.xtraTabControl1.ResumeLayout(false);
            this.xtraTabPage1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).EndInit();
            this.panelControl1.ResumeLayout(false);
            this.ResumeLayout(false);
        }
        #endregion
        private DevExpress.XtraGrid.GridControl gcMain;
        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
        private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
        private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
        private UserControls.Data.UcPageBar pageBar1;
        private DevExpress.XtraGrid.Columns.GridColumn gv_supplierItemName;
        private DevExpress.XtraGrid.Columns.GridColumn gv_supplierItemCode;
        private DevExpress.XtraGrid.Columns.GridColumn gv_purchaseUnit;
        private DevExpress.XtraGrid.Columns.GridColumn gv_guid;
        private DevExpress.XtraGrid.Columns.GridColumn gv_chk;
        private DevExpress.XtraEditors.PanelControl panelControl1;
        private DevExpress.XtraEditors.SimpleButton btnIn;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
        private DevExpress.XtraGrid.Columns.GridColumn gv_supplierItemCode;
        private DevExpress.XtraGrid.Columns.GridColumn gv_supplierItemName;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
        private DevExpress.XtraGrid.Columns.GridColumn gv_purchaseUnit;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
        private DevExpress.XtraEditors.PanelControl panelControl1;
        private DevExpress.XtraEditors.SimpleButton btnIn;
    }
}
DevApp/Gs.DevApp/DevFrm/Warehouse/SelectShuoTuiSq.cs
ÎļþÃû´Ó DevApp/Gs.DevApp/UserControl/SelectShuoTuiSq.cs ÐÞ¸Ä
@@ -8,9 +8,7 @@
{
    public partial class SelectShuoTuiSq : DevExpress.XtraEditors.XtraForm
    {
        private readonly List<FilterEntity> _filterList =
             new List<FilterEntity>();
        private readonly string _webServiceName = "MesShouTuiManager/";
        private string cusId = "";
        private string inOrgId = "";
@@ -30,13 +28,8 @@
            this.inOrgId = _inOrgId;
            this.ckId = _ckId;
            this.isSource = _isSource;
            pageBar1.PagerEvent += PageBar1_PagerEvent;
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", (value) =>
            {
            });
            getPageList(1, UtilityHelper.GetPageSize());
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", null, null, false);
            getPageList(1);
            btnIn.Click += (s, e) =>
            {
                var list = new List<dynamic>();
@@ -73,26 +66,18 @@
        /// </summary>
        public event EventHandler<UpdateParentEventArgs> UpdateParent;
        /// <summary>
        ///     åˆ†é¡µäº‹ä»¶
        /// </summary>
        /// <param name="curPage"></param>
        /// <param name="pageSize"></param>
        private void PageBar1_PagerEvent(int curPage, int pageSize)
        {
            getPageList(curPage, pageSize);
        }
        /// <summary>
        /// </summary>
        /// <param name="curPage">第几页</param>
        /// <param name="pageSize">每页几条</param>
        private void getPageList(int curPage, int pageSize)
        private void getPageList(int curPage)
        {
            var _obj = new
            {
                currentPage = curPage,
                everyPageSize = pageSize,
                everyPageSize = 999999,
                sortName = "",
                keyWhere = "",
                inIsSource = this.isSource,
@@ -112,9 +97,6 @@
                gcMain.ForceInitialize();
                gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
                var dddd = dd.rtnData.pages; //总页
                pageBar1.TotalPages = dddd;
                pageBar1.RecordCount = dd.rtnData.total; //记录总数
                pageBar1.CurrentPage = curPage; //当前页
            }
            catch (Exception ex)
            {
DevApp/Gs.DevApp/DevFrm/Warehouse/SelectShuoTuiSq.resx
DevApp/Gs.DevApp/DevFrm/Work/SelectProcess.cs
@@ -14,10 +14,7 @@
        public SelectProcess()
        {
            InitializeComponent();
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", (value) =>
            {
            });
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", null, null, false);
            getPageList(1);
            btnIn.Click += (s, e) =>
            {
DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -889,12 +889,6 @@
    <Compile Include="UserControl\SelectCgMx.Designer.cs">
      <DependentUpon>SelectCgMx.cs</DependentUpon>
    </Compile>
    <Compile Include="UserControl\SelectCgOutMx.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="UserControl\SelectCgOutMx.Designer.cs">
      <DependentUpon>SelectCgOutMx.cs</DependentUpon>
    </Compile>
    <Compile Include="UserControl\SelectCheckDt.cs">
      <SubType>Form</SubType>
    </Compile>
@@ -925,10 +919,10 @@
    <Compile Include="UserControl\SelectHz.Designer.cs">
      <DependentUpon>SelectHz.cs</DependentUpon>
    </Compile>
    <Compile Include="UserControl\SelectItemTbl.cs">
    <Compile Include="DevFrm\Rk\SelectItemTbl.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="UserControl\SelectItemTbl.Designer.cs">
    <Compile Include="DevFrm\Rk\SelectItemTbl.Designer.cs">
      <DependentUpon>SelectItemTbl.cs</DependentUpon>
    </Compile>
    <Compile Include="UserControl\SelectMesCgthSq.cs">
@@ -943,17 +937,11 @@
    <Compile Include="UserControl\SelectOrg.Designer.cs">
      <DependentUpon>SelectOrg.cs</DependentUpon>
    </Compile>
    <Compile Include="UserControl\SelectShuoTuiSq.cs">
    <Compile Include="DevFrm\Warehouse\SelectShuoTuiSq.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="UserControl\SelectShuoTuiSq.Designer.cs">
    <Compile Include="DevFrm\Warehouse\SelectShuoTuiSq.Designer.cs">
      <DependentUpon>SelectShuoTuiSq.cs</DependentUpon>
    </Compile>
    <Compile Include="UserControl\SelectWomdaahb.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="UserControl\SelectWomdaahb.Designer.cs">
      <DependentUpon>SelectWomdaahb.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\WOM\SelectWompba.cs">
      <SubType>Form</SubType>
@@ -961,10 +949,10 @@
    <Compile Include="DevFrm\WOM\SelectWompba.Designer.cs">
      <DependentUpon>SelectWompba.cs</DependentUpon>
    </Compile>
    <Compile Include="UserControl\SelectWwPc.cs">
    <Compile Include="DevFrm\WW\SelectWwPc.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="UserControl\SelectWwPc.Designer.cs">
    <Compile Include="DevFrm\WW\SelectWwPc.Designer.cs">
      <DependentUpon>SelectWwPc.cs</DependentUpon>
    </Compile>
    <Compile Include="UserControl\ShowFile.cs">
@@ -1497,9 +1485,6 @@
    <EmbeddedResource Include="UserControl\SelectCgMx.resx">
      <DependentUpon>SelectCgMx.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="UserControl\SelectCgOutMx.resx">
      <DependentUpon>SelectCgOutMx.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="UserControl\SelectCheckDt.resx">
      <DependentUpon>SelectCheckDt.cs</DependentUpon>
    </EmbeddedResource>
@@ -1515,7 +1500,7 @@
    <EmbeddedResource Include="UserControl\SelectHz.resx">
      <DependentUpon>SelectHz.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="UserControl\SelectItemTbl.resx">
    <EmbeddedResource Include="DevFrm\Rk\SelectItemTbl.resx">
      <DependentUpon>SelectItemTbl.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="UserControl\SelectMesCgthSq.resx">
@@ -1524,16 +1509,13 @@
    <EmbeddedResource Include="UserControl\SelectOrg.resx">
      <DependentUpon>SelectOrg.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="UserControl\SelectShuoTuiSq.resx">
    <EmbeddedResource Include="DevFrm\Warehouse\SelectShuoTuiSq.resx">
      <DependentUpon>SelectShuoTuiSq.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="UserControl\SelectWomdaahb.resx">
      <DependentUpon>SelectWomdaahb.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\WOM\SelectWompba.resx">
      <DependentUpon>SelectWompba.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="UserControl\SelectWwPc.resx">
    <EmbeddedResource Include="DevFrm\WW\SelectWwPc.resx">
      <DependentUpon>SelectWwPc.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="UserControl\ShowFile.resx">
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -1691,7 +1691,7 @@
        /// <param name="fileName">字段</param>
        /// <param name="icoName">图标路径</param>
        /// <param name="action"></param>
        public static void SetGridViewParameter(GridView gridView1, PictureBox picCheckBox = null, Form fm = null, string fileName = "checkStatus", string icoName = "", DelegateGetModel action = null, DevExpress.Utils.ToolTipController tips = null, bool isSearch = true)
        public static void SetGridViewParameter(GridView gridView1, PictureBox picCheckBox = null, Form fm = null, string fileName = "checkStatus", string icoName = "", DelegateGetModel action = null, DevExpress.Utils.ToolTipController tips = null, bool isPostSearch = true)
        {
            gridView1.PopupMenuShowing += (s, e) =>
            {
@@ -1714,7 +1714,7 @@
            };
            gridView1.OptionsView.ColumnAutoWidth = false;//自动调整列宽
            if (isSearch == true)
            if (isPostSearch == true)
            {
                gridView1.OptionsView.ShowGroupPanel = false;
                gridView1.OptionsCustomization.AllowGroup = false;
@@ -1745,9 +1745,10 @@
                if (column.Tag == null || column.Tag.ToString().EndsWith("edit"))
                    column.OptionsColumn.ReadOnly = false;
                else
                    column.OptionsColumn.ReadOnly = true;
                    //column.OptionsColumn.ReadOnly = true;
                column.OptionsColumn.ReadOnly = !isPostSearch;
                if (isSearch == true)
                if (isPostSearch == true)
                {
                    if (column.Tag == null || column.Tag.ToString().Length <= 0)
                        column.OptionsFilter.AllowAutoFilter = false;
@@ -2033,17 +2034,12 @@
            return isNumeric;
        }
        public static void PrintJiSuan(Form fm, DevExpress.XtraEditors.TextEdit box1, DevExpress.XtraEditors.TextEdit box2, string sum, DevExpress.XtraEditors.RadioGroup rd)
        public static void PrintJiSuan(DevExpress.XtraEditors.TextEdit box1, DevExpress.XtraEditors.TextEdit box2, string sum, DevExpress.XtraEditors.RadioGroup rd)
        {
            if (rd.SelectedIndex == 2)
                return;
            try
            {
                if (fm.ActiveControl is DevExpress.XtraEditors.TextEdit textBox)
                {
                    if (textBox.Name != box1.Name)
                        return;
                }
                string t1 = box1.Text.Trim();
                string t2 = box2.Text.Trim();
                if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric2(t1))
@@ -2069,7 +2065,15 @@
            }
        }
        public static void PrintAuto(DevExpress.XtraEditors.TextEdit txt_psnQty_1, DevExpress.XtraEditors.TextEdit txt_iCount_1, DevExpress.XtraEditors.RadioGroup radOut) {
            txt_psnQty_1.Text = "";
            txt_iCount_1.Text = "";
            radOut.Properties.Items[0].Description = "全自动";
            if (radOut.SelectedIndex == 2)
                txt_iCount_1.ReadOnly = false;
            else
                txt_iCount_1.ReadOnly = true;
        }
        public static decimal PrintYuLiang(DevExpress.XtraEditors.RadioGroup rd)
        {
            decimal dc = 0;
DevApp/Gs.DevApp/UserControl/SelectCgMx.cs
@@ -26,10 +26,7 @@
            radioGroup1.SelectedIndex = 0;
            this.suppId = _suppId;
            this.receiveOrgId = _receiveOrgId;
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", (value) =>
            {
            },null,false);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", null, null, false);
            getPageList(1);
            btnIn.Click += (s, e) =>
            {
DevApp/Gs.DevApp/UserControl/SelectCgOutMx.Designer.cs
ÎļþÒÑɾ³ý
DevApp/Gs.DevApp/UserControl/SelectCgOutMx.cs
ÎļþÒÑɾ³ý
DevApp/Gs.DevApp/UserControl/SelectCgOutMx.resx
ÎļþÒÑɾ³ý
DevApp/Gs.DevApp/UserControl/SelectCk.cs
@@ -23,7 +23,7 @@
            _strGuid = strGuid;
            InitializeComponent();
            getPageList(1);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", null, null, false);
        }
        /// <summary>
        /// æŸ¥è¯¢äº‹ä»¶
DevApp/Gs.DevApp/UserControl/SelectCw.cs
@@ -24,7 +24,7 @@
            _strGuid = strGuid;
            InitializeComponent();
            getPageList(1);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", null, null, false);
        }
        /// <summary>
        /// æŸ¥è¯¢äº‹ä»¶
DevApp/Gs.DevApp/UserControl/SelectHz.cs
@@ -42,7 +42,7 @@
                    getPageListCus(1);
                    break;
            }
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", null, null, false);
        }
        /// <summary>
DevApp/Gs.DevApp/UserControl/SelectMesCgthSq.Designer.cs
@@ -50,7 +50,7 @@
            this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
            this.btnIn = new DevExpress.XtraEditors.SimpleButton();
            this.pageBar1 = new UserControls.Data.UcPageBar();
            this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
            ((System.ComponentModel.ISupportInitialize)(this.panelControl3)).BeginInit();
            this.panelControl3.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.radioGroup1.Properties)).BeginInit();
@@ -93,7 +93,6 @@
            // gcMain
            // 
            this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
            this.gcMain.Location = new System.Drawing.Point(0, 38);
            this.gcMain.MainView = this.gridView1;
            this.gcMain.Name = "gcMain";
@@ -106,7 +105,6 @@
            // 
            this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
            this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
            this.gridView1.Appearance.Row.Options.UseFont = true;
            this.gridView1.ColumnPanelRowHeight = 50;
            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
@@ -124,7 +122,8 @@
            this.gridColumn10,
            this.gridColumn2,
            this.gridColumn1,
            this.gridColumn8});
            this.gridColumn8,
            this.gridColumn11});
            this.gridView1.GridControl = this.gcMain;
            this.gridView1.IndicatorWidth = 50;
            this.gridView1.Name = "gridView1";
@@ -136,7 +135,6 @@
            // 
            // gv_guid
            // 
            this.gv_guid.AppearanceCell.Options.UseFont = true;
            this.gv_guid.Caption = "主键不能删除";
            this.gv_guid.FieldName = "rkmxGuid";
@@ -156,22 +154,22 @@
            this.gridColumn3.Name = "gridColumn3";
            this.gridColumn3.OptionsColumn.ReadOnly = true;
            this.gridColumn3.Visible = true;
            this.gridColumn3.VisibleIndex = 1;
            this.gridColumn3.VisibleIndex = 10;
            this.gridColumn3.Width = 50;
            // 
            // gridColumn4
            // 
            this.gridColumn4.Caption = "入库单号";
            this.gridColumn4.FieldName = "invBillNo";
            this.gridColumn4.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left;
            this.gridColumn4.MinWidth = 25;
            this.gridColumn4.Name = "gridColumn4";
            this.gridColumn4.Visible = true;
            this.gridColumn4.VisibleIndex = 2;
            this.gridColumn4.VisibleIndex = 1;
            this.gridColumn4.Width = 94;
            // 
            // gv_billNo
            // 
            this.gv_billNo.AppearanceCell.Options.UseFont = true;
            this.gv_billNo.Caption = "采购单号";
            this.gv_billNo.FieldName = "ebeln";
@@ -180,35 +178,35 @@
            this.gv_billNo.OptionsColumn.ReadOnly = true;
            this.gv_billNo.Tag = "query_a.BILL_NO";
            this.gv_billNo.Visible = true;
            this.gv_billNo.VisibleIndex = 3;
            this.gv_billNo.VisibleIndex = 9;
            this.gv_billNo.Width = 110;
            // 
            // gv_supplierItemCode
            // 
            this.gv_supplierItemCode.AppearanceCell.Options.UseFont = true;
            this.gv_supplierItemCode.Caption = "物料编码";
            this.gv_supplierItemCode.FieldName = "wlbm";
            this.gv_supplierItemCode.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left;
            this.gv_supplierItemCode.Name = "gv_supplierItemCode";
            this.gv_supplierItemCode.OptionsColumn.AllowEdit = false;
            this.gv_supplierItemCode.OptionsColumn.ReadOnly = true;
            this.gv_supplierItemCode.Tag = "query_a.SUPPLIER_ITEM_CODE";
            this.gv_supplierItemCode.Visible = true;
            this.gv_supplierItemCode.VisibleIndex = 4;
            this.gv_supplierItemCode.VisibleIndex = 2;
            this.gv_supplierItemCode.Width = 100;
            // 
            // gv_supplierItemName
            // 
            this.gv_supplierItemName.AppearanceCell.Options.UseFont = true;
            this.gv_supplierItemName.Caption = "物料名称";
            this.gv_supplierItemName.FieldName = "wlmc";
            this.gv_supplierItemName.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left;
            this.gv_supplierItemName.Name = "gv_supplierItemName";
            this.gv_supplierItemName.OptionsColumn.AllowEdit = false;
            this.gv_supplierItemName.OptionsColumn.ReadOnly = true;
            this.gv_supplierItemName.Tag = "query_a.SUPPLIER_ITEM_NAME";
            this.gv_supplierItemName.Visible = true;
            this.gv_supplierItemName.VisibleIndex = 5;
            this.gv_supplierItemName.VisibleIndex = 3;
            this.gv_supplierItemName.Width = 120;
            // 
            // gridColumn5
@@ -217,8 +215,6 @@
            this.gridColumn5.FieldName = "wlgg";
            this.gridColumn5.Name = "gridColumn5";
            this.gridColumn5.OptionsColumn.ReadOnly = true;
            this.gridColumn5.Visible = true;
            this.gridColumn5.VisibleIndex = 6;
            this.gridColumn5.Width = 250;
            // 
            // gridColumn6
@@ -230,7 +226,7 @@
            this.gridColumn6.Name = "gridColumn6";
            this.gridColumn6.OptionsColumn.ReadOnly = true;
            this.gridColumn6.Visible = true;
            this.gridColumn6.VisibleIndex = 7;
            this.gridColumn6.VisibleIndex = 4;
            this.gridColumn6.Width = 50;
            // 
            // gridColumn7
@@ -242,28 +238,23 @@
            this.gridColumn7.Name = "gridColumn7";
            this.gridColumn7.OptionsColumn.ReadOnly = true;
            this.gridColumn7.Visible = true;
            this.gridColumn7.VisibleIndex = 8;
            this.gridColumn7.VisibleIndex = 5;
            this.gridColumn7.Width = 50;
            // 
            // gridColumn9
            // 
            this.gridColumn9.AppearanceCell.ForeColor = System.Drawing.Color.Red;
            this.gridColumn9.AppearanceCell.Options.UseForeColor = true;
            this.gridColumn9.AppearanceHeader.ForeColor = System.Drawing.Color.Red;
            this.gridColumn9.AppearanceHeader.Options.UseForeColor = true;
            this.gridColumn9.Caption = "已退数量";
            this.gridColumn9.FieldName = "yt";
            this.gridColumn9.FieldName = "ytsl";
            this.gridColumn9.MaxWidth = 50;
            this.gridColumn9.MinWidth = 50;
            this.gridColumn9.Name = "gridColumn9";
            this.gridColumn9.OptionsColumn.ReadOnly = true;
            this.gridColumn9.Visible = true;
            this.gridColumn9.VisibleIndex = 9;
            this.gridColumn9.VisibleIndex = 6;
            this.gridColumn9.Width = 50;
            // 
            // gv_purchaseUnit
            // 
            this.gv_purchaseUnit.AppearanceCell.Options.UseFont = true;
            this.gv_purchaseUnit.Caption = "可退数量";
            this.gv_purchaseUnit.FieldName = "kt";
@@ -281,7 +272,7 @@
            this.gridColumn10.FieldName = "gysName";
            this.gridColumn10.Name = "gridColumn10";
            this.gridColumn10.Visible = true;
            this.gridColumn10.VisibleIndex = 10;
            this.gridColumn10.VisibleIndex = 8;
            this.gridColumn10.Width = 125;
            // 
            // gridColumn2
@@ -314,7 +305,6 @@
            // panelControl1
            // 
            this.panelControl1.Controls.Add(this.btnIn);
            this.panelControl1.Controls.Add(this.pageBar1);
            this.panelControl1.Dock = System.Windows.Forms.DockStyle.Bottom;
            this.panelControl1.Location = new System.Drawing.Point(0, 639);
            this.panelControl1.Name = "panelControl1";
@@ -333,17 +323,19 @@
            this.btnIn.TabIndex = 4;
            this.btnIn.Text = "确定导入";
            // 
            // pageBar1
            // gridColumn11
            // 
            this.pageBar1.CurrentPage = 1;
            this.pageBar1.Dock = System.Windows.Forms.DockStyle.Left;
            this.pageBar1.Location = new System.Drawing.Point(2, 2);
            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(984, 39);
            this.pageBar1.TabIndex = 3;
            this.pageBar1.TotalPages = 0;
            this.gridColumn11.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
            this.gridColumn11.AppearanceCell.Options.UseForeColor = true;
            this.gridColumn11.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
            this.gridColumn11.AppearanceHeader.Options.UseForeColor = true;
            this.gridColumn11.Caption = "可退数量";
            this.gridColumn11.FieldName = "ktsl";
            this.gridColumn11.MinWidth = 25;
            this.gridColumn11.Name = "gridColumn11";
            this.gridColumn11.Visible = true;
            this.gridColumn11.VisibleIndex = 7;
            this.gridColumn11.Width = 94;
            // 
            // SelectMesCgthSq
            // 
@@ -358,7 +350,7 @@
            this.MinimizeBox = false;
            this.Name = "SelectMesCgthSq";
            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
            this.Text = "选择退货明细";
            this.Text = "选择退货明细,只显示可退数量大于0的";
            this.TopMost = true;
            ((System.ComponentModel.ISupportInitialize)(this.panelControl3)).EndInit();
            this.panelControl3.ResumeLayout(false);
@@ -394,7 +386,7 @@
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
        private DevExpress.XtraEditors.PanelControl panelControl1;
        private DevExpress.XtraEditors.SimpleButton btnIn;
        private UserControls.Data.UcPageBar pageBar1;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
    }
}
DevApp/Gs.DevApp/UserControl/SelectMesCgthSq.cs
@@ -1,23 +1,14 @@
using DevExpress.XtraEditors;
using Gs.DevApp.ToolBox;
using Gs.DevApp.ToolBox;
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.UserControl
{
    public partial class SelectMesCgthSq : DevExpress.XtraEditors.XtraForm
    {
        private readonly List<FilterEntity> _filterList =
             new List<FilterEntity>();
        private readonly string _webServiceName = "MesCgthSqManager/";
        private string suppId = "";
        private string receiveOrgId = "";
@@ -33,12 +24,8 @@
            radioGroup1.SelectedIndex = 0;
            this.suppId = _suppId;
            this.receiveOrgId = _receiveOrgId;
            pageBar1.PagerEvent += PageBar1_PagerEvent;
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", (value) =>
            {
            });
            getPageList(1, UtilityHelper.GetPageSize());
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", null, null, false);
            getPageList(1);
            btnIn.Click += (s, e) =>
            {
                var list = new List<string>();
@@ -55,7 +42,7 @@
            };
            radioGroup1.SelectedIndexChanged += (s, e) =>
            {
                getPageList(1, UtilityHelper.GetPageSize());
                getPageList(1);
            };
        }
@@ -69,21 +56,21 @@
        /// </summary>
        /// <param name="curPage"></param>
        /// <param name="pageSize"></param>
        private void PageBar1_PagerEvent(int curPage, int pageSize)
        private void PageBar1_PagerEvent(int curPage)
        {
            getPageList(curPage, pageSize);
            getPageList(curPage);
        }
        /// <summary>
        /// </summary>
        /// <param name="curPage">第几页</param>
        /// <param name="pageSize">每页几条</param>
        private void getPageList(int curPage, int pageSize)
        private void getPageList(int curPage)
        {
            var _obj = new
            {
                currentPage = curPage,
                everyPageSize = pageSize,
                everyPageSize = 999999,
                sortName = "",
                keyWhere = "",
             //   inIsWw = this.isWw,
@@ -102,10 +89,6 @@
                gcMain.DataSource = dt;
                gcMain.ForceInitialize();
                gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
                var dddd = dd.rtnData.pages; //总页
                pageBar1.TotalPages = dddd;
                pageBar1.RecordCount = dd.rtnData.total; //记录总数
                pageBar1.CurrentPage = curPage; //当前页
            }
            catch (Exception ex)
            {
DevApp/Gs.DevApp/UserControl/SelectOrg.cs
@@ -16,7 +16,7 @@
        {
            InitializeComponent();
            getPageList(1);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", null, null, false);
        }
        /// <summary>
        /// æŸ¥è¯¢äº‹ä»¶
DevApp/Gs.DevApp/UserControl/SelectWomdaahb.Designer.cs
ÎļþÒÑɾ³ý
DevApp/Gs.DevApp/UserControl/SelectWomdaahb.cs
ÎļþÒÑɾ³ý
DevApp/Gs.DevApp/UserControl/SelectWomdaahb.resx
ÎļþÒÑɾ³ý
DevApp/Gs.DevApp/UserControl/SelectWwPc.cs
ÎļþÒÑɾ³ý