From 40036d84a94b47b82b2d6316fb63df5e2847c6df Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期四, 10 七月 2025 11:17:46 +0800
Subject: [PATCH] 首检

---
 DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesSctkSq.Designer.cs |  342 ++++++++++++++++++++++-----------------------------------
 1 files changed, 132 insertions(+), 210 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesSctkSq.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesSctkSq.Designer.cs
index 2b1bac3..4730b26 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesSctkSq.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesSctkSq.Designer.cs
@@ -48,36 +48,32 @@
             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.gridColumn1 = 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.txt_returnType = new Gs.DevApp.UserControl.UcDictionaryComBox();
             this.btnSelect = new DevExpress.XtraEditors.SimpleButton();
             this.lbGuid = new System.Windows.Forms.Label();
             this.txt_thOrgId = new Gs.DevApp.UserControl.UcLookOrg();
-            this.txt_returnType = new DevExpress.XtraEditors.ComboBoxEdit();
             this.txt_billNo = new DevExpress.XtraEditors.TextEdit();
             this.txt_checkDate = new DevExpress.XtraEditors.TextEdit();
             this.txt_depotId = new Gs.DevApp.UserControl.UcLookCk();
             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();
@@ -89,6 +85,10 @@
             this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
             this.tabMx = new DevExpress.XtraTab.XtraTabControl();
             this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
             this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -109,10 +109,6 @@
             this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
             this.picCheckBox = new System.Windows.Forms.PictureBox();
             this.tips = new DevExpress.Utils.ToolTipController(this.components);
-            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
             this.xtraTabControl1.SuspendLayout();
             this.xtraTabPage1.SuspendLayout();
@@ -132,14 +128,13 @@
             this.splitMx1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
             this.layoutMx1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_returnType.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
             ((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();
@@ -151,6 +146,10 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
             this.tabMx.SuspendLayout();
             this.tabMxPage1.SuspendLayout();
@@ -158,10 +157,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
             this.SuspendLayout();
             // 
             // toolBarMenu1
@@ -239,36 +234,22 @@
             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.gv_remark,
+            this.gridColumn1});
             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;
-            // 
-            // 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 +262,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 +274,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 +286,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 +298,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 +310,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 +322,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 +346,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,8 +358,16 @@
             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;
+            // 
+            // gridColumn1
+            // 
+            this.gridColumn1.Caption = "涓婚敭";
+            this.gridColumn1.FieldName = "guid";
+            this.gridColumn1.MinWidth = 25;
+            this.gridColumn1.Name = "gridColumn1";
+            this.gridColumn1.Width = 94;
             // 
             // pageBar1
             // 
@@ -474,18 +411,18 @@
             // 
             // layoutMx1
             // 
+            this.layoutMx1.Controls.Add(this.txt_returnType);
             this.layoutMx1.Controls.Add(this.btnSelect);
             this.layoutMx1.Controls.Add(this.lbGuid);
             this.layoutMx1.Controls.Add(this.txt_thOrgId);
-            this.layoutMx1.Controls.Add(this.txt_returnType);
             this.layoutMx1.Controls.Add(this.txt_billNo);
             this.layoutMx1.Controls.Add(this.txt_checkDate);
             this.layoutMx1.Controls.Add(this.txt_depotId);
             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[] {
@@ -499,6 +436,15 @@
             this.layoutMx1.TabIndex = 0;
             this.layoutMx1.Text = "layoutControl1";
             // 
+            // txt_returnType
+            // 
+            this.txt_returnType.Location = new System.Drawing.Point(385, 12);
+            this.txt_returnType.Name = "txt_returnType";
+            this.txt_returnType.Size = new System.Drawing.Size(165, 24);
+            this.txt_returnType.TabIndex = 533;
+            this.txt_returnType.TextTxt = "";
+            this.txt_returnType.WhereTxt = "a.s_type=\'鐢熶骇閫�搴撳師鍥燶'  and a.pid<>\'00000000-0000-0000-0000-000000000000\'";
+            // 
             // btnSelect
             // 
             this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
@@ -507,7 +453,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
             // 
@@ -525,25 +471,6 @@
             this.txt_thOrgId.Name = "txt_thOrgId";
             this.txt_thOrgId.Size = new System.Drawing.Size(165, 24);
             this.txt_thOrgId.TabIndex = 526;
-            // 
-            // txt_returnType
-            // 
-            this.txt_returnType.EditValue = "-璇烽�夋嫨-";
-            this.txt_returnType.Location = new System.Drawing.Point(385, 12);
-            this.txt_returnType.Name = "txt_returnType";
-            this.txt_returnType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.txt_returnType.Properties.Items.AddRange(new object[] {
-            "-璇烽�夋嫨-",
-            "TKYY01_SYS(璁㈠崟鏈夎)",
-            "TKYY02_SYS(鏁伴噺鏈夎)",
-            "TKYY03_SYS(缂栫爜鏈夎)",
-            "TKYY04_SYS(璐ㄩ噺闂)",
-            "TKYY05_SYS(鍖呰璋冩暣)"});
-            this.txt_returnType.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
-            this.txt_returnType.Size = new System.Drawing.Size(165, 24);
-            this.txt_returnType.StyleController = this.layoutMx1;
-            this.txt_returnType.TabIndex = 521;
             // 
             // txt_billNo
             // 
@@ -603,23 +530,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
             // 
@@ -664,10 +591,10 @@
             this.layoutControlItem14,
             this.layoutControlItem15,
             this.layoutControlItem11,
-            this.layoutControlItem6,
             this.layoutControlItem3,
             this.layoutControlItem7,
-            this.layoutControlItem16});
+            this.layoutControlItem16,
+            this.layoutControlItem4});
             this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.Root.Name = "Root";
             columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -722,7 +649,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 +665,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;
@@ -768,6 +695,53 @@
             this.layoutControlItem11.Text = "瀹℃牳鏍囪瘑";
             this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem11.TextVisible = false;
+            // 
+            // layoutControlItem3
+            // 
+            this.layoutControlItem3.Control = this.txt_depotId;
+            this.layoutControlItem3.Location = new System.Drawing.Point(271, 31);
+            this.layoutControlItem3.Name = "layoutControlItem3";
+            this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem3.Size = new System.Drawing.Size(271, 31);
+            this.layoutControlItem3.Text = "閫夋嫨浠撳簱";
+            this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem7
+            // 
+            this.layoutControlItem7.Control = this.txt_remark;
+            this.layoutControlItem7.Location = new System.Drawing.Point(271, 62);
+            this.layoutControlItem7.Name = "layoutControlItem7";
+            this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem7.OptionsTableLayoutItem.ColumnSpan = 2;
+            this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem7.Size = new System.Drawing.Size(542, 31);
+            this.layoutControlItem7.Text = "鐢宠澶囨敞";
+            this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem16
+            // 
+            this.layoutControlItem16.Control = this.btnSelect;
+            this.layoutControlItem16.Location = new System.Drawing.Point(0, 62);
+            this.layoutControlItem16.MaxSize = new System.Drawing.Size(120, 31);
+            this.layoutControlItem16.MinSize = new System.Drawing.Size(20, 31);
+            this.layoutControlItem16.Name = "layoutControlItem16";
+            this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem16.Size = new System.Drawing.Size(271, 31);
+            this.layoutControlItem16.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.layoutControlItem16.Text = "閫�璐ф槑缁�";
+            this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem16.TextVisible = false;
+            // 
+            // layoutControlItem4
+            // 
+            this.layoutControlItem4.Control = this.txt_returnType;
+            this.layoutControlItem4.Location = new System.Drawing.Point(271, 0);
+            this.layoutControlItem4.Name = "layoutControlItem4";
+            this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem4.Size = new System.Drawing.Size(271, 31);
+            this.layoutControlItem4.Text = "閫�搴撳師鍥�";
+            this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18);
             // 
             // tabMx
             // 
@@ -824,7 +798,7 @@
             // 
             // rkmxGuid
             // 
-            this.rkmxGuid.Caption = "gridColumn1";
+            this.rkmxGuid.Caption = "鍏ュ簱鏄庣粏琛℅uid";
             this.rkmxGuid.FieldName = "rkmxGuid";
             this.rkmxGuid.MinWidth = 25;
             this.rkmxGuid.Name = "rkmxGuid";
@@ -833,7 +807,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";
@@ -843,7 +817,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";
@@ -854,7 +828,7 @@
             // 
             this.gvMx1ebeln.AppearanceCell.Options.UseFont = true;
             this.gvMx1ebeln.Caption = "鐢熶骇杞﹂棿";
-            this.gvMx1ebeln.FieldName = "ebeln";
+            this.gvMx1ebeln.FieldName = "workShop";
             this.gvMx1ebeln.MinWidth = 50;
             this.gvMx1ebeln.Name = "gvMx1ebeln";
             this.gvMx1ebeln.Tag = "query_a.EBELN";
@@ -875,7 +849,7 @@
             // gridColumn2
             // 
             this.gridColumn2.Caption = "鐗╂枡缂栫爜";
-            this.gridColumn2.FieldName = "wlbm";
+            this.gridColumn2.FieldName = "itemNo";
             this.gridColumn2.MinWidth = 25;
             this.gridColumn2.Name = "gridColumn2";
             this.gridColumn2.Visible = true;
@@ -885,7 +859,7 @@
             // gridColumn5
             // 
             this.gridColumn5.Caption = "鐗╂枡鍚嶇О";
-            this.gridColumn5.FieldName = "wlmc";
+            this.gridColumn5.FieldName = "itemName";
             this.gridColumn5.MinWidth = 25;
             this.gridColumn5.Name = "gridColumn5";
             this.gridColumn5.Visible = true;
@@ -895,7 +869,7 @@
             // gridColumn3
             // 
             this.gridColumn3.Caption = "鐗╂枡瑙勬牸";
-            this.gridColumn3.FieldName = "wlgg";
+            this.gridColumn3.FieldName = "itemModel";
             this.gridColumn3.MinWidth = 25;
             this.gridColumn3.Name = "gridColumn3";
             this.gridColumn3.Visible = true;
@@ -988,53 +962,6 @@
             this.picCheckBox.TabStop = false;
             this.picCheckBox.Visible = false;
             // 
-            // layoutControlItem6
-            // 
-            this.layoutControlItem6.Control = this.txt_returnType;
-            this.layoutControlItem6.Location = new System.Drawing.Point(271, 0);
-            this.layoutControlItem6.Name = "layoutControlItem6";
-            this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem6.Size = new System.Drawing.Size(271, 31);
-            this.layoutControlItem6.Text = "閫�搴撳師鍥�";
-            this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem3
-            // 
-            this.layoutControlItem3.Control = this.txt_depotId;
-            this.layoutControlItem3.Location = new System.Drawing.Point(271, 31);
-            this.layoutControlItem3.Name = "layoutControlItem3";
-            this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem3.Size = new System.Drawing.Size(271, 31);
-            this.layoutControlItem3.Text = "閫夋嫨浠撳簱";
-            this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem7
-            // 
-            this.layoutControlItem7.Control = this.txt_remark;
-            this.layoutControlItem7.Location = new System.Drawing.Point(271, 62);
-            this.layoutControlItem7.Name = "layoutControlItem7";
-            this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem7.OptionsTableLayoutItem.ColumnSpan = 2;
-            this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem7.Size = new System.Drawing.Size(542, 31);
-            this.layoutControlItem7.Text = "鐢宠澶囨敞";
-            this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem16
-            // 
-            this.layoutControlItem16.Control = this.btnSelect;
-            this.layoutControlItem16.Location = new System.Drawing.Point(0, 62);
-            this.layoutControlItem16.MaxSize = new System.Drawing.Size(120, 31);
-            this.layoutControlItem16.MinSize = new System.Drawing.Size(20, 31);
-            this.layoutControlItem16.Name = "layoutControlItem16";
-            this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem16.Size = new System.Drawing.Size(271, 31);
-            this.layoutControlItem16.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem16.Text = "閫�璐ф槑缁�";
-            this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem16.TextVisible = false;
-            // 
             // Frm_MesSctkSq
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1064,14 +991,13 @@
             this.splitMx1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
             this.layoutMx1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.txt_returnType.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
             ((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();
@@ -1083,6 +1009,10 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
             this.tabMx.ResumeLayout(false);
             this.tabMxPage1.ResumeLayout(false);
@@ -1090,10 +1020,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -1105,19 +1031,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;
@@ -1126,7 +1047,6 @@
         private DevExpress.XtraLayout.LayoutControlGroup Root;
         private UserControl.UcLookOrg txt_thOrgId;
         private DevExpress.XtraEditors.SimpleButton btnSelect;
-        private DevExpress.XtraEditors.ComboBoxEdit txt_returnType;
         private UserControl.UcLookCk txt_depotId;
         private System.Windows.Forms.Label lbGuid;
         private DevExpress.XtraEditors.TextEdit txt_remark;
@@ -1139,8 +1059,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;
@@ -1165,9 +1085,11 @@
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
         private DevExpress.Utils.ToolTipController tips;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+        private UserControl.UcDictionaryComBox txt_returnType;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3