From f13592561fedab01d5d447a3f8db9026ce51b7c8 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期三, 12 二月 2025 11:06:36 +0800
Subject: [PATCH] 其它入库

---
 DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs |  244 ++++++++++++----------------------
 DevApp/Gs.DevApp/UserControl/UcLookHuoZhu.cs           |    4 
 DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs          |   64 ++++++--
 DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs   |   35 ++++
 DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs            |    9 +
 DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs              |   35 ++++
 6 files changed, 206 insertions(+), 185 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs
index aa38953..d3e3702 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs
@@ -106,6 +106,8 @@
             this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
             this.lbGuid = new System.Windows.Forms.Label();
             this.picCheckBox = new System.Windows.Forms.PictureBox();
+            this.labelControl5 = new DevExpress.XtraEditors.LabelControl();
+            this.txt_qt008 = new Gs.DevApp.UserControl.UcLookCk();
             this.tabMxPage1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
@@ -135,7 +137,7 @@
             // 
             this.tabMxPage1.Controls.Add(this.gcMx1);
             this.tabMxPage1.Name = "tabMxPage1";
-            this.tabMxPage1.Size = new System.Drawing.Size(1124, 367);
+            this.tabMxPage1.Size = new System.Drawing.Size(1124, 325);
             this.tabMxPage1.Text = "鐢宠鏄庣粏";
             // 
             // gcMx1
@@ -147,7 +149,7 @@
             this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
             this.repositoryItemButtonEdit1,
             this.repositoryItemSearchLookUpEdit1});
-            this.gcMx1.Size = new System.Drawing.Size(1124, 367);
+            this.gcMx1.Size = new System.Drawing.Size(1124, 325);
             this.gcMx1.TabIndex = 1;
             this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx1});
@@ -801,10 +803,10 @@
             // tabMx
             // 
             this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.tabMx.Location = new System.Drawing.Point(0, 171);
+            this.tabMx.Location = new System.Drawing.Point(0, 213);
             this.tabMx.Name = "tabMx";
             this.tabMx.SelectedTabPage = this.tabMxPage1;
-            this.tabMx.Size = new System.Drawing.Size(1126, 399);
+            this.tabMx.Size = new System.Drawing.Size(1126, 357);
             this.tabMx.TabIndex = 2;
             this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.tabMxPage1});
@@ -812,6 +814,8 @@
             // panel1
             // 
             this.panel1.BackColor = System.Drawing.Color.White;
+            this.panel1.Controls.Add(this.txt_qt008);
+            this.panel1.Controls.Add(this.labelControl5);
             this.panel1.Controls.Add(this.ucLookHuoZhu1);
             this.panel1.Controls.Add(this.labelControl4);
             this.panel1.Controls.Add(this.txt_qt009);
@@ -843,7 +847,7 @@
             this.panel1.Font = new System.Drawing.Font("Tahoma", 10F);
             this.panel1.Location = new System.Drawing.Point(0, 0);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(1126, 171);
+            this.panel1.Size = new System.Drawing.Size(1126, 213);
             this.panel1.TabIndex = 1;
             // 
             // ucLookHuoZhu1
@@ -999,6 +1003,25 @@
             this.picCheckBox.TabStop = false;
             this.picCheckBox.Visible = false;
             // 
+            // labelControl5
+            // 
+            this.labelControl5.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.labelControl5.Appearance.Options.UseFont = true;
+            this.labelControl5.Location = new System.Drawing.Point(18, 173);
+            this.labelControl5.Name = "labelControl5";
+            this.labelControl5.Size = new System.Drawing.Size(68, 21);
+            this.labelControl5.TabIndex = 319;
+            this.labelControl5.Text = "鍙戞枡浠撳簱";
+            // 
+            // txt_qt008
+            // 
+            this.txt_qt008.IsReadly = false;
+            this.txt_qt008.Location = new System.Drawing.Point(92, 173);
+            this.txt_qt008.Margin = new System.Windows.Forms.Padding(0);
+            this.txt_qt008.Name = "txt_qt008";
+            this.txt_qt008.Size = new System.Drawing.Size(219, 30);
+            this.txt_qt008.TabIndex = 320;
+            // 
             // Frm_MesItemQt
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1118,5 +1141,7 @@
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
         private DevExpress.XtraEditors.LabelControl labelControl4;
         private UserControl.UcLookHuoZhu ucLookHuoZhu1;
+        private UserControl.UcLookCk txt_qt008;
+        private DevExpress.XtraEditors.LabelControl labelControl5;
     }
 }
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs
index 3dc4684..aaa8a03 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs
@@ -49,6 +49,7 @@
                 string _orgId = txt_qt023.GetId();
                 if (string.IsNullOrEmpty(_orgId))
                     return;
+                txt_qt008.getSuppler(_orgId);
                 ucLookHuoZhu1.OrgId = _orgId;
                 System.Text.StringBuilder sbWhere = new System.Text.StringBuilder();
                 sbWhere.Append(" and a.FSubsidiary ='" + _orgId + "'");
@@ -259,6 +260,7 @@
             string inLyCus = txt_qt013.GetId();//棰嗙敤瀹㈡埛
             string inLyDepart = txt_qt009.GetId();//棰嗙敤閮ㄩ棬
             string inKcfx = txt_qt020.Text.Trim();//搴撳瓨鏂瑰悜
+            string inFlck = txt_qt008.GetId();//鍙戞枡浠撳簱
             if (string.IsNullOrEmpty(inOrgId))
             {
                 Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨搴撳瓨缁勭粐锛�");
@@ -279,6 +281,12 @@
             {
                 Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鍗曟嵁绫诲瀷锛�");
                 txt_qt019.Focus();
+                return;
+            }
+            if (string.IsNullOrEmpty(inFlck))
+            {
+                Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鍙戞枡浠撳簱锛�");
+                txt_qt008.Focus();
                 return;
             }
             if (string.IsNullOrEmpty(inLyOrg))
@@ -310,6 +318,7 @@
                 inLyCus = inLyCus,//棰嗙敤瀹㈡埛
                 inLyDepart = inLyDepart,//棰嗙敤閮ㄩ棬
                 inKcfx = inKcfx,//搴撳瓨鏂瑰悜
+                inFlck = inFlck,//鍙戞枡浠撳簱
                 list = new List<dynamic>(),
             };
             gvMx1.CloseEditor();
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs
index 4d5de96..81ad8ec 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs
@@ -29,16 +29,16 @@
         /// </summary>
         private void InitializeComponent()
         {
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions25 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject97 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject98 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject99 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject100 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions26 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject101 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject102 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject103 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject104 = new DevExpress.Utils.SerializableAppearanceObject();
             this.gvMx1qd010 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1qd009 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1qd008 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -127,16 +127,9 @@
             this.gvBtnAlawys = new DevExpress.XtraGrid.Columns.GridColumn();
             this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
             this.panel1 = new System.Windows.Forms.Panel();
-            this.txt_qt023 = new DevExpress.XtraEditors.ComboBoxEdit();
             this.labelControl6 = new DevExpress.XtraEditors.LabelControl();
             this.txt_qt022 = new Gs.DevApp.UserControl.UcLookOrg();
             this.labelControl3 = new DevExpress.XtraEditors.LabelControl();
-            this.txt_qt026 = new Gs.DevApp.UserControl.UcLookDepartment();
-            this.txt_qt024 = new Gs.DevApp.UserControl.UcLookOrg();
-            this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
-            this.txt_qt025 = new Gs.DevApp.UserControl.UcLookCustomer();
-            this.labelControl4 = new DevExpress.XtraEditors.LabelControl();
-            this.labelControl5 = new DevExpress.XtraEditors.LabelControl();
             this.txt_qt003 = new DevExpress.XtraEditors.ComboBoxEdit();
             this.txt_qt009 = new Gs.DevApp.UserControl.UcLookDepartment();
             this.txt_qt015 = new DevExpress.XtraEditors.CheckEdit();
@@ -147,6 +140,8 @@
             this.lbGuid = new System.Windows.Forms.Label();
             this.lb_qt011 = new DevExpress.XtraEditors.LabelControl();
             this.picCheckBox = new System.Windows.Forms.PictureBox();
+            this.ucLookHuoZhu1 = new Gs.DevApp.UserControl.UcLookHuoZhu();
+            this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
             this.tabMxPage1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
@@ -180,7 +175,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).BeginInit();
             this.panel1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_qt023.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_qt003.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_qt015.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_qt019.Properties)).BeginInit();
@@ -340,7 +334,7 @@
             this.tabMxPage1.Controls.Add(this.gcMx1);
             this.tabMxPage1.Controls.Add(this.panelMx1);
             this.tabMxPage1.Name = "tabMxPage1";
-            this.tabMxPage1.Size = new System.Drawing.Size(1165, 358);
+            this.tabMxPage1.Size = new System.Drawing.Size(1165, 370);
             this.tabMxPage1.Text = "鐗╂枡鏄庣粏";
             // 
             // gcMx1
@@ -352,7 +346,7 @@
             this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
             this.repositoryItemButtonEdit1,
             this.repositoryItemSearchLookUpEdit1});
-            this.gcMx1.Size = new System.Drawing.Size(1165, 256);
+            this.gcMx1.Size = new System.Drawing.Size(1165, 268);
             this.gcMx1.TabIndex = 0;
             this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx1});
@@ -483,10 +477,10 @@
             // repositoryItemButtonEdit1
             // 
             this.repositoryItemButtonEdit1.AutoHeight = false;
-            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
-            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+            editorButtonImageOptions25.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+            editorButtonImageOptions25.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
             this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions25, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject97, serializableAppearanceObject98, serializableAppearanceObject99, serializableAppearanceObject100, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
             this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
             this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
             this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -681,7 +675,7 @@
             // 
             this.lb_qt019.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_qt019.Appearance.Options.UseFont = true;
-            this.lb_qt019.Location = new System.Drawing.Point(355, 51);
+            this.lb_qt019.Location = new System.Drawing.Point(719, 20);
             this.lb_qt019.Name = "lb_qt019";
             this.lb_qt019.Size = new System.Drawing.Size(68, 21);
             this.lb_qt019.TabIndex = 285;
@@ -705,7 +699,7 @@
             // 
             this.lb_qt018.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_qt018.Appearance.Options.UseFont = true;
-            this.lb_qt018.Location = new System.Drawing.Point(8, 119);
+            this.lb_qt018.Location = new System.Drawing.Point(364, 80);
             this.lb_qt018.Name = "lb_qt018";
             this.lb_qt018.Size = new System.Drawing.Size(85, 21);
             this.lb_qt018.TabIndex = 280;
@@ -715,15 +709,15 @@
             // 
             this.lb_qt016.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_qt016.Appearance.Options.UseFont = true;
-            this.lb_qt016.Location = new System.Drawing.Point(917, 51);
+            this.lb_qt016.Location = new System.Drawing.Point(736, 85);
             this.lb_qt016.Name = "lb_qt016";
-            this.lb_qt016.Size = new System.Drawing.Size(56, 21);
+            this.lb_qt016.Size = new System.Drawing.Size(51, 21);
             this.lb_qt016.TabIndex = 267;
-            this.lb_qt016.Text = "瀹℃牳浜� ";
+            this.lb_qt016.Text = "瀹℃牳浜�";
             // 
             // txt_qt016
             // 
-            this.txt_qt016.Location = new System.Drawing.Point(977, 47);
+            this.txt_qt016.Location = new System.Drawing.Point(792, 81);
             this.txt_qt016.Name = "txt_qt016";
             this.txt_qt016.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_qt016.Properties.Appearance.Options.UseFont = true;
@@ -749,11 +743,11 @@
             // 
             this.lb_qt015.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_qt015.Appearance.Options.UseFont = true;
-            this.lb_qt015.Location = new System.Drawing.Point(900, 20);
+            this.lb_qt015.Location = new System.Drawing.Point(719, 54);
             this.lb_qt015.Name = "lb_qt015";
-            this.lb_qt015.Size = new System.Drawing.Size(73, 21);
+            this.lb_qt015.Size = new System.Drawing.Size(68, 21);
             this.lb_qt015.TabIndex = 262;
-            this.lb_qt015.Text = "瀹℃牳鐘舵�� ";
+            this.lb_qt015.Text = "瀹℃牳鐘舵��";
             // 
             // gv_qt015
             // 
@@ -789,19 +783,19 @@
             // 
             this.lb_qt010.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_qt010.Appearance.Options.UseFont = true;
-            this.lb_qt010.Location = new System.Drawing.Point(17, 149);
+            this.lb_qt010.Location = new System.Drawing.Point(20, 140);
             this.lb_qt010.Name = "lb_qt010";
-            this.lb_qt010.Size = new System.Drawing.Size(73, 21);
+            this.lb_qt010.Size = new System.Drawing.Size(68, 21);
             this.lb_qt010.TabIndex = 240;
-            this.lb_qt010.Text = "鍏ュ簱鍘熷洜 ";
+            this.lb_qt010.Text = "鍏ュ簱鍘熷洜";
             // 
             // txt_qt010
             // 
-            this.txt_qt010.Location = new System.Drawing.Point(95, 145);
+            this.txt_qt010.Location = new System.Drawing.Point(95, 136);
             this.txt_qt010.Name = "txt_qt010";
             this.txt_qt010.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_qt010.Properties.Appearance.Options.UseFont = true;
-            this.txt_qt010.Size = new System.Drawing.Size(483, 28);
+            this.txt_qt010.Size = new System.Drawing.Size(510, 28);
             this.txt_qt010.TabIndex = 240;
             // 
             // gv_qt010
@@ -822,11 +816,11 @@
             // 
             this.lb_qt009.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_qt009.Appearance.Options.UseFont = true;
-            this.lb_qt009.Location = new System.Drawing.Point(20, 86);
+            this.lb_qt009.Location = new System.Drawing.Point(381, 51);
             this.lb_qt009.Name = "lb_qt009";
-            this.lb_qt009.Size = new System.Drawing.Size(73, 21);
+            this.lb_qt009.Size = new System.Drawing.Size(68, 21);
             this.lb_qt009.TabIndex = 235;
-            this.lb_qt009.Text = "閫夋嫨閮ㄩ棬 ";
+            this.lb_qt009.Text = "閫夋嫨閮ㄩ棬";
             // 
             // gv_qt005
             // 
@@ -846,7 +840,7 @@
             // 
             this.lb_qt003.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_qt003.Appearance.Options.UseFont = true;
-            this.lb_qt003.Location = new System.Drawing.Point(355, 20);
+            this.lb_qt003.Location = new System.Drawing.Point(381, 20);
             this.lb_qt003.Name = "lb_qt003";
             this.lb_qt003.Size = new System.Drawing.Size(68, 21);
             this.lb_qt003.TabIndex = 219;
@@ -870,15 +864,15 @@
             // 
             this.lb_qt002.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_qt002.Appearance.Options.UseFont = true;
-            this.lb_qt002.Location = new System.Drawing.Point(900, 86);
+            this.lb_qt002.Location = new System.Drawing.Point(719, 114);
             this.lb_qt002.Name = "lb_qt002";
-            this.lb_qt002.Size = new System.Drawing.Size(73, 21);
+            this.lb_qt002.Size = new System.Drawing.Size(68, 21);
             this.lb_qt002.TabIndex = 217;
-            this.lb_qt002.Text = "瀹℃牳鏃ユ湡 ";
+            this.lb_qt002.Text = "瀹℃牳鏃ユ湡";
             // 
             // txt_qt002
             // 
-            this.txt_qt002.Location = new System.Drawing.Point(977, 82);
+            this.txt_qt002.Location = new System.Drawing.Point(792, 110);
             this.txt_qt002.Name = "txt_qt002";
             this.txt_qt002.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_qt002.Properties.Appearance.Options.UseFont = true;
@@ -920,9 +914,9 @@
             this.lb_qtck.Appearance.Options.UseFont = true;
             this.lb_qtck.Location = new System.Drawing.Point(20, 20);
             this.lb_qtck.Name = "lb_qtck";
-            this.lb_qtck.Size = new System.Drawing.Size(73, 21);
+            this.lb_qtck.Size = new System.Drawing.Size(68, 21);
             this.lb_qtck.TabIndex = 213;
-            this.lb_qtck.Text = "鐢宠鍗曞彿 ";
+            this.lb_qtck.Text = "鐢宠鍗曞彿";
             // 
             // txt_qtck
             // 
@@ -930,7 +924,7 @@
             this.txt_qtck.Name = "txt_qtck";
             this.txt_qtck.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_qtck.Properties.Appearance.Options.UseFont = true;
-            this.txt_qtck.Size = new System.Drawing.Size(254, 28);
+            this.txt_qtck.Size = new System.Drawing.Size(263, 28);
             this.txt_qtck.TabIndex = 213;
             this.txt_qtck.Tag = "readonly";
             // 
@@ -1043,10 +1037,10 @@
             // tabMx
             // 
             this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.tabMx.Location = new System.Drawing.Point(0, 180);
+            this.tabMx.Location = new System.Drawing.Point(0, 168);
             this.tabMx.Name = "tabMx";
             this.tabMx.SelectedTabPage = this.tabMxPage1;
-            this.tabMx.Size = new System.Drawing.Size(1167, 390);
+            this.tabMx.Size = new System.Drawing.Size(1167, 402);
             this.tabMx.TabIndex = 2;
             this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.tabMxPage1,
@@ -1056,7 +1050,7 @@
             // 
             this.xtraTabPage3.Controls.Add(this.gcMx2);
             this.xtraTabPage3.Name = "xtraTabPage3";
-            this.xtraTabPage3.Size = new System.Drawing.Size(1165, 358);
+            this.xtraTabPage3.Size = new System.Drawing.Size(1165, 370);
             this.xtraTabPage3.Text = "宸叉墦鍗版潯鐮佹槑缁�";
             // 
             // gcMx2
@@ -1067,7 +1061,7 @@
             this.gcMx2.Name = "gcMx2";
             this.gcMx2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
             this.repositoryItemButtonEdit2});
-            this.gcMx2.Size = new System.Drawing.Size(1165, 358);
+            this.gcMx2.Size = new System.Drawing.Size(1165, 370);
             this.gcMx2.TabIndex = 2;
             this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx2});
@@ -1207,10 +1201,10 @@
             // repositoryItemButtonEdit2
             // 
             this.repositoryItemButtonEdit2.AutoHeight = false;
-            editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
-            editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+            editorButtonImageOptions26.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+            editorButtonImageOptions26.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
             this.repositoryItemButtonEdit2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions26, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject101, serializableAppearanceObject102, serializableAppearanceObject103, serializableAppearanceObject104, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
             this.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2";
             this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
             this.repositoryItemButtonEdit2.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit2_ButtonClick);
@@ -1218,16 +1212,11 @@
             // panel1
             // 
             this.panel1.BackColor = System.Drawing.Color.White;
-            this.panel1.Controls.Add(this.txt_qt023);
+            this.panel1.Controls.Add(this.labelControl2);
+            this.panel1.Controls.Add(this.ucLookHuoZhu1);
             this.panel1.Controls.Add(this.labelControl6);
             this.panel1.Controls.Add(this.txt_qt022);
             this.panel1.Controls.Add(this.labelControl3);
-            this.panel1.Controls.Add(this.txt_qt026);
-            this.panel1.Controls.Add(this.txt_qt024);
-            this.panel1.Controls.Add(this.labelControl2);
-            this.panel1.Controls.Add(this.txt_qt025);
-            this.panel1.Controls.Add(this.labelControl4);
-            this.panel1.Controls.Add(this.labelControl5);
             this.panel1.Controls.Add(this.txt_qt003);
             this.panel1.Controls.Add(this.txt_qt009);
             this.panel1.Controls.Add(this.txt_qt015);
@@ -1254,30 +1243,14 @@
             this.panel1.Font = new System.Drawing.Font("Tahoma", 10F);
             this.panel1.Location = new System.Drawing.Point(0, 0);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(1167, 180);
+            this.panel1.Size = new System.Drawing.Size(1167, 168);
             this.panel1.TabIndex = 1;
-            // 
-            // txt_qt023
-            // 
-            this.txt_qt023.EditValue = "璇烽�夋嫨";
-            this.txt_qt023.Location = new System.Drawing.Point(671, 18);
-            this.txt_qt023.Name = "txt_qt023";
-            this.txt_qt023.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.txt_qt023.Properties.Items.AddRange(new object[] {
-            "璇烽�夋嫨",
-            "1,缁勭粐(BD_OwnerOrg)",
-            "2,渚涘簲鍟�(BD_Supplier)",
-            "3,瀹㈡埛(BD_Customer)"});
-            this.txt_qt023.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
-            this.txt_qt023.Size = new System.Drawing.Size(210, 24);
-            this.txt_qt023.TabIndex = 328;
             // 
             // labelControl6
             // 
             this.labelControl6.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.labelControl6.Appearance.Options.UseFont = true;
-            this.labelControl6.Location = new System.Drawing.Point(598, 20);
+            this.labelControl6.Location = new System.Drawing.Point(20, 80);
             this.labelControl6.Name = "labelControl6";
             this.labelControl6.Size = new System.Drawing.Size(68, 21);
             this.labelControl6.TabIndex = 327;
@@ -1286,92 +1259,38 @@
             // txt_qt022
             // 
             this.txt_qt022.IsReadly = false;
-            this.txt_qt022.Location = new System.Drawing.Point(95, 46);
+            this.txt_qt022.Location = new System.Drawing.Point(95, 47);
             this.txt_qt022.Name = "txt_qt022";
-            this.txt_qt022.Size = new System.Drawing.Size(254, 28);
+            this.txt_qt022.Size = new System.Drawing.Size(263, 28);
             this.txt_qt022.TabIndex = 326;
             // 
             // labelControl3
             // 
             this.labelControl3.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.labelControl3.Appearance.Options.UseFont = true;
-            this.labelControl3.Location = new System.Drawing.Point(25, 51);
+            this.labelControl3.Location = new System.Drawing.Point(20, 51);
             this.labelControl3.Name = "labelControl3";
             this.labelControl3.Size = new System.Drawing.Size(68, 21);
             this.labelControl3.TabIndex = 325;
             this.labelControl3.Text = "搴撳瓨缁勭粐";
             // 
-            // txt_qt026
-            // 
-            this.txt_qt026.IsReadly = false;
-            this.txt_qt026.Location = new System.Drawing.Point(671, 116);
-            this.txt_qt026.Name = "txt_qt026";
-            this.txt_qt026.Size = new System.Drawing.Size(210, 28);
-            this.txt_qt026.TabIndex = 324;
-            // 
-            // txt_qt024
-            // 
-            this.txt_qt024.IsReadly = false;
-            this.txt_qt024.Location = new System.Drawing.Point(671, 46);
-            this.txt_qt024.Name = "txt_qt024";
-            this.txt_qt024.Size = new System.Drawing.Size(210, 28);
-            this.txt_qt024.TabIndex = 321;
-            // 
-            // labelControl2
-            // 
-            this.labelControl2.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.labelControl2.Appearance.Options.UseFont = true;
-            this.labelControl2.Location = new System.Drawing.Point(584, 51);
-            this.labelControl2.Name = "labelControl2";
-            this.labelControl2.Size = new System.Drawing.Size(82, 21);
-            this.labelControl2.TabIndex = 320;
-            this.labelControl2.Text = "璐т富(缁勭粐)";
-            // 
-            // txt_qt025
-            // 
-            this.txt_qt025.IsReadly = false;
-            this.txt_qt025.Location = new System.Drawing.Point(671, 82);
-            this.txt_qt025.Name = "txt_qt025";
-            this.txt_qt025.Size = new System.Drawing.Size(210, 28);
-            this.txt_qt025.TabIndex = 319;
-            // 
-            // labelControl4
-            // 
-            this.labelControl4.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.labelControl4.Appearance.Options.UseFont = true;
-            this.labelControl4.Location = new System.Drawing.Point(584, 86);
-            this.labelControl4.Name = "labelControl4";
-            this.labelControl4.Size = new System.Drawing.Size(82, 21);
-            this.labelControl4.TabIndex = 318;
-            this.labelControl4.Text = "璐т富(瀹㈡埛)";
-            // 
-            // labelControl5
-            // 
-            this.labelControl5.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.labelControl5.Appearance.Options.UseFont = true;
-            this.labelControl5.Location = new System.Drawing.Point(584, 120);
-            this.labelControl5.Name = "labelControl5";
-            this.labelControl5.Size = new System.Drawing.Size(82, 21);
-            this.labelControl5.TabIndex = 317;
-            this.labelControl5.Text = "璐т富(閮ㄩ棬)";
-            // 
             // txt_qt003
             // 
             this.txt_qt003.EditValue = "1,鍏跺畠鍏ュ簱(QTRKD01_SYS)";
-            this.txt_qt003.Location = new System.Drawing.Point(428, 18);
+            this.txt_qt003.Location = new System.Drawing.Point(455, 18);
             this.txt_qt003.Name = "txt_qt003";
             this.txt_qt003.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
             this.txt_qt003.Properties.Items.AddRange(new object[] {
             "1,鍏跺畠鍏ュ簱(QTRKD01_SYS)"});
             this.txt_qt003.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
-            this.txt_qt003.Size = new System.Drawing.Size(150, 24);
+            this.txt_qt003.Size = new System.Drawing.Size(254, 24);
             this.txt_qt003.TabIndex = 305;
             // 
             // txt_qt009
             // 
             this.txt_qt009.IsReadly = false;
-            this.txt_qt009.Location = new System.Drawing.Point(95, 81);
+            this.txt_qt009.Location = new System.Drawing.Point(455, 47);
             this.txt_qt009.Name = "txt_qt009";
             this.txt_qt009.Size = new System.Drawing.Size(254, 28);
             this.txt_qt009.TabIndex = 304;
@@ -1380,7 +1299,7 @@
             // 
             this.txt_qt015.AllowDrop = true;
             this.txt_qt015.Enabled = false;
-            this.txt_qt015.Location = new System.Drawing.Point(980, 18);
+            this.txt_qt015.Location = new System.Drawing.Point(792, 52);
             this.txt_qt015.Name = "txt_qt015";
             this.txt_qt015.Properties.Caption = "";
             this.txt_qt015.Size = new System.Drawing.Size(94, 24);
@@ -1389,7 +1308,7 @@
             // txt_qt018
             // 
             this.txt_qt018.IsReadly = false;
-            this.txt_qt018.Location = new System.Drawing.Point(95, 114);
+            this.txt_qt018.Location = new System.Drawing.Point(455, 76);
             this.txt_qt018.Margin = new System.Windows.Forms.Padding(0);
             this.txt_qt018.Name = "txt_qt018";
             this.txt_qt018.Size = new System.Drawing.Size(254, 28);
@@ -1398,7 +1317,7 @@
             // txt_qt008
             // 
             this.txt_qt008.IsReadly = false;
-            this.txt_qt008.Location = new System.Drawing.Point(428, 82);
+            this.txt_qt008.Location = new System.Drawing.Point(455, 105);
             this.txt_qt008.Margin = new System.Windows.Forms.Padding(0);
             this.txt_qt008.Name = "txt_qt008";
             this.txt_qt008.Size = new System.Drawing.Size(150, 29);
@@ -1407,7 +1326,7 @@
             // txt_qt019
             // 
             this.txt_qt019.EditValue = "璇烽�夋嫨";
-            this.txt_qt019.Location = new System.Drawing.Point(428, 49);
+            this.txt_qt019.Location = new System.Drawing.Point(792, 18);
             this.txt_qt019.Name = "txt_qt019";
             this.txt_qt019.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -1421,7 +1340,7 @@
             // 
             // labelControl11
             // 
-            this.labelControl11.Location = new System.Drawing.Point(928, 129);
+            this.labelControl11.Location = new System.Drawing.Point(742, 141);
             this.labelControl11.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.labelControl11.Name = "labelControl11";
             this.labelControl11.Size = new System.Drawing.Size(45, 18);
@@ -1432,7 +1351,7 @@
             // lbGuid
             // 
             this.lbGuid.AutoSize = true;
-            this.lbGuid.Location = new System.Drawing.Point(979, 129);
+            this.lbGuid.Location = new System.Drawing.Point(793, 141);
             this.lbGuid.Name = "lbGuid";
             this.lbGuid.Size = new System.Drawing.Size(0, 21);
             this.lbGuid.TabIndex = 1;
@@ -1442,11 +1361,11 @@
             // 
             this.lb_qt011.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_qt011.Appearance.Options.UseFont = true;
-            this.lb_qt011.Location = new System.Drawing.Point(355, 86);
+            this.lb_qt011.Location = new System.Drawing.Point(381, 109);
             this.lb_qt011.Name = "lb_qt011";
             this.lb_qt011.Size = new System.Drawing.Size(68, 21);
             this.lb_qt011.TabIndex = 243;
-            this.lb_qt011.Text = "閫夋嫨浠撳簱";
+            this.lb_qt011.Text = "鏀舵枡浠撳簱";
             // 
             // picCheckBox
             // 
@@ -1458,6 +1377,25 @@
             this.picCheckBox.TabIndex = 5;
             this.picCheckBox.TabStop = false;
             this.picCheckBox.Visible = false;
+            // 
+            // ucLookHuoZhu1
+            // 
+            this.ucLookHuoZhu1.IsReadly = false;
+            this.ucLookHuoZhu1.Location = new System.Drawing.Point(95, 80);
+            this.ucLookHuoZhu1.Name = "ucLookHuoZhu1";
+            this.ucLookHuoZhu1.OrgId = null;
+            this.ucLookHuoZhu1.Size = new System.Drawing.Size(263, 55);
+            this.ucLookHuoZhu1.TabIndex = 329;
+            // 
+            // labelControl2
+            // 
+            this.labelControl2.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.labelControl2.Appearance.Options.UseFont = true;
+            this.labelControl2.Location = new System.Drawing.Point(54, 107);
+            this.labelControl2.Name = "labelControl2";
+            this.labelControl2.Size = new System.Drawing.Size(34, 21);
+            this.labelControl2.TabIndex = 330;
+            this.labelControl2.Text = "璐т富";
             // 
             // Frm_MesItemQtrk
             // 
@@ -1504,7 +1442,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).EndInit();
             this.panel1.ResumeLayout(false);
             this.panel1.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_qt023.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_qt003.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_qt015.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_qt019.Properties)).EndInit();
@@ -1620,15 +1557,10 @@
         private DevExpress.XtraGrid.Columns.GridColumn gvBtnAlawys;
         private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit2;
         private DevExpress.XtraEditors.ComboBoxEdit txt_qt003;
-        private UserControl.UcLookDepartment txt_qt026;
-        private UserControl.UcLookOrg txt_qt024;
-        private DevExpress.XtraEditors.LabelControl labelControl2;
-        private UserControl.UcLookCustomer txt_qt025;
-        private DevExpress.XtraEditors.LabelControl labelControl4;
-        private DevExpress.XtraEditors.LabelControl labelControl5;
         private UserControl.UcLookOrg txt_qt022;
         private DevExpress.XtraEditors.LabelControl labelControl3;
-        private DevExpress.XtraEditors.ComboBoxEdit txt_qt023;
         private DevExpress.XtraEditors.LabelControl labelControl6;
+        private DevExpress.XtraEditors.LabelControl labelControl2;
+        private UserControl.UcLookHuoZhu ucLookHuoZhu1;
     }
 }
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs
index 96275cb..9ad47bc 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs
@@ -9,7 +9,6 @@
 using System.Data;
 using System.Threading.Tasks;
 using System.Windows.Forms;
-
 namespace Gs.DevApp.DevFrm
 {
     public partial class Frm_MesItemQtrk : DevExpress.XtraEditors.XtraForm
@@ -281,34 +280,61 @@
         private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
         {
             toolBarMenu1.isSetBtn = false;
-            string inGys = txt_qt018.GetId();
-            string inCjId = txt_qt008.GetId();
-            if (string.IsNullOrEmpty(inGys))
+            string kcZz = txt_qt022.GetId();//搴撳瓨缁勭粐
+            string kcBm = txt_qt009.GetId();//搴撳瓨閮ㄩ棬
+            string kcGys = txt_qt018.GetId();//搴撳瓨渚涘簲鍟�
+            string djLx = txt_qt003.Text.Trim();//鍗曟嵁绫诲瀷
+            string kcfx = txt_qt019.Text.Trim();//搴撳瓨鏂瑰悜
+            string inHzlx = ucLookHuoZhu1.GetHzLx();//璐т富绫诲瀷
+            string inHz = ucLookHuoZhu1.GetHzId();//璐т富
+            string inRkyy = txt_qt010.Text.Trim();//鍏ュ簱鍘熷洜
+            string kcCk = txt_qt008.GetId();//浠撳簱
+            if (string.IsNullOrEmpty(kcZz))
             {
-                Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨渚涘簲鍟嗭紒");
-                txt_qt018.Focus();
+                Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨搴撳瓨缁勭粐锛�");
+                txt_qt022.Focus();
                 return;
             }
-            if (string.IsNullOrEmpty(inCjId))
+            if (string.IsNullOrEmpty(inHzlx))
             {
-                Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨浠撳簱锛�");
+                Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨璐т富绫诲瀷锛�");
+                return;
+            }
+            if (string.IsNullOrEmpty(inHz))
+            {
+                Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨璐т富锛�");
+                return;
+            }
+            if (txt_qt003.SelectedIndex < 0)
+            {
+                Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鍗曟嵁绫诲瀷锛�");
+                txt_qt003.Focus();
+                return;
+            }
+            if (txt_qt019.SelectedIndex <= 0)
+            {
+                Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨搴撳瓨鏂瑰悜锛�");
+                txt_qt019.Focus();
+                return;
+            }
+            if (string.IsNullOrEmpty(kcCk))
+            {
+                Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鍙戞枡浠撳簱锛�");
                 txt_qt008.Focus();
                 return;
             }
             var _obj = new
             {
                 guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
-                kcZz = txt_qt022.GetId(),//搴撳瓨缁勭粐
-                kcBm = txt_qt009.GetId(),//搴撳瓨閮ㄩ棬
-                kcGys = txt_qt018.GetId(),//搴撳瓨渚涘簲鍟�
-                kcCk = txt_qt008.GetId(),//搴撳瓨渚涘簲鍟�
-                inRkyy = txt_qt010.Text.Trim(),//鍏ュ簱鍘熷洜
-                djLx = txt_qt003.Text.Trim(),//鍗曟嵁绫诲瀷
-                kcfx = txt_qt019.Text.Trim(),//搴撳瓨鏂瑰悜
-                hzlx = txt_qt023.Text.Trim(),//璐т富绫诲瀷
-                hzzz = txt_qt024.GetId(),//璐т富缁勭粐
-                hzkh = txt_qt025.GetId(),//璐т富瀹㈡埛
-                hzbm = txt_qt026.GetId(),//璐т富閮ㄩ棬
+                kcZz = kcZz,//搴撳瓨缁勭粐
+                kcBm = kcBm,//搴撳瓨閮ㄩ棬
+                kcGys = kcGys,//搴撳瓨渚涘簲鍟�
+                kcCk = kcCk,//搴撳瓨浠撳簱
+                inRkyy = inRkyy,//鍏ュ簱鍘熷洜
+                djLx = djLx,//鍗曟嵁绫诲瀷
+                kcfx = kcfx,//搴撳瓨鏂瑰悜
+                hzlx = inHzlx,//璐т富绫诲瀷
+                inHz = inHz,//璐т富
                 list = new List<dynamic>(),
             };
             gvMx1.CloseEditor();
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index 7a32a52..a3f5459 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -451,7 +451,6 @@
                             txt.Enabled = !isEdt;
                             continue;
                         }
-
                         //鏃堕棿
                         if (colType is DateTimePicker)
                         {
@@ -641,6 +640,17 @@
                                 txt.Enabled = false;
                             continue;
                         }
+                        //鑷畾璐т富
+                        if (colType is UcLookHuoZhu)
+                        {
+                            var txt = colType as UcLookHuoZhu;
+                            //txt.SetIdOrCode(strVal);
+                            if (txt.IsReadly == false)
+                                txt.Enabled = !isEdt;
+                            else
+                                txt.Enabled = false;
+                            continue;
+                        }
                         if (colType is SimpleButton)
                         {
                             var txt = colType as SimpleButton;
@@ -762,7 +772,6 @@
                         txt.ReadOnly = isEdt;
                     continue;
                 }
-
                 //鏃堕棿
                 if (ctrl is DateTimePicker)
                 {
@@ -789,7 +798,6 @@
                         txt.Checked = false;
                     continue;
                 }
-
                 //鑷畾涔変粨搴�
                 if (ctrl is UcLookCk)
                 {
@@ -907,6 +915,15 @@
                 {
                     var txt = ctrl as UcLookWwgd;
                     txt.SetIdOrCode("-1");
+                    txt.Enabled = !isEdt;
+                    continue;
+                }
+                //鑷畾涔夎揣涓�
+                if (ctrl is UcLookHuoZhu)
+                {
+                    var txt = ctrl as UcLookHuoZhu;
+                    txt.SetHzId("-1");
+                    txt.SetHzLx(0);
                     txt.Enabled = !isEdt;
                     continue;
                 }
@@ -1161,6 +1178,18 @@
                         txt.Enabled = false;
                     continue;
                 }
+
+                //鑷畾涔夎揣涓�
+                if (ctrl is UcLookHuoZhu)
+                {
+                    var txt = ctrl as UcLookHuoZhu;
+                    if (txt.IsReadly == false)
+                        txt.Enabled = !isEdt;
+                    else
+                        txt.Enabled = false;
+                    continue;
+                }
+
                 if (ctrl is SimpleButton)
                 {
                     var txt = ctrl as SimpleButton;
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookHuoZhu.cs b/DevApp/Gs.DevApp/UserControl/UcLookHuoZhu.cs
index 77e21a0..303276c 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookHuoZhu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookHuoZhu.cs
@@ -207,9 +207,9 @@
         /// 璁剧疆
         /// </summary>
         /// <param name="Code"></param>
-        public void SetHzLx(string Code)
+        public void SetHzLx(int Code)
         {
-            txt_qt018.Text = Code;
+            txt_qt025.SelectedIndex = Code;
         }
     }
 }

--
Gitblit v1.9.3