From 5bb244513c2a80b1745c10229274183b6f8af934 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 12 十二月 2024 09:51:33 +0800
Subject: [PATCH] 其它业务-出库

---
 DevApp/Gs.DevApp/UserControl/UcLookDepartment.Designer.cs            |  135 +++++
 DevApp/Gs.DevApp/Gs.DevApp.csproj                                    |    9 
 DevApp/Gs.DevApp/UserControl/UcLookDepartment.resx                   |  120 +++++
 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemOut_SCLL.Designer.cs |  870 +++++------------------------------
 DevApp/Gs.DevApp/UserControl/UcLookDepartment.cs                     |  108 ++++
 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemOut_SCLL.cs          |  192 +------
 6 files changed, 542 insertions(+), 892 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemOut_SCLL.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemOut_SCLL.Designer.cs
index 14d5602..2e5dc07 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemOut_SCLL.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemOut_SCLL.Designer.cs
@@ -115,47 +115,17 @@
             this.gcMx1 = new DevExpress.XtraGrid.GridControl();
             this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
             this.lb_depotId = new DevExpress.XtraEditors.LabelControl();
-            this.txt_depotId = new DevExpress.XtraEditors.TextEdit();
-            this.gv_depotId = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_suppId = new DevExpress.XtraEditors.LabelControl();
-            this.txt_suppId = new DevExpress.XtraEditors.TextEdit();
-            this.gv_suppId = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_states = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_msg = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_fmrmode = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_nflag = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_pbillNo = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_planQty = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_boardItem = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_businessType = new DevExpress.XtraGrid.Columns.GridColumn();
             this.lb_outType = new DevExpress.XtraEditors.LabelControl();
             this.txt_outType = new DevExpress.XtraEditors.TextEdit();
             this.gv_outType = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_boardFlag = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_itemFlag = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_cmpocode = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_suppNo = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_workLine = new DevExpress.XtraGrid.Columns.GridColumn();
             this.lb_workNo = new DevExpress.XtraEditors.LabelControl();
             this.txt_workNo = new DevExpress.XtraEditors.TextEdit();
             this.gv_workNo = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_mtransctionNo = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_company = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_factory = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_receiver = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_isVisual = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_outStatus = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_fType = new DevExpress.XtraGrid.Columns.GridColumn();
             this.lb_outPart = new DevExpress.XtraEditors.LabelControl();
-            this.txt_outPart = new DevExpress.XtraEditors.TextEdit();
             this.gv_outPart = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_procLineNo = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_saptext = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_sapyear = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_sapstatus = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_sapno = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_depotCode = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_mmlist = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_outDate = new DevExpress.XtraGrid.Columns.GridColumn();
             this.lb_checkDate = new DevExpress.XtraEditors.LabelControl();
             this.txt_checkDate = new DevExpress.XtraEditors.TextEdit();
@@ -163,15 +133,10 @@
             this.lb_checkUser = new DevExpress.XtraEditors.LabelControl();
             this.txt_checkUser = new DevExpress.XtraEditors.TextEdit();
             this.gv_checkUser = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_produceLineNo = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_reason = new DevExpress.XtraGrid.Columns.GridColumn();
             this.lb_remark = new DevExpress.XtraEditors.LabelControl();
             this.txt_remark = new DevExpress.XtraEditors.TextEdit();
             this.gv_remark = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_transactionNo = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_billTypeId = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_lastupdateDate = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_lastupdateBy = new DevExpress.XtraGrid.Columns.GridColumn();
             this.lb_createDate = new DevExpress.XtraEditors.LabelControl();
             this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
             this.gv_createDate = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -180,38 +145,34 @@
             this.gv_createBy = new DevExpress.XtraGrid.Columns.GridColumn();
             this.lb_status = new DevExpress.XtraEditors.LabelControl();
             this.gv_status = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_procNo = new DevExpress.XtraGrid.Columns.GridColumn();
             this.lb_taskNo = new DevExpress.XtraEditors.LabelControl();
             this.txt_taskNo = new DevExpress.XtraEditors.TextEdit();
-            this.gv_taskNo = new DevExpress.XtraGrid.Columns.GridColumn();
             this.lb_itemOutNo = new DevExpress.XtraEditors.LabelControl();
             this.txt_itemOutNo = new DevExpress.XtraEditors.TextEdit();
             this.gv_itemOutNo = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_bbillNo = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn();
             this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
             this.gcMain = new DevExpress.XtraGrid.GridControl();
             this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
             this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
             this.pageBar1 = new UserControls.Data.UcPageBar();
             this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
             this.tabMx = new DevExpress.XtraTab.XtraTabControl();
             this.panel1 = new System.Windows.Forms.Panel();
+            this.depot_id = new Gs.DevApp.UserControl.UcLookCk();
+            this.txt_status = new DevExpress.XtraEditors.CheckEdit();
             this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
             this.lbGuid = new System.Windows.Forms.Label();
-            this.txt_status = new DevExpress.XtraEditors.CheckEdit();
+            this.txt_outPart = new Gs.DevApp.UserControl.UcLookDepartment();
             this.tabMxPage2.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
             this.tabMxPage1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_depotId.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_suppId.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_outType.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_workNo.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_outPart.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
@@ -241,7 +202,7 @@
             this.gvMx2depotId.Name = "gvMx2depotId";
             this.gvMx2depotId.Tag = "query_a.depot_id";
             this.gvMx2depotId.Visible = true;
-            this.gvMx2depotId.VisibleIndex = 0;
+            this.gvMx2depotId.VisibleIndex = 40;
             this.gvMx2depotId.Width = 94;
             // 
             // gvMx2dabid
@@ -254,7 +215,7 @@
             this.gvMx2dabid.Name = "gvMx2dabid";
             this.gvMx2dabid.Tag = "query_a.DABID";
             this.gvMx2dabid.Visible = true;
-            this.gvMx2dabid.VisibleIndex = 0;
+            this.gvMx2dabid.VisibleIndex = 39;
             this.gvMx2dabid.Width = 94;
             // 
             // gvMx2itemId
@@ -267,7 +228,7 @@
             this.gvMx2itemId.Name = "gvMx2itemId";
             this.gvMx2itemId.Tag = "query_a.ITEM_ID";
             this.gvMx2itemId.Visible = true;
-            this.gvMx2itemId.VisibleIndex = 0;
+            this.gvMx2itemId.VisibleIndex = 38;
             this.gvMx2itemId.Width = 94;
             // 
             // gvMx2lineK3id
@@ -280,7 +241,7 @@
             this.gvMx2lineK3id.Name = "gvMx2lineK3id";
             this.gvMx2lineK3id.Tag = "query_a.LINE_K3ID";
             this.gvMx2lineK3id.Visible = true;
-            this.gvMx2lineK3id.VisibleIndex = 0;
+            this.gvMx2lineK3id.VisibleIndex = 37;
             this.gvMx2lineK3id.Width = 94;
             // 
             // gvMx2ebelnK3id
@@ -293,7 +254,7 @@
             this.gvMx2ebelnK3id.Name = "gvMx2ebelnK3id";
             this.gvMx2ebelnK3id.Tag = "query_a.EBELN_K3ID";
             this.gvMx2ebelnK3id.Visible = true;
-            this.gvMx2ebelnK3id.VisibleIndex = 0;
+            this.gvMx2ebelnK3id.VisibleIndex = 36;
             this.gvMx2ebelnK3id.Width = 94;
             // 
             // gvMx2rkNo
@@ -306,7 +267,7 @@
             this.gvMx2rkNo.Name = "gvMx2rkNo";
             this.gvMx2rkNo.Tag = "query_a.RK_NO";
             this.gvMx2rkNo.Visible = true;
-            this.gvMx2rkNo.VisibleIndex = 0;
+            this.gvMx2rkNo.VisibleIndex = 35;
             this.gvMx2rkNo.Width = 94;
             // 
             // gvMx2rcvPart
@@ -319,7 +280,7 @@
             this.gvMx2rcvPart.Name = "gvMx2rcvPart";
             this.gvMx2rcvPart.Tag = "query_a.RCV_PART";
             this.gvMx2rcvPart.Visible = true;
-            this.gvMx2rcvPart.VisibleIndex = 0;
+            this.gvMx2rcvPart.VisibleIndex = 34;
             this.gvMx2rcvPart.Width = 94;
             // 
             // gvMx2rcvBy
@@ -332,7 +293,7 @@
             this.gvMx2rcvBy.Name = "gvMx2rcvBy";
             this.gvMx2rcvBy.Tag = "query_a.RCV_BY";
             this.gvMx2rcvBy.Visible = true;
-            this.gvMx2rcvBy.VisibleIndex = 0;
+            this.gvMx2rcvBy.VisibleIndex = 33;
             this.gvMx2rcvBy.Width = 94;
             // 
             // gvMx2rtime
@@ -345,7 +306,7 @@
             this.gvMx2rtime.Name = "gvMx2rtime";
             this.gvMx2rtime.Tag = "query_a.RTIME";
             this.gvMx2rtime.Visible = true;
-            this.gvMx2rtime.VisibleIndex = 0;
+            this.gvMx2rtime.VisibleIndex = 32;
             this.gvMx2rtime.Width = 94;
             // 
             // gvMx2receive
@@ -358,7 +319,7 @@
             this.gvMx2receive.Name = "gvMx2receive";
             this.gvMx2receive.Tag = "query_a.RECEIVE";
             this.gvMx2receive.Visible = true;
-            this.gvMx2receive.VisibleIndex = 0;
+            this.gvMx2receive.VisibleIndex = 31;
             this.gvMx2receive.Width = 94;
             // 
             // gvMx2pbillNo
@@ -371,7 +332,7 @@
             this.gvMx2pbillNo.Name = "gvMx2pbillNo";
             this.gvMx2pbillNo.Tag = "query_a.PBILL_NO";
             this.gvMx2pbillNo.Visible = true;
-            this.gvMx2pbillNo.VisibleIndex = 0;
+            this.gvMx2pbillNo.VisibleIndex = 30;
             this.gvMx2pbillNo.Width = 94;
             // 
             // gvMx2suppNo
@@ -384,7 +345,7 @@
             this.gvMx2suppNo.Name = "gvMx2suppNo";
             this.gvMx2suppNo.Tag = "query_a.SUPP_NO";
             this.gvMx2suppNo.Visible = true;
-            this.gvMx2suppNo.VisibleIndex = 0;
+            this.gvMx2suppNo.VisibleIndex = 29;
             this.gvMx2suppNo.Width = 94;
             // 
             // gvMx2workLine
@@ -397,7 +358,7 @@
             this.gvMx2workLine.Name = "gvMx2workLine";
             this.gvMx2workLine.Tag = "query_a.WORK_LINE";
             this.gvMx2workLine.Visible = true;
-            this.gvMx2workLine.VisibleIndex = 0;
+            this.gvMx2workLine.VisibleIndex = 28;
             this.gvMx2workLine.Width = 94;
             // 
             // gvMx2workNo
@@ -410,7 +371,7 @@
             this.gvMx2workNo.Name = "gvMx2workNo";
             this.gvMx2workNo.Tag = "query_a.WORK_NO";
             this.gvMx2workNo.Visible = true;
-            this.gvMx2workNo.VisibleIndex = 0;
+            this.gvMx2workNo.VisibleIndex = 27;
             this.gvMx2workNo.Width = 94;
             // 
             // gvMx2taskNo
@@ -423,7 +384,7 @@
             this.gvMx2taskNo.Name = "gvMx2taskNo";
             this.gvMx2taskNo.Tag = "query_a.TASK_NO";
             this.gvMx2taskNo.Visible = true;
-            this.gvMx2taskNo.VisibleIndex = 0;
+            this.gvMx2taskNo.VisibleIndex = 26;
             this.gvMx2taskNo.Width = 94;
             // 
             // gvMx2boardStyle
@@ -436,7 +397,7 @@
             this.gvMx2boardStyle.Name = "gvMx2boardStyle";
             this.gvMx2boardStyle.Tag = "query_a.BOARD_STYLE";
             this.gvMx2boardStyle.Visible = true;
-            this.gvMx2boardStyle.VisibleIndex = 0;
+            this.gvMx2boardStyle.VisibleIndex = 25;
             this.gvMx2boardStyle.Width = 94;
             // 
             // gvMx2kbNo
@@ -449,7 +410,7 @@
             this.gvMx2kbNo.Name = "gvMx2kbNo";
             this.gvMx2kbNo.Tag = "query_a.KB_NO";
             this.gvMx2kbNo.Visible = true;
-            this.gvMx2kbNo.VisibleIndex = 0;
+            this.gvMx2kbNo.VisibleIndex = 24;
             this.gvMx2kbNo.Width = 94;
             // 
             // gvMx2taskPack
@@ -462,7 +423,7 @@
             this.gvMx2taskPack.Name = "gvMx2taskPack";
             this.gvMx2taskPack.Tag = "query_a.TASK_PACK";
             this.gvMx2taskPack.Visible = true;
-            this.gvMx2taskPack.VisibleIndex = 0;
+            this.gvMx2taskPack.VisibleIndex = 23;
             this.gvMx2taskPack.Width = 94;
             // 
             // gvMx2boxNo
@@ -475,7 +436,7 @@
             this.gvMx2boxNo.Name = "gvMx2boxNo";
             this.gvMx2boxNo.Tag = "query_a.BOX_NO";
             this.gvMx2boxNo.Visible = true;
-            this.gvMx2boxNo.VisibleIndex = 0;
+            this.gvMx2boxNo.VisibleIndex = 22;
             this.gvMx2boxNo.Width = 94;
             // 
             // gvMx2taskNoy
@@ -488,7 +449,7 @@
             this.gvMx2taskNoy.Name = "gvMx2taskNoy";
             this.gvMx2taskNoy.Tag = "query_a.TASK_NOY";
             this.gvMx2taskNoy.Visible = true;
-            this.gvMx2taskNoy.VisibleIndex = 0;
+            this.gvMx2taskNoy.VisibleIndex = 21;
             this.gvMx2taskNoy.Width = 94;
             // 
             // gvMx2company
@@ -501,7 +462,7 @@
             this.gvMx2company.Name = "gvMx2company";
             this.gvMx2company.Tag = "query_a.COMPANY";
             this.gvMx2company.Visible = true;
-            this.gvMx2company.VisibleIndex = 0;
+            this.gvMx2company.VisibleIndex = 20;
             this.gvMx2company.Width = 94;
             // 
             // gvMx2factory
@@ -514,7 +475,7 @@
             this.gvMx2factory.Name = "gvMx2factory";
             this.gvMx2factory.Tag = "query_a.FACTORY";
             this.gvMx2factory.Visible = true;
-            this.gvMx2factory.VisibleIndex = 0;
+            this.gvMx2factory.VisibleIndex = 19;
             this.gvMx2factory.Width = 94;
             // 
             // gvMx2checkStatus
@@ -527,7 +488,7 @@
             this.gvMx2checkStatus.Name = "gvMx2checkStatus";
             this.gvMx2checkStatus.Tag = "query_a.CHECK_STATUS";
             this.gvMx2checkStatus.Visible = true;
-            this.gvMx2checkStatus.VisibleIndex = 0;
+            this.gvMx2checkStatus.VisibleIndex = 18;
             this.gvMx2checkStatus.Width = 94;
             // 
             // gvMx2prdLotNo
@@ -540,7 +501,7 @@
             this.gvMx2prdLotNo.Name = "gvMx2prdLotNo";
             this.gvMx2prdLotNo.Tag = "query_a.PRD_LOT_NO";
             this.gvMx2prdLotNo.Visible = true;
-            this.gvMx2prdLotNo.VisibleIndex = 0;
+            this.gvMx2prdLotNo.VisibleIndex = 17;
             this.gvMx2prdLotNo.Width = 94;
             // 
             // gvMx2forceExemptFlag
@@ -553,7 +514,7 @@
             this.gvMx2forceExemptFlag.Name = "gvMx2forceExemptFlag";
             this.gvMx2forceExemptFlag.Tag = "query_a.FORCE_EXEMPT_FLAG";
             this.gvMx2forceExemptFlag.Visible = true;
-            this.gvMx2forceExemptFlag.VisibleIndex = 0;
+            this.gvMx2forceExemptFlag.VisibleIndex = 16;
             this.gvMx2forceExemptFlag.Width = 94;
             // 
             // gvMx2remark
@@ -566,7 +527,7 @@
             this.gvMx2remark.Name = "gvMx2remark";
             this.gvMx2remark.Tag = "query_a.REMARK";
             this.gvMx2remark.Visible = true;
-            this.gvMx2remark.VisibleIndex = 0;
+            this.gvMx2remark.VisibleIndex = 15;
             this.gvMx2remark.Width = 94;
             // 
             // gvMx2depotSectionCode
@@ -579,7 +540,7 @@
             this.gvMx2depotSectionCode.Name = "gvMx2depotSectionCode";
             this.gvMx2depotSectionCode.Tag = "query_a.DEPOT_SECTION_CODE";
             this.gvMx2depotSectionCode.Visible = true;
-            this.gvMx2depotSectionCode.VisibleIndex = 0;
+            this.gvMx2depotSectionCode.VisibleIndex = 14;
             this.gvMx2depotSectionCode.Width = 94;
             // 
             // gvMx2depotCode
@@ -592,7 +553,7 @@
             this.gvMx2depotCode.Name = "gvMx2depotCode";
             this.gvMx2depotCode.Tag = "query_a.DEPOT_CODE";
             this.gvMx2depotCode.Visible = true;
-            this.gvMx2depotCode.VisibleIndex = 0;
+            this.gvMx2depotCode.VisibleIndex = 13;
             this.gvMx2depotCode.Width = 94;
             // 
             // gvMx2custNo
@@ -605,7 +566,7 @@
             this.gvMx2custNo.Name = "gvMx2custNo";
             this.gvMx2custNo.Tag = "query_a.CUST_NO";
             this.gvMx2custNo.Visible = true;
-            this.gvMx2custNo.VisibleIndex = 0;
+            this.gvMx2custNo.VisibleIndex = 12;
             this.gvMx2custNo.Width = 94;
             // 
             // gvMx2lastupdateDate
@@ -618,7 +579,7 @@
             this.gvMx2lastupdateDate.Name = "gvMx2lastupdateDate";
             this.gvMx2lastupdateDate.Tag = "query_a.LASTUPDATE_DATE";
             this.gvMx2lastupdateDate.Visible = true;
-            this.gvMx2lastupdateDate.VisibleIndex = 0;
+            this.gvMx2lastupdateDate.VisibleIndex = 11;
             this.gvMx2lastupdateDate.Width = 94;
             // 
             // gvMx2lastupdateBy
@@ -631,7 +592,7 @@
             this.gvMx2lastupdateBy.Name = "gvMx2lastupdateBy";
             this.gvMx2lastupdateBy.Tag = "query_a.LASTUPDATE_BY";
             this.gvMx2lastupdateBy.Visible = true;
-            this.gvMx2lastupdateBy.VisibleIndex = 0;
+            this.gvMx2lastupdateBy.VisibleIndex = 10;
             this.gvMx2lastupdateBy.Width = 94;
             // 
             // gvMx2createDate
@@ -644,7 +605,7 @@
             this.gvMx2createDate.Name = "gvMx2createDate";
             this.gvMx2createDate.Tag = "query_a.CREATE_DATE";
             this.gvMx2createDate.Visible = true;
-            this.gvMx2createDate.VisibleIndex = 0;
+            this.gvMx2createDate.VisibleIndex = 9;
             this.gvMx2createDate.Width = 94;
             // 
             // gvMx2createBy
@@ -657,7 +618,7 @@
             this.gvMx2createBy.Name = "gvMx2createBy";
             this.gvMx2createBy.Tag = "query_a.CREATE_BY";
             this.gvMx2createBy.Visible = true;
-            this.gvMx2createBy.VisibleIndex = 0;
+            this.gvMx2createBy.VisibleIndex = 8;
             this.gvMx2createBy.Width = 94;
             // 
             // gvMx2forceOutFlag
@@ -670,7 +631,7 @@
             this.gvMx2forceOutFlag.Name = "gvMx2forceOutFlag";
             this.gvMx2forceOutFlag.Tag = "query_a.FORCE_OUT_FLAG";
             this.gvMx2forceOutFlag.Visible = true;
-            this.gvMx2forceOutFlag.VisibleIndex = 0;
+            this.gvMx2forceOutFlag.VisibleIndex = 7;
             this.gvMx2forceOutFlag.Width = 94;
             // 
             // gvMx2quantity
@@ -683,7 +644,7 @@
             this.gvMx2quantity.Name = "gvMx2quantity";
             this.gvMx2quantity.Tag = "query_a.QUANTITY";
             this.gvMx2quantity.Visible = true;
-            this.gvMx2quantity.VisibleIndex = 0;
+            this.gvMx2quantity.VisibleIndex = 6;
             this.gvMx2quantity.Width = 94;
             // 
             // gvMx2lotNo
@@ -696,7 +657,7 @@
             this.gvMx2lotNo.Name = "gvMx2lotNo";
             this.gvMx2lotNo.Tag = "query_a.LOT_NO";
             this.gvMx2lotNo.Visible = true;
-            this.gvMx2lotNo.VisibleIndex = 0;
+            this.gvMx2lotNo.VisibleIndex = 5;
             this.gvMx2lotNo.Width = 94;
             // 
             // gvMx2itemNo
@@ -709,7 +670,7 @@
             this.gvMx2itemNo.Name = "gvMx2itemNo";
             this.gvMx2itemNo.Tag = "query_a.ITEM_NO";
             this.gvMx2itemNo.Visible = true;
-            this.gvMx2itemNo.VisibleIndex = 0;
+            this.gvMx2itemNo.VisibleIndex = 4;
             this.gvMx2itemNo.Width = 94;
             // 
             // gvMx2cItemCode
@@ -722,7 +683,7 @@
             this.gvMx2cItemCode.Name = "gvMx2cItemCode";
             this.gvMx2cItemCode.Tag = "query_a.C_ITEM_CODE";
             this.gvMx2cItemCode.Visible = true;
-            this.gvMx2cItemCode.VisibleIndex = 0;
+            this.gvMx2cItemCode.VisibleIndex = 3;
             this.gvMx2cItemCode.Width = 94;
             // 
             // gvMx2itemBarcode
@@ -735,7 +696,7 @@
             this.gvMx2itemBarcode.Name = "gvMx2itemBarcode";
             this.gvMx2itemBarcode.Tag = "query_a.ITEM_BARCODE";
             this.gvMx2itemBarcode.Visible = true;
-            this.gvMx2itemBarcode.VisibleIndex = 0;
+            this.gvMx2itemBarcode.VisibleIndex = 2;
             this.gvMx2itemBarcode.Width = 94;
             // 
             // gvMx2itemOutId
@@ -748,7 +709,7 @@
             this.gvMx2itemOutId.Name = "gvMx2itemOutId";
             this.gvMx2itemOutId.Tag = "query_a.ITEM_OUT_ID";
             this.gvMx2itemOutId.Visible = true;
-            this.gvMx2itemOutId.VisibleIndex = 0;
+            this.gvMx2itemOutId.VisibleIndex = 1;
             this.gvMx2itemOutId.Width = 94;
             // 
             // gvMx2guid
@@ -1399,177 +1360,37 @@
             this.lb_depotId.Appearance.Options.UseFont = true;
             this.lb_depotId.Location = new System.Drawing.Point(290, 117);
             this.lb_depotId.Name = "lb_depotId";
-            this.lb_depotId.Size = new System.Drawing.Size(69, 21);
+            this.lb_depotId.Size = new System.Drawing.Size(34, 21);
             this.lb_depotId.TabIndex = 571;
-            this.lb_depotId.Text = "depot_id ";
-            // 
-            // txt_depotId
-            // 
-            this.txt_depotId.Location = new System.Drawing.Point(363, 117);
-            this.txt_depotId.Name = "txt_depotId";
-            this.txt_depotId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_depotId.Properties.Appearance.Options.UseFont = true;
-            this.txt_depotId.Size = new System.Drawing.Size(150, 28);
-            this.txt_depotId.TabIndex = 571;
-            // 
-            // gv_depotId
-            // 
-            this.gv_depotId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_depotId.AppearanceCell.Options.UseFont = true;
-            this.gv_depotId.Caption = "depot_id ";
-            this.gv_depotId.FieldName = "depotId";
-            this.gv_depotId.MinWidth = 50;
-            this.gv_depotId.Name = "gv_depotId";
-            this.gv_depotId.OptionsColumn.AllowEdit = false;
-            this.gv_depotId.Tag = "query_a.depot_id";
-            this.gv_depotId.Visible = true;
-            this.gv_depotId.VisibleIndex = 49;
-            this.gv_depotId.Width = 94;
-            // 
-            // lb_suppId
-            // 
-            this.lb_suppId.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_suppId.Appearance.Options.UseFont = true;
-            this.lb_suppId.Location = new System.Drawing.Point(31, 117);
-            this.lb_suppId.Name = "lb_suppId";
-            this.lb_suppId.Size = new System.Drawing.Size(62, 21);
-            this.lb_suppId.TabIndex = 558;
-            this.lb_suppId.Text = "supp_id ";
-            // 
-            // txt_suppId
-            // 
-            this.txt_suppId.Location = new System.Drawing.Point(98, 117);
-            this.txt_suppId.Name = "txt_suppId";
-            this.txt_suppId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_suppId.Properties.Appearance.Options.UseFont = true;
-            this.txt_suppId.Size = new System.Drawing.Size(150, 28);
-            this.txt_suppId.TabIndex = 558;
-            // 
-            // gv_suppId
-            // 
-            this.gv_suppId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_suppId.AppearanceCell.Options.UseFont = true;
-            this.gv_suppId.Caption = "supp_id ";
-            this.gv_suppId.FieldName = "suppId";
-            this.gv_suppId.MinWidth = 50;
-            this.gv_suppId.Name = "gv_suppId";
-            this.gv_suppId.OptionsColumn.AllowEdit = false;
-            this.gv_suppId.Tag = "query_a.supp_id";
-            this.gv_suppId.Visible = true;
-            this.gv_suppId.VisibleIndex = 48;
-            this.gv_suppId.Width = 94;
-            // 
-            // gv_states
-            // 
-            this.gv_states.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_states.AppearanceCell.Options.UseFont = true;
-            this.gv_states.Caption = "鐘舵�� ";
-            this.gv_states.FieldName = "states";
-            this.gv_states.MinWidth = 50;
-            this.gv_states.Name = "gv_states";
-            this.gv_states.OptionsColumn.AllowEdit = false;
-            this.gv_states.Tag = "query_a.states";
-            this.gv_states.Visible = true;
-            this.gv_states.VisibleIndex = 47;
-            this.gv_states.Width = 94;
-            // 
-            // gv_msg
-            // 
-            this.gv_msg.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_msg.AppearanceCell.Options.UseFont = true;
-            this.gv_msg.Caption = "erp杩斿洖淇℃伅 ";
-            this.gv_msg.FieldName = "msg";
-            this.gv_msg.MinWidth = 50;
-            this.gv_msg.Name = "gv_msg";
-            this.gv_msg.OptionsColumn.AllowEdit = false;
-            this.gv_msg.Tag = "query_a.msg";
-            this.gv_msg.Visible = true;
-            this.gv_msg.VisibleIndex = 46;
-            this.gv_msg.Width = 94;
-            // 
-            // gv_fmrmode
-            // 
-            this.gv_fmrmode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_fmrmode.AppearanceCell.Options.UseFont = true;
-            this.gv_fmrmode.Caption = "閫�鏂欐柟寮� ";
-            this.gv_fmrmode.FieldName = "fmrmode";
-            this.gv_fmrmode.MinWidth = 50;
-            this.gv_fmrmode.Name = "gv_fmrmode";
-            this.gv_fmrmode.OptionsColumn.AllowEdit = false;
-            this.gv_fmrmode.Tag = "query_a.fmrmode";
-            this.gv_fmrmode.Visible = true;
-            this.gv_fmrmode.VisibleIndex = 45;
-            this.gv_fmrmode.Width = 94;
-            // 
-            // gv_nflag
-            // 
-            this.gv_nflag.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_nflag.AppearanceCell.Options.UseFont = true;
-            this.gv_nflag.Caption = "鏍囪瘑 /1宸叉帹閫� ";
-            this.gv_nflag.FieldName = "nflag";
-            this.gv_nflag.MinWidth = 50;
-            this.gv_nflag.Name = "gv_nflag";
-            this.gv_nflag.OptionsColumn.AllowEdit = false;
-            this.gv_nflag.Tag = "query_a.nflag";
-            this.gv_nflag.Visible = true;
-            this.gv_nflag.VisibleIndex = 44;
-            this.gv_nflag.Width = 94;
+            this.lb_depotId.Text = "浠撳簱";
             // 
             // gv_pbillNo
             // 
             this.gv_pbillNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_pbillNo.AppearanceCell.Options.UseFont = true;
-            this.gv_pbillNo.Caption = "棰嗘枡缂栧彿/濮斿璁㈠崟/鍏朵粬鍑哄簱鍗曞彿 ";
+            this.gv_pbillNo.Caption = "宸ュ崟鍗曞彿";
             this.gv_pbillNo.FieldName = "pbillNo";
             this.gv_pbillNo.MinWidth = 50;
             this.gv_pbillNo.Name = "gv_pbillNo";
             this.gv_pbillNo.OptionsColumn.AllowEdit = false;
             this.gv_pbillNo.Tag = "query_a.pbill_no";
             this.gv_pbillNo.Visible = true;
-            this.gv_pbillNo.VisibleIndex = 43;
+            this.gv_pbillNo.VisibleIndex = 3;
             this.gv_pbillNo.Width = 94;
-            // 
-            // gv_planQty
-            // 
-            this.gv_planQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_planQty.AppearanceCell.Options.UseFont = true;
-            this.gv_planQty.Caption = "浜ч噺 ";
-            this.gv_planQty.FieldName = "planQty";
-            this.gv_planQty.MinWidth = 50;
-            this.gv_planQty.Name = "gv_planQty";
-            this.gv_planQty.OptionsColumn.AllowEdit = false;
-            this.gv_planQty.Tag = "query_a.plan_qty";
-            this.gv_planQty.Visible = true;
-            this.gv_planQty.VisibleIndex = 42;
-            this.gv_planQty.Width = 94;
             // 
             // gv_boardItem
             // 
             this.gv_boardItem.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_boardItem.AppearanceCell.Options.UseFont = true;
-            this.gv_boardItem.Caption = "浜у搧缂栧彿 ";
+            this.gv_boardItem.Caption = "浜у搧缂栫爜";
             this.gv_boardItem.FieldName = "boardItem";
             this.gv_boardItem.MinWidth = 50;
             this.gv_boardItem.Name = "gv_boardItem";
             this.gv_boardItem.OptionsColumn.AllowEdit = false;
             this.gv_boardItem.Tag = "query_a.board_item";
             this.gv_boardItem.Visible = true;
-            this.gv_boardItem.VisibleIndex = 41;
+            this.gv_boardItem.VisibleIndex = 4;
             this.gv_boardItem.Width = 94;
-            // 
-            // gv_businessType
-            // 
-            this.gv_businessType.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_businessType.AppearanceCell.Options.UseFont = true;
-            this.gv_businessType.Caption = "涓氬姟绫诲瀷 ";
-            this.gv_businessType.FieldName = "businessType";
-            this.gv_businessType.MinWidth = 50;
-            this.gv_businessType.Name = "gv_businessType";
-            this.gv_businessType.OptionsColumn.AllowEdit = false;
-            this.gv_businessType.Tag = "query_a.business_type";
-            this.gv_businessType.Visible = true;
-            this.gv_businessType.VisibleIndex = 40;
-            this.gv_businessType.Width = 94;
             // 
             // lb_outType
             // 
@@ -1601,78 +1422,8 @@
             this.gv_outType.OptionsColumn.AllowEdit = false;
             this.gv_outType.Tag = "query_a.out_type";
             this.gv_outType.Visible = true;
-            this.gv_outType.VisibleIndex = 39;
+            this.gv_outType.VisibleIndex = 7;
             this.gv_outType.Width = 94;
-            // 
-            // gv_boardFlag
-            // 
-            this.gv_boardFlag.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_boardFlag.AppearanceCell.Options.UseFont = true;
-            this.gv_boardFlag.Caption = "1=鍗婃垚鍝佸嚭璐� ";
-            this.gv_boardFlag.FieldName = "boardFlag";
-            this.gv_boardFlag.MinWidth = 50;
-            this.gv_boardFlag.Name = "gv_boardFlag";
-            this.gv_boardFlag.OptionsColumn.AllowEdit = false;
-            this.gv_boardFlag.Tag = "query_a.board_flag";
-            this.gv_boardFlag.Visible = true;
-            this.gv_boardFlag.VisibleIndex = 38;
-            this.gv_boardFlag.Width = 94;
-            // 
-            // gv_itemFlag
-            // 
-            this.gv_itemFlag.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_itemFlag.AppearanceCell.Options.UseFont = true;
-            this.gv_itemFlag.Caption = "鍘熺墿鏂欏嚭璐ф爣璇� ";
-            this.gv_itemFlag.FieldName = "itemFlag";
-            this.gv_itemFlag.MinWidth = 50;
-            this.gv_itemFlag.Name = "gv_itemFlag";
-            this.gv_itemFlag.OptionsColumn.AllowEdit = false;
-            this.gv_itemFlag.Tag = "query_a.item_flag";
-            this.gv_itemFlag.Visible = true;
-            this.gv_itemFlag.VisibleIndex = 37;
-            this.gv_itemFlag.Width = 94;
-            // 
-            // gv_cmpocode
-            // 
-            this.gv_cmpocode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_cmpocode.AppearanceCell.Options.UseFont = true;
-            this.gv_cmpocode.Caption = "璁㈠崟鍙� ";
-            this.gv_cmpocode.FieldName = "cmpocode";
-            this.gv_cmpocode.MinWidth = 50;
-            this.gv_cmpocode.Name = "gv_cmpocode";
-            this.gv_cmpocode.OptionsColumn.AllowEdit = false;
-            this.gv_cmpocode.Tag = "query_a.cmpocode";
-            this.gv_cmpocode.Visible = true;
-            this.gv_cmpocode.VisibleIndex = 36;
-            this.gv_cmpocode.Width = 94;
-            // 
-            // gv_suppNo
-            // 
-            this.gv_suppNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_suppNo.AppearanceCell.Options.UseFont = true;
-            this.gv_suppNo.Caption = "渚涘簲鍟嗙紪鍙� ";
-            this.gv_suppNo.FieldName = "suppNo";
-            this.gv_suppNo.MinWidth = 50;
-            this.gv_suppNo.Name = "gv_suppNo";
-            this.gv_suppNo.OptionsColumn.AllowEdit = false;
-            this.gv_suppNo.Tag = "query_a.supp_no";
-            this.gv_suppNo.Visible = true;
-            this.gv_suppNo.VisibleIndex = 35;
-            this.gv_suppNo.Width = 94;
-            // 
-            // gv_workLine
-            // 
-            this.gv_workLine.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_workLine.AppearanceCell.Options.UseFont = true;
-            this.gv_workLine.Caption = "浠诲姟鍗曞彿琛屽彿 ";
-            this.gv_workLine.FieldName = "workLine";
-            this.gv_workLine.MinWidth = 50;
-            this.gv_workLine.Name = "gv_workLine";
-            this.gv_workLine.OptionsColumn.AllowEdit = false;
-            this.gv_workLine.Tag = "query_a.work_line";
-            this.gv_workLine.Visible = true;
-            this.gv_workLine.VisibleIndex = 34;
-            this.gv_workLine.Width = 94;
             // 
             // lb_workNo
             // 
@@ -1697,113 +1448,29 @@
             // 
             this.gv_workNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_workNo.AppearanceCell.Options.UseFont = true;
-            this.gv_workNo.Caption = "浠诲姟鍗曞彿 ";
+            this.gv_workNo.Caption = "浠诲姟鍗曞彿";
             this.gv_workNo.FieldName = "workNo";
-            this.gv_workNo.MinWidth = 50;
+            this.gv_workNo.MinWidth = 100;
             this.gv_workNo.Name = "gv_workNo";
             this.gv_workNo.OptionsColumn.AllowEdit = false;
             this.gv_workNo.Tag = "query_a.work_no";
             this.gv_workNo.Visible = true;
-            this.gv_workNo.VisibleIndex = 33;
-            this.gv_workNo.Width = 94;
-            // 
-            // gv_mtransctionNo
-            // 
-            this.gv_mtransctionNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_mtransctionNo.AppearanceCell.Options.UseFont = true;
-            this.gv_mtransctionNo.Caption = "鍐查攢浜嬪姟绫诲瀷缂栫爜 ";
-            this.gv_mtransctionNo.FieldName = "mtransctionNo";
-            this.gv_mtransctionNo.MinWidth = 50;
-            this.gv_mtransctionNo.Name = "gv_mtransctionNo";
-            this.gv_mtransctionNo.OptionsColumn.AllowEdit = false;
-            this.gv_mtransctionNo.Tag = "query_a.mtransction_no";
-            this.gv_mtransctionNo.Visible = true;
-            this.gv_mtransctionNo.VisibleIndex = 32;
-            this.gv_mtransctionNo.Width = 94;
-            // 
-            // gv_company
-            // 
-            this.gv_company.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_company.AppearanceCell.Options.UseFont = true;
-            this.gv_company.Caption = "鍏徃缂栧彿 ";
-            this.gv_company.FieldName = "company";
-            this.gv_company.MinWidth = 50;
-            this.gv_company.Name = "gv_company";
-            this.gv_company.OptionsColumn.AllowEdit = false;
-            this.gv_company.Tag = "query_a.company";
-            this.gv_company.Visible = true;
-            this.gv_company.VisibleIndex = 31;
-            this.gv_company.Width = 94;
-            // 
-            // gv_factory
-            // 
-            this.gv_factory.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_factory.AppearanceCell.Options.UseFont = true;
-            this.gv_factory.Caption = "宸ュ巶缂栧彿 ";
-            this.gv_factory.FieldName = "factory";
-            this.gv_factory.MinWidth = 50;
-            this.gv_factory.Name = "gv_factory";
-            this.gv_factory.OptionsColumn.AllowEdit = false;
-            this.gv_factory.Tag = "query_a.factory";
-            this.gv_factory.Visible = true;
-            this.gv_factory.VisibleIndex = 30;
-            this.gv_factory.Width = 94;
+            this.gv_workNo.VisibleIndex = 2;
+            this.gv_workNo.Width = 100;
             // 
             // gv_receiver
             // 
             this.gv_receiver.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_receiver.AppearanceCell.Options.UseFont = true;
-            this.gv_receiver.Caption = "鎺ユ敹浜� ";
+            this.gv_receiver.Caption = "棰嗘枡浜�";
             this.gv_receiver.FieldName = "receiver";
             this.gv_receiver.MinWidth = 50;
             this.gv_receiver.Name = "gv_receiver";
             this.gv_receiver.OptionsColumn.AllowEdit = false;
             this.gv_receiver.Tag = "query_a.receiver";
             this.gv_receiver.Visible = true;
-            this.gv_receiver.VisibleIndex = 29;
+            this.gv_receiver.VisibleIndex = 10;
             this.gv_receiver.Width = 94;
-            // 
-            // gv_isVisual
-            // 
-            this.gv_isVisual.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_isVisual.AppearanceCell.Options.UseFont = true;
-            this.gv_isVisual.Caption = "鏄惁鍙 ";
-            this.gv_isVisual.FieldName = "isVisual";
-            this.gv_isVisual.MinWidth = 50;
-            this.gv_isVisual.Name = "gv_isVisual";
-            this.gv_isVisual.OptionsColumn.AllowEdit = false;
-            this.gv_isVisual.Tag = "query_a.is_visual";
-            this.gv_isVisual.Visible = true;
-            this.gv_isVisual.VisibleIndex = 28;
-            this.gv_isVisual.Width = 94;
-            // 
-            // gv_outStatus
-            // 
-            this.gv_outStatus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_outStatus.AppearanceCell.Options.UseFont = true;
-            this.gv_outStatus.Caption = "褰曞叆鎻愪氦 ";
-            this.gv_outStatus.FieldName = "outStatus";
-            this.gv_outStatus.MinWidth = 50;
-            this.gv_outStatus.Name = "gv_outStatus";
-            this.gv_outStatus.OptionsColumn.AllowEdit = false;
-            this.gv_outStatus.Tag = "query_a.out_status";
-            this.gv_outStatus.Visible = true;
-            this.gv_outStatus.VisibleIndex = 27;
-            this.gv_outStatus.Width = 94;
-            // 
-            // gv_fType
-            // 
-            this.gv_fType.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_fType.AppearanceCell.Options.UseFont = true;
-            this.gv_fType.Caption = "0 鐢熶骇,1 濮斿 ";
-            this.gv_fType.FieldName = "fType";
-            this.gv_fType.MinWidth = 50;
-            this.gv_fType.Name = "gv_fType";
-            this.gv_fType.OptionsColumn.AllowEdit = false;
-            this.gv_fType.Tag = "query_a.f_type";
-            this.gv_fType.Visible = true;
-            this.gv_fType.VisibleIndex = 26;
-            this.gv_fType.Width = 94;
             // 
             // lb_outPart
             // 
@@ -1814,15 +1481,6 @@
             this.lb_outPart.Size = new System.Drawing.Size(73, 21);
             this.lb_outPart.TabIndex = 319;
             this.lb_outPart.Text = "棰嗘枡閮ㄩ棬 ";
-            // 
-            // txt_outPart
-            // 
-            this.txt_outPart.Location = new System.Drawing.Point(363, 16);
-            this.txt_outPart.Name = "txt_outPart";
-            this.txt_outPart.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_outPart.Properties.Appearance.Options.UseFont = true;
-            this.txt_outPart.Size = new System.Drawing.Size(150, 28);
-            this.txt_outPart.TabIndex = 319;
             // 
             // gv_outPart
             // 
@@ -1835,120 +1493,22 @@
             this.gv_outPart.OptionsColumn.AllowEdit = false;
             this.gv_outPart.Tag = "query_a.out_part";
             this.gv_outPart.Visible = true;
-            this.gv_outPart.VisibleIndex = 25;
+            this.gv_outPart.VisibleIndex = 11;
             this.gv_outPart.Width = 94;
-            // 
-            // gv_procLineNo
-            // 
-            this.gv_procLineNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_procLineNo.AppearanceCell.Options.UseFont = true;
-            this.gv_procLineNo.Caption = "宸ュ簭绾夸綋 ";
-            this.gv_procLineNo.FieldName = "procLineNo";
-            this.gv_procLineNo.MinWidth = 50;
-            this.gv_procLineNo.Name = "gv_procLineNo";
-            this.gv_procLineNo.OptionsColumn.AllowEdit = false;
-            this.gv_procLineNo.Tag = "query_a.proc_line_no";
-            this.gv_procLineNo.Visible = true;
-            this.gv_procLineNo.VisibleIndex = 24;
-            this.gv_procLineNo.Width = 94;
-            // 
-            // gv_saptext
-            // 
-            this.gv_saptext.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_saptext.AppearanceCell.Options.UseFont = true;
-            this.gv_saptext.Caption = "SAP杩斿洖淇℃伅 ";
-            this.gv_saptext.FieldName = "saptext";
-            this.gv_saptext.MinWidth = 50;
-            this.gv_saptext.Name = "gv_saptext";
-            this.gv_saptext.OptionsColumn.AllowEdit = false;
-            this.gv_saptext.Tag = "query_a.saptext";
-            this.gv_saptext.Visible = true;
-            this.gv_saptext.VisibleIndex = 23;
-            this.gv_saptext.Width = 94;
-            // 
-            // gv_sapyear
-            // 
-            this.gv_sapyear.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_sapyear.AppearanceCell.Options.UseFont = true;
-            this.gv_sapyear.Caption = "SAP杩斿洖骞翠唤 ";
-            this.gv_sapyear.FieldName = "sapyear";
-            this.gv_sapyear.MinWidth = 50;
-            this.gv_sapyear.Name = "gv_sapyear";
-            this.gv_sapyear.OptionsColumn.AllowEdit = false;
-            this.gv_sapyear.Tag = "query_a.sapyear";
-            this.gv_sapyear.Visible = true;
-            this.gv_sapyear.VisibleIndex = 22;
-            this.gv_sapyear.Width = 94;
-            // 
-            // gv_sapstatus
-            // 
-            this.gv_sapstatus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_sapstatus.AppearanceCell.Options.UseFont = true;
-            this.gv_sapstatus.Caption = "鏄惁宸插洖鍐橲AP ";
-            this.gv_sapstatus.FieldName = "sapstatus";
-            this.gv_sapstatus.MinWidth = 50;
-            this.gv_sapstatus.Name = "gv_sapstatus";
-            this.gv_sapstatus.OptionsColumn.AllowEdit = false;
-            this.gv_sapstatus.Tag = "query_a.sapstatus";
-            this.gv_sapstatus.Visible = true;
-            this.gv_sapstatus.VisibleIndex = 21;
-            this.gv_sapstatus.Width = 94;
-            // 
-            // gv_sapno
-            // 
-            this.gv_sapno.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_sapno.AppearanceCell.Options.UseFont = true;
-            this.gv_sapno.Caption = "SAP杩斿洖鍗曟嵁 ";
-            this.gv_sapno.FieldName = "sapno";
-            this.gv_sapno.MinWidth = 50;
-            this.gv_sapno.Name = "gv_sapno";
-            this.gv_sapno.OptionsColumn.AllowEdit = false;
-            this.gv_sapno.Tag = "query_a.sapno";
-            this.gv_sapno.Visible = true;
-            this.gv_sapno.VisibleIndex = 20;
-            this.gv_sapno.Width = 94;
-            // 
-            // gv_depotCode
-            // 
-            this.gv_depotCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_depotCode.AppearanceCell.Options.UseFont = true;
-            this.gv_depotCode.Caption = "瀛愬簱CODE ";
-            this.gv_depotCode.FieldName = "depotCode";
-            this.gv_depotCode.MinWidth = 50;
-            this.gv_depotCode.Name = "gv_depotCode";
-            this.gv_depotCode.OptionsColumn.AllowEdit = false;
-            this.gv_depotCode.Tag = "query_a.depot_code";
-            this.gv_depotCode.Visible = true;
-            this.gv_depotCode.VisibleIndex = 19;
-            this.gv_depotCode.Width = 94;
-            // 
-            // gv_mmlist
-            // 
-            this.gv_mmlist.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_mmlist.AppearanceCell.Options.UseFont = true;
-            this.gv_mmlist.Caption = "棰嗘枡宸ユ ";
-            this.gv_mmlist.FieldName = "mmlist";
-            this.gv_mmlist.MinWidth = 50;
-            this.gv_mmlist.Name = "gv_mmlist";
-            this.gv_mmlist.OptionsColumn.AllowEdit = false;
-            this.gv_mmlist.Tag = "query_a.mmlist";
-            this.gv_mmlist.Visible = true;
-            this.gv_mmlist.VisibleIndex = 18;
-            this.gv_mmlist.Width = 94;
             // 
             // gv_outDate
             // 
             this.gv_outDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_outDate.AppearanceCell.Options.UseFont = true;
-            this.gv_outDate.Caption = "棰嗘枡鏃ユ湡 ";
+            this.gv_outDate.Caption = "鍑哄簱鏃ユ湡 ";
             this.gv_outDate.FieldName = "outDate";
-            this.gv_outDate.MinWidth = 50;
+            this.gv_outDate.MinWidth = 120;
             this.gv_outDate.Name = "gv_outDate";
             this.gv_outDate.OptionsColumn.AllowEdit = false;
             this.gv_outDate.Tag = "query_a.out_date";
             this.gv_outDate.Visible = true;
-            this.gv_outDate.VisibleIndex = 17;
-            this.gv_outDate.Width = 94;
+            this.gv_outDate.VisibleIndex = 6;
+            this.gv_outDate.Width = 120;
             // 
             // lb_checkDate
             // 
@@ -1975,13 +1535,13 @@
             this.gv_checkDate.AppearanceCell.Options.UseFont = true;
             this.gv_checkDate.Caption = "瀹℃牳鏃ユ湡 ";
             this.gv_checkDate.FieldName = "checkDate";
-            this.gv_checkDate.MinWidth = 50;
+            this.gv_checkDate.MinWidth = 120;
             this.gv_checkDate.Name = "gv_checkDate";
             this.gv_checkDate.OptionsColumn.AllowEdit = false;
             this.gv_checkDate.Tag = "query_a.check_date";
             this.gv_checkDate.Visible = true;
-            this.gv_checkDate.VisibleIndex = 16;
-            this.gv_checkDate.Width = 94;
+            this.gv_checkDate.VisibleIndex = 9;
+            this.gv_checkDate.Width = 120;
             // 
             // lb_checkUser
             // 
@@ -2013,22 +1573,8 @@
             this.gv_checkUser.OptionsColumn.AllowEdit = false;
             this.gv_checkUser.Tag = "query_a.check_user";
             this.gv_checkUser.Visible = true;
-            this.gv_checkUser.VisibleIndex = 15;
+            this.gv_checkUser.VisibleIndex = 8;
             this.gv_checkUser.Width = 94;
-            // 
-            // gv_produceLineNo
-            // 
-            this.gv_produceLineNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_produceLineNo.AppearanceCell.Options.UseFont = true;
-            this.gv_produceLineNo.Caption = "鐢熶骇绾跨紪鐮� ";
-            this.gv_produceLineNo.FieldName = "produceLineNo";
-            this.gv_produceLineNo.MinWidth = 50;
-            this.gv_produceLineNo.Name = "gv_produceLineNo";
-            this.gv_produceLineNo.OptionsColumn.AllowEdit = false;
-            this.gv_produceLineNo.Tag = "query_a.produce_line_no";
-            this.gv_produceLineNo.Visible = true;
-            this.gv_produceLineNo.VisibleIndex = 14;
-            this.gv_produceLineNo.Width = 94;
             // 
             // gv_reason
             // 
@@ -2041,7 +1587,7 @@
             this.gv_reason.OptionsColumn.AllowEdit = false;
             this.gv_reason.Tag = "query_a.reason";
             this.gv_reason.Visible = true;
-            this.gv_reason.VisibleIndex = 13;
+            this.gv_reason.VisibleIndex = 15;
             this.gv_reason.Width = 94;
             // 
             // lb_remark
@@ -2074,64 +1620,8 @@
             this.gv_remark.OptionsColumn.AllowEdit = false;
             this.gv_remark.Tag = "query_a.remark";
             this.gv_remark.Visible = true;
-            this.gv_remark.VisibleIndex = 12;
+            this.gv_remark.VisibleIndex = 14;
             this.gv_remark.Width = 94;
-            // 
-            // gv_transactionNo
-            // 
-            this.gv_transactionNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_transactionNo.AppearanceCell.Options.UseFont = true;
-            this.gv_transactionNo.Caption = "浜嬪姟绫诲瀷 ";
-            this.gv_transactionNo.FieldName = "transactionNo";
-            this.gv_transactionNo.MinWidth = 50;
-            this.gv_transactionNo.Name = "gv_transactionNo";
-            this.gv_transactionNo.OptionsColumn.AllowEdit = false;
-            this.gv_transactionNo.Tag = "query_a.transaction_no";
-            this.gv_transactionNo.Visible = true;
-            this.gv_transactionNo.VisibleIndex = 11;
-            this.gv_transactionNo.Width = 94;
-            // 
-            // gv_billTypeId
-            // 
-            this.gv_billTypeId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_billTypeId.AppearanceCell.Options.UseFont = true;
-            this.gv_billTypeId.Caption = "鍗曟嵁绫诲瀷ID ";
-            this.gv_billTypeId.FieldName = "billTypeId";
-            this.gv_billTypeId.MinWidth = 50;
-            this.gv_billTypeId.Name = "gv_billTypeId";
-            this.gv_billTypeId.OptionsColumn.AllowEdit = false;
-            this.gv_billTypeId.Tag = "query_a.bill_type_id";
-            this.gv_billTypeId.Visible = true;
-            this.gv_billTypeId.VisibleIndex = 10;
-            this.gv_billTypeId.Width = 94;
-            // 
-            // gv_lastupdateDate
-            // 
-            this.gv_lastupdateDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_lastupdateDate.AppearanceCell.Options.UseFont = true;
-            this.gv_lastupdateDate.Caption = "鏈�鍚庢洿鏂版椂闂� ";
-            this.gv_lastupdateDate.FieldName = "lastupdateDate";
-            this.gv_lastupdateDate.MinWidth = 50;
-            this.gv_lastupdateDate.Name = "gv_lastupdateDate";
-            this.gv_lastupdateDate.OptionsColumn.AllowEdit = false;
-            this.gv_lastupdateDate.Tag = "query_a.lastupdate_date";
-            this.gv_lastupdateDate.Visible = true;
-            this.gv_lastupdateDate.VisibleIndex = 9;
-            this.gv_lastupdateDate.Width = 94;
-            // 
-            // gv_lastupdateBy
-            // 
-            this.gv_lastupdateBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_lastupdateBy.AppearanceCell.Options.UseFont = true;
-            this.gv_lastupdateBy.Caption = "鏈�鍚庢洿鏂颁汉 ";
-            this.gv_lastupdateBy.FieldName = "lastupdateBy";
-            this.gv_lastupdateBy.MinWidth = 50;
-            this.gv_lastupdateBy.Name = "gv_lastupdateBy";
-            this.gv_lastupdateBy.OptionsColumn.AllowEdit = false;
-            this.gv_lastupdateBy.Tag = "query_a.lastupdate_by";
-            this.gv_lastupdateBy.Visible = true;
-            this.gv_lastupdateBy.VisibleIndex = 8;
-            this.gv_lastupdateBy.Width = 94;
             // 
             // lb_createDate
             // 
@@ -2156,14 +1646,14 @@
             // 
             this.gv_createDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_createDate.AppearanceCell.Options.UseFont = true;
-            this.gv_createDate.Caption = "鍒涘缓鏃堕棿 ";
+            this.gv_createDate.Caption = "鍒涘缓鏃堕棿";
             this.gv_createDate.FieldName = "createDate";
             this.gv_createDate.MinWidth = 50;
             this.gv_createDate.Name = "gv_createDate";
             this.gv_createDate.OptionsColumn.AllowEdit = false;
             this.gv_createDate.Tag = "query_a.create_date";
             this.gv_createDate.Visible = true;
-            this.gv_createDate.VisibleIndex = 7;
+            this.gv_createDate.VisibleIndex = 13;
             this.gv_createDate.Width = 94;
             // 
             // lb_createBy
@@ -2189,14 +1679,14 @@
             // 
             this.gv_createBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_createBy.AppearanceCell.Options.UseFont = true;
-            this.gv_createBy.Caption = "鍒涘缓浜� ";
+            this.gv_createBy.Caption = "鍒涘缓浜�";
             this.gv_createBy.FieldName = "createBy";
             this.gv_createBy.MinWidth = 50;
             this.gv_createBy.Name = "gv_createBy";
             this.gv_createBy.OptionsColumn.AllowEdit = false;
             this.gv_createBy.Tag = "query_a.create_by";
             this.gv_createBy.Visible = true;
-            this.gv_createBy.VisibleIndex = 6;
+            this.gv_createBy.VisibleIndex = 12;
             this.gv_createBy.Width = 94;
             // 
             // lb_status
@@ -2213,29 +1703,15 @@
             // 
             this.gv_status.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_status.AppearanceCell.Options.UseFont = true;
-            this.gv_status.Caption = "鐘舵�亅0-鏈鏍�1-瀹℃牳 ";
+            this.gv_status.Caption = "瀹℃牳鏍囪瘑";
             this.gv_status.FieldName = "status";
             this.gv_status.MinWidth = 50;
             this.gv_status.Name = "gv_status";
             this.gv_status.OptionsColumn.AllowEdit = false;
             this.gv_status.Tag = "query_a.status";
             this.gv_status.Visible = true;
-            this.gv_status.VisibleIndex = 5;
+            this.gv_status.VisibleIndex = 0;
             this.gv_status.Width = 94;
-            // 
-            // gv_procNo
-            // 
-            this.gv_procNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_procNo.AppearanceCell.Options.UseFont = true;
-            this.gv_procNo.Caption = "宸ュ簭鍙� ";
-            this.gv_procNo.FieldName = "procNo";
-            this.gv_procNo.MinWidth = 50;
-            this.gv_procNo.Name = "gv_procNo";
-            this.gv_procNo.OptionsColumn.AllowEdit = false;
-            this.gv_procNo.Tag = "query_a.proc_no";
-            this.gv_procNo.Visible = true;
-            this.gv_procNo.VisibleIndex = 4;
-            this.gv_procNo.Width = 94;
             // 
             // lb_taskNo
             // 
@@ -2255,20 +1731,6 @@
             this.txt_taskNo.Properties.Appearance.Options.UseFont = true;
             this.txt_taskNo.Size = new System.Drawing.Size(150, 28);
             this.txt_taskNo.TabIndex = 216;
-            // 
-            // gv_taskNo
-            // 
-            this.gv_taskNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_taskNo.AppearanceCell.Options.UseFont = true;
-            this.gv_taskNo.Caption = "鐢熶骇璁㈠崟 ";
-            this.gv_taskNo.FieldName = "taskNo";
-            this.gv_taskNo.MinWidth = 50;
-            this.gv_taskNo.Name = "gv_taskNo";
-            this.gv_taskNo.OptionsColumn.AllowEdit = false;
-            this.gv_taskNo.Tag = "query_a.task_no";
-            this.gv_taskNo.Visible = true;
-            this.gv_taskNo.VisibleIndex = 3;
-            this.gv_taskNo.Width = 94;
             // 
             // lb_itemOutNo
             // 
@@ -2293,43 +1755,15 @@
             // 
             this.gv_itemOutNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_itemOutNo.AppearanceCell.Options.UseFont = true;
-            this.gv_itemOutNo.Caption = "鍑哄簱鍗曞彿 ";
+            this.gv_itemOutNo.Caption = "鍑哄簱鍗曞彿";
             this.gv_itemOutNo.FieldName = "itemOutNo";
-            this.gv_itemOutNo.MinWidth = 50;
+            this.gv_itemOutNo.MinWidth = 100;
             this.gv_itemOutNo.Name = "gv_itemOutNo";
             this.gv_itemOutNo.OptionsColumn.AllowEdit = false;
             this.gv_itemOutNo.Tag = "query_a.item_out_no";
             this.gv_itemOutNo.Visible = true;
-            this.gv_itemOutNo.VisibleIndex = 2;
-            this.gv_itemOutNo.Width = 94;
-            // 
-            // gv_bbillNo
-            // 
-            this.gv_bbillNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_bbillNo.AppearanceCell.Options.UseFont = true;
-            this.gv_bbillNo.Caption = "琛ユ枡鐢宠鍗曞彿 ";
-            this.gv_bbillNo.FieldName = "bbillNo";
-            this.gv_bbillNo.MinWidth = 50;
-            this.gv_bbillNo.Name = "gv_bbillNo";
-            this.gv_bbillNo.OptionsColumn.AllowEdit = false;
-            this.gv_bbillNo.Tag = "query_a.bbill_no";
-            this.gv_bbillNo.Visible = true;
-            this.gv_bbillNo.VisibleIndex = 1;
-            this.gv_bbillNo.Width = 94;
-            // 
-            // gv_guid
-            // 
-            this.gv_guid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_guid.AppearanceCell.Options.UseFont = true;
-            this.gv_guid.Caption = "GUID ";
-            this.gv_guid.FieldName = "guid";
-            this.gv_guid.MinWidth = 50;
-            this.gv_guid.Name = "gv_guid";
-            this.gv_guid.OptionsColumn.AllowEdit = false;
-            this.gv_guid.Tag = "query_a.GUID";
-            this.gv_guid.Visible = true;
-            this.gv_guid.VisibleIndex = 0;
-            this.gv_guid.Width = 94;
+            this.gv_itemOutNo.VisibleIndex = 1;
+            this.gv_itemOutNo.Width = 150;
             // 
             // toolBarMenu1
             // 
@@ -2362,62 +1796,37 @@
             this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gridView1.Appearance.Row.Options.UseFont = true;
             this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
-            this.gv_guid,
-            this.gv_bbillNo,
-            this.gv_itemOutNo,
-            this.gv_taskNo,
-            this.gv_procNo,
             this.gv_status,
-            this.gv_createBy,
-            this.gv_createDate,
-            this.gv_lastupdateBy,
-            this.gv_lastupdateDate,
-            this.gv_billTypeId,
-            this.gv_transactionNo,
-            this.gv_remark,
-            this.gv_reason,
-            this.gv_produceLineNo,
+            this.gv_itemOutNo,
+            this.gv_workNo,
+            this.gv_pbillNo,
+            this.gv_boardItem,
+            this.gridColumn1,
+            this.gv_outDate,
+            this.gv_outType,
             this.gv_checkUser,
             this.gv_checkDate,
-            this.gv_outDate,
-            this.gv_mmlist,
-            this.gv_depotCode,
-            this.gv_sapno,
-            this.gv_sapstatus,
-            this.gv_sapyear,
-            this.gv_saptext,
-            this.gv_procLineNo,
-            this.gv_outPart,
-            this.gv_fType,
-            this.gv_outStatus,
-            this.gv_isVisual,
             this.gv_receiver,
-            this.gv_factory,
-            this.gv_company,
-            this.gv_mtransctionNo,
-            this.gv_workNo,
-            this.gv_workLine,
-            this.gv_suppNo,
-            this.gv_cmpocode,
-            this.gv_itemFlag,
-            this.gv_boardFlag,
-            this.gv_outType,
-            this.gv_businessType,
-            this.gv_boardItem,
-            this.gv_planQty,
-            this.gv_pbillNo,
-            this.gv_nflag,
-            this.gv_fmrmode,
-            this.gv_msg,
-            this.gv_states,
-            this.gv_suppId,
-            this.gv_depotId});
+            this.gv_outPart,
+            this.gv_createBy,
+            this.gv_createDate,
+            this.gv_remark,
+            this.gv_reason});
             this.gridView1.GridControl = this.gcMain;
             this.gridView1.IndicatorWidth = 50;
             this.gridView1.Name = "gridView1";
             this.gridView1.OptionsFind.ShowSearchNavButtons = false;
             this.gridView1.OptionsView.ShowAutoFilterRow = true;
             this.gridView1.OptionsView.ShowGroupPanel = false;
+            // 
+            // gridColumn1
+            // 
+            this.gridColumn1.Caption = "浜у搧鍚嶇О";
+            this.gridColumn1.MinWidth = 120;
+            this.gridColumn1.Name = "gridColumn1";
+            this.gridColumn1.Visible = true;
+            this.gridColumn1.VisibleIndex = 5;
+            this.gridColumn1.Width = 120;
             // 
             // xtraTabControl1
             // 
@@ -2475,19 +1884,17 @@
             // panel1
             // 
             this.panel1.BackColor = System.Drawing.Color.White;
+            this.panel1.Controls.Add(this.txt_outPart);
+            this.panel1.Controls.Add(this.depot_id);
             this.panel1.Controls.Add(this.txt_status);
             this.panel1.Controls.Add(this.labelControl11);
             this.panel1.Controls.Add(this.lbGuid);
             this.panel1.Controls.Add(this.lb_depotId);
-            this.panel1.Controls.Add(this.txt_depotId);
-            this.panel1.Controls.Add(this.lb_suppId);
-            this.panel1.Controls.Add(this.txt_suppId);
             this.panel1.Controls.Add(this.lb_outType);
             this.panel1.Controls.Add(this.txt_outType);
             this.panel1.Controls.Add(this.lb_workNo);
             this.panel1.Controls.Add(this.txt_workNo);
             this.panel1.Controls.Add(this.lb_outPart);
-            this.panel1.Controls.Add(this.txt_outPart);
             this.panel1.Controls.Add(this.lb_checkDate);
             this.panel1.Controls.Add(this.txt_checkDate);
             this.panel1.Controls.Add(this.lb_checkUser);
@@ -2510,6 +1917,23 @@
             this.panel1.Size = new System.Drawing.Size(1126, 153);
             this.panel1.TabIndex = 1;
             // 
+            // depot_id
+            // 
+            this.depot_id.IsReadly = false;
+            this.depot_id.Location = new System.Drawing.Point(366, 117);
+            this.depot_id.Margin = new System.Windows.Forms.Padding(0);
+            this.depot_id.Name = "depot_id";
+            this.depot_id.Size = new System.Drawing.Size(150, 28);
+            this.depot_id.TabIndex = 573;
+            // 
+            // txt_status
+            // 
+            this.txt_status.Location = new System.Drawing.Point(850, 84);
+            this.txt_status.Name = "txt_status";
+            this.txt_status.Properties.Caption = "";
+            this.txt_status.Size = new System.Drawing.Size(94, 24);
+            this.txt_status.TabIndex = 572;
+            // 
             // labelControl11
             // 
             this.labelControl11.Location = new System.Drawing.Point(550, 108);
@@ -2527,13 +1951,13 @@
             this.lbGuid.Size = new System.Drawing.Size(0, 21);
             this.lbGuid.TabIndex = 1;
             // 
-            // txt_status
+            // txt_outPart
             // 
-            this.txt_status.Location = new System.Drawing.Point(850, 84);
-            this.txt_status.Name = "txt_status";
-            this.txt_status.Properties.Caption = "";
-            this.txt_status.Size = new System.Drawing.Size(94, 24);
-            this.txt_status.TabIndex = 572;
+            this.txt_outPart.IsReadly = false;
+            this.txt_outPart.Location = new System.Drawing.Point(366, 19);
+            this.txt_outPart.Name = "txt_outPart";
+            this.txt_outPart.Size = new System.Drawing.Size(150, 28);
+            this.txt_outPart.TabIndex = 574;
             // 
             // Frm_MesInvItemOut_SCLL
             // 
@@ -2549,11 +1973,8 @@
             this.tabMxPage1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_depotId.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_suppId.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_outType.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_workNo.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_outPart.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
@@ -2675,51 +2096,20 @@
         private DevExpress.XtraGrid.GridControl gcMx1;
         private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
         private DevExpress.XtraEditors.LabelControl lb_depotId;
-        private DevExpress.XtraEditors.TextEdit txt_depotId;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_depotId;
-
-        private DevExpress.XtraEditors.LabelControl lb_suppId;
-        private DevExpress.XtraEditors.TextEdit txt_suppId;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_suppId;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_states;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_msg;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_fmrmode;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_nflag;
         private DevExpress.XtraGrid.Columns.GridColumn gv_pbillNo;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_planQty;
         private DevExpress.XtraGrid.Columns.GridColumn gv_boardItem;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_businessType;
 
         private DevExpress.XtraEditors.LabelControl lb_outType;
         private DevExpress.XtraEditors.TextEdit txt_outType;
         private DevExpress.XtraGrid.Columns.GridColumn gv_outType;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_boardFlag;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_itemFlag;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_cmpocode;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_suppNo;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_workLine;
 
         private DevExpress.XtraEditors.LabelControl lb_workNo;
         private DevExpress.XtraEditors.TextEdit txt_workNo;
         private DevExpress.XtraGrid.Columns.GridColumn gv_workNo;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_mtransctionNo;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_company;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_factory;
         private DevExpress.XtraGrid.Columns.GridColumn gv_receiver;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_isVisual;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_outStatus;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_fType;
 
         private DevExpress.XtraEditors.LabelControl lb_outPart;
-        private DevExpress.XtraEditors.TextEdit txt_outPart;
         private DevExpress.XtraGrid.Columns.GridColumn gv_outPart;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_procLineNo;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_saptext;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_sapyear;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_sapstatus;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_sapno;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_depotCode;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_mmlist;
         private DevExpress.XtraGrid.Columns.GridColumn gv_outDate;
 
         private DevExpress.XtraEditors.LabelControl lb_checkDate;
@@ -2729,16 +2119,11 @@
         private DevExpress.XtraEditors.LabelControl lb_checkUser;
         private DevExpress.XtraEditors.TextEdit txt_checkUser;
         private DevExpress.XtraGrid.Columns.GridColumn gv_checkUser;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_produceLineNo;
         private DevExpress.XtraGrid.Columns.GridColumn gv_reason;
 
         private DevExpress.XtraEditors.LabelControl lb_remark;
         private DevExpress.XtraEditors.TextEdit txt_remark;
         private DevExpress.XtraGrid.Columns.GridColumn gv_remark;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_transactionNo;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_billTypeId;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_lastupdateDate;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_lastupdateBy;
 
         private DevExpress.XtraEditors.LabelControl lb_createDate;
         private DevExpress.XtraEditors.TextEdit txt_createDate;
@@ -2750,17 +2135,16 @@
 
         private DevExpress.XtraEditors.LabelControl lb_status;
         private DevExpress.XtraGrid.Columns.GridColumn gv_status;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_procNo;
 
         private DevExpress.XtraEditors.LabelControl lb_taskNo;
         private DevExpress.XtraEditors.TextEdit txt_taskNo;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_taskNo;
 
         private DevExpress.XtraEditors.LabelControl lb_itemOutNo;
         private DevExpress.XtraEditors.TextEdit txt_itemOutNo;
         private DevExpress.XtraGrid.Columns.GridColumn gv_itemOutNo;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_bbillNo;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_guid;
         private DevExpress.XtraEditors.CheckEdit txt_status;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+        private UserControl.UcLookCk depot_id;
+        private UserControl.UcLookDepartment txt_outPart;
     }
 }
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemOut_SCLL.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemOut_SCLL.cs
index 96564cd..ffef9b5 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemOut_SCLL.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemOut_SCLL.cs
@@ -1,7 +1,6 @@
-using DevExpress.XtraGrid.Views.Grid;
-using DevExpress.XtraGrid.Views.Grid.ViewInfo;
 using Gs.DevApp.Entity;
 using Gs.DevApp.ToolBox;
+using Gs.DevApp.UserControl;
 using MES.Service.Modes;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
@@ -9,42 +8,36 @@
 using System.Collections.Generic;
 using System.Data;
 using System.Drawing;
+using System.Threading.Tasks;
 using System.Windows.Forms;
 
 namespace Gs.DevApp.DevFrm
 {
     public partial class Frm_MesInvItemOut_SCLL : DevExpress.XtraEditors.XtraForm
     {
-        string _webServiceName = "User/";
+        string _webServiceName = "MesInvItemOutsManager/";
         List<FilterEntity> _filterList = new List<FilterEntity>();
         public Frm_MesInvItemOut_SCLL()
         {
             InitializeComponent();
-            this.toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick;
-            this.toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
-            this.toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
             this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
             this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1;
             this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
             this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
             gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
-            getPageList(1, UtilityHelper.GetPageSize());
+            Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1);
+            getPageList(1);
             pageBar1.PagerEvent += PageBar1_PagerEvent;
-            gridView1.CustomDrawRowIndicator += (s, e) =>
-            {
-                if (e.Info.IsRowIndicator && e.RowHandle >= 0)
-                {
-                    e.Info.DisplayText = (e.RowHandle + 1).ToString();
-                }
-            };
-            gridView1.CustomDrawEmptyForeground += (s, e) =>
-            {
-                string str = "鏆傛湭鏌ユ壘鍒板尮閰嶇殑鏁版嵁!";
-                Font f = new Font("寰蒋闆呴粦", 16);
-                Rectangle r = new Rectangle(gridView1.GridControl.Width / 2 - 100, e.Bounds.Top + 45, e.Bounds.Right - 5, e.Bounds.Height - 5);
-                e.Graphics.DrawString(str, f, Brushes.Gray, r);
-            };
+            depot_id.getSuppler("");
         }
+
+        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
+        {
+            _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns);
+            Task.Delay(100);
+            getPageList(1);
+        }
+
 
         /// <summary>
         /// 鍙屽嚮浜嬩欢
@@ -64,7 +57,7 @@
         /// <param name="pageSize"></param>
         private void PageBar1_PagerEvent(int curPage, int pageSize)
         {
-            getPageList(curPage, pageSize);
+            getPageList(curPage);
         }
         /// <summary>
         /// 鏌ヨ浜嬩欢
@@ -73,7 +66,10 @@
         /// <param name="e"></param>
         private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
         {
-            Gs.DevApp.UserControl.ShowFilter frm = new Gs.DevApp.UserControl.ShowFilter(gridView1.Columns, _filterList);
+            gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+            gridView1.ActiveFilter.Clear();
+            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+            var frm = new ShowFilter(gridView1.Columns, _filterList);
             frm.UpdateParent += Frm_UpdateParent;
             frm.ShowDialog();
         }
@@ -85,7 +81,7 @@
         private void Frm_UpdateParent(object sender, UpdateParentEventArgs e)
         {
             _filterList = e.FilterList;
-            getPageList(1, pageBar1.RowsCount);
+            getPageList(1);
         }
         /// <summary>
         ///     鍙嶅鏍�
@@ -151,7 +147,7 @@
                 if (_rtn.rtnCode > 0)
                 {
                     UtilityHelper.JumpToTab(xtraTabControl1, 0);
-                    getPageList(1, UtilityHelper.GetPageSize());
+                    getPageList(1);
                 }
                 ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
             }
@@ -171,150 +167,48 @@
             if (xtraTabControl1.SelectedTabPageIndex == 1)
                 getModel(lbGuid.Text.Trim(), false, 999);
             else
-                getPageList(1, UtilityHelper.GetPageSize());
-        }
-        /// <summary>
-        /// 淇敼浜嬩欢
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
-        {
-            string rowGuid = "", rowName = "";
-            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_itemOutNo, gridView1);
-            if (string.IsNullOrEmpty(rowGuid))
             {
-                ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
-                return;
-            }
-            getModel(rowGuid, true, 1);
-        }
-        /// <summary>
-        /// 鏂板浜嬩欢
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ToolBarMenu1_btnAddClick(object sender, EventArgs e)
-        {
-            UtilityHelper.JumpToTab(xtraTabControl1, 1);
-            lbGuid.Text = "";
-            List<DevExpress.XtraGrid.Views.Grid.GridView> gridViews = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
-            gridViews.Add(gvMx1);
-            gridViews.Add(gvMx2);
-            UtilityHelper.CleanValueByControl(this.panel1.Controls, true, gridViews);
-            Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
-            Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx2, gvMx2);
-        }
-        /// <summary>
-        /// 淇濆瓨浜嬩欢
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
-        {
-            toolBarMenu1.isSetBtn = false;
-            //var _ckId = txt_depotId.GetId(); //浠撳簱缂栧彿 depots_code
-            //var _gysId = txt_suppId.GetId(); //渚涘簲鍟嗙紪鍙�
-            //if (string.IsNullOrEmpty(_gysId))
-            //{
-            //    MsgHelper.Warning("璇烽�夋嫨渚涘簲鍟嗭紒");
-            //    txt_suppId.Focus();
-            //    return;
-            //}
-
-            //if (string.IsNullOrEmpty(_ckId))
-            //{
-            //    MsgHelper.Warning("璇烽�夋嫨浠撳簱锛�");
-            //    txt_depotId.Focus();
-            //    return;
-            //}
-            var _obj = new MesInvItemOuts()
-            {
-                Guid = Gs.DevApp.ToolBox.UtilityHelper.ToGuid(lbGuid.Text.Trim()), //鍒拌揣鍗曚富閿�
-                Remark = txt_remark.Text.Trim(), //澶囨敞
-                //SuppId = int.Parse(_gysId), //渚涘簲鍟�
-                //DepotId = int.Parse(_ckId),//浠撳簱
-                //FType = txt_fType.Checked == true ? 1 : 0,  //0=閲囪喘锛�1=濮斿
-                //Fmrmode = txt_fmrmode.Text,//閫�鏂欐柟寮�
-                //Reason = txt_reason.Text,//閫�鏂欐柟寮�
-                MesInvItemOutItemsList = new List<MesInvItemOutItems>(),
-            };
-            gvMx2.CloseEditor();
-            gvMx2.UpdateCurrentRow();
-            if (gvMx2.DataRowCount <= 0)
-            {
-                MsgHelper.ShowError("鏄庣粏涓嶈兘涓虹┖锛岃閫夋嫨浣犵殑鏀舵枡鏄庣粏锛�");
-                return;
-            }
-            for (var i = 0; i < gvMx2.DataRowCount; i++)
-            {
-                var row = gvMx2.GetDataRow(i);
-                if (row != null)
+                _filterList.Clear();
+                if (gridView1.ActiveFilter.Count > 0)
                 {
-                    Guid _guid = UtilityHelper.ToGuid(row["guid"].ToString());
-                    string _msl = row["quantity"].ToString();
-                    if (string.IsNullOrEmpty(_msl))
-                    {
-                        MsgHelper.ShowError("鐢宠鏁伴噺涓嶈兘涓虹┖锛�");
-                        return;
-                    }
-                    _obj.MesInvItemOutItemsList.Add(new MesInvItemOutItems
-                    {
-                        Guid = _guid,
-                        AboutGuid = UtilityHelper.ToGuid(row["aboutGuid"].ToString()),//
-                        Quantity = decimal.Parse(row["quantity"].ToString())
-                    });
+                    gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+                    gridView1.ActiveFilter.Clear();
+                    gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
                 }
-            }
-            try
-            {
-                var strJson = UtilityHelper.HttpPost("",
-                    _webServiceName + "EditModel",
-                    JsonConvert.SerializeObject(_obj));
-                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
-                MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
-                if (_rtn.rtnCode > 0)
-                {
-                    lbGuid.Text = _rtn.rtnData;
-                    toolBarMenu1.isSetBtn = true;
-                    UtilityHelper.ChangeEnableByControl(panel1.Controls, false);
-                }
-            }
-            catch (Exception ex)
-            {
-                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+                getPageList(1);
             }
         }
-
+        
         /// <summary>
         /// 
         /// </summary>
         /// <param name="curPage">绗嚑椤�</param>
         /// <param name="pageSize">姣忛〉鍑犳潯</param>
-        private void getPageList(int curPage, int pageSize)
+        private void getPageList(int curPage)
         {
-            System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
-            foreach (FilterEntity itm in _filterList)
-            {
-                _sbSqlWhere.Append(" and " + itm.fileId + itm.fileOper + "'" + itm.fileValue + "'");
-            }
-            PageQueryModel pgq = new PageQueryModel(curPage, pageSize, "create_date", "asc", "", _sbSqlWhere.ToString());
+            var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+            PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "item_out_no", "asc", "", _sbSqlWhere.ToString());
             string json = JsonConvert.SerializeObject(pgq);
             try
             {
-                string strReturn = UtilityHelper.HttpPost("", _webServiceName + "GetListPage", json);
+                string strReturn = UtilityHelper.HttpPost("", _webServiceName + "GetListPageSCLL", json);
                 ReturnModel<PageListModel> dd = UtilityHelper.ReturnToTablePage(strReturn);
                 if (dd.rtnCode > 0)
                 {
                     DataTable dt = dd.rtnData.list;
                     gcMain.BindingContext = new BindingContext();
-                    gcMain.DataSource = dt;
-                    gcMain.ForceInitialize();
-                    int dddd = dd.rtnData.pages;//鎬婚〉
-                    pageBar1.TotalPages = dddd;
-                    pageBar1.RecordCount = dd.rtnData.total;//璁板綍鎬绘暟
+                    gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+                    if (dt.Rows.Count > 0)
+                    {
+                        gcMain.DataSource = dt;
+                        gcMain.ForceInitialize();
+                    }
+                    else
+                        UtilityHelper.SetDefaultTable(gcMain, gridView1);
+                    gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+                    pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉
                     pageBar1.CurrentPage = curPage;//褰撳墠椤�
-                    pageBar1.setTxt();
+                    pageBar1.RecordCount = dd.rtnData.total;//鎬昏褰曟暟
                 }
                 else
                 {
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index ff74cfe..7a78a04 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -635,6 +635,12 @@
     <Compile Include="UserControl\UcLookDefectType.Designer.cs">
       <DependentUpon>UcLookDefectType.cs</DependentUpon>
     </Compile>
+    <Compile Include="UserControl\UcLookDepartment.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="UserControl\UcLookDepartment.Designer.cs">
+      <DependentUpon>UcLookDepartment.cs</DependentUpon>
+    </Compile>
     <Compile Include="UserControl\UcLookItems.cs">
       <SubType>UserControl</SubType>
     </Compile>
@@ -927,6 +933,9 @@
     <EmbeddedResource Include="UserControl\UcLookDefectType.resx">
       <DependentUpon>UcLookDefectType.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="UserControl\UcLookDepartment.resx">
+      <DependentUpon>UcLookDepartment.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="UserControl\UcLookItems.resx">
       <DependentUpon>UcLookItems.cs</DependentUpon>
     </EmbeddedResource>
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookDepartment.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcLookDepartment.Designer.cs
new file mode 100644
index 0000000..65e2a9e
--- /dev/null
+++ b/DevApp/Gs.DevApp/UserControl/UcLookDepartment.Designer.cs
@@ -0,0 +1,135 @@
+锘縩amespace Gs.DevApp.UserControl
+{
+    partial class UcLookDepartment
+    {
+        /// <summary> 
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary> 
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Component Designer generated code
+
+        /// <summary> 
+        /// Required method for Designer support - do not modify 
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.lookSearchSupplier = new DevExpress.XtraEditors.SearchLookUpEdit();
+            this.searchLookUpEdit1View = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
+            ((System.ComponentModel.ISupportInitialize)(this.lookSearchSupplier.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.searchLookUpEdit1View)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // lookSearchSupplier
+            // 
+            this.lookSearchSupplier.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.lookSearchSupplier.EditValue = "璇烽�夋嫨";
+            this.lookSearchSupplier.Location = new System.Drawing.Point(0, 0);
+            this.lookSearchSupplier.Name = "lookSearchSupplier";
+            this.lookSearchSupplier.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.lookSearchSupplier.Properties.Appearance.Options.UseFont = true;
+            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(259, 28);
+            this.lookSearchSupplier.TabIndex = 10;
+            // 
+            // searchLookUpEdit1View
+            // 
+            this.searchLookUpEdit1View.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.gridColumn5,
+            this.gridColumn1,
+            this.gridColumn2,
+            this.gridColumn3,
+            this.gridColumn4});
+            this.searchLookUpEdit1View.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus;
+            this.searchLookUpEdit1View.Name = "searchLookUpEdit1View";
+            this.searchLookUpEdit1View.OptionsSelection.EnableAppearanceFocusedCell = false;
+            this.searchLookUpEdit1View.OptionsView.ShowGroupPanel = false;
+            // 
+            // gridColumn5
+            // 
+            this.gridColumn5.Caption = "浣跨敤缁勭粐";
+            this.gridColumn5.FieldName = "fSubsidiary";
+            this.gridColumn5.Name = "gridColumn5";
+            this.gridColumn5.Visible = true;
+            this.gridColumn5.VisibleIndex = 0;
+            // 
+            // gridColumn1
+            // 
+            this.gridColumn1.Caption = "杞﹂棿ID";
+            this.gridColumn1.FieldName = "departmentid";
+            this.gridColumn1.Name = "gridColumn1";
+            this.gridColumn1.Visible = true;
+            this.gridColumn1.VisibleIndex = 1;
+            // 
+            // gridColumn2
+            // 
+            this.gridColumn2.Caption = "杞﹂棿缂栧彿";
+            this.gridColumn2.FieldName = "departmentcode";
+            this.gridColumn2.MinWidth = 80;
+            this.gridColumn2.Name = "gridColumn2";
+            this.gridColumn2.UnboundDataType = typeof(string);
+            this.gridColumn2.Visible = true;
+            this.gridColumn2.VisibleIndex = 2;
+            this.gridColumn2.Width = 80;
+            // 
+            // gridColumn3
+            // 
+            this.gridColumn3.Caption = "杞﹂棿鍚嶇О";
+            this.gridColumn3.FieldName = "departmentname";
+            this.gridColumn3.MinWidth = 100;
+            this.gridColumn3.Name = "gridColumn3";
+            this.gridColumn3.Visible = true;
+            this.gridColumn3.VisibleIndex = 3;
+            this.gridColumn3.Width = 100;
+            // 
+            // gridColumn4
+            // 
+            this.gridColumn4.Caption = "guid";
+            this.gridColumn4.FieldName = "guid";
+            this.gridColumn4.Name = "gridColumn4";
+            // 
+            // UcLookDepartment
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.Controls.Add(this.lookSearchSupplier);
+            this.Name = "UcLookDepartment";
+            this.Size = new System.Drawing.Size(259, 29);
+            ((System.ComponentModel.ISupportInitialize)(this.lookSearchSupplier.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.searchLookUpEdit1View)).EndInit();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private DevExpress.XtraEditors.SearchLookUpEdit lookSearchSupplier;
+        private DevExpress.XtraGrid.Views.Grid.GridView searchLookUpEdit1View;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
+    }
+}
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookDepartment.cs b/DevApp/Gs.DevApp/UserControl/UcLookDepartment.cs
new file mode 100644
index 0000000..89e6191
--- /dev/null
+++ b/DevApp/Gs.DevApp/UserControl/UcLookDepartment.cs
@@ -0,0 +1,108 @@
+锘縰sing DevExpress.XtraEditors;
+using Gs.DevApp.Entity;
+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 UcLookDepartment : DevExpress.XtraEditors.XtraUserControl
+    {
+        public UcLookDepartment()
+        {
+            InitializeComponent();
+            lookSearchSupplier.Properties.NullText = "璇烽�夋嫨";
+            lookSearchSupplier.EditValueChanged +=
+                LookSearchSupplier_EditValueChanged;
+            getSuppler();
+        }
+
+        public bool IsReadly { get; set; }
+
+        /// <summary>
+        ///     鏀瑰彉浜嬩欢
+        /// </summary>
+        public event EventHandler EditChanged;
+
+        private void LookSearchSupplier_EditValueChanged(object sender,
+            EventArgs e)
+        {
+            if (EditChanged != null) EditChanged(this, e);
+        }
+
+        private void getSuppler()
+        {
+            var pgq = new PageQueryModel(1, 999999, "a.departmentid", "asc", "", " and 1=1");
+            var json = JsonConvert.SerializeObject(pgq);
+            try
+            {
+                var strReturn = UtilityHelper.HttpPost("", "SysDepartmentManager/GetListPage", json);
+                var rtn = UtilityHelper.ReturnToTablePage(strReturn);
+                var dt = rtn.rtnData.list;
+                lookSearchSupplier.Properties.DataSource = dt;
+                lookSearchSupplier.Properties.DisplayMember = "departmentname";
+                lookSearchSupplier.Properties.ValueMember = "departmentid";
+            }
+            catch (Exception ex)
+            {
+                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+            }
+        }
+
+        public string GetId()
+        {
+            var row = lookSearchSupplier.GetSelectedDataRow() as DataRowView;
+            if (row != null)
+            {
+                string id = row["departmentid"].ToString();
+                return id;
+            }
+            return "";
+        }
+        public string GetCode()
+        {
+            var row = lookSearchSupplier.GetSelectedDataRow() as DataRowView;
+            if (row != null)
+            {
+                string id = row["departmentcode"].ToString();
+                return id;
+            }
+            return "";
+        }
+        public string GetName()
+        {
+            var name = lookSearchSupplier.Text.Trim();
+            return name;
+        }
+
+        public void SetIdOrCode(string Code)
+        {
+            if (Code == "-1")
+            {
+                lookSearchSupplier.EditValue = null;
+                return;
+            }
+            lookSearchSupplier.EditValue = Int64.Parse(((Code.ToString().Trim())));
+        }
+
+
+        public string GetGuid()
+        {
+            var row = lookSearchSupplier.GetSelectedDataRow() as DataRowView;
+            if (row != null)
+            {
+                string id = row["guid"].ToString();
+                return id;
+            }
+            return "";
+        }
+    }
+}
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookDepartment.resx b/DevApp/Gs.DevApp/UserControl/UcLookDepartment.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/DevApp/Gs.DevApp/UserControl/UcLookDepartment.resx
@@ -0,0 +1,120 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file

--
Gitblit v1.9.3