From 2772043a6abe77f742161c3372bf1e2855c0c6bb Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 18 四月 2025 08:28:28 +0800
Subject: [PATCH] 生产退库

---
 DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesSctkSq.Designer.cs   |  161 +--
 DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesSctkSq.cs            |   10 
 DevApp/Gs.DevApp/DevFrm/Ck/SelectSctk.Designer.cs      |   70 
 DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs |    4 
 DevApp/Gs.DevApp/DevFrm/FrmLogin.cs                    |   19 
 DevApp/Gs.DevApp/DevFrm/FrmLogin.Designer.cs           |  342 +++++--
 DevApp/Gs.DevApp/Gs.DevApp.csproj                      |    6 
 DevApp/Gs.DevApp/App.config                            |    2 
 DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesSctkSqDj.Designer.cs | 1510 ++++++++++++++++++++++++++++++++++++
 DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesSctkSqDj.cs          |  324 +++++++
 10 files changed, 2,168 insertions(+), 280 deletions(-)

diff --git a/DevApp/Gs.DevApp/App.config b/DevApp/Gs.DevApp/App.config
index 2d4703e..5bad92a 100644
--- a/DevApp/Gs.DevApp/App.config
+++ b/DevApp/Gs.DevApp/App.config
@@ -31,7 +31,7 @@
 		 <add key="WebApiUrl" value="http://localhost:5263/" />
 		<!--<add key="WebApiUrl" value="http://192.168.1.145:81/" />--> 
         <add key="LogPath" value="logs" />
-        <add key="ProductName" value="骞挎繁绉戞妧 G-MES V2.0" />
+        <add key="ProductName" value="G-MES V2.0" />
         <add key="PageSize" value="50" />
         <add key="Version" value="0.1" />
         <add key="IsAutoUpdater" value="0" />
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesSctkSq.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesSctkSq.Designer.cs
index acdc974..ecf5a63 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesSctkSq.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesSctkSq.Designer.cs
@@ -48,19 +48,14 @@
             this.split1 = new DevExpress.XtraEditors.SplitContainerControl();
             this.gcMain1 = new DevExpress.XtraGrid.GridControl();
             this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
-            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_status = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_isFinish = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_isOut = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_billNo = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_lastUpdateUser = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_lastUpdateTime = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_checkUser = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_checkDate = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_returnMethod = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_returnType = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_depotId = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_suppId = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_remark = new DevExpress.XtraGrid.Columns.GridColumn();
             this.pageBar1 = new UserControls.Data.UcPageBar();
             this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
@@ -76,8 +71,8 @@
             this.txt_remark = new DevExpress.XtraEditors.TextEdit();
             this.txt_checkUser = new DevExpress.XtraEditors.TextEdit();
             this.txt_status = new DevExpress.XtraEditors.CheckEdit();
-            this.lastUpdateUser = new DevExpress.XtraEditors.TextEdit();
-            this.lastUpdateTime = new DevExpress.XtraEditors.TextEdit();
+            this.txt_lastUpdateUser = new DevExpress.XtraEditors.TextEdit();
+            this.txt_lastUpdateTime = new DevExpress.XtraEditors.TextEdit();
             this.txt_guid = new DevExpress.XtraEditors.TextEdit();
             this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -138,8 +133,8 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.lastUpdateUser.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.lastUpdateTime.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_lastUpdateUser.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_lastUpdateTime.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
@@ -239,19 +234,14 @@
             this.gridView1.Appearance.Row.Options.UseFont = true;
             this.gridView1.ColumnPanelRowHeight = 50;
             this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
-            this.gridColumn1,
             this.gv_status,
-            this.gv_isFinish,
-            this.gv_isOut,
             this.gv_billNo,
             this.gv_lastUpdateUser,
             this.gv_lastUpdateTime,
             this.gv_checkUser,
             this.gv_checkDate,
-            this.gv_returnMethod,
             this.gv_returnType,
             this.gv_depotId,
-            this.gv_suppId,
             this.gv_remark});
             this.gridView1.GridControl = this.gcMain1;
             this.gridView1.IndicatorWidth = 50;
@@ -259,16 +249,6 @@
             this.gridView1.OptionsFind.ShowSearchNavButtons = false;
             this.gridView1.OptionsView.ShowAutoFilterRow = true;
             this.gridView1.OptionsView.ShowGroupPanel = false;
-            // 
-            // gridColumn1
-            // 
-            this.gridColumn1.Caption = "閫�璐х粍缁�";
-            this.gridColumn1.FieldName = "receivingOrg";
-            this.gridColumn1.Name = "gridColumn1";
-            this.gridColumn1.Tag = "org.fnamber";
-            this.gridColumn1.Visible = true;
-            this.gridColumn1.VisibleIndex = 0;
-            this.gridColumn1.Width = 250;
             // 
             // gv_status
             // 
@@ -281,36 +261,8 @@
             this.gv_status.OptionsColumn.AllowEdit = false;
             this.gv_status.Tag = "query_a.STATUS";
             this.gv_status.Visible = true;
-            this.gv_status.VisibleIndex = 1;
+            this.gv_status.VisibleIndex = 0;
             this.gv_status.Width = 50;
-            // 
-            // gv_isFinish
-            // 
-            this.gv_isFinish.AppearanceCell.Options.UseFont = true;
-            this.gv_isFinish.Caption = "鏄惁瀹屾垚";
-            this.gv_isFinish.FieldName = "isFinish";
-            this.gv_isFinish.MaxWidth = 50;
-            this.gv_isFinish.MinWidth = 50;
-            this.gv_isFinish.Name = "gv_isFinish";
-            this.gv_isFinish.OptionsColumn.AllowEdit = false;
-            this.gv_isFinish.Tag = "query_a.IS_FINISH";
-            this.gv_isFinish.Visible = true;
-            this.gv_isFinish.VisibleIndex = 2;
-            this.gv_isFinish.Width = 50;
-            // 
-            // gv_isOut
-            // 
-            this.gv_isOut.AppearanceCell.Options.UseFont = true;
-            this.gv_isOut.Caption = "濮斿鏍囪瘑";
-            this.gv_isOut.FieldName = "isOut";
-            this.gv_isOut.MaxWidth = 50;
-            this.gv_isOut.MinWidth = 50;
-            this.gv_isOut.Name = "gv_isOut";
-            this.gv_isOut.OptionsColumn.AllowEdit = false;
-            this.gv_isOut.Tag = "query_a.IS_OUT";
-            this.gv_isOut.Visible = true;
-            this.gv_isOut.VisibleIndex = 3;
-            this.gv_isOut.Width = 50;
             // 
             // gv_billNo
             // 
@@ -321,7 +273,7 @@
             this.gv_billNo.OptionsColumn.AllowEdit = false;
             this.gv_billNo.Tag = "query_a.BILL_NO";
             this.gv_billNo.Visible = true;
-            this.gv_billNo.VisibleIndex = 4;
+            this.gv_billNo.VisibleIndex = 1;
             this.gv_billNo.Width = 120;
             // 
             // gv_lastUpdateUser
@@ -333,7 +285,7 @@
             this.gv_lastUpdateUser.OptionsColumn.AllowEdit = false;
             this.gv_lastUpdateUser.Tag = "query_a.LAST_UPDATE_USER";
             this.gv_lastUpdateUser.Visible = true;
-            this.gv_lastUpdateUser.VisibleIndex = 5;
+            this.gv_lastUpdateUser.VisibleIndex = 2;
             this.gv_lastUpdateUser.Width = 94;
             // 
             // gv_lastUpdateTime
@@ -345,7 +297,7 @@
             this.gv_lastUpdateTime.OptionsColumn.AllowEdit = false;
             this.gv_lastUpdateTime.Tag = "query_a.LAST_UPDATE_TIME";
             this.gv_lastUpdateTime.Visible = true;
-            this.gv_lastUpdateTime.VisibleIndex = 6;
+            this.gv_lastUpdateTime.VisibleIndex = 3;
             this.gv_lastUpdateTime.Width = 180;
             // 
             // gv_checkUser
@@ -357,7 +309,7 @@
             this.gv_checkUser.OptionsColumn.AllowEdit = false;
             this.gv_checkUser.Tag = "query_a.CHECK_USER";
             this.gv_checkUser.Visible = true;
-            this.gv_checkUser.VisibleIndex = 7;
+            this.gv_checkUser.VisibleIndex = 4;
             this.gv_checkUser.Width = 94;
             // 
             // gv_checkDate
@@ -369,31 +321,19 @@
             this.gv_checkDate.OptionsColumn.AllowEdit = false;
             this.gv_checkDate.Tag = "query_a.CHECK_DATE";
             this.gv_checkDate.Visible = true;
-            this.gv_checkDate.VisibleIndex = 8;
+            this.gv_checkDate.VisibleIndex = 5;
             this.gv_checkDate.Width = 94;
-            // 
-            // gv_returnMethod
-            // 
-            this.gv_returnMethod.AppearanceCell.Options.UseFont = true;
-            this.gv_returnMethod.Caption = "閫�鏂欐柟寮� ";
-            this.gv_returnMethod.FieldName = "returnMethod";
-            this.gv_returnMethod.Name = "gv_returnMethod";
-            this.gv_returnMethod.OptionsColumn.AllowEdit = false;
-            this.gv_returnMethod.Tag = "query_a.RETURN_METHOD";
-            this.gv_returnMethod.Visible = true;
-            this.gv_returnMethod.VisibleIndex = 9;
-            this.gv_returnMethod.Width = 94;
             // 
             // gv_returnType
             // 
             this.gv_returnType.AppearanceCell.Options.UseFont = true;
-            this.gv_returnType.Caption = "閫�鏂欑被鍨� ";
+            this.gv_returnType.Caption = "閫�搴撶被鍨� ";
             this.gv_returnType.FieldName = "returnType";
             this.gv_returnType.Name = "gv_returnType";
             this.gv_returnType.OptionsColumn.AllowEdit = false;
             this.gv_returnType.Tag = "query_a.RETURN_TYPE";
             this.gv_returnType.Visible = true;
-            this.gv_returnType.VisibleIndex = 10;
+            this.gv_returnType.VisibleIndex = 6;
             this.gv_returnType.Width = 94;
             // 
             // gv_depotId
@@ -405,20 +345,8 @@
             this.gv_depotId.OptionsColumn.AllowEdit = false;
             this.gv_depotId.Tag = "query_a.DEPOT_ID";
             this.gv_depotId.Visible = true;
-            this.gv_depotId.VisibleIndex = 11;
+            this.gv_depotId.VisibleIndex = 7;
             this.gv_depotId.Width = 94;
-            // 
-            // gv_suppId
-            // 
-            this.gv_suppId.AppearanceCell.Options.UseFont = true;
-            this.gv_suppId.Caption = "渚涘簲鍟�";
-            this.gv_suppId.FieldName = "supName";
-            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 = 12;
-            this.gv_suppId.Width = 94;
             // 
             // gv_remark
             // 
@@ -429,7 +357,7 @@
             this.gv_remark.OptionsColumn.AllowEdit = false;
             this.gv_remark.Tag = "query_a.REMARK";
             this.gv_remark.Visible = true;
-            this.gv_remark.VisibleIndex = 13;
+            this.gv_remark.VisibleIndex = 8;
             this.gv_remark.Width = 94;
             // 
             // pageBar1
@@ -484,8 +412,8 @@
             this.layoutMx1.Controls.Add(this.txt_remark);
             this.layoutMx1.Controls.Add(this.txt_checkUser);
             this.layoutMx1.Controls.Add(this.txt_status);
-            this.layoutMx1.Controls.Add(this.lastUpdateUser);
-            this.layoutMx1.Controls.Add(this.lastUpdateTime);
+            this.layoutMx1.Controls.Add(this.txt_lastUpdateUser);
+            this.layoutMx1.Controls.Add(this.txt_lastUpdateTime);
             this.layoutMx1.Controls.Add(this.txt_guid);
             this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
@@ -507,7 +435,7 @@
             this.btnSelect.Size = new System.Drawing.Size(116, 27);
             this.btnSelect.StyleController = this.layoutMx1;
             this.btnSelect.TabIndex = 525;
-            this.btnSelect.Text = "閫夋嫨閫�璐ф槑缁�";
+            this.btnSelect.Text = "閫夋嫨閫�搴撴槑缁�";
             // 
             // lbGuid
             // 
@@ -603,23 +531,23 @@
             this.txt_status.TabIndex = 528;
             this.txt_status.Tag = "readonly";
             // 
-            // lastUpdateUser
+            // txt_lastUpdateUser
             // 
-            this.lastUpdateUser.Location = new System.Drawing.Point(656, 12);
-            this.lastUpdateUser.Name = "lastUpdateUser";
-            this.lastUpdateUser.Size = new System.Drawing.Size(165, 24);
-            this.lastUpdateUser.StyleController = this.layoutMx1;
-            this.lastUpdateUser.TabIndex = 530;
-            this.lastUpdateUser.Tag = "readonly";
+            this.txt_lastUpdateUser.Location = new System.Drawing.Point(656, 12);
+            this.txt_lastUpdateUser.Name = "txt_lastUpdateUser";
+            this.txt_lastUpdateUser.Size = new System.Drawing.Size(165, 24);
+            this.txt_lastUpdateUser.StyleController = this.layoutMx1;
+            this.txt_lastUpdateUser.TabIndex = 530;
+            this.txt_lastUpdateUser.Tag = "readonly";
             // 
-            // lastUpdateTime
+            // txt_lastUpdateTime
             // 
-            this.lastUpdateTime.Location = new System.Drawing.Point(656, 43);
-            this.lastUpdateTime.Name = "lastUpdateTime";
-            this.lastUpdateTime.Size = new System.Drawing.Size(165, 24);
-            this.lastUpdateTime.StyleController = this.layoutMx1;
-            this.lastUpdateTime.TabIndex = 531;
-            this.lastUpdateTime.Tag = "readonly";
+            this.txt_lastUpdateTime.Location = new System.Drawing.Point(656, 43);
+            this.txt_lastUpdateTime.Name = "txt_lastUpdateTime";
+            this.txt_lastUpdateTime.Size = new System.Drawing.Size(165, 24);
+            this.txt_lastUpdateTime.StyleController = this.layoutMx1;
+            this.txt_lastUpdateTime.TabIndex = 531;
+            this.txt_lastUpdateTime.Tag = "readonly";
             // 
             // txt_guid
             // 
@@ -722,7 +650,7 @@
             this.layoutControlItem9.Name = "layoutControlItem9";
             this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem9.Size = new System.Drawing.Size(272, 31);
-            this.layoutControlItem9.Text = "瀹℃牳浜�";
+            this.layoutControlItem9.Text = "瀹℃牳浜哄憳";
             this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem10
@@ -738,17 +666,17 @@
             // 
             // layoutControlItem14
             // 
-            this.layoutControlItem14.Control = this.lastUpdateUser;
+            this.layoutControlItem14.Control = this.txt_lastUpdateUser;
             this.layoutControlItem14.Location = new System.Drawing.Point(542, 0);
             this.layoutControlItem14.Name = "layoutControlItem14";
             this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem14.Size = new System.Drawing.Size(271, 31);
-            this.layoutControlItem14.Text = "鏈�鍚庢洿鏂颁汉";
+            this.layoutControlItem14.Text = "鏈�鍚庢洿鏂颁汉鍛�";
             this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem15
             // 
-            this.layoutControlItem15.Control = this.lastUpdateTime;
+            this.layoutControlItem15.Control = this.txt_lastUpdateTime;
             this.layoutControlItem15.Location = new System.Drawing.Point(542, 31);
             this.layoutControlItem15.Name = "layoutControlItem15";
             this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
@@ -871,7 +799,7 @@
             // 
             // rkmxGuid
             // 
-            this.rkmxGuid.Caption = "gridColumn1";
+            this.rkmxGuid.Caption = "鍏ュ簱鏄庣粏琛℅uid";
             this.rkmxGuid.FieldName = "rkmxGuid";
             this.rkmxGuid.MinWidth = 25;
             this.rkmxGuid.Name = "rkmxGuid";
@@ -880,7 +808,7 @@
             // gvMx1id
             // 
             this.gvMx1id.AppearanceCell.Options.UseFont = true;
-            this.gvMx1id.Caption = "ID ";
+            this.gvMx1id.Caption = "鐢宠鏄庣粏Guid";
             this.gvMx1id.FieldName = "id";
             this.gvMx1id.MinWidth = 50;
             this.gvMx1id.Name = "gvMx1id";
@@ -890,7 +818,7 @@
             // gvMx1mid
             // 
             this.gvMx1mid.AppearanceCell.Options.UseFont = true;
-            this.gvMx1mid.Caption = "MID ";
+            this.gvMx1mid.Caption = "涓昏〃Guid";
             this.gvMx1mid.FieldName = "mid";
             this.gvMx1mid.MinWidth = 50;
             this.gvMx1mid.Name = "gvMx1mid";
@@ -1070,8 +998,8 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.lastUpdateUser.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.lastUpdateTime.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_lastUpdateUser.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_lastUpdateTime.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
@@ -1105,19 +1033,14 @@
         private DevExpress.XtraEditors.SplitContainerControl split1;
         private DevExpress.XtraGrid.GridControl gcMain1;
         private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
         private DevExpress.XtraGrid.Columns.GridColumn gv_status;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_isFinish;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_isOut;
         private DevExpress.XtraGrid.Columns.GridColumn gv_billNo;
         private DevExpress.XtraGrid.Columns.GridColumn gv_lastUpdateUser;
         private DevExpress.XtraGrid.Columns.GridColumn gv_lastUpdateTime;
         private DevExpress.XtraGrid.Columns.GridColumn gv_checkUser;
         private DevExpress.XtraGrid.Columns.GridColumn gv_checkDate;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_returnMethod;
         private DevExpress.XtraGrid.Columns.GridColumn gv_returnType;
         private DevExpress.XtraGrid.Columns.GridColumn gv_depotId;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_suppId;
         private DevExpress.XtraGrid.Columns.GridColumn gv_remark;
         private UserControls.Data.UcPageBar pageBar1;
         private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
@@ -1139,8 +1062,8 @@
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
-        private DevExpress.XtraEditors.TextEdit lastUpdateUser;
-        private DevExpress.XtraEditors.TextEdit lastUpdateTime;
+        private DevExpress.XtraEditors.TextEdit txt_lastUpdateUser;
+        private DevExpress.XtraEditors.TextEdit txt_lastUpdateTime;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
         private DevExpress.XtraTab.XtraTabControl tabMx;
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesSctkSq.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesSctkSq.cs
index e3a0900..330417b 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesSctkSq.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesSctkSq.cs
@@ -16,7 +16,6 @@
         string _webServiceName = "MesSctkSqManager/";
         List<FilterEntity> _filterList = new List<FilterEntity>();
         string _ucCk = "";//鍙戞枡浠撳簱
-        string _ucGys = "";//渚涘簲鍟�
         public Frm_MesSctkSq()
         {
             InitializeComponent();
@@ -45,7 +44,7 @@
             }, lbGuid);
             getPageList(1);
             pageBar1.PagerEvent += PageBar1_PagerEvent;
-            //閫夋嫨搴撳瓨缁勭粐锛堜粨搴撳拰渚涘簲鍟嗭級
+            //閫夋嫨搴撳瓨缁勭粐锛堜粨搴擄級
             txt_thOrgId.EditChanged += (s, e) =>
             {
                 var orgId = txt_thOrgId.GetId();
@@ -86,7 +85,7 @@
                             _row["itemName"] = dym.itemName;
                             _row["itemModel"] = dym.itemModel;
                             _row["dwName"] = dym.dwName;
-                            _row["sqNum"] = "";
+                           // _row["sqNum"] = "";
                             _row["ysNum"] = "0";
                             _row["remark"] = "";
                             _Table.Rows.Add(_row);
@@ -98,7 +97,7 @@
                         gvMx1.PostEditor();
                         gvMx1.UpdateCurrentRow();
                         gvMx1.BestFitColumns();
-                        Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
+                        Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
                     }
                     catch (Exception ex)
                     {
@@ -233,7 +232,6 @@
             {
                 MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
             }
-
         }
 
         /// <summary>
@@ -454,13 +452,11 @@
                 if (_rtn.rtnCode > 0)
                 {
                     dynamic dy = _rtn.rtnData;
-                    _ucGys = dy.suppId;
                     _ucCk = dy.depotId;
                     lbGuid.Text = strGuid;
                     List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
                     gvList.Add(gvMx1);
                     UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList);
-                    _ucGys = "";
                     _ucCk = "";
                     JObject _job = JObject.Parse(strJson);
                     JArray array = new JArray();
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesSctkSqDj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesSctkSqDj.Designer.cs
new file mode 100644
index 0000000..dc27f9f
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesSctkSqDj.Designer.cs
@@ -0,0 +1,1510 @@
+锘縩amespace Gs.DevApp.DevFrm.Ck
+{
+    partial class Frm_MesSctkSqDj
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.components = new System.ComponentModel.Container();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
+            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
+            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
+            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
+            this.split1 = new DevExpress.XtraEditors.SplitContainerControl();
+            this.gcMain1 = new DevExpress.XtraGrid.GridControl();
+            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_status = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_fType = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_itemOutNo = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_suppNo = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_depotCode = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_remark = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_createDate = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_checkDate = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_reason = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_fmrmode = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.pageBar1 = new UserControls.Data.UcPageBar();
+            this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
+            this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
+            this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
+            this.lbGuid = new System.Windows.Forms.Label();
+            this.txt_suppName = new DevExpress.XtraEditors.TextEdit();
+            this.txt_checkUser = new DevExpress.XtraEditors.TextEdit();
+            this.txt_checkDate = new DevExpress.XtraEditors.TextEdit();
+            this.txt_depotName = new DevExpress.XtraEditors.TextEdit();
+            this.txt_reason = new DevExpress.XtraEditors.ComboBoxEdit();
+            this.txt_fmrmode = new DevExpress.XtraEditors.ComboBoxEdit();
+            this.txt_itemOutNo = new DevExpress.XtraEditors.TextEdit();
+            this.txt_fType = new DevExpress.XtraEditors.CheckEdit();
+            this.txt_sqRemark = new DevExpress.XtraEditors.TextEdit();
+            this.txt_status = new DevExpress.XtraEditors.CheckEdit();
+            this.txt_guid = new DevExpress.XtraEditors.TextEdit();
+            this.txt_sqdNo = new DevExpress.XtraEditors.TextEdit();
+            this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
+            this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
+            this.lb_guid = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
+            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.lab_createBy = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.tabMx = new DevExpress.XtraTab.XtraTabControl();
+            this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
+            this.gcMx1 = new DevExpress.XtraGrid.GridControl();
+            this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx2status = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx2pbillNo = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx2workLine = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx2itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx2quantity = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx2tlQty = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx2depotCode = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx2remark = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx2ebelnK3id = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx2lineK3id = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx2itemOutId = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
+            this.gcMx2 = new DevExpress.XtraGrid.GridControl();
+            this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.gvMx1guid = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1itemBarcode = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1quantity = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1depotCode = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1depotSectionCode = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1ebelnK3id = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1lineK3id = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.picCheckBox = new System.Windows.Forms.PictureBox();
+            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.tips = new DevExpress.Utils.ToolTipController(this.components);
+            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
+            this.xtraTabControl1.SuspendLayout();
+            this.xtraTabPage1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.split1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).BeginInit();
+            this.split1.Panel1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).BeginInit();
+            this.split1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
+            this.xtraTabPage2.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).BeginInit();
+            this.splitMx1.Panel1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel2)).BeginInit();
+            this.splitMx1.Panel2.SuspendLayout();
+            this.splitMx1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
+            this.layoutMx1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_suppName.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_depotName.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_reason.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fmrmode.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_itemOutNo.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fType.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_sqRemark.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_sqdNo.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.lb_guid)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.lab_createBy)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
+            this.tabMx.SuspendLayout();
+            this.tabMxPage2.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
+            this.xtraTabPage3.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // toolBarMenu1
+            // 
+            this.toolBarMenu1.chkParameter = null;
+            this.toolBarMenu1.currentAction = null;
+            this.toolBarMenu1.defaultActions = null;
+            this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
+            this.toolBarMenu1.guidKey = null;
+            this.toolBarMenu1.isSetBtn = false;
+            this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
+            this.toolBarMenu1.Name = "toolBarMenu1";
+            this.toolBarMenu1.rptParameter = null;
+            this.toolBarMenu1.Size = new System.Drawing.Size(1128, 80);
+            this.toolBarMenu1.TabIndex = 0;
+            this.toolBarMenu1.xlsInService = null;
+            this.toolBarMenu1.xlsOutParameter = null;
+            // 
+            // xtraTabControl1
+            // 
+            this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
+            this.xtraTabControl1.Name = "xtraTabControl1";
+            this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
+            this.xtraTabControl1.Size = new System.Drawing.Size(1128, 602);
+            this.xtraTabControl1.TabIndex = 3;
+            this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
+            this.xtraTabPage1,
+            this.xtraTabPage2});
+            // 
+            // xtraTabPage1
+            // 
+            this.xtraTabPage1.Controls.Add(this.split1);
+            this.xtraTabPage1.Name = "xtraTabPage1";
+            this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
+            this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
+            // 
+            // split1
+            // 
+            this.split1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.split1.Horizontal = false;
+            this.split1.Location = new System.Drawing.Point(0, 0);
+            this.split1.Name = "split1";
+            // 
+            // split1.Panel1
+            // 
+            this.split1.Panel1.Controls.Add(this.gcMain1);
+            this.split1.Panel1.Controls.Add(this.pageBar1);
+            this.split1.Panel1.Text = "Panel1";
+            // 
+            // split1.Panel2
+            // 
+            this.split1.Panel2.Text = "Panel2"; this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2; this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+            this.split1.Size = new System.Drawing.Size(1126, 570);
+            this.split1.SplitterPosition = 0;
+            this.split1.TabIndex = 3;
+            // 
+            // gcMain1
+            // 
+            this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMain1.Location = new System.Drawing.Point(0, 0);
+            this.gcMain1.MainView = this.gridView1;
+            this.gcMain1.Name = "gcMain1";
+            this.gcMain1.Size = new System.Drawing.Size(1126, 519);
+            this.gcMain1.TabIndex = 2;
+            this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+            this.gridView1});
+            // 
+            // gridView1
+            // 
+            this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
+            this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+            this.gridView1.Appearance.Row.Options.UseFont = true;
+            this.gridView1.ColumnPanelRowHeight = 50;
+            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.gridColumn13,
+            this.gv_status,
+            this.gv_fType,
+            this.gv_itemOutNo,
+            this.gv_suppNo,
+            this.gridColumn1,
+            this.gv_depotCode,
+            this.gridColumn2,
+            this.gv_remark,
+            this.gridColumn3,
+            this.gv_createDate,
+            this.gridColumn4,
+            this.gv_checkDate,
+            this.gv_reason,
+            this.gv_fmrmode,
+            this.gridColumn7,
+            this.gridColumn18});
+            this.gridView1.GridControl = this.gcMain1;
+            this.gridView1.IndicatorWidth = 50;
+            this.gridView1.Name = "gridView1";
+            this.gridView1.OptionsFind.ShowSearchNavButtons = false;
+            this.gridView1.OptionsView.ShowAutoFilterRow = true;
+            this.gridView1.OptionsView.ShowGroupPanel = false;
+            // 
+            // gridColumn13
+            // 
+            this.gridColumn13.Caption = "閫�鏂欑粍缁�";
+            this.gridColumn13.FieldName = "receivingOrg";
+            this.gridColumn13.Name = "gridColumn13";
+            this.gridColumn13.Tag = "org.fnamber";
+            this.gridColumn13.Visible = true;
+            this.gridColumn13.VisibleIndex = 0;
+            this.gridColumn13.Width = 250;
+            // 
+            // gv_status
+            // 
+            this.gv_status.AppearanceCell.Options.UseFont = true;
+            this.gv_status.Caption = "瀹℃牳鏍囪瘑";
+            this.gv_status.FieldName = "statusChk";
+            this.gv_status.MaxWidth = 50;
+            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 = 1;
+            this.gv_status.Width = 50;
+            // 
+            // gv_fType
+            // 
+            this.gv_fType.AppearanceCell.Options.UseFont = true;
+            this.gv_fType.Caption = "濮斿鏍囪瘑";
+            this.gv_fType.FieldName = "isOut";
+            this.gv_fType.MaxWidth = 50;
+            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 = 2;
+            this.gv_fType.Width = 50;
+            // 
+            // gv_itemOutNo
+            // 
+            this.gv_itemOutNo.AppearanceCell.Options.UseFont = true;
+            this.gv_itemOutNo.Caption = "鍑哄簱鍗曞彿 ";
+            this.gv_itemOutNo.FieldName = "itemOutNo";
+            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 = 3;
+            this.gv_itemOutNo.Width = 100;
+            // 
+            // gv_suppNo
+            // 
+            this.gv_suppNo.AppearanceCell.Options.UseFont = true;
+            this.gv_suppNo.Caption = "渚涘簲鍟嗙紪鍙� ";
+            this.gv_suppNo.FieldName = "suppNo2";
+            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 = 4;
+            this.gv_suppNo.Width = 94;
+            // 
+            // gridColumn1
+            // 
+            this.gridColumn1.Caption = "渚涘簲鍟嗗悕绉�";
+            this.gridColumn1.FieldName = "suppName";
+            this.gridColumn1.Name = "gridColumn1";
+            this.gridColumn1.Visible = true;
+            this.gridColumn1.VisibleIndex = 5;
+            this.gridColumn1.Width = 94;
+            // 
+            // gv_depotCode
+            // 
+            this.gv_depotCode.AppearanceCell.Options.UseFont = true;
+            this.gv_depotCode.Caption = "閫�鏂欎粨搴�";
+            this.gv_depotCode.FieldName = "depotCode";
+            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 = 6;
+            this.gv_depotCode.Width = 94;
+            // 
+            // gridColumn2
+            // 
+            this.gridColumn2.Caption = "浠撳簱鍚嶇О";
+            this.gridColumn2.FieldName = "depotName";
+            this.gridColumn2.Name = "gridColumn2";
+            this.gridColumn2.Visible = true;
+            this.gridColumn2.VisibleIndex = 7;
+            this.gridColumn2.Width = 94;
+            // 
+            // gv_remark
+            // 
+            this.gv_remark.AppearanceCell.Options.UseFont = true;
+            this.gv_remark.Caption = "鐢宠澶囨敞";
+            this.gv_remark.FieldName = "sqRemark";
+            this.gv_remark.Name = "gv_remark";
+            this.gv_remark.OptionsColumn.AllowEdit = false;
+            this.gv_remark.Tag = "query_a.remark";
+            this.gv_remark.Visible = true;
+            this.gv_remark.VisibleIndex = 8;
+            this.gv_remark.Width = 94;
+            // 
+            // gridColumn3
+            // 
+            this.gridColumn3.Caption = "鍒涘缓浜�";
+            this.gridColumn3.FieldName = "createBy";
+            this.gridColumn3.Name = "gridColumn3";
+            this.gridColumn3.Visible = true;
+            this.gridColumn3.VisibleIndex = 9;
+            this.gridColumn3.Width = 94;
+            // 
+            // gv_createDate
+            // 
+            this.gv_createDate.AppearanceCell.Options.UseFont = true;
+            this.gv_createDate.Caption = "鍒涘缓鏃堕棿 ";
+            this.gv_createDate.FieldName = "createDate";
+            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 = 10;
+            this.gv_createDate.Width = 180;
+            // 
+            // gridColumn4
+            // 
+            this.gridColumn4.Caption = "瀹℃牳浜�";
+            this.gridColumn4.FieldName = "checkUser";
+            this.gridColumn4.Name = "gridColumn4";
+            this.gridColumn4.Visible = true;
+            this.gridColumn4.VisibleIndex = 11;
+            this.gridColumn4.Width = 94;
+            // 
+            // gv_checkDate
+            // 
+            this.gv_checkDate.AppearanceCell.Options.UseFont = true;
+            this.gv_checkDate.Caption = "瀹℃牳鏃ユ湡 ";
+            this.gv_checkDate.FieldName = "checkDate";
+            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 = 12;
+            this.gv_checkDate.Width = 180;
+            // 
+            // gv_reason
+            // 
+            this.gv_reason.AppearanceCell.Options.UseFont = true;
+            this.gv_reason.Caption = "閫�鏂欏師鍥�";
+            this.gv_reason.FieldName = "reason";
+            this.gv_reason.Name = "gv_reason";
+            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.Width = 94;
+            // 
+            // gv_fmrmode
+            // 
+            this.gv_fmrmode.AppearanceCell.Options.UseFont = true;
+            this.gv_fmrmode.Caption = "閫�鏂欐柟寮� ";
+            this.gv_fmrmode.FieldName = "fmrmode";
+            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 = 14;
+            this.gv_fmrmode.Width = 94;
+            // 
+            // gridColumn7
+            // 
+            this.gridColumn7.Caption = "鍗曟嵁绫诲瀷";
+            this.gridColumn7.FieldName = "outType";
+            this.gridColumn7.MinWidth = 25;
+            this.gridColumn7.Name = "gridColumn7";
+            this.gridColumn7.Visible = true;
+            this.gridColumn7.VisibleIndex = 15;
+            this.gridColumn7.Width = 94;
+            // 
+            // gridColumn18
+            // 
+            this.gridColumn18.Caption = "鐢宠鍗曞彿";
+            this.gridColumn18.FieldName = "sqdNo";
+            this.gridColumn18.MinWidth = 25;
+            this.gridColumn18.Name = "gridColumn18";
+            this.gridColumn18.Visible = true;
+            this.gridColumn18.VisibleIndex = 16;
+            this.gridColumn18.Width = 94;
+            // 
+            // pageBar1
+            // 
+            this.pageBar1.CurrentPage = 1;
+            this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.pageBar1.Location = new System.Drawing.Point(0, 519);
+            this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
+            this.pageBar1.Name = "pageBar1";
+            this.pageBar1.RecordCount = 0;
+            this.pageBar1.Size = new System.Drawing.Size(1126, 39);
+            this.pageBar1.TabIndex = 4;
+            this.pageBar1.TotalPages = 0;
+            // 
+            // xtraTabPage2
+            // 
+            this.xtraTabPage2.Controls.Add(this.splitMx1);
+            this.xtraTabPage2.Name = "xtraTabPage2";
+            this.xtraTabPage2.Size = new System.Drawing.Size(1126, 570);
+            this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
+            // 
+            // splitMx1
+            // 
+            this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.splitMx1.Horizontal = false;
+            this.splitMx1.Location = new System.Drawing.Point(0, 0);
+            this.splitMx1.Name = "splitMx1"; this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+            // 
+            // splitMx1.Panel1
+            // 
+            this.splitMx1.Panel1.Controls.Add(this.layoutMx1);
+            this.splitMx1.Panel1.Text = "Panel1";
+            // 
+            // splitMx1.Panel2
+            // 
+            this.splitMx1.Panel2.Controls.Add(this.tabMx);
+            this.splitMx1.Panel2.Text = "Panel2";
+            this.splitMx1.Size = new System.Drawing.Size(1126, 570);
+            this.splitMx1.SplitterPosition = 137;
+            this.splitMx1.TabIndex = 0;
+            // 
+            // layoutMx1
+            // 
+            this.layoutMx1.Controls.Add(this.lbGuid);
+            this.layoutMx1.Controls.Add(this.txt_suppName);
+            this.layoutMx1.Controls.Add(this.txt_checkUser);
+            this.layoutMx1.Controls.Add(this.txt_checkDate);
+            this.layoutMx1.Controls.Add(this.txt_depotName);
+            this.layoutMx1.Controls.Add(this.txt_reason);
+            this.layoutMx1.Controls.Add(this.txt_fmrmode);
+            this.layoutMx1.Controls.Add(this.txt_itemOutNo);
+            this.layoutMx1.Controls.Add(this.txt_fType);
+            this.layoutMx1.Controls.Add(this.txt_sqRemark);
+            this.layoutMx1.Controls.Add(this.txt_status);
+            this.layoutMx1.Controls.Add(this.txt_guid);
+            this.layoutMx1.Controls.Add(this.txt_sqdNo);
+            this.layoutMx1.Controls.Add(this.txt_createBy);
+            this.layoutMx1.Controls.Add(this.txt_createDate);
+            this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+            this.lb_guid,
+            this.layoutControlItem12});
+            this.layoutMx1.Location = new System.Drawing.Point(0, 0);
+            this.layoutMx1.Name = "layoutMx1";
+            this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(792, 394, 812, 500);
+            this.layoutMx1.Root = this.Root;
+            this.layoutMx1.Size = new System.Drawing.Size(1126, 137);
+            this.layoutMx1.TabIndex = 0;
+            this.layoutMx1.Text = "layoutControl1";
+            // 
+            // lbGuid
+            // 
+            this.lbGuid.Location = new System.Drawing.Point(825, 108);
+            this.lbGuid.Name = "lbGuid";
+            this.lbGuid.Size = new System.Drawing.Size(268, 28);
+            this.lbGuid.TabIndex = 527;
+            this.lbGuid.Text = "lbGuid";
+            // 
+            // txt_suppName
+            // 
+            this.txt_suppName.Location = new System.Drawing.Point(84, 70);
+            this.txt_suppName.Name = "txt_suppName";
+            this.txt_suppName.Properties.Appearance.Options.UseFont = true;
+            this.txt_suppName.Size = new System.Drawing.Size(200, 24);
+            this.txt_suppName.StyleController = this.layoutMx1;
+            this.txt_suppName.TabIndex = 524;
+            // 
+            // txt_checkUser
+            // 
+            this.txt_checkUser.Location = new System.Drawing.Point(912, 41);
+            this.txt_checkUser.Name = "txt_checkUser";
+            this.txt_checkUser.Properties.Appearance.Options.UseFont = true;
+            this.txt_checkUser.Size = new System.Drawing.Size(202, 24);
+            this.txt_checkUser.StyleController = this.layoutMx1;
+            this.txt_checkUser.TabIndex = 513;
+            // 
+            // txt_checkDate
+            // 
+            this.txt_checkDate.Location = new System.Drawing.Point(912, 70);
+            this.txt_checkDate.Name = "txt_checkDate";
+            this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
+            this.txt_checkDate.Size = new System.Drawing.Size(202, 24);
+            this.txt_checkDate.StyleController = this.layoutMx1;
+            this.txt_checkDate.TabIndex = 252;
+            // 
+            // txt_depotName
+            // 
+            this.txt_depotName.Location = new System.Drawing.Point(84, 41);
+            this.txt_depotName.Name = "txt_depotName";
+            this.txt_depotName.Properties.Appearance.Options.UseFont = true;
+            this.txt_depotName.Size = new System.Drawing.Size(200, 24);
+            this.txt_depotName.StyleController = this.layoutMx1;
+            this.txt_depotName.TabIndex = 523;
+            // 
+            // txt_reason
+            // 
+            this.txt_reason.Location = new System.Drawing.Point(360, 70);
+            this.txt_reason.Name = "txt_reason";
+            this.txt_reason.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.txt_reason.Properties.Items.AddRange(new object[] {
+            "鏉ユ枡涓嶈壇",
+            "渚涘簲鍟嗗閫�",
+            "浣滀笟涓嶈壇",
+            "渚涘簲鍟嗙墿鍝佸彿閿欒",
+            "閲囪喘鏂欏彿鍙樻洿"});
+            this.txt_reason.Size = new System.Drawing.Size(200, 24);
+            this.txt_reason.StyleController = this.layoutMx1;
+            this.txt_reason.TabIndex = 518;
+            // 
+            // txt_fmrmode
+            // 
+            this.txt_fmrmode.Location = new System.Drawing.Point(360, 41);
+            this.txt_fmrmode.Name = "txt_fmrmode";
+            this.txt_fmrmode.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.txt_fmrmode.Properties.Items.AddRange(new object[] {
+            "閫�鏂欒ˉ鏂�",
+            "閫�鏂欏苟鎵f"});
+            this.txt_fmrmode.Size = new System.Drawing.Size(200, 24);
+            this.txt_fmrmode.StyleController = this.layoutMx1;
+            this.txt_fmrmode.TabIndex = 519;
+            // 
+            // txt_itemOutNo
+            // 
+            this.txt_itemOutNo.Location = new System.Drawing.Point(84, 12);
+            this.txt_itemOutNo.Name = "txt_itemOutNo";
+            this.txt_itemOutNo.Properties.Appearance.Options.UseFont = true;
+            this.txt_itemOutNo.Size = new System.Drawing.Size(200, 24);
+            this.txt_itemOutNo.StyleController = this.layoutMx1;
+            this.txt_itemOutNo.TabIndex = 210;
+            // 
+            // txt_fType
+            // 
+            this.txt_fType.Location = new System.Drawing.Point(288, 12);
+            this.txt_fType.Name = "txt_fType";
+            this.txt_fType.Properties.Caption = "濮斿鏍囪瘑";
+            this.txt_fType.Size = new System.Drawing.Size(272, 24);
+            this.txt_fType.StyleController = this.layoutMx1;
+            this.txt_fType.TabIndex = 525;
+            this.txt_fType.Tag = "readOnly";
+            // 
+            // txt_sqRemark
+            // 
+            this.txt_sqRemark.Location = new System.Drawing.Point(84, 99);
+            this.txt_sqRemark.Name = "txt_sqRemark";
+            this.txt_sqRemark.Properties.Appearance.Options.UseFont = true;
+            this.txt_sqRemark.Size = new System.Drawing.Size(476, 24);
+            this.txt_sqRemark.StyleController = this.layoutMx1;
+            this.txt_sqRemark.TabIndex = 235;
+            // 
+            // txt_status
+            // 
+            this.txt_status.Location = new System.Drawing.Point(840, 12);
+            this.txt_status.Name = "txt_status";
+            this.txt_status.Properties.Caption = "瀹℃牳鏍囪瘑";
+            this.txt_status.Size = new System.Drawing.Size(274, 24);
+            this.txt_status.StyleController = this.layoutMx1;
+            this.txt_status.TabIndex = 526;
+            // 
+            // txt_guid
+            // 
+            this.txt_guid.Location = new System.Drawing.Point(626, 108);
+            this.txt_guid.Name = "txt_guid";
+            this.txt_guid.Size = new System.Drawing.Size(195, 24);
+            this.txt_guid.StyleController = this.layoutMx1;
+            this.txt_guid.TabIndex = 528;
+            // 
+            // txt_sqdNo
+            // 
+            this.txt_sqdNo.Location = new System.Drawing.Point(636, 70);
+            this.txt_sqdNo.Name = "txt_sqdNo";
+            this.txt_sqdNo.Size = new System.Drawing.Size(200, 24);
+            this.txt_sqdNo.StyleController = this.layoutMx1;
+            this.txt_sqdNo.TabIndex = 529;
+            // 
+            // txt_createBy
+            // 
+            this.txt_createBy.Location = new System.Drawing.Point(636, 12);
+            this.txt_createBy.Name = "txt_createBy";
+            this.txt_createBy.Size = new System.Drawing.Size(200, 24);
+            this.txt_createBy.StyleController = this.layoutMx1;
+            this.txt_createBy.TabIndex = 530;
+            // 
+            // txt_createDate
+            // 
+            this.txt_createDate.Location = new System.Drawing.Point(636, 41);
+            this.txt_createDate.Name = "txt_createDate";
+            this.txt_createDate.Size = new System.Drawing.Size(200, 24);
+            this.txt_createDate.StyleController = this.layoutMx1;
+            this.txt_createDate.TabIndex = 531;
+            // 
+            // lb_guid
+            // 
+            this.lb_guid.Control = this.txt_guid;
+            this.lb_guid.Location = new System.Drawing.Point(542, 96);
+            this.lb_guid.Name = "lb_guid";
+            this.lb_guid.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.lb_guid.OptionsTableLayoutItem.RowIndex = 3;
+            this.lb_guid.Size = new System.Drawing.Size(271, 32);
+            this.lb_guid.Text = "涓婚敭Guid";
+            this.lb_guid.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem12
+            // 
+            this.layoutControlItem12.Control = this.lbGuid;
+            this.layoutControlItem12.Location = new System.Drawing.Point(813, 96);
+            this.layoutControlItem12.Name = "layoutControlItem12";
+            this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3;
+            this.layoutControlItem12.Size = new System.Drawing.Size(272, 32);
+            this.layoutControlItem12.Text = "lbGuid";
+            this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem12.TextVisible = false;
+            // 
+            // Root
+            // 
+            this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
+            this.Root.GroupBordersVisible = false;
+            this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+            this.layoutControlItem2,
+            this.layoutControlItem1,
+            this.layoutControlItem6,
+            this.layoutControlItem5,
+            this.layoutControlItem3,
+            this.layoutControlItem7,
+            this.layoutControlItem8,
+            this.layoutControlItem9,
+            this.layoutControlItem10,
+            this.layoutControlItem11,
+            this.layoutControlItem13,
+            this.lab_createBy,
+            this.layoutControlItem15});
+            this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
+            this.Root.Name = "Root";
+            columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition5.Width = 100D;
+            columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition6.Width = 100D;
+            columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition7.Width = 100D;
+            columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition8.Width = 100D;
+            this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
+            columnDefinition5,
+            columnDefinition6,
+            columnDefinition7,
+            columnDefinition8});
+            rowDefinition5.Height = 100D;
+            rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition6.Height = 100D;
+            rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition7.Height = 100D;
+            rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition8.Height = 100D;
+            rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+            this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
+            rowDefinition5,
+            rowDefinition6,
+            rowDefinition7,
+            rowDefinition8});
+            this.Root.Size = new System.Drawing.Size(1126, 137);
+            this.Root.TextVisible = false;
+            // 
+            // layoutControlItem2
+            // 
+            this.layoutControlItem2.Control = this.txt_depotName;
+            this.layoutControlItem2.Location = new System.Drawing.Point(0, 29);
+            this.layoutControlItem2.Name = "layoutControlItem2";
+            this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem2.Size = new System.Drawing.Size(276, 29);
+            this.layoutControlItem2.Text = "渚涘簲鍟�";
+            this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem1
+            // 
+            this.layoutControlItem1.Control = this.txt_itemOutNo;
+            this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
+            this.layoutControlItem1.Name = "layoutControlItem1";
+            this.layoutControlItem1.Size = new System.Drawing.Size(276, 29);
+            this.layoutControlItem1.Text = "鍑哄簱鍗曞彿";
+            this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem6
+            // 
+            this.layoutControlItem6.Control = this.txt_suppName;
+            this.layoutControlItem6.Location = new System.Drawing.Point(0, 58);
+            this.layoutControlItem6.Name = "layoutControlItem6";
+            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem6.Size = new System.Drawing.Size(276, 29);
+            this.layoutControlItem6.Text = "閫�鏂欎粨搴�";
+            this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem5
+            // 
+            this.layoutControlItem5.Control = this.txt_reason;
+            this.layoutControlItem5.Location = new System.Drawing.Point(276, 58);
+            this.layoutControlItem5.Name = "layoutControlItem5";
+            this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem5.Size = new System.Drawing.Size(276, 29);
+            this.layoutControlItem5.Text = "閫�璐у師鍥�";
+            this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem3
+            // 
+            this.layoutControlItem3.Control = this.txt_fmrmode;
+            this.layoutControlItem3.Location = new System.Drawing.Point(276, 29);
+            this.layoutControlItem3.Name = "layoutControlItem3";
+            this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem3.Size = new System.Drawing.Size(276, 29);
+            this.layoutControlItem3.Text = "閫�鏂欐柟寮�";
+            this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem7
+            // 
+            this.layoutControlItem7.Control = this.txt_fType;
+            this.layoutControlItem7.Location = new System.Drawing.Point(276, 0);
+            this.layoutControlItem7.Name = "layoutControlItem7";
+            this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem7.Size = new System.Drawing.Size(276, 29);
+            this.layoutControlItem7.Text = "濮斿鏍囪瘑";
+            this.layoutControlItem7.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem7.TextVisible = false;
+            // 
+            // layoutControlItem8
+            // 
+            this.layoutControlItem8.Control = this.txt_sqRemark;
+            this.layoutControlItem8.Location = new System.Drawing.Point(0, 87);
+            this.layoutControlItem8.Name = "layoutControlItem8";
+            this.layoutControlItem8.OptionsTableLayoutItem.ColumnSpan = 2;
+            this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 3;
+            this.layoutControlItem8.Size = new System.Drawing.Size(552, 30);
+            this.layoutControlItem8.Text = "鐢宠澶囨敞";
+            this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem9
+            // 
+            this.layoutControlItem9.Control = this.txt_checkUser;
+            this.layoutControlItem9.Location = new System.Drawing.Point(828, 29);
+            this.layoutControlItem9.Name = "layoutControlItem9";
+            this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem9.Size = new System.Drawing.Size(278, 29);
+            this.layoutControlItem9.Text = "瀹℃牳浜�";
+            this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem10
+            // 
+            this.layoutControlItem10.Control = this.txt_checkDate;
+            this.layoutControlItem10.Location = new System.Drawing.Point(828, 58);
+            this.layoutControlItem10.Name = "layoutControlItem10";
+            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem10.Size = new System.Drawing.Size(278, 29);
+            this.layoutControlItem10.Text = "瀹℃牳鏃ユ湡";
+            this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem11
+            // 
+            this.layoutControlItem11.Control = this.txt_status;
+            this.layoutControlItem11.Location = new System.Drawing.Point(828, 0);
+            this.layoutControlItem11.Name = "layoutControlItem11";
+            this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem11.Size = new System.Drawing.Size(278, 29);
+            this.layoutControlItem11.Text = "瀹℃牳鏍囪瘑";
+            this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem11.TextVisible = false;
+            // 
+            // layoutControlItem13
+            // 
+            this.layoutControlItem13.Control = this.txt_sqdNo;
+            this.layoutControlItem13.Location = new System.Drawing.Point(552, 58);
+            this.layoutControlItem13.Name = "layoutControlItem13";
+            this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem13.Size = new System.Drawing.Size(276, 29);
+            this.layoutControlItem13.Text = "鐢宠鍗曞彿";
+            this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // lab_createBy
+            // 
+            this.lab_createBy.Control = this.txt_createBy;
+            this.lab_createBy.Location = new System.Drawing.Point(552, 0);
+            this.lab_createBy.Name = "lab_createBy";
+            this.lab_createBy.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.lab_createBy.Size = new System.Drawing.Size(276, 29);
+            this.lab_createBy.Text = "鍒涘缓浜�";
+            this.lab_createBy.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem15
+            // 
+            this.layoutControlItem15.Control = this.txt_createDate;
+            this.layoutControlItem15.Location = new System.Drawing.Point(552, 29);
+            this.layoutControlItem15.Name = "layoutControlItem15";
+            this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem15.Size = new System.Drawing.Size(276, 29);
+            this.layoutControlItem15.Text = "鍒涘缓鏃堕棿";
+            this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // tabMx
+            // 
+            this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tabMx.Location = new System.Drawing.Point(0, 0);
+            this.tabMx.Name = "tabMx";
+            this.tabMx.SelectedTabPage = this.tabMxPage2;
+            this.tabMx.Size = new System.Drawing.Size(1126, 421);
+            this.tabMx.TabIndex = 3;
+            this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
+            this.tabMxPage2,
+            this.xtraTabPage3});
+            // 
+            // tabMxPage2
+            // 
+            this.tabMxPage2.Controls.Add(this.gcMx1);
+            this.tabMxPage2.Name = "tabMxPage2";
+            this.tabMxPage2.Size = new System.Drawing.Size(1124, 389);
+            this.tabMxPage2.Text = "閫�璐х墿鏂欐槑缁�";
+            // 
+            // gcMx1
+            // 
+            this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMx1.Location = new System.Drawing.Point(0, 0);
+            this.gcMx1.MainView = this.gvMx1;
+            this.gcMx1.Name = "gcMx1";
+            this.gcMx1.Size = new System.Drawing.Size(1124, 389);
+            this.gcMx1.TabIndex = 0;
+            this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+            this.gvMx1});
+            // 
+            // gvMx1
+            // 
+            this.gvMx1.Appearance.Row.Options.UseFont = true;
+            this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.gridColumn12,
+            this.gvMx2status,
+            this.gvMx2pbillNo,
+            this.gvMx2workLine,
+            this.gvMx2itemNo,
+            this.gridColumn5,
+            this.gridColumn6,
+            this.gvMx2quantity,
+            this.gvMx2tlQty,
+            this.gvMx2depotCode,
+            this.gvMx2remark,
+            this.gvMx2ebelnK3id,
+            this.gvMx2lineK3id,
+            this.gvMx2itemOutId,
+            this.gridColumn14,
+            this.gridColumn15});
+            this.gvMx1.GridControl = this.gcMx1;
+            this.gvMx1.Name = "gvMx1";
+            this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
+            this.gvMx1.OptionsFind.ShowSearchNavButtons = false;
+            this.gvMx1.OptionsView.ShowGroupPanel = false;
+            // 
+            // gridColumn12
+            // 
+            this.gridColumn12.Caption = "鏄庣粏涓婚敭";
+            this.gridColumn12.FieldName = "guid";
+            this.gridColumn12.MinWidth = 25;
+            this.gridColumn12.Name = "gridColumn12";
+            this.gridColumn12.OptionsColumn.ReadOnly = true;
+            this.gridColumn12.Width = 94;
+            // 
+            // gvMx2status
+            // 
+            this.gvMx2status.AppearanceCell.Options.UseFont = true;
+            this.gvMx2status.Caption = "瀹岀粨";
+            this.gvMx2status.FieldName = "status";
+            this.gvMx2status.MaxWidth = 50;
+            this.gvMx2status.MinWidth = 50;
+            this.gvMx2status.Name = "gvMx2status";
+            this.gvMx2status.OptionsColumn.ReadOnly = true;
+            this.gvMx2status.Tag = "query_a.status";
+            this.gvMx2status.Width = 50;
+            // 
+            // gvMx2pbillNo
+            // 
+            this.gvMx2pbillNo.AppearanceCell.Options.UseFont = true;
+            this.gvMx2pbillNo.Caption = "鍒拌揣鍗曞彿";
+            this.gvMx2pbillNo.FieldName = "pbillNo";
+            this.gvMx2pbillNo.Name = "gvMx2pbillNo";
+            this.gvMx2pbillNo.OptionsColumn.ReadOnly = true;
+            this.gvMx2pbillNo.Tag = "query_a.pbill_no";
+            this.gvMx2pbillNo.Visible = true;
+            this.gvMx2pbillNo.VisibleIndex = 0;
+            this.gvMx2pbillNo.Width = 94;
+            // 
+            // gvMx2workLine
+            // 
+            this.gvMx2workLine.AppearanceCell.Options.UseFont = true;
+            this.gvMx2workLine.Caption = "琛屽彿 ";
+            this.gvMx2workLine.FieldName = "workLine";
+            this.gvMx2workLine.Name = "gvMx2workLine";
+            this.gvMx2workLine.OptionsColumn.ReadOnly = true;
+            this.gvMx2workLine.Tag = "query_a.work_line";
+            this.gvMx2workLine.Visible = true;
+            this.gvMx2workLine.VisibleIndex = 1;
+            this.gvMx2workLine.Width = 94;
+            // 
+            // gvMx2itemNo
+            // 
+            this.gvMx2itemNo.AppearanceCell.Options.UseFont = true;
+            this.gvMx2itemNo.Caption = "鐗╂枡缂栫爜";
+            this.gvMx2itemNo.FieldName = "itemNo";
+            this.gvMx2itemNo.Name = "gvMx2itemNo";
+            this.gvMx2itemNo.OptionsColumn.ReadOnly = true;
+            this.gvMx2itemNo.Tag = "query_a.item_no";
+            this.gvMx2itemNo.Visible = true;
+            this.gvMx2itemNo.VisibleIndex = 2;
+            this.gvMx2itemNo.Width = 94;
+            // 
+            // gridColumn5
+            // 
+            this.gridColumn5.Caption = "鐗╂枡鍚嶇О";
+            this.gridColumn5.FieldName = "itemName";
+            this.gridColumn5.Name = "gridColumn5";
+            this.gridColumn5.OptionsColumn.ReadOnly = true;
+            this.gridColumn5.Visible = true;
+            this.gridColumn5.VisibleIndex = 3;
+            this.gridColumn5.Width = 94;
+            // 
+            // gridColumn6
+            // 
+            this.gridColumn6.Caption = "瑙勬牸鍨嬪彿";
+            this.gridColumn6.FieldName = "itemModel";
+            this.gridColumn6.Name = "gridColumn6";
+            this.gridColumn6.OptionsColumn.ReadOnly = true;
+            this.gridColumn6.Visible = true;
+            this.gridColumn6.VisibleIndex = 4;
+            this.gridColumn6.Width = 94;
+            // 
+            // gvMx2quantity
+            // 
+            this.gvMx2quantity.AppearanceCell.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192)))));
+            this.gvMx2quantity.AppearanceCell.Options.UseFont = true;
+            this.gvMx2quantity.AppearanceCell.Options.UseForeColor = true;
+            this.gvMx2quantity.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+            this.gvMx2quantity.AppearanceHeader.Options.UseForeColor = true;
+            this.gvMx2quantity.Caption = "鐢宠鏁伴噺 ";
+            this.gvMx2quantity.FieldName = "quantity";
+            this.gvMx2quantity.Name = "gvMx2quantity";
+            this.gvMx2quantity.Tag = "query_a.quantity";
+            this.gvMx2quantity.Visible = true;
+            this.gvMx2quantity.VisibleIndex = 5;
+            this.gvMx2quantity.Width = 94;
+            // 
+            // gvMx2tlQty
+            // 
+            this.gvMx2tlQty.AppearanceCell.Options.UseFont = true;
+            this.gvMx2tlQty.Caption = "宸叉壂鏁伴噺 ";
+            this.gvMx2tlQty.FieldName = "tlQty";
+            this.gvMx2tlQty.Name = "gvMx2tlQty";
+            this.gvMx2tlQty.OptionsColumn.ReadOnly = true;
+            this.gvMx2tlQty.Tag = "query_a.tl_qty";
+            this.gvMx2tlQty.Visible = true;
+            this.gvMx2tlQty.VisibleIndex = 6;
+            this.gvMx2tlQty.Width = 94;
+            // 
+            // gvMx2depotCode
+            // 
+            this.gvMx2depotCode.AppearanceCell.Options.UseFont = true;
+            this.gvMx2depotCode.Caption = "浠撳簱缂栫爜";
+            this.gvMx2depotCode.FieldName = "depotCode";
+            this.gvMx2depotCode.Name = "gvMx2depotCode";
+            this.gvMx2depotCode.OptionsColumn.ReadOnly = true;
+            this.gvMx2depotCode.Tag = "query_a.depot_code";
+            this.gvMx2depotCode.Visible = true;
+            this.gvMx2depotCode.VisibleIndex = 7;
+            this.gvMx2depotCode.Width = 94;
+            // 
+            // gvMx2remark
+            // 
+            this.gvMx2remark.AppearanceCell.Options.UseFont = true;
+            this.gvMx2remark.Caption = "鐢宠澶囨敞";
+            this.gvMx2remark.FieldName = "sqRemark";
+            this.gvMx2remark.Name = "gvMx2remark";
+            this.gvMx2remark.OptionsColumn.ReadOnly = true;
+            this.gvMx2remark.Tag = "query_a.remark";
+            this.gvMx2remark.Visible = true;
+            this.gvMx2remark.VisibleIndex = 8;
+            this.gvMx2remark.Width = 94;
+            // 
+            // gvMx2ebelnK3id
+            // 
+            this.gvMx2ebelnK3id.AppearanceCell.Options.UseFont = true;
+            this.gvMx2ebelnK3id.Caption = "閲囪喘鍗旾D ";
+            this.gvMx2ebelnK3id.FieldName = "ebelnK3id";
+            this.gvMx2ebelnK3id.Name = "gvMx2ebelnK3id";
+            this.gvMx2ebelnK3id.OptionsColumn.ReadOnly = true;
+            this.gvMx2ebelnK3id.Tag = "query_a.ebeln_k3id";
+            this.gvMx2ebelnK3id.Visible = true;
+            this.gvMx2ebelnK3id.VisibleIndex = 9;
+            this.gvMx2ebelnK3id.Width = 94;
+            // 
+            // gvMx2lineK3id
+            // 
+            this.gvMx2lineK3id.AppearanceCell.Options.UseFont = true;
+            this.gvMx2lineK3id.Caption = "閲囪喘鍗曡ID ";
+            this.gvMx2lineK3id.FieldName = "lineK3id";
+            this.gvMx2lineK3id.Name = "gvMx2lineK3id";
+            this.gvMx2lineK3id.OptionsColumn.ReadOnly = true;
+            this.gvMx2lineK3id.Tag = "query_a.line_k3id";
+            this.gvMx2lineK3id.Visible = true;
+            this.gvMx2lineK3id.VisibleIndex = 10;
+            this.gvMx2lineK3id.Width = 94;
+            // 
+            // gvMx2itemOutId
+            // 
+            this.gvMx2itemOutId.AppearanceCell.Options.UseFont = true;
+            this.gvMx2itemOutId.Caption = "涓昏〃涓婚敭";
+            this.gvMx2itemOutId.FieldName = "itemOutId";
+            this.gvMx2itemOutId.Name = "gvMx2itemOutId";
+            this.gvMx2itemOutId.OptionsColumn.ReadOnly = true;
+            this.gvMx2itemOutId.Tag = "query_a.item_out_id";
+            this.gvMx2itemOutId.Width = 94;
+            // 
+            // gridColumn14
+            // 
+            this.gridColumn14.Caption = "鍒涘缓浜�";
+            this.gridColumn14.FieldName = "createBy";
+            this.gridColumn14.MinWidth = 25;
+            this.gridColumn14.Name = "gridColumn14";
+            this.gridColumn14.Visible = true;
+            this.gridColumn14.VisibleIndex = 11;
+            this.gridColumn14.Width = 94;
+            // 
+            // gridColumn15
+            // 
+            this.gridColumn15.Caption = "鍒涘缓鏃堕棿";
+            this.gridColumn15.FieldName = "createDate";
+            this.gridColumn15.MinWidth = 25;
+            this.gridColumn15.Name = "gridColumn15";
+            this.gridColumn15.Visible = true;
+            this.gridColumn15.VisibleIndex = 12;
+            this.gridColumn15.Width = 94;
+            // 
+            // xtraTabPage3
+            // 
+            this.xtraTabPage3.Controls.Add(this.gcMx2);
+            this.xtraTabPage3.Name = "xtraTabPage3";
+            this.xtraTabPage3.Size = new System.Drawing.Size(1124, 389);
+            this.xtraTabPage3.Text = "閫�璐х墿鏂欐壂鐮佹槑缁�";
+            // 
+            // gcMx2
+            // 
+            this.gcMx2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMx2.Location = new System.Drawing.Point(0, 0);
+            this.gcMx2.MainView = this.gvMx2;
+            this.gcMx2.Name = "gcMx2";
+            this.gcMx2.Size = new System.Drawing.Size(1124, 389);
+            this.gcMx2.TabIndex = 1;
+            this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+            this.gvMx2});
+            // 
+            // gvMx2
+            // 
+            this.gvMx2.Appearance.Row.Options.UseFont = true;
+            this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.gvMx1guid,
+            this.gvMx1itemBarcode,
+            this.gvMx1itemNo,
+            this.gridColumn8,
+            this.gridColumn9,
+            this.gvMx1quantity,
+            this.gridColumn10,
+            this.gvMx1depotCode,
+            this.gvMx1depotSectionCode,
+            this.gvMx1ebelnK3id,
+            this.gvMx1lineK3id,
+            this.gridColumn16,
+            this.gridColumn17});
+            this.gvMx2.GridControl = this.gcMx2;
+            this.gvMx2.Name = "gvMx2";
+            this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
+            this.gvMx2.OptionsFind.ShowSearchNavButtons = false;
+            this.gvMx2.OptionsView.ShowGroupPanel = false;
+            // 
+            // gvMx1guid
+            // 
+            this.gvMx1guid.AppearanceCell.Options.UseFont = true;
+            this.gvMx1guid.Caption = "guid ";
+            this.gvMx1guid.FieldName = "guid";
+            this.gvMx1guid.MinWidth = 50;
+            this.gvMx1guid.Name = "gvMx1guid";
+            this.gvMx1guid.Tag = "query_a.guid";
+            this.gvMx1guid.Width = 94;
+            // 
+            // gvMx1itemBarcode
+            // 
+            this.gvMx1itemBarcode.AppearanceCell.Options.UseFont = true;
+            this.gvMx1itemBarcode.Caption = "鐗╂枡鏉$爜 ";
+            this.gvMx1itemBarcode.FieldName = "itemBarcode";
+            this.gvMx1itemBarcode.Name = "gvMx1itemBarcode";
+            this.gvMx1itemBarcode.Tag = "query_a.ITEM_BARCODE";
+            this.gvMx1itemBarcode.Visible = true;
+            this.gvMx1itemBarcode.VisibleIndex = 1;
+            this.gvMx1itemBarcode.Width = 94;
+            // 
+            // gvMx1itemNo
+            // 
+            this.gvMx1itemNo.AppearanceCell.Options.UseFont = true;
+            this.gvMx1itemNo.Caption = "鐗╂枡缂栫爜";
+            this.gvMx1itemNo.FieldName = "itemNo";
+            this.gvMx1itemNo.Name = "gvMx1itemNo";
+            this.gvMx1itemNo.Tag = "query_a.ITEM_NO";
+            this.gvMx1itemNo.Visible = true;
+            this.gvMx1itemNo.VisibleIndex = 0;
+            this.gvMx1itemNo.Width = 94;
+            // 
+            // gridColumn8
+            // 
+            this.gridColumn8.Caption = "鐗╂枡鍚嶇О";
+            this.gridColumn8.FieldName = "itemName";
+            this.gridColumn8.Name = "gridColumn8";
+            this.gridColumn8.Visible = true;
+            this.gridColumn8.VisibleIndex = 2;
+            this.gridColumn8.Width = 94;
+            // 
+            // gridColumn9
+            // 
+            this.gridColumn9.Caption = "瑙勬牸鍨嬪彿";
+            this.gridColumn9.FieldName = "itemModel";
+            this.gridColumn9.Name = "gridColumn9";
+            this.gridColumn9.Visible = true;
+            this.gridColumn9.VisibleIndex = 3;
+            this.gridColumn9.Width = 94;
+            // 
+            // gvMx1quantity
+            // 
+            this.gvMx1quantity.AppearanceCell.Options.UseFont = true;
+            this.gvMx1quantity.Caption = "鏁伴噺";
+            this.gvMx1quantity.FieldName = "quantity";
+            this.gvMx1quantity.MinWidth = 50;
+            this.gvMx1quantity.Name = "gvMx1quantity";
+            this.gvMx1quantity.Tag = "query_a.QUANTITY";
+            this.gvMx1quantity.Visible = true;
+            this.gvMx1quantity.VisibleIndex = 4;
+            this.gvMx1quantity.Width = 94;
+            // 
+            // gridColumn10
+            // 
+            this.gridColumn10.Caption = "鍗曚綅";
+            this.gridColumn10.FieldName = "kcUnit";
+            this.gridColumn10.MinWidth = 50;
+            this.gridColumn10.Name = "gridColumn10";
+            this.gridColumn10.Visible = true;
+            this.gridColumn10.VisibleIndex = 5;
+            this.gridColumn10.Width = 94;
+            // 
+            // gvMx1depotCode
+            // 
+            this.gvMx1depotCode.AppearanceCell.Options.UseFont = true;
+            this.gvMx1depotCode.Caption = "浠撳簱缂栫爜 ";
+            this.gvMx1depotCode.FieldName = "depotCode";
+            this.gvMx1depotCode.Name = "gvMx1depotCode";
+            this.gvMx1depotCode.Tag = "query_a.DEPOT_CODE";
+            this.gvMx1depotCode.Visible = true;
+            this.gvMx1depotCode.VisibleIndex = 6;
+            this.gvMx1depotCode.Width = 94;
+            // 
+            // gvMx1depotSectionCode
+            // 
+            this.gvMx1depotSectionCode.AppearanceCell.Options.UseFont = true;
+            this.gvMx1depotSectionCode.Caption = "璐т綅缂栫爜 ";
+            this.gvMx1depotSectionCode.FieldName = "depotSectionCode";
+            this.gvMx1depotSectionCode.Name = "gvMx1depotSectionCode";
+            this.gvMx1depotSectionCode.Tag = "query_a.DEPOT_SECTION_CODE";
+            this.gvMx1depotSectionCode.Visible = true;
+            this.gvMx1depotSectionCode.VisibleIndex = 7;
+            this.gvMx1depotSectionCode.Width = 94;
+            // 
+            // gvMx1ebelnK3id
+            // 
+            this.gvMx1ebelnK3id.AppearanceCell.Options.UseFont = true;
+            this.gvMx1ebelnK3id.Caption = "閲囪喘璁㈠崟ID ";
+            this.gvMx1ebelnK3id.FieldName = "ebelnK3id";
+            this.gvMx1ebelnK3id.Name = "gvMx1ebelnK3id";
+            this.gvMx1ebelnK3id.Tag = "query_a.EBELN_K3ID";
+            this.gvMx1ebelnK3id.Visible = true;
+            this.gvMx1ebelnK3id.VisibleIndex = 8;
+            this.gvMx1ebelnK3id.Width = 94;
+            // 
+            // gvMx1lineK3id
+            // 
+            this.gvMx1lineK3id.AppearanceCell.Options.UseFont = true;
+            this.gvMx1lineK3id.Caption = "閲囪喘璁㈠崟琛孖D ";
+            this.gvMx1lineK3id.FieldName = "lineK3id";
+            this.gvMx1lineK3id.Name = "gvMx1lineK3id";
+            this.gvMx1lineK3id.Tag = "query_a.LINE_K3ID";
+            this.gvMx1lineK3id.Visible = true;
+            this.gvMx1lineK3id.VisibleIndex = 9;
+            this.gvMx1lineK3id.Width = 94;
+            // 
+            // gridColumn16
+            // 
+            this.gridColumn16.Caption = "鍒涘缓浜�";
+            this.gridColumn16.FieldName = "createBy";
+            this.gridColumn16.MinWidth = 25;
+            this.gridColumn16.Name = "gridColumn16";
+            this.gridColumn16.Visible = true;
+            this.gridColumn16.VisibleIndex = 10;
+            this.gridColumn16.Width = 94;
+            // 
+            // gridColumn17
+            // 
+            this.gridColumn17.Caption = "鍒涘缓鏃堕棿";
+            this.gridColumn17.FieldName = "createDate";
+            this.gridColumn17.MinWidth = 25;
+            this.gridColumn17.Name = "gridColumn17";
+            this.gridColumn17.Visible = true;
+            this.gridColumn17.VisibleIndex = 11;
+            this.gridColumn17.Width = 94;
+            // 
+            // picCheckBox
+            // 
+            this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
+            this.picCheckBox.Location = new System.Drawing.Point(968, 55);
+            this.picCheckBox.Name = "picCheckBox";
+            this.picCheckBox.Size = new System.Drawing.Size(100, 50);
+            this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+            this.picCheckBox.TabIndex = 11;
+            this.picCheckBox.TabStop = false;
+            this.picCheckBox.Visible = false;
+            // 
+            // layoutControlItem4
+            // 
+            this.layoutControlItem4.Control = this.txt_reason;
+            this.layoutControlItem4.Location = new System.Drawing.Point(276, 0);
+            this.layoutControlItem4.Name = "layoutControlItem4";
+            this.layoutControlItem4.Size = new System.Drawing.Size(138, 73);
+            this.layoutControlItem4.TextSize = new System.Drawing.Size(50, 20);
+            // 
+            // Frm_MesCgthSqDj
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1128, 682);
+            this.Controls.Add(this.picCheckBox);
+            this.Controls.Add(this.xtraTabControl1);
+            this.Controls.Add(this.toolBarMenu1);
+            this.Name = "Frm_MesCgthSqDj";
+            this.Text = "閲囪喘閫�璐у崟";
+            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
+            this.xtraTabControl1.ResumeLayout(false);
+            this.xtraTabPage1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).EndInit();
+            this.split1.Panel1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.split1)).EndInit();
+            this.split1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
+            this.xtraTabPage2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).EndInit();
+            this.splitMx1.Panel1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel2)).EndInit();
+            this.splitMx1.Panel2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).EndInit();
+            this.splitMx1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
+            this.layoutMx1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.txt_suppName.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_depotName.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_reason.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fmrmode.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_itemOutNo.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fType.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_sqRemark.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_sqdNo.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.lb_guid)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.lab_createBy)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
+            this.tabMx.ResumeLayout(false);
+            this.tabMxPage2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
+            this.xtraTabPage3.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
+            this.ResumeLayout(false);
+
+        }
+        #endregion
+        private UserControl.UcToolBarMenu toolBarMenu1;
+        private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
+        private System.Windows.Forms.PictureBox picCheckBox;
+        private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
+        private DevExpress.XtraEditors.SplitContainerControl split1;
+        private UserControls.Data.UcPageBar pageBar1;
+        private DevExpress.XtraGrid.GridControl gcMain1;
+        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_status;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_fType;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_itemOutNo;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_suppNo;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_depotCode;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_remark;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_createDate;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_checkDate;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_reason;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_fmrmode;
+        private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
+        private DevExpress.XtraEditors.SplitContainerControl splitMx1;
+        private DevExpress.XtraLayout.LayoutControl layoutMx1;
+        private DevExpress.XtraLayout.LayoutControlGroup Root;
+        private DevExpress.XtraEditors.TextEdit txt_suppName;
+        private DevExpress.XtraEditors.TextEdit txt_depotName;
+        private DevExpress.XtraEditors.ComboBoxEdit txt_fmrmode;
+        private DevExpress.XtraEditors.ComboBoxEdit txt_reason;
+        private DevExpress.XtraEditors.TextEdit txt_checkUser;
+        private DevExpress.XtraEditors.TextEdit txt_checkDate;
+        private DevExpress.XtraEditors.TextEdit txt_sqRemark;
+        private DevExpress.XtraEditors.TextEdit txt_itemOutNo;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
+        private DevExpress.XtraEditors.CheckEdit txt_fType;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
+        private System.Windows.Forms.Label lbGuid;
+        private DevExpress.XtraEditors.CheckEdit txt_status;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
+        private DevExpress.XtraTab.XtraTabControl tabMx;
+        private DevExpress.XtraTab.XtraTabPage tabMxPage2;
+        private DevExpress.XtraGrid.GridControl gcMx1;
+        private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx2status;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx2pbillNo;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx2workLine;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx2itemNo;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx2quantity;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx2tlQty;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx2depotCode;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx2remark;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx2ebelnK3id;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx2lineK3id;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx2itemOutId;
+        private DevExpress.XtraTab.XtraTabPage xtraTabPage3;
+        private DevExpress.XtraGrid.GridControl gcMx2;
+        private DevExpress.XtraGrid.Views.Grid.GridView gvMx2;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1guid;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1itemBarcode;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1itemNo;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1quantity;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1depotCode;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1depotSectionCode;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1ebelnK3id;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1lineK3id;
+        private DevExpress.XtraEditors.TextEdit txt_guid;
+        private DevExpress.XtraLayout.LayoutControlItem lb_guid;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn17;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn18;
+        private DevExpress.XtraEditors.TextEdit txt_sqdNo;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
+        private DevExpress.XtraEditors.TextEdit txt_createBy;
+        private DevExpress.XtraEditors.TextEdit txt_createDate;
+        private DevExpress.XtraLayout.LayoutControlItem lab_createBy;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
+        private DevExpress.Utils.ToolTipController tips;
+    }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesSctkSqDj.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesSctkSqDj.cs
new file mode 100644
index 0000000..cb81da8
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesSctkSqDj.cs
@@ -0,0 +1,324 @@
+锘縰sing Gs.DevApp.Entity;
+using Gs.DevApp.ToolBox;
+using Gs.DevApp.UserControl;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace Gs.DevApp.DevFrm.Ck
+{
+    public partial class Frm_MesSctkSqDj : DevExpress.XtraEditors.XtraForm
+    {
+        string _webServiceName = "MesSctkSqDjManager/";
+        List<FilterEntity> _filterList = new List<FilterEntity>();
+        public Frm_MesSctkSqDj()
+        {
+            InitializeComponent();
+            this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
+            this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
+            this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
+            toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
+            toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
+            toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
+            this.toolBarMenu1.getXmlConfig();
+            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
+            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
+            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "statusChk", "", (value) =>
+            {
+                Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
+            }, tips);
+            Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
+            {
+                getModel(value);
+            }, (value) =>
+            {
+                getPageList(this.pageBar1.CurrentPage);
+            }, lbGuid);
+            getPageList(1);
+            pageBar1.PagerEvent += PageBar1_PagerEvent;
+        }
+        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
+        {
+            _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
+            Task.Delay(100);
+            getPageList(1);
+        }
+        /// <summary>
+        /// 鍒嗛〉浜嬩欢
+        /// </summary>
+        /// <param name="curPage"></param>
+        /// <param name="pageSize"></param>
+        private void PageBar1_PagerEvent(int curPage, int pageSize)
+        {
+            getPageList(curPage);
+        }
+        /// <summary>
+        /// 鏌ヨ浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
+        {
+            gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+            gridView1.ActiveFilter.Clear();
+            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+            var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
+            frm.UpdateParent += Frm_UpdateParent;
+            frm.ShowDialog();
+        }
+        /// <summary>
+        /// 鏌ヨ鍥炶皟
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Frm_UpdateParent(object sender, UpdateParentEventArgs e)
+        {
+            _filterList = e.FilterList;
+            getPageList(1);
+        }
+        /// <summary>
+        ///     瀹℃牳浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ToolBarMenu1_btnChkClick(object sender, EventArgs e)
+        {
+            _toolCk(1);
+        }
+
+        /// <summary>
+        ///     鍙嶅鏍�
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        /// <exception cref="NotImplementedException"></exception>
+        private void ToolBarMenu1_btnFChkClick(object sender, EventArgs e)
+        {
+            _toolCk(0);
+        }
+        /// <summary>
+        /// 鍙栨秷浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ToolBarMenu1_btnEscClick(object sender, EventArgs e)
+        {
+            Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 1);
+        }
+
+        /// <summary>
+        /// 鏃ュ織
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ToolBarMenu1_btnLogClick(object sender, EventArgs e)
+        {
+            toolBarMenu1.guidKey = "";
+            string rowGuid, rowName;
+            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+                lbGuid, txt_itemOutNo, gridView1);
+            toolBarMenu1.guidKey = rowGuid;
+        }
+        /// <summary>
+        /// 鍒锋柊浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
+        {
+            if (xtraTabControl1.SelectedTabPageIndex == 1)
+                getModel(lbGuid.Text.Trim());
+            else
+            {
+                //_filterList.Clear();
+                //if (gridView1.ActiveFilter.Count > 0)
+                //{
+                //    gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+                //    gridView1.ActiveFilter.Clear();
+                //    gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+                //}
+                //getPageList(1);
+                getPageList(this.pageBar1.CurrentPage);
+            }
+        }
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="curPage">绗嚑椤�</param>
+        /// <param name="pageSize">姣忛〉鍑犳潯</param>
+        private void getPageList(int curPage)
+        {
+            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);
+                ReturnModel<PageListModel> dd = UtilityHelper.ReturnToTablePage(strReturn);
+                if (dd.rtnCode > 0)
+                {
+                    DataTable dt = dd.rtnData.list;
+                    gcMain1.BindingContext = new BindingContext();
+                    gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+                    if (dt.Rows.Count > 0)
+                    {
+                        gcMain1.DataSource = dt;
+                        gcMain1.ForceInitialize();
+                        gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
+                    }
+                    else
+                        UtilityHelper.SetDefaultTable(gcMain1, gridView1);
+                    gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+                    pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉
+                    pageBar1.CurrentPage = curPage;//褰撳墠椤�
+                    pageBar1.RecordCount = dd.rtnData.total;//鎬昏褰曟暟
+                }
+                else
+                {
+                    ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg);
+                }
+            }
+            catch (Exception ex)
+            {
+                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+            }
+        }
+        private void getModel(string strGuid)
+        {
+            bool isEdit = false;
+            if (toolBarMenu1.currentAction == "add") return;
+            if (toolBarMenu1.currentAction == "edit") isEdit = true;
+            if (string.IsNullOrEmpty(strGuid))
+            {
+                ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+                return;
+            }
+            var _obj = new
+            {
+                guid = strGuid,//涓诲缓
+            };
+            try
+            {
+                string strJson = UtilityHelper.HttpPost("", _webServiceName + "GetModel", JsonConvert.SerializeObject(_obj));
+                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+                if (_rtn.rtnCode > 0)
+                {
+                    dynamic dy = _rtn.rtnData;
+                    lbGuid.Text = strGuid;
+                    List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
+                    gvList.Add(gvMx2);
+                    gvList.Add(gvMx1);
+                    UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList);
+                    JObject _job = JObject.Parse(strJson);
+                    JArray array = new JArray();
+                    foreach (var a in _job["rtnData"]["list"])
+                    {
+                        array.Add(a);
+                    }
+                    //杩欐槸閫�璐ф槑缁� 琛�
+                    DataTable dt = JsonConvert.DeserializeObject<DataTable>(array.ToString());
+                    if (dt.Rows.Count > 0)
+                    {
+                        gcMx1.BindingContext = new BindingContext();
+                        gcMx1.DataSource = dt;
+                        gcMx1.ForceInitialize();
+                        gvMx1.BestFitColumns();
+                        Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
+                    }
+                    else
+                    {
+                        Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
+                    }
+                    //杩欐槸鎵爜琛�
+                    JArray array1 = new JArray();
+                    foreach (var a in _job["rtnData"]["list2"])
+                    {
+                        array1.Add(a);
+                    }
+                    DataTable dt1 = JsonConvert.DeserializeObject<DataTable>(array1.ToString());
+                    if (dt1.Rows.Count > 0)
+                    {
+                        gcMx2.BindingContext = new BindingContext();
+                        gcMx2.DataSource = dt1;
+                        gcMx2.ForceInitialize();
+                        gvMx2.BestFitColumns();
+                        Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx2);
+                    }
+                    else
+                    {
+                        Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx2, gvMx2);
+                    }
+                }
+                else
+                    ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+            }
+            catch (Exception ex)
+            {
+                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+            }
+        }
+
+        /// <summary>
+        /// 宸ュ叿鏉′簨浠�
+        /// </summary>
+        /// <param name="inFieldValue"></param>
+        private void _toolCk(int _inFieldValue)
+        {
+            string strMsg = "";
+            switch (_inFieldValue)
+            {
+                case 1:
+                    strMsg = "瀹℃牳";
+                    break;
+                case 0:
+                    strMsg = "鍙嶅鏍�";
+                    break;
+            };
+            toolBarMenu1.guidKey = "";
+            string rowGuid, rowName;
+            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_itemOutNo, gridView1, "itemOutNo");
+            if (string.IsNullOrEmpty(rowGuid))
+            {
+                MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+                return;
+            }
+            if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵"))
+                return;
+            var _obj = new
+            {
+                guid = rowGuid,
+                inFieldValue = _inFieldValue,
+            };
+            try
+            {
+                var strJson = UtilityHelper.HttpPost("",
+                    _webServiceName + "EditModelSubmit",
+                    JsonConvert.SerializeObject(_obj));
+                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+                MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
+                if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
+                {
+                    if (xtraTabControl1.SelectedTabPageIndex == 1)
+                    {
+                        getModel(lbGuid.Text.Trim());
+                    }
+                    int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
+                    gridView1.FocusedRowHandle = rowHandle;
+                    UtilityHelper.SetCheckIco(gridView1, "statusChk", "checkUser", "checkDate", picCheckBox, this, _inFieldValue.ToString());
+                }
+            }
+            catch (Exception ex)
+            {
+                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+            }
+
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/SelectSctk.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/SelectSctk.Designer.cs
index 175312a..21426f9 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/SelectSctk.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/SelectSctk.Designer.cs
@@ -40,17 +40,17 @@
             this.gv_msg = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
-            this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
             ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
@@ -85,9 +85,9 @@
             this.gridColumn6,
             this.gridColumn7,
             this.gridColumn8,
-            this.gridColumn9,
             this.gridColumn10,
-            this.gridColumn12});
+            this.gridColumn12,
+            this.gridColumn9});
             this.gridView1.GridControl = this.gcMain;
             this.gridView1.Name = "gridView1";
             this.gridView1.OptionsFind.ShowSearchNavButtons = false;
@@ -99,6 +99,7 @@
             this.gv_operationTime.AppearanceCell.Options.UseFont = true;
             this.gv_operationTime.Caption = "鍏ュ簱鍗曞彿";
             this.gv_operationTime.FieldName = "rkdh";
+            this.gv_operationTime.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left;
             this.gv_operationTime.MinWidth = 10;
             this.gv_operationTime.Name = "gv_operationTime";
             this.gv_operationTime.OptionsColumn.AllowEdit = false;
@@ -152,6 +153,16 @@
             this.gridColumn2.Visible = true;
             this.gridColumn2.VisibleIndex = 4;
             this.gridColumn2.Width = 94;
+            // 
+            // gridColumn11
+            // 
+            this.gridColumn11.Caption = "鐗╂枡鍚嶇О";
+            this.gridColumn11.FieldName = "itemName";
+            this.gridColumn11.MinWidth = 25;
+            this.gridColumn11.Name = "gridColumn11";
+            this.gridColumn11.Visible = true;
+            this.gridColumn11.VisibleIndex = 11;
+            this.gridColumn11.Width = 94;
             // 
             // gridColumn3
             // 
@@ -213,14 +224,33 @@
             this.gridColumn8.VisibleIndex = 10;
             this.gridColumn8.Width = 94;
             // 
+            // gridColumn10
+            // 
+            this.gridColumn10.Caption = "鏄庣粏GUID";
+            this.gridColumn10.FieldName = "guid";
+            this.gridColumn10.MinWidth = 25;
+            this.gridColumn10.Name = "gridColumn10";
+            this.gridColumn10.Width = 94;
+            // 
+            // gridColumn12
+            // 
+            this.gridColumn12.Caption = "杞﹂棿";
+            this.gridColumn12.FieldName = "workShop";
+            this.gridColumn12.MinWidth = 25;
+            this.gridColumn12.Name = "gridColumn12";
+            this.gridColumn12.Visible = true;
+            this.gridColumn12.VisibleIndex = 12;
+            this.gridColumn12.Width = 94;
+            // 
             // gridColumn9
             // 
             this.gridColumn9.Caption = "閫夋嫨";
             this.gridColumn9.ColumnEdit = this.repositoryItemButtonEdit1;
+            this.gridColumn9.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Right;
             this.gridColumn9.MinWidth = 25;
             this.gridColumn9.Name = "gridColumn9";
             this.gridColumn9.Visible = true;
-            this.gridColumn9.VisibleIndex = 11;
+            this.gridColumn9.VisibleIndex = 13;
             this.gridColumn9.Width = 94;
             // 
             // repositoryItemButtonEdit1
@@ -233,34 +263,6 @@
             this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
             this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
             this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
-            // 
-            // gridColumn10
-            // 
-            this.gridColumn10.Caption = "鏄庣粏GUID";
-            this.gridColumn10.FieldName = "guid";
-            this.gridColumn10.MinWidth = 25;
-            this.gridColumn10.Name = "gridColumn10";
-            this.gridColumn10.Width = 94;
-            // 
-            // gridColumn11
-            // 
-            this.gridColumn11.Caption = "鐗╂枡鍚嶇О";
-            this.gridColumn11.FieldName = "itemName";
-            this.gridColumn11.MinWidth = 25;
-            this.gridColumn11.Name = "gridColumn11";
-            this.gridColumn11.Visible = true;
-            this.gridColumn11.VisibleIndex = 12;
-            this.gridColumn11.Width = 94;
-            // 
-            // gridColumn12
-            // 
-            this.gridColumn12.Caption = "杞﹂棿";
-            this.gridColumn12.FieldName = "workShop";
-            this.gridColumn12.MinWidth = 25;
-            this.gridColumn12.Name = "gridColumn12";
-            this.gridColumn12.Visible = true;
-            this.gridColumn12.VisibleIndex = 13;
-            this.gridColumn12.Width = 94;
             // 
             // SelectSctk
             // 
diff --git a/DevApp/Gs.DevApp/DevFrm/FrmLogin.Designer.cs b/DevApp/Gs.DevApp/DevFrm/FrmLogin.Designer.cs
index 5217323..0327b94 100644
--- a/DevApp/Gs.DevApp/DevFrm/FrmLogin.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FrmLogin.Designer.cs
@@ -30,159 +30,266 @@
         private void InitializeComponent()
         {
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmLogin));
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition11 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition12 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition13 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition14 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition15 = new DevExpress.XtraLayout.RowDefinition();
             this.lbVersion = new System.Windows.Forms.Label();
+            this.table1 = new System.Windows.Forms.TableLayoutPanel();
             this.panel1 = new System.Windows.Forms.Panel();
-            this.txtUser = new DevExpress.XtraEditors.TextEdit();
-            this.ckRemember = new DevExpress.XtraEditors.CheckEdit();
-            this.txtPwd = new DevExpress.XtraEditors.TextEdit();
+            this.lay1 = new DevExpress.XtraLayout.LayoutControl();
             this.btnCancel = new DevExpress.XtraEditors.SimpleButton();
+            this.ckRemember = new DevExpress.XtraEditors.CheckEdit();
             this.btnLogin = new DevExpress.XtraEditors.SimpleButton();
-            this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
-            this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
-            this.label1 = new System.Windows.Forms.Label();
+            this.txtUser = new DevExpress.XtraEditors.TextEdit();
+            this.txtPwd = new DevExpress.XtraEditors.TextEdit();
+            this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
+            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.table1.SuspendLayout();
             this.panel1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.txtUser.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.lay1)).BeginInit();
+            this.lay1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.ckRemember.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtUser.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtPwd.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
             this.SuspendLayout();
             // 
             // lbVersion
             // 
             this.lbVersion.AutoSize = true;
             this.lbVersion.BackColor = System.Drawing.Color.Transparent;
-            
-            this.lbVersion.ForeColor = System.Drawing.Color.White;
-            this.lbVersion.Location = new System.Drawing.Point(12, 9);
+            this.lbVersion.Location = new System.Drawing.Point(3, 763);
+            this.lbVersion.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
             this.lbVersion.Name = "lbVersion";
-            this.lbVersion.Size = new System.Drawing.Size(0, 24);
-            this.lbVersion.TabIndex = 244;
+            this.lbVersion.Size = new System.Drawing.Size(143, 18);
+            this.lbVersion.TabIndex = 245;
+            this.lbVersion.Text = "鎶�鏈敮鎸侊細骞挎繁绉戞妧";
+            // 
+            // table1
+            // 
+            this.table1.BackColor = System.Drawing.Color.Transparent;
+            this.table1.ColumnCount = 1;
+            this.table1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
+            this.table1.Controls.Add(this.lbVersion, 0, 1);
+            this.table1.Controls.Add(this.panel1, 0, 0);
+            this.table1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.table1.Location = new System.Drawing.Point(0, 0);
+            this.table1.Name = "table1";
+            this.table1.RowCount = 2;
+            this.table1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
+            this.table1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30F));
+            this.table1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
+            this.table1.Size = new System.Drawing.Size(734, 793);
+            this.table1.TabIndex = 247;
             // 
             // panel1
             // 
+            this.panel1.Anchor = System.Windows.Forms.AnchorStyles.Bottom;
             this.panel1.BackColor = System.Drawing.Color.Transparent;
-            this.panel1.Controls.Add(this.txtUser);
-            this.panel1.Controls.Add(this.ckRemember);
-            this.panel1.Controls.Add(this.txtPwd);
-            this.panel1.Controls.Add(this.btnCancel);
-            this.panel1.Controls.Add(this.btnLogin);
-            this.panel1.Controls.Add(this.labelControl2);
-            this.panel1.Controls.Add(this.labelControl1);
-            
-            this.panel1.Location = new System.Drawing.Point(172, 457);
+            this.panel1.Controls.Add(this.lay1);
+            this.panel1.Location = new System.Drawing.Point(179, 501);
             this.panel1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(408, 276);
+            this.panel1.Size = new System.Drawing.Size(375, 258);
             this.panel1.TabIndex = 243;
             // 
-            // txtUser
+            // lay1
             // 
-            this.txtUser.EditValue = "";
-            this.txtUser.Location = new System.Drawing.Point(168, 26);
-            this.txtUser.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.txtUser.Name = "txtUser";
-            
-            this.txtUser.Properties.Appearance.Options.UseFont = true;
-            this.txtUser.Properties.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.HotFlat;
-            this.txtUser.Size = new System.Drawing.Size(211, 30);
-            this.txtUser.TabIndex = 21;
+            this.lay1.Controls.Add(this.btnCancel);
+            this.lay1.Controls.Add(this.ckRemember);
+            this.lay1.Controls.Add(this.btnLogin);
+            this.lay1.Controls.Add(this.txtUser);
+            this.lay1.Controls.Add(this.txtPwd);
+            this.lay1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.lay1.Location = new System.Drawing.Point(0, 0);
+            this.lay1.Name = "lay1";
+            this.lay1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(934, 404, 812, 500);
+            this.lay1.Root = this.Root;
+            this.lay1.Size = new System.Drawing.Size(375, 258);
+            this.lay1.TabIndex = 233;
+            this.lay1.Text = "layoutControl1";
+            // 
+            // btnCancel
+            // 
+            this.btnCancel.Appearance.Options.UseFont = true;
+            this.btnCancel.ButtonStyle = DevExpress.XtraEditors.Controls.BorderStyles.HotFlat;
+            this.btnCancel.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.btnCancel.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnCancel.ImageOptions.Image")));
+            this.btnCancel.Location = new System.Drawing.Point(269, 153);
+            this.btnCancel.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.btnCancel.Name = "btnCancel";
+            this.btnCancel.Size = new System.Drawing.Size(94, 25);
+            this.btnCancel.StyleController = this.lay1;
+            this.btnCancel.TabIndex = 15;
+            this.btnCancel.Text = "鍙栨秷 (&C)";
             // 
             // ckRemember
             // 
-            this.ckRemember.Location = new System.Drawing.Point(168, 121);
+            this.ckRemember.Location = new System.Drawing.Point(12, 106);
             this.ckRemember.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.ckRemember.Name = "ckRemember";
-           
             this.ckRemember.Properties.Appearance.ForeColor = System.Drawing.Color.Black;
             this.ckRemember.Properties.Appearance.Options.UseFont = true;
             this.ckRemember.Properties.Appearance.Options.UseForeColor = true;
             this.ckRemember.Properties.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.UltraFlat;
             this.ckRemember.Properties.Caption = "淇濆瓨鐧诲綍淇℃伅";
-            this.ckRemember.Size = new System.Drawing.Size(157, 27);
+            this.ckRemember.Size = new System.Drawing.Size(351, 26);
+            this.ckRemember.StyleController = this.lay1;
             this.ckRemember.TabIndex = 17;
-            // 
-            // txtPwd
-            // 
-            this.txtPwd.EditValue = "";
-            this.txtPwd.Location = new System.Drawing.Point(168, 72);
-            this.txtPwd.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.txtPwd.Name = "txtPwd";
-           
-            this.txtPwd.Properties.Appearance.Options.UseFont = true;
-            this.txtPwd.Properties.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.HotFlat;
-            this.txtPwd.Properties.PasswordChar = '*';
-            this.txtPwd.Size = new System.Drawing.Size(211, 30);
-            this.txtPwd.TabIndex = 22;
-            // 
-            // btnCancel
-            // 
-            
-            this.btnCancel.Appearance.Options.UseFont = true;
-            this.btnCancel.ButtonStyle = DevExpress.XtraEditors.Controls.BorderStyles.HotFlat;
-            this.btnCancel.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.btnCancel.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnCancel.ImageOptions.Image")));
-            this.btnCancel.Location = new System.Drawing.Point(276, 174);
-            this.btnCancel.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.btnCancel.Name = "btnCancel";
-            this.btnCancel.Size = new System.Drawing.Size(103, 37);
-            this.btnCancel.TabIndex = 15;
-            this.btnCancel.Text = "鍙栨秷 (&C)";
             // 
             // btnLogin
             // 
-            
             this.btnLogin.Appearance.Options.UseFont = true;
             this.btnLogin.ButtonStyle = DevExpress.XtraEditors.Controls.BorderStyles.HotFlat;
             this.btnLogin.Cursor = System.Windows.Forms.Cursors.Hand;
             this.btnLogin.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnLogin.ImageOptions.Image")));
-            this.btnLogin.Location = new System.Drawing.Point(159, 174);
+            this.btnLogin.Location = new System.Drawing.Point(93, 153);
             this.btnLogin.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.btnLogin.Name = "btnLogin";
-            this.btnLogin.Size = new System.Drawing.Size(102, 37);
+            this.btnLogin.Size = new System.Drawing.Size(92, 25);
+            this.btnLogin.StyleController = this.lay1;
             this.btnLogin.TabIndex = 14;
             this.btnLogin.Text = "鐧诲綍 (&L)";
             // 
-            // labelControl2
+            // txtUser
             // 
-            
-            this.labelControl2.Appearance.ForeColor = System.Drawing.Color.Black;
-            this.labelControl2.Appearance.Options.UseFont = true;
-            this.labelControl2.Appearance.Options.UseForeColor = true;
-            this.labelControl2.Appearance.Options.UseTextOptions = true;
-            this.labelControl2.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far;
-            this.labelControl2.AutoSizeMode = DevExpress.XtraEditors.LabelAutoSizeMode.None;
-            this.labelControl2.Location = new System.Drawing.Point(3, 78);
-            this.labelControl2.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.labelControl2.Name = "labelControl2";
-            this.labelControl2.Size = new System.Drawing.Size(162, 18);
-            this.labelControl2.TabIndex = 232;
-            this.labelControl2.Text = "瀵嗙爜锛�";
+            this.txtUser.EditValue = "";
+            this.txtUser.Location = new System.Drawing.Point(99, 12);
+            this.txtUser.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.txtUser.Name = "txtUser";
+            this.txtUser.Properties.Appearance.Options.UseFont = true;
+            this.txtUser.Properties.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.HotFlat;
+            this.txtUser.Size = new System.Drawing.Size(264, 26);
+            this.txtUser.StyleController = this.lay1;
+            this.txtUser.TabIndex = 21;
             // 
-            // labelControl1
+            // txtPwd
             // 
-            
-            this.labelControl1.Appearance.ForeColor = System.Drawing.Color.Black;
-            this.labelControl1.Appearance.Options.UseFont = true;
-            this.labelControl1.Appearance.Options.UseForeColor = true;
-            this.labelControl1.Appearance.Options.UseTextOptions = true;
-            this.labelControl1.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far;
-            this.labelControl1.AutoSizeMode = DevExpress.XtraEditors.LabelAutoSizeMode.None;
-            this.labelControl1.Location = new System.Drawing.Point(3, 32);
-            this.labelControl1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.labelControl1.Name = "labelControl1";
-            this.labelControl1.Size = new System.Drawing.Size(162, 18);
-            this.labelControl1.TabIndex = 231;
-            this.labelControl1.Text = "鐧诲綍甯愬彿锛�";
+            this.txtPwd.EditValue = "";
+            this.txtPwd.Location = new System.Drawing.Point(99, 59);
+            this.txtPwd.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.txtPwd.Name = "txtPwd";
+            this.txtPwd.Properties.Appearance.Options.UseFont = true;
+            this.txtPwd.Properties.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.HotFlat;
+            this.txtPwd.Properties.PasswordChar = '*';
+            this.txtPwd.Size = new System.Drawing.Size(264, 26);
+            this.txtPwd.StyleController = this.lay1;
+            this.txtPwd.TabIndex = 22;
             // 
-            // label1
+            // Root
             // 
-            this.label1.AutoSize = true;
-            this.label1.BackColor = System.Drawing.Color.Transparent;
-           
-            this.label1.Location = new System.Drawing.Point(13, 758);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(163, 21);
-            this.label1.TabIndex = 245;
-            this.label1.Text = "鎶�鏈敮鎸侊細骞挎繁绉戞妧";
+            this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
+            this.Root.GroupBordersVisible = false;
+            this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+            this.layoutControlItem1,
+            this.layoutControlItem2,
+            this.layoutControlItem3,
+            this.layoutControlItem4,
+            this.layoutControlItem5});
+            this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
+            this.Root.Name = "Root";
+            columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition5.Width = 100D;
+            columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition6.Width = 100D;
+            this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
+            columnDefinition5,
+            columnDefinition6});
+            rowDefinition11.Height = 100D;
+            rowDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition12.Height = 100D;
+            rowDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition13.Height = 100D;
+            rowDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition14.Height = 100D;
+            rowDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition15.Height = 50D;
+            rowDefinition15.SizeType = System.Windows.Forms.SizeType.AutoSize;
+            this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
+            rowDefinition11,
+            rowDefinition12,
+            rowDefinition13,
+            rowDefinition14,
+            rowDefinition15});
+            this.Root.Size = new System.Drawing.Size(375, 258);
+            this.Root.TextVisible = false;
+            // 
+            // layoutControlItem1
+            // 
+            this.layoutControlItem1.Control = this.txtUser;
+            this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
+            this.layoutControlItem1.Name = "layoutControlItem1";
+            this.layoutControlItem1.OptionsTableLayoutItem.ColumnSpan = 2;
+            this.layoutControlItem1.Size = new System.Drawing.Size(355, 47);
+            this.layoutControlItem1.Text = "鐧诲綍甯愬彿锛�";
+            this.layoutControlItem1.TextSize = new System.Drawing.Size(75, 18);
+            // 
+            // layoutControlItem2
+            // 
+            this.layoutControlItem2.Control = this.txtPwd;
+            this.layoutControlItem2.Location = new System.Drawing.Point(0, 47);
+            this.layoutControlItem2.Name = "layoutControlItem2";
+            this.layoutControlItem2.OptionsTableLayoutItem.ColumnSpan = 2;
+            this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem2.Size = new System.Drawing.Size(355, 47);
+            this.layoutControlItem2.Text = "鐧诲綍瀵嗙爜锛�";
+            this.layoutControlItem2.TextSize = new System.Drawing.Size(75, 18);
+            // 
+            // layoutControlItem3
+            // 
+            this.layoutControlItem3.Control = this.ckRemember;
+            this.layoutControlItem3.Location = new System.Drawing.Point(0, 94);
+            this.layoutControlItem3.Name = "layoutControlItem3";
+            this.layoutControlItem3.OptionsTableLayoutItem.ColumnSpan = 2;
+            this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem3.Size = new System.Drawing.Size(355, 47);
+            this.layoutControlItem3.Text = "淇濆瓨瀵嗙爜";
+            this.layoutControlItem3.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem3.TextVisible = false;
+            // 
+            // layoutControlItem4
+            // 
+            this.layoutControlItem4.ContentHorzAlignment = DevExpress.Utils.HorzAlignment.Far;
+            this.layoutControlItem4.Control = this.btnLogin;
+            this.layoutControlItem4.Location = new System.Drawing.Point(0, 141);
+            this.layoutControlItem4.MaxSize = new System.Drawing.Size(96, 29);
+            this.layoutControlItem4.MinSize = new System.Drawing.Size(96, 29);
+            this.layoutControlItem4.Name = "layoutControlItem4";
+            this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 3;
+            this.layoutControlItem4.Size = new System.Drawing.Size(177, 47);
+            this.layoutControlItem4.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.layoutControlItem4.Text = "鐧诲綍";
+            this.layoutControlItem4.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem4.TextVisible = false;
+            // 
+            // layoutControlItem5
+            // 
+            this.layoutControlItem5.ContentHorzAlignment = DevExpress.Utils.HorzAlignment.Far;
+            this.layoutControlItem5.Control = this.btnCancel;
+            this.layoutControlItem5.Location = new System.Drawing.Point(177, 141);
+            this.layoutControlItem5.MaxSize = new System.Drawing.Size(98, 29);
+            this.layoutControlItem5.MinSize = new System.Drawing.Size(98, 29);
+            this.layoutControlItem5.Name = "layoutControlItem5";
+            this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 3;
+            this.layoutControlItem5.Size = new System.Drawing.Size(178, 47);
+            this.layoutControlItem5.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.layoutControlItem5.Text = "鍙栨秷";
+            this.layoutControlItem5.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem5.TextVisible = false;
             // 
             // FrmLogin
             // 
@@ -192,10 +299,8 @@
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackgroundImageLayoutStore = System.Windows.Forms.ImageLayout.Stretch;
             this.BackgroundImageStore = global::Gs.DevApp.Properties.Resources.login_bg6;
-            this.ClientSize = new System.Drawing.Size(782, 793);
-            this.Controls.Add(this.label1);
-            this.Controls.Add(this.lbVersion);
-            this.Controls.Add(this.panel1);
+            this.ClientSize = new System.Drawing.Size(734, 793);
+            this.Controls.Add(this.table1);
             this.DoubleBuffered = true;
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
             this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png;
@@ -203,26 +308,39 @@
             this.MinimizeBox = false;
             this.Name = "FrmLogin";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+            this.table1.ResumeLayout(false);
+            this.table1.PerformLayout();
             this.panel1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.txtUser.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.lay1)).EndInit();
+            this.lay1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.ckRemember.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtUser.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtPwd.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
             this.ResumeLayout(false);
-            this.PerformLayout();
 
         }
 
         #endregion
-
         private System.Windows.Forms.Label lbVersion;
+        private System.Windows.Forms.TableLayoutPanel table1;
         private System.Windows.Forms.Panel panel1;
         private DevExpress.XtraEditors.TextEdit txtUser;
         private DevExpress.XtraEditors.CheckEdit ckRemember;
         private DevExpress.XtraEditors.TextEdit txtPwd;
         private DevExpress.XtraEditors.SimpleButton btnCancel;
         private DevExpress.XtraEditors.SimpleButton btnLogin;
-        private DevExpress.XtraEditors.LabelControl labelControl2;
-        private DevExpress.XtraEditors.LabelControl labelControl1;
-        private System.Windows.Forms.Label label1;
+        private DevExpress.XtraLayout.LayoutControl lay1;
+        private DevExpress.XtraLayout.LayoutControlGroup Root;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
     }
 }
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/FrmLogin.cs b/DevApp/Gs.DevApp/DevFrm/FrmLogin.cs
index ee1506b..310adde 100644
--- a/DevApp/Gs.DevApp/DevFrm/FrmLogin.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FrmLogin.cs
@@ -1,5 +1,6 @@
 锘縰sing AutoUpdaterDotNET;
 using DevExpress.XtraEditors;
+using DevExpress.XtraRichEdit.Export.Rtf;
 using Gs.DevApp.Entity;
 using Gs.DevApp.Properties;
 using Gs.DevApp.ToolBox;
@@ -18,18 +19,23 @@
 {
     public partial class FrmLogin : XtraForm
     {
+        private string _productName = "";
+        private string _version = "鏈煡";
+        private string _strFont = "";
+        private string _webApiUrl = "";
         public FrmLogin()
         {
 
             InitializeComponent();
+            _productName = ConfigurationManager.AppSettings["ProductName"];
+            _webApiUrl = ConfigurationManager.AppSettings["WebApiUrl"];
             if (ConfigurationManager.AppSettings["IsAutoUpdater"] == "1")
                 _autoUpdate();
             _getFont();
             _getRemember();
-            Text = lbVersion.Text = ConfigurationManager.AppSettings["ProductName"];
             btnLogin.Click += BtnLogin_Click;
             btnCancel.Click += BtnCancel_Click;
-
+            lbVersion.Text = _productName+ "锛岀増鏈�(" + _version + ")" + "锛屼娇鐢ㄥ瓧浣�(" + _strFont + ")"+"锛屾湇鍔″湴鍧�("+ _webApiUrl + ")";
         }
 
         private void BtnCancel_Click(object sender, EventArgs e)
@@ -114,10 +120,10 @@
         {
             try
             {
-                string strFont = Settings.Default.fontSizeName;
-                if (string.IsNullOrEmpty(strFont))
+                _strFont = Settings.Default.fontSizeName;
+                if (string.IsNullOrEmpty(_strFont))
                     return;
-                string[] ary = strFont.Split(',');
+                string[] ary = _strFont.Split(',');
                 if (ary.Length < 2)
                     return;
                 float _ft = float.Parse(ary[1]);
@@ -127,6 +133,7 @@
                 DevExpress.XtraEditors.WindowsFormsSettings.DefaultMenuFont = new System.Drawing.Font(ary[0], _ft);
                 DevExpress.XtraEditors.WindowsFormsSettings.DefaultPrintFont = new System.Drawing.Font(ary[0], _ft);
                 #endregion
+              
             }
             catch (Exception)
             {
@@ -134,7 +141,7 @@
         }
         private void _autoUpdate()
         {
-            var _version = ConfigurationManager.AppSettings["Version"];
+            _version = ConfigurationManager.AppSettings["Version"];
             AutoUpdater.InstalledVersion = new Version(_version);
             AutoUpdater.Start(ConfigurationManager.AppSettings["AutoUpdaterXml"]);
             AutoUpdater.CheckForUpdateEvent += AutoUpdater_CheckForUpdateEvent;
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs
index c46da60..f36ea8f 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs
@@ -279,6 +279,7 @@
             // split1
             // 
             this.split1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
             this.split1.Horizontal = false;
             this.split1.Location = new System.Drawing.Point(0, 0);
             this.split1.Name = "split1";
@@ -288,8 +289,9 @@
             this.split1.Panel1.Controls.Add(this.gcMain1);
             this.split1.Panel1.Controls.Add(this.pageBar1);
             this.split1.Panel1.Text = "Panel1";
+            this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.False;
             this.split1.Size = new System.Drawing.Size(1167, 570);
-            this.split1.SplitterPosition = 558;
+            this.split1.SplitterPosition = 0;
             this.split1.TabIndex = 4;
             // 
             // gcMain1
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 3d1d519..6c8a0c2 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -284,6 +284,12 @@
     <Compile Include="DevFrm\Ck\Frm_MesItemQtDj.Designer.cs">
       <DependentUpon>Frm_MesItemQtDj.cs</DependentUpon>
     </Compile>
+    <Compile Include="DevFrm\Ck\Frm_MesSctkSqDj.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="DevFrm\Ck\Frm_MesSctkSqDj.Designer.cs">
+      <DependentUpon>Frm_MesSctkSqDj.cs</DependentUpon>
+    </Compile>
     <Compile Include="DevFrm\Ck\SelectSctk.cs">
       <SubType>Form</SubType>
     </Compile>

--
Gitblit v1.9.3