lu
2025-04-12 813daab971b161ad4f40cbeb5b19b70a5b160aa2
生产退料
已修改9个文件
385 ■■■■ 文件已修改
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs 151 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl_RK.Designer.cs 110 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesScrkDj.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/SelectCgMx.cs 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/SelectItemTbl.Designer.cs 41 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/SelectItemTbl.cs 36 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/UcLookDaa.Designer.cs 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/UcLookDaa.cs 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs
@@ -371,8 +371,6 @@
            this.gv_tbl020.Name = "gv_tbl020";
            this.gv_tbl020.OptionsColumn.AllowEdit = false;
            this.gv_tbl020.Tag = "query_a.tbl020";
            this.gv_tbl020.Visible = true;
            this.gv_tbl020.VisibleIndex = 1;
            this.gv_tbl020.Width = 50;
            // 
            // gridColumn5
@@ -383,7 +381,7 @@
            this.gridColumn5.Name = "gridColumn5";
            this.gridColumn5.Tag = "org.fnamber";
            this.gridColumn5.Visible = true;
            this.gridColumn5.VisibleIndex = 2;
            this.gridColumn5.VisibleIndex = 1;
            this.gridColumn5.Width = 94;
            // 
            // gv_billNo
@@ -396,7 +394,7 @@
            this.gv_billNo.OptionsColumn.AllowEdit = false;
            this.gv_billNo.Tag = "query_a.bill_no";
            this.gv_billNo.Visible = true;
            this.gv_billNo.VisibleIndex = 3;
            this.gv_billNo.VisibleIndex = 2;
            this.gv_billNo.Width = 94;
            // 
            // gv_tbl003
@@ -409,7 +407,7 @@
            this.gv_tbl003.OptionsColumn.AllowEdit = false;
            this.gv_tbl003.Tag = "query_a.tbl003";
            this.gv_tbl003.Visible = true;
            this.gv_tbl003.VisibleIndex = 4;
            this.gv_tbl003.VisibleIndex = 3;
            this.gv_tbl003.Width = 94;
            // 
            // gv_tbl002
@@ -422,7 +420,7 @@
            this.gv_tbl002.OptionsColumn.AllowEdit = false;
            this.gv_tbl002.Tag = "query_a.tbl002";
            this.gv_tbl002.Visible = true;
            this.gv_tbl002.VisibleIndex = 5;
            this.gv_tbl002.VisibleIndex = 4;
            this.gv_tbl002.Width = 94;
            // 
            // gv_tbl021
@@ -435,7 +433,7 @@
            this.gv_tbl021.OptionsColumn.AllowEdit = false;
            this.gv_tbl021.Tag = "query_a.tbl021";
            this.gv_tbl021.Visible = true;
            this.gv_tbl021.VisibleIndex = 6;
            this.gv_tbl021.VisibleIndex = 5;
            this.gv_tbl021.Width = 94;
            // 
            // gridColumn6
@@ -445,7 +443,7 @@
            this.gridColumn6.MinWidth = 25;
            this.gridColumn6.Name = "gridColumn6";
            this.gridColumn6.Visible = true;
            this.gridColumn6.VisibleIndex = 7;
            this.gridColumn6.VisibleIndex = 6;
            this.gridColumn6.Width = 94;
            // 
            // gridColumn10
@@ -455,7 +453,7 @@
            this.gridColumn10.MinWidth = 25;
            this.gridColumn10.Name = "gridColumn10";
            this.gridColumn10.Visible = true;
            this.gridColumn10.VisibleIndex = 8;
            this.gridColumn10.VisibleIndex = 7;
            this.gridColumn10.Width = 94;
            // 
            // gv_tbl004
@@ -468,7 +466,7 @@
            this.gv_tbl004.OptionsColumn.AllowEdit = false;
            this.gv_tbl004.Tag = "query_a.tbl004";
            this.gv_tbl004.Visible = true;
            this.gv_tbl004.VisibleIndex = 9;
            this.gv_tbl004.VisibleIndex = 8;
            this.gv_tbl004.Width = 94;
            // 
            // gv_tbl005
@@ -481,7 +479,7 @@
            this.gv_tbl005.OptionsColumn.AllowEdit = false;
            this.gv_tbl005.Tag = "query_a.tbl005";
            this.gv_tbl005.Visible = true;
            this.gv_tbl005.VisibleIndex = 10;
            this.gv_tbl005.VisibleIndex = 9;
            this.gv_tbl005.Width = 94;
            // 
            // gv_tbl009
@@ -494,7 +492,7 @@
            this.gv_tbl009.OptionsColumn.AllowEdit = false;
            this.gv_tbl009.Tag = "query_a.tbl009";
            this.gv_tbl009.Visible = true;
            this.gv_tbl009.VisibleIndex = 11;
            this.gv_tbl009.VisibleIndex = 10;
            this.gv_tbl009.Width = 94;
            // 
            // gv_tbl010
@@ -507,7 +505,7 @@
            this.gv_tbl010.OptionsColumn.AllowEdit = false;
            this.gv_tbl010.Tag = "query_a.tbl010";
            this.gv_tbl010.Visible = true;
            this.gv_tbl010.VisibleIndex = 12;
            this.gv_tbl010.VisibleIndex = 11;
            this.gv_tbl010.Width = 94;
            // 
            // gv_tbl011
@@ -520,7 +518,7 @@
            this.gv_tbl011.OptionsColumn.AllowEdit = false;
            this.gv_tbl011.Tag = "query_a.tbl011";
            this.gv_tbl011.Visible = true;
            this.gv_tbl011.VisibleIndex = 13;
            this.gv_tbl011.VisibleIndex = 12;
            this.gv_tbl011.Width = 94;
            // 
            // gv_tbl012
@@ -533,7 +531,7 @@
            this.gv_tbl012.OptionsColumn.AllowEdit = false;
            this.gv_tbl012.Tag = "query_a.tbl012";
            this.gv_tbl012.Visible = true;
            this.gv_tbl012.VisibleIndex = 14;
            this.gv_tbl012.VisibleIndex = 13;
            this.gv_tbl012.Width = 94;
            // 
            // gridColumn11
@@ -551,7 +549,7 @@
            this.gridColumn12.MinWidth = 25;
            this.gridColumn12.Name = "gridColumn12";
            this.gridColumn12.Visible = true;
            this.gridColumn12.VisibleIndex = 15;
            this.gridColumn12.VisibleIndex = 14;
            this.gridColumn12.Width = 94;
            // 
            // pageBar1
@@ -650,7 +648,7 @@
            this.txt_tbl023.IsReadly = false;
            this.txt_tbl023.Location = new System.Drawing.Point(84, 43);
            this.txt_tbl023.Name = "txt_tbl023";
            this.txt_tbl023.Size = new System.Drawing.Size(200, 24);
            this.txt_tbl023.Size = new System.Drawing.Size(195, 24);
            this.txt_tbl023.TabIndex = 462;
            // 
            // txt_tbl005
@@ -666,43 +664,44 @@
            "来料不良退料",
            "作业不良退料"});
            this.txt_tbl005.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
            this.txt_tbl005.Size = new System.Drawing.Size(200, 24);
            this.txt_tbl005.Size = new System.Drawing.Size(195, 24);
            this.txt_tbl005.StyleController = this.layoutMx1;
            this.txt_tbl005.TabIndex = 459;
            // 
            // txt_tbl006
            // 
            this.txt_tbl006.Location = new System.Drawing.Point(360, 105);
            this.txt_tbl006.Location = new System.Drawing.Point(355, 105);
            this.txt_tbl006.Name = "txt_tbl006";
            this.txt_tbl006.Properties.Appearance.Options.UseFont = true;
            this.txt_tbl006.Size = new System.Drawing.Size(476, 24);
            this.txt_tbl006.Size = new System.Drawing.Size(466, 24);
            this.txt_tbl006.StyleController = this.layoutMx1;
            this.txt_tbl006.TabIndex = 226;
            // 
            // txt_tbl002
            // 
            this.txt_tbl002.category = null;
            this.txt_tbl002.IsReadly = false;
            this.txt_tbl002.Location = new System.Drawing.Point(84, 74);
            this.txt_tbl002.Name = "txt_tbl002";
            this.txt_tbl002.Size = new System.Drawing.Size(200, 24);
            this.txt_tbl002.Size = new System.Drawing.Size(195, 24);
            this.txt_tbl002.TabIndex = 458;
            // 
            // txt_workName
            // 
            this.txt_workName.Location = new System.Drawing.Point(360, 74);
            this.txt_workName.Location = new System.Drawing.Point(355, 74);
            this.txt_workName.Name = "txt_workName";
            this.txt_workName.Properties.Appearance.Options.UseFont = true;
            this.txt_workName.Size = new System.Drawing.Size(200, 24);
            this.txt_workName.Size = new System.Drawing.Size(195, 24);
            this.txt_workName.StyleController = this.layoutMx1;
            this.txt_workName.TabIndex = 298;
            this.txt_workName.Tag = "readonly";
            // 
            // txt_tbl012
            // 
            this.txt_tbl012.Location = new System.Drawing.Point(912, 43);
            this.txt_tbl012.Location = new System.Drawing.Point(897, 43);
            this.txt_tbl012.Name = "txt_tbl012";
            this.txt_tbl012.Properties.Appearance.Options.UseFont = true;
            this.txt_tbl012.Size = new System.Drawing.Size(202, 24);
            this.txt_tbl012.Size = new System.Drawing.Size(196, 24);
            this.txt_tbl012.StyleController = this.layoutMx1;
            this.txt_tbl012.TabIndex = 247;
            this.txt_tbl012.Tag = "readonly";
@@ -712,84 +711,84 @@
            this.txt_billNo.Location = new System.Drawing.Point(84, 12);
            this.txt_billNo.Name = "txt_billNo";
            this.txt_billNo.Properties.Appearance.Options.UseFont = true;
            this.txt_billNo.Size = new System.Drawing.Size(200, 24);
            this.txt_billNo.Size = new System.Drawing.Size(195, 24);
            this.txt_billNo.StyleController = this.layoutMx1;
            this.txt_billNo.TabIndex = 211;
            this.txt_billNo.Tag = "readonly";
            // 
            // txt_rwd
            // 
            this.txt_rwd.Location = new System.Drawing.Point(912, 136);
            this.txt_rwd.Location = new System.Drawing.Point(897, 136);
            this.txt_rwd.Name = "txt_rwd";
            this.txt_rwd.Properties.Appearance.Options.UseFont = true;
            this.txt_rwd.Size = new System.Drawing.Size(202, 24);
            this.txt_rwd.Size = new System.Drawing.Size(196, 24);
            this.txt_rwd.StyleController = this.layoutMx1;
            this.txt_rwd.TabIndex = 217;
            this.txt_rwd.Tag = "readonly";
            // 
            // txt_tbl011
            // 
            this.txt_tbl011.Location = new System.Drawing.Point(912, 12);
            this.txt_tbl011.Location = new System.Drawing.Point(897, 12);
            this.txt_tbl011.Name = "txt_tbl011";
            this.txt_tbl011.Properties.Appearance.Options.UseFont = true;
            this.txt_tbl011.Size = new System.Drawing.Size(202, 24);
            this.txt_tbl011.Size = new System.Drawing.Size(196, 24);
            this.txt_tbl011.StyleController = this.layoutMx1;
            this.txt_tbl011.TabIndex = 243;
            this.txt_tbl011.Tag = "readonly";
            // 
            // txt_itemName
            // 
            this.txt_itemName.Location = new System.Drawing.Point(360, 12);
            this.txt_itemName.Location = new System.Drawing.Point(355, 12);
            this.txt_itemName.Name = "txt_itemName";
            this.txt_itemName.Properties.Appearance.Options.UseFont = true;
            this.txt_itemName.Size = new System.Drawing.Size(200, 24);
            this.txt_itemName.Size = new System.Drawing.Size(195, 24);
            this.txt_itemName.StyleController = this.layoutMx1;
            this.txt_itemName.TabIndex = 219;
            this.txt_itemName.Tag = "readonly";
            // 
            // txt_tbl013
            // 
            this.txt_tbl013.Location = new System.Drawing.Point(840, 74);
            this.txt_tbl013.Location = new System.Drawing.Point(825, 74);
            this.txt_tbl013.Name = "txt_tbl013";
            this.txt_tbl013.Properties.Caption = "审核状态";
            this.txt_tbl013.Size = new System.Drawing.Size(274, 24);
            this.txt_tbl013.Size = new System.Drawing.Size(268, 24);
            this.txt_tbl013.StyleController = this.layoutMx1;
            this.txt_tbl013.TabIndex = 463;
            this.txt_tbl013.Tag = "readonly";
            // 
            // txt_tbl009
            // 
            this.txt_tbl009.Location = new System.Drawing.Point(636, 12);
            this.txt_tbl009.Location = new System.Drawing.Point(626, 12);
            this.txt_tbl009.Name = "txt_tbl009";
            this.txt_tbl009.Size = new System.Drawing.Size(200, 24);
            this.txt_tbl009.Size = new System.Drawing.Size(195, 24);
            this.txt_tbl009.StyleController = this.layoutMx1;
            this.txt_tbl009.TabIndex = 464;
            this.txt_tbl009.Tag = "readonly";
            // 
            // txt_tbl010
            // 
            this.txt_tbl010.Location = new System.Drawing.Point(636, 43);
            this.txt_tbl010.Location = new System.Drawing.Point(626, 43);
            this.txt_tbl010.Name = "txt_tbl010";
            this.txt_tbl010.Size = new System.Drawing.Size(200, 24);
            this.txt_tbl010.Size = new System.Drawing.Size(195, 24);
            this.txt_tbl010.StyleController = this.layoutMx1;
            this.txt_tbl010.TabIndex = 465;
            this.txt_tbl010.Tag = "readonly";
            // 
            // txt_tbl020
            // 
            this.txt_tbl020.Location = new System.Drawing.Point(564, 74);
            this.txt_tbl020.Location = new System.Drawing.Point(554, 74);
            this.txt_tbl020.Name = "txt_tbl020";
            this.txt_tbl020.Properties.Caption = "完结标识";
            this.txt_tbl020.Size = new System.Drawing.Size(272, 24);
            this.txt_tbl020.Size = new System.Drawing.Size(267, 24);
            this.txt_tbl020.StyleController = this.layoutMx1;
            this.txt_tbl020.TabIndex = 466;
            this.txt_tbl020.Tag = "readonly";
            // 
            // txt_daa003
            // 
            this.txt_daa003.Location = new System.Drawing.Point(360, 43);
            this.txt_daa003.Location = new System.Drawing.Point(355, 43);
            this.txt_daa003.Name = "txt_daa003";
            this.txt_daa003.Size = new System.Drawing.Size(200, 24);
            this.txt_daa003.Size = new System.Drawing.Size(195, 24);
            this.txt_daa003.StyleController = this.layoutMx1;
            this.txt_daa003.TabIndex = 467;
            this.txt_daa003.Tag = "readonly";
@@ -805,9 +804,9 @@
            // 
            // txt_daa014
            // 
            this.txt_daa014.Location = new System.Drawing.Point(912, 105);
            this.txt_daa014.Location = new System.Drawing.Point(897, 105);
            this.txt_daa014.Name = "txt_daa014";
            this.txt_daa014.Size = new System.Drawing.Size(202, 24);
            this.txt_daa014.Size = new System.Drawing.Size(196, 24);
            this.txt_daa014.StyleController = this.layoutMx1;
            this.txt_daa014.TabIndex = 469;
            this.txt_daa014.Tag = "readonly";
@@ -888,7 +887,7 @@
            rowDefinition3,
            rowDefinition4,
            rowDefinition5});
            this.Root.Size = new System.Drawing.Size(1126, 175);
            this.Root.Size = new System.Drawing.Size(1105, 175);
            this.Root.TextVisible = false;
            // 
            // layoutControlItem1
@@ -896,7 +895,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(60, 18);
            // 
@@ -906,7 +905,7 @@
            this.layoutControlItem3.Location = new System.Drawing.Point(0, 31);
            this.layoutControlItem3.Name = "layoutControlItem3";
            this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1;
            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(60, 18);
            // 
@@ -916,7 +915,7 @@
            this.layoutControlItem4.Location = new System.Drawing.Point(0, 62);
            this.layoutControlItem4.Name = "layoutControlItem4";
            this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 2;
            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(60, 18);
            // 
@@ -926,39 +925,39 @@
            this.layoutControlItem5.Location = new System.Drawing.Point(0, 93);
            this.layoutControlItem5.Name = "layoutControlItem5";
            this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 3;
            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(60, 18);
            // 
            // layoutControlItem9
            // 
            this.layoutControlItem9.Control = this.txt_tbl011;
            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(60, 18);
            // 
            // layoutControlItem10
            // 
            this.layoutControlItem10.Control = this.txt_tbl012;
            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(60, 18);
            // 
            // layoutControlItem11
            // 
            this.layoutControlItem11.Control = this.txt_tbl013;
            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;
@@ -966,32 +965,32 @@
            // layoutControlItem12
            // 
            this.layoutControlItem12.Control = this.txt_tbl009;
            this.layoutControlItem12.Location = new System.Drawing.Point(552, 0);
            this.layoutControlItem12.Location = new System.Drawing.Point(542, 0);
            this.layoutControlItem12.Name = "layoutControlItem12";
            this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 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(60, 18);
            // 
            // layoutControlItem13
            // 
            this.layoutControlItem13.Control = this.txt_tbl010;
            this.layoutControlItem13.Location = new System.Drawing.Point(552, 31);
            this.layoutControlItem13.Location = new System.Drawing.Point(542, 31);
            this.layoutControlItem13.Name = "layoutControlItem13";
            this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem13.Size = new System.Drawing.Size(276, 31);
            this.layoutControlItem13.Size = new System.Drawing.Size(271, 31);
            this.layoutControlItem13.Text = "申请时间";
            this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem14
            // 
            this.layoutControlItem14.Control = this.txt_tbl020;
            this.layoutControlItem14.Location = new System.Drawing.Point(552, 62);
            this.layoutControlItem14.Location = new System.Drawing.Point(542, 62);
            this.layoutControlItem14.Name = "layoutControlItem14";
            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 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(0, 0);
            this.layoutControlItem14.TextVisible = false;
@@ -1004,7 +1003,7 @@
            this.layoutControlItem16.MinSize = new System.Drawing.Size(30, 31);
            this.layoutControlItem16.Name = "layoutControlItem16";
            this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 4;
            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);
@@ -1013,66 +1012,66 @@
            // layoutControlItem8
            // 
            this.layoutControlItem8.Control = this.txt_itemName;
            this.layoutControlItem8.Location = new System.Drawing.Point(276, 0);
            this.layoutControlItem8.Location = new System.Drawing.Point(271, 0);
            this.layoutControlItem8.Name = "layoutControlItem8";
            this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem8.Size = new System.Drawing.Size(276, 31);
            this.layoutControlItem8.Size = new System.Drawing.Size(271, 31);
            this.layoutControlItem8.Text = "产品名称";
            this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem18
            // 
            this.layoutControlItem18.Control = this.txt_daa003;
            this.layoutControlItem18.Location = new System.Drawing.Point(276, 31);
            this.layoutControlItem18.Location = new System.Drawing.Point(271, 31);
            this.layoutControlItem18.Name = "layoutControlItem18";
            this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem18.Size = new System.Drawing.Size(276, 31);
            this.layoutControlItem18.Size = new System.Drawing.Size(271, 31);
            this.layoutControlItem18.Text = "产品编号";
            this.layoutControlItem18.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem6
            // 
            this.layoutControlItem6.Control = this.txt_workName;
            this.layoutControlItem6.Location = new System.Drawing.Point(276, 62);
            this.layoutControlItem6.Location = new System.Drawing.Point(271, 62);
            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.Text = "生产车间";
            this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
            // 
            // lab_daa014
            // 
            this.lab_daa014.Control = this.txt_daa014;
            this.lab_daa014.Location = new System.Drawing.Point(828, 93);
            this.lab_daa014.Location = new System.Drawing.Point(813, 93);
            this.lab_daa014.Name = "lab_daa014";
            this.lab_daa014.OptionsTableLayoutItem.ColumnIndex = 3;
            this.lab_daa014.OptionsTableLayoutItem.RowIndex = 3;
            this.lab_daa014.Size = new System.Drawing.Size(278, 31);
            this.lab_daa014.Size = new System.Drawing.Size(272, 31);
            this.lab_daa014.Text = "投料单号";
            this.lab_daa014.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem2
            // 
            this.layoutControlItem2.Control = this.txt_rwd;
            this.layoutControlItem2.Location = new System.Drawing.Point(828, 124);
            this.layoutControlItem2.Location = new System.Drawing.Point(813, 124);
            this.layoutControlItem2.Name = "layoutControlItem2";
            this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 4;
            this.layoutControlItem2.Size = new System.Drawing.Size(278, 31);
            this.layoutControlItem2.Size = new System.Drawing.Size(272, 31);
            this.layoutControlItem2.Text = "任务单号";
            this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem15
            // 
            this.layoutControlItem15.Control = this.txt_tbl006;
            this.layoutControlItem15.Location = new System.Drawing.Point(276, 93);
            this.layoutControlItem15.Location = new System.Drawing.Point(271, 93);
            this.layoutControlItem15.Name = "layoutControlItem15";
            this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem15.OptionsTableLayoutItem.ColumnSpan = 2;
            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem15.Size = new System.Drawing.Size(552, 31);
            this.layoutControlItem15.Size = new System.Drawing.Size(542, 31);
            this.layoutControlItem15.Text = "备注说明";
            this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
            // 
@@ -1136,7 +1135,7 @@
            // gvMx1tlid
            // 
            this.gvMx1tlid.AppearanceCell.Options.UseFont = true;
            this.gvMx1tlid.Caption = "tlid";
            this.gvMx1tlid.Caption = "申请明细表主键";
            this.gvMx1tlid.FieldName = "tlid";
            this.gvMx1tlid.MinWidth = 50;
            this.gvMx1tlid.Name = "gvMx1tlid";
@@ -1338,7 +1337,7 @@
            // 
            // lbMxGuid
            // 
            this.lbMxGuid.Location = new System.Drawing.Point(821, 14);
            this.lbMxGuid.Location = new System.Drawing.Point(1034, 10);
            this.lbMxGuid.Name = "lbMxGuid";
            this.lbMxGuid.Size = new System.Drawing.Size(58, 18);
            this.lbMxGuid.TabIndex = 229;
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl_RK.Designer.cs
@@ -29,15 +29,15 @@
        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.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 rowDefinition16 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition17 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition18 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition19 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition20 = new DevExpress.XtraLayout.RowDefinition();
            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -133,6 +133,8 @@
            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.picCheckBox = new System.Windows.Forms.PictureBox();
            this.tips = new DevExpress.Utils.ToolTipController(this.components);
            this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
            this.xtraTabControl1.SuspendLayout();
            this.xtraTabPage1.SuspendLayout();
@@ -253,7 +255,7 @@
            // 
            this.split1.Panel2.Text = "Panel2";
            this.split1.Size = new System.Drawing.Size(1346, 570);
            this.split1.SplitterPosition = 558;
            this.split1.SplitterPosition = 555;
            this.split1.TabIndex = 4;
            // 
            // gcMain1
@@ -262,7 +264,7 @@
            this.gcMain1.Location = new System.Drawing.Point(0, 0);
            this.gcMain1.MainView = this.gridView1;
            this.gcMain1.Name = "gcMain1";
            this.gcMain1.Size = new System.Drawing.Size(1346, 519);
            this.gcMain1.Size = new System.Drawing.Size(1346, 516);
            this.gcMain1.TabIndex = 2;
            this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gridView1});
@@ -290,7 +292,8 @@
            this.gv_rbillNo,
            this.bandedGridColumn4,
            this.gridColumn7,
            this.gridColumn8});
            this.gridColumn8,
            this.gridColumn10});
            this.gridView1.GridControl = this.gcMain1;
            this.gridView1.IndicatorWidth = 50;
            this.gridView1.Name = "gridView1";
@@ -436,8 +439,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;
@@ -545,7 +548,7 @@
            // 
            this.pageBar1.CurrentPage = 1;
            this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
            this.pageBar1.Location = new System.Drawing.Point(0, 519);
            this.pageBar1.Location = new System.Drawing.Point(0, 516);
            this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
            this.pageBar1.Name = "pageBar1";
            this.pageBar1.RecordCount = 0;
@@ -831,35 +834,35 @@
            this.layoutControlItem17});
            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;
            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;
            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;
            columnDefinition13,
            columnDefinition14,
            columnDefinition15,
            columnDefinition16});
            rowDefinition16.Height = 100D;
            rowDefinition16.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition17.Height = 100D;
            rowDefinition17.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition18.Height = 100D;
            rowDefinition18.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition19.Height = 100D;
            rowDefinition19.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition20.Height = 100D;
            rowDefinition20.SizeType = System.Windows.Forms.SizeType.Percent;
            this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
            rowDefinition1,
            rowDefinition2,
            rowDefinition3,
            rowDefinition4,
            rowDefinition5});
            rowDefinition16,
            rowDefinition17,
            rowDefinition18,
            rowDefinition19,
            rowDefinition20});
            this.Root.Size = new System.Drawing.Size(1346, 168);
            this.Root.TextVisible = false;
            // 
@@ -1234,7 +1237,8 @@
            this.gvMx2quantity,
            this.gvMx2unit,
            this.gridColumn5,
            this.gridColumn6});
            this.gridColumn6,
            this.gridColumn9});
            this.gvMx1.GridControl = this.gcMx1;
            this.gvMx1.Name = "gvMx1";
            this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -1327,6 +1331,24 @@
            this.picCheckBox.TabIndex = 7;
            this.picCheckBox.TabStop = false;
            this.picCheckBox.Visible = false;
            //
            // gridColumn9
            //
            this.gridColumn9.Caption = "申请明细主键";
            this.gridColumn9.FieldName = "itemDabid";
            this.gridColumn9.MinWidth = 25;
            this.gridColumn9.Name = "gridColumn9";
            this.gridColumn9.Width = 94;
            //
            // gridColumn10
            //
            this.gridColumn10.Caption = "退料类型";
            this.gridColumn10.FieldName = "tbl005";
            this.gridColumn10.MinWidth = 25;
            this.gridColumn10.Name = "gridColumn10";
            this.gridColumn10.Visible = true;
            this.gridColumn10.VisibleIndex = 19;
            this.gridColumn10.Width = 94;
            // 
            // Frm_MesItemTbl_RK
            // 
@@ -1503,5 +1525,7 @@
        private DevExpress.XtraEditors.TextEdit txt_guid;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
        private DevExpress.Utils.ToolTipController tips;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
    }
}
DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesScrkDj.cs
@@ -219,6 +219,7 @@
                        gcMx1.DataSource = dt;
                        gcMx1.ForceInitialize();
                        gvMx1.BestFitColumns();
                        Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
                    }
                    else
                    {
@@ -237,6 +238,7 @@
                        gcMx2.DataSource = dt2;
                        gcMx2.ForceInitialize();
                        gvMx2.BestFitColumns();
                        Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx2);
                    }
                    else
                    {
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
@@ -1737,7 +1737,7 @@
            // 
            this.gvMx1dab007.AppearanceCell.Options.UseFont = true;
            this.gvMx1dab007.Caption = "已领用量";
            this.gvMx1dab007.FieldName = "dab007";
            this.gvMx1dab007.FieldName = "ylQty";
            this.gvMx1dab007.MinWidth = 50;
            this.gvMx1dab007.Name = "gvMx1dab007";
            this.gvMx1dab007.Tag = "query_a.dab007";
@@ -1748,6 +1748,7 @@
            // gridColumn14
            // 
            this.gridColumn14.Caption = "剩余可领";
            this.gridColumn14.FieldName = "klQty";
            this.gridColumn14.MinWidth = 25;
            this.gridColumn14.Name = "gridColumn14";
            this.gridColumn14.Visible = true;
DevApp/Gs.DevApp/UserControl/SelectCgMx.cs
@@ -57,16 +57,6 @@
        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);
        }
        /// <summary>
        /// </summary>
        /// <param name="curPage">第几页</param>
        /// <param name="pageSize">每页几条</param>
DevApp/Gs.DevApp/UserControl/SelectItemTbl.Designer.cs
@@ -43,7 +43,6 @@
            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.gcMain)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).BeginInit();
@@ -53,7 +52,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";
@@ -66,7 +64,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[] {
@@ -92,7 +89,6 @@
            // 
            // gv_guid
            // 
            this.gv_guid.AppearanceCell.Options.UseFont = true;
            this.gv_guid.Caption = "主键不能删除";
            this.gv_guid.FieldName = "dabGuid";
@@ -107,31 +103,31 @@
            // 
            this.gridColumn1.Caption = "物料ID";
            this.gridColumn1.FieldName = "itemId";
            this.gridColumn1.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left;
            this.gridColumn1.MinWidth = 80;
            this.gridColumn1.Name = "gridColumn1";
            this.gridColumn1.OptionsColumn.ReadOnly = true;
            this.gridColumn1.Visible = true;
            this.gridColumn1.VisibleIndex = 1;
            this.gridColumn1.VisibleIndex = 2;
            this.gridColumn1.Width = 94;
            // 
            // gv_supplierItemCode
            // 
            this.gv_supplierItemCode.AppearanceCell.Options.UseFont = true;
            this.gv_supplierItemCode.Caption = "物料编码";
            this.gv_supplierItemCode.FieldName = "itemNo";
            this.gv_supplierItemCode.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left;
            this.gv_supplierItemCode.MinWidth = 100;
            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 = 2;
            this.gv_supplierItemCode.VisibleIndex = 3;
            this.gv_supplierItemCode.Width = 100;
            // 
            // gv_supplierItemName
            // 
            this.gv_supplierItemName.AppearanceCell.Options.UseFont = true;
            this.gv_supplierItemName.Caption = "物料名称";
            this.gv_supplierItemName.FieldName = "dab004";
@@ -141,7 +137,7 @@
            this.gv_supplierItemName.OptionsColumn.ReadOnly = true;
            this.gv_supplierItemName.Tag = "query_a.SUPPLIER_ITEM_NAME";
            this.gv_supplierItemName.Visible = true;
            this.gv_supplierItemName.VisibleIndex = 3;
            this.gv_supplierItemName.VisibleIndex = 4;
            this.gv_supplierItemName.Width = 120;
            // 
            // gridColumn5
@@ -152,7 +148,7 @@
            this.gridColumn5.Name = "gridColumn5";
            this.gridColumn5.OptionsColumn.ReadOnly = true;
            this.gridColumn5.Visible = true;
            this.gridColumn5.VisibleIndex = 4;
            this.gridColumn5.VisibleIndex = 9;
            this.gridColumn5.Width = 250;
            // 
            // gridColumn6
@@ -170,7 +166,7 @@
            // gridColumn4
            // 
            this.gridColumn4.Caption = "已领数量";
            this.gridColumn4.FieldName = "dab007";
            this.gridColumn4.FieldName = "ylsl";
            this.gridColumn4.MaxWidth = 50;
            this.gridColumn4.MinWidth = 50;
            this.gridColumn4.Name = "gridColumn4";
@@ -181,7 +177,7 @@
            // gridColumn7
            // 
            this.gridColumn7.Caption = "已退数量";
            this.gridColumn7.FieldName = "ytSl";
            this.gridColumn7.FieldName = "ytsl";
            this.gridColumn7.MinWidth = 25;
            this.gridColumn7.Name = "gridColumn7";
            this.gridColumn7.Visible = true;
@@ -195,7 +191,7 @@
            this.gridColumn8.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
            this.gridColumn8.AppearanceHeader.Options.UseForeColor = true;
            this.gridColumn8.Caption = "可退数量";
            this.gridColumn8.FieldName = "ktSl";
            this.gridColumn8.FieldName = "ktsl";
            this.gridColumn8.MinWidth = 25;
            this.gridColumn8.Name = "gridColumn8";
            this.gridColumn8.Visible = true;
@@ -209,23 +205,23 @@
            this.gridColumn3.MinWidth = 25;
            this.gridColumn3.Name = "gridColumn3";
            this.gridColumn3.Visible = true;
            this.gridColumn3.VisibleIndex = 9;
            this.gridColumn3.VisibleIndex = 10;
            this.gridColumn3.Width = 94;
            // 
            // gridColumn2
            // 
            this.gridColumn2.Caption = "工单号";
            this.gridColumn2.FieldName = "dab001";
            this.gridColumn2.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left;
            this.gridColumn2.MinWidth = 25;
            this.gridColumn2.Name = "gridColumn2";
            this.gridColumn2.Visible = true;
            this.gridColumn2.VisibleIndex = 10;
            this.gridColumn2.VisibleIndex = 1;
            this.gridColumn2.Width = 94;
            // 
            // 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, 542);
            this.panelControl1.Name = "panelControl1";
@@ -243,18 +239,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, 8, 3, 8);
            this.pageBar1.Name = "pageBar1";
            this.pageBar1.RecordCount = 0;
            this.pageBar1.Size = new System.Drawing.Size(1023, 39);
            this.pageBar1.TabIndex = 8;
            this.pageBar1.TotalPages = 0;
            // 
            // SelectItemTbl
            // 
@@ -289,7 +273,6 @@
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
        private DevExpress.XtraEditors.PanelControl panelControl1;
        private DevExpress.XtraEditors.SimpleButton btnIn;
        private UserControls.Data.UcPageBar pageBar1;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
    }
DevApp/Gs.DevApp/UserControl/SelectItemTbl.cs
@@ -1,34 +1,25 @@
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 SelectItemTbl : DevExpress.XtraEditors.XtraForm
    {
        private readonly List<FilterEntity> _filterList =
            new List<FilterEntity>();
        private readonly string _webServiceName = "MesItemTblManager/";
        private string daaGuid = "";
        public SelectItemTbl(string _daaGuid)
        {
            InitializeComponent();
            this.daaGuid = _daaGuid;
            pageBar1.PagerEvent += PageBar1_PagerEvent;
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter( gridView1, null, null, null, "", (value) =>
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", (value) =>
            {
            });
            getPageList(1, UtilityHelper.GetPageSize());
            }, null, false);
            getPageList(1);
            btnIn.Click += (s, e) =>
            {
                var list = new List<string>();
@@ -50,26 +41,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 = "",
                daaGuid = daaGuid
@@ -85,11 +68,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/UcLookDaa.Designer.cs
@@ -38,6 +38,7 @@
            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
            ((System.ComponentModel.ISupportInitialize)(this.lookSearchSupplier.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.searchLookUpEdit1View)).BeginInit();
            this.SuspendLayout();
@@ -52,7 +53,7 @@
            this.lookSearchSupplier.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
            this.lookSearchSupplier.Properties.PopupView = this.searchLookUpEdit1View;
            this.lookSearchSupplier.Size = new System.Drawing.Size(387, 28);
            this.lookSearchSupplier.Size = new System.Drawing.Size(387, 24);
            this.lookSearchSupplier.TabIndex = 10;
            // 
            // searchLookUpEdit1View
@@ -61,10 +62,11 @@
            this.gridColumn5,
            this.gridColumn1,
            this.gridColumn2,
            this.gridColumn3,
            this.gridColumn6,
            this.gridColumn9,
            this.gridColumn8,
            this.gridColumn7,
            this.gridColumn6,
            this.gridColumn3,
            this.gridColumn4});
            this.searchLookUpEdit1View.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus;
            this.searchLookUpEdit1View.Name = "searchLookUpEdit1View";
@@ -103,16 +105,12 @@
            this.gridColumn8.Caption = "任务单号";
            this.gridColumn8.FieldName = "daa021";
            this.gridColumn8.Name = "gridColumn8";
            this.gridColumn8.Visible = true;
            this.gridColumn8.VisibleIndex = 3;
            // 
            // gridColumn7
            // 
            this.gridColumn7.Caption = "规格型号";
            this.gridColumn7.FieldName = "itemModel";
            this.gridColumn7.Name = "gridColumn7";
            this.gridColumn7.Visible = true;
            this.gridColumn7.VisibleIndex = 4;
            // 
            // gridColumn6
            // 
@@ -129,7 +127,7 @@
            this.gridColumn3.MinWidth = 100;
            this.gridColumn3.Name = "gridColumn3";
            this.gridColumn3.Visible = true;
            this.gridColumn3.VisibleIndex = 6;
            this.gridColumn3.VisibleIndex = 3;
            this.gridColumn3.Width = 100;
            // 
            // gridColumn4
@@ -137,6 +135,14 @@
            this.gridColumn4.Caption = "guid";
            this.gridColumn4.FieldName = "guid";
            this.gridColumn4.Name = "gridColumn4";
            //
            // gridColumn9
            //
            this.gridColumn9.Caption = "产品名称";
            this.gridColumn9.FieldName = "itemName";
            this.gridColumn9.Name = "gridColumn9";
            this.gridColumn9.Visible = true;
            this.gridColumn9.VisibleIndex = 5;
            // 
            // UcLookDaa
            // 
@@ -163,5 +169,6 @@
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
    }
}
DevApp/Gs.DevApp/UserControl/UcLookDaa.cs
@@ -16,6 +16,7 @@
{
    public partial class UcLookDaa : DevExpress.XtraEditors.XtraUserControl
    {
        public UcLookDaa()
        {
            InitializeComponent();
@@ -236,5 +237,13 @@
            }
            return "";
        }
        /// <summary>
        /// 类型,多用于分类查询
        /// </summary>
        public string category{
            set;
            get;
        }
    }
}