From 9ef74b7a500c2a40cdbfc0632867764938e1f2f5 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期一, 14 四月 2025 17:31:49 +0800
Subject: [PATCH] fqc

---
 DevApp/Gs.DevApp/DevFrm/FQC/UcChouJianList.Designer.cs  |  343 +++++++++++++++++++
 DevApp/Gs.DevApp/Gs.DevApp.csproj                       |    9 
 DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs |  449 ++++--------------------
 DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs          |   35 -
 DevApp/Gs.DevApp/DevFrm/FQC/UcChouJianList.cs           |   68 +++
 DevApp/Gs.DevApp/DevFrm/FQC/UcChouJianList.resx         |  120 ++++++
 6 files changed, 626 insertions(+), 398 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs
index 9743459..25ba567 100644
--- a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs
@@ -30,33 +30,24 @@
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition12 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition13 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition14 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition15 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.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();
-            DevExpress.XtraLayout.RowDefinition rowDefinition16 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition17 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition18 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition19 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition20 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition16 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition17 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition18 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition19 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition21 = new DevExpress.XtraLayout.RowDefinition();
-            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.XtraLayout.ColumnDefinition columnDefinition20 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition21 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition22 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition22 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
+            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 rowDefinition10 = new DevExpress.XtraLayout.RowDefinition();
             this.repositoryItemComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
             this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
             this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
@@ -223,25 +214,7 @@
             this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
             this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
-            this.gcMx14 = new DevExpress.XtraGrid.GridControl();
-            this.gvMx14 = new DevExpress.XtraGrid.Views.Grid.GridView();
-            this.gvMx2guid = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2itemBarcode = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2quantity = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2itemSname = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn34 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn35 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn36 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn31 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
-            this.panel1 = new System.Windows.Forms.Panel();
-            this.layoutMxMsg2 = new DevExpress.XtraLayout.LayoutControl();
-            this.txtChouJian = new DevExpress.XtraEditors.TextEdit();
-            this.layoutControlGroup2 = new DevExpress.XtraLayout.LayoutControlGroup();
-            this.layoutControlItem30 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.ucChouJianList1 = new Gs.DevApp.DevFrm.FQC.UcChouJianList();
             this.tabMxPage3 = new DevExpress.XtraTab.XtraTabPage();
             this.ucUpFileList1 = new Gs.DevApp.UserControl.UCUpFileList();
             this.repositoryItemComboBox2 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
@@ -375,15 +348,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
             this.tabMxPage2.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.gcMx14)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gvMx14)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
-            this.panel1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutMxMsg2)).BeginInit();
-            this.layoutMxMsg2.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.txtChouJian.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).BeginInit();
             this.tabMxPage3.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
@@ -1326,47 +1290,47 @@
             this.layoutControlItem4});
             this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.Root.Name = "Root";
-            columnDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition12.Width = 100D;
-            columnDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition13.Width = 100D;
-            columnDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition14.Width = 100D;
-            columnDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition15.Width = 100D;
+            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition1.Width = 100D;
+            columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition2.Width = 100D;
+            columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition3.Width = 100D;
+            columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition4.Width = 100D;
             this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
-            columnDefinition12,
-            columnDefinition13,
-            columnDefinition14,
-            columnDefinition15});
-            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 = 100D;
-            rowDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition16.Height = 100D;
-            rowDefinition16.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition17.Height = 100D;
-            rowDefinition17.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition18.Height = 100D;
-            rowDefinition18.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition19.Height = 100D;
-            rowDefinition19.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition20.Height = 100D;
-            rowDefinition20.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition1,
+            columnDefinition2,
+            columnDefinition3,
+            columnDefinition4});
+            rowDefinition1.Height = 100D;
+            rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition2.Height = 100D;
+            rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition3.Height = 100D;
+            rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition4.Height = 100D;
+            rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition5.Height = 100D;
+            rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+            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;
+            rowDefinition9.Height = 100D;
+            rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
             this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
-            rowDefinition12,
-            rowDefinition13,
-            rowDefinition14,
-            rowDefinition15,
-            rowDefinition16,
-            rowDefinition17,
-            rowDefinition18,
-            rowDefinition19,
-            rowDefinition20});
+            rowDefinition1,
+            rowDefinition2,
+            rowDefinition3,
+            rowDefinition4,
+            rowDefinition5,
+            rowDefinition6,
+            rowDefinition7,
+            rowDefinition8,
+            rowDefinition9});
             this.Root.Size = new System.Drawing.Size(1342, 282);
             this.Root.TextVisible = false;
             // 
@@ -2351,23 +2315,23 @@
             this.layoutControlItem19});
             this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.layoutControlGroup1.Name = "Root";
-            columnDefinition16.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition16.Width = 100D;
-            columnDefinition17.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition17.Width = 100D;
-            columnDefinition18.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition18.Width = 100D;
-            columnDefinition19.SizeType = System.Windows.Forms.SizeType.AutoSize;
-            columnDefinition19.Width = 110D;
+            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.AutoSize;
+            columnDefinition8.Width = 110D;
             this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
-            columnDefinition16,
-            columnDefinition17,
-            columnDefinition18,
-            columnDefinition19});
-            rowDefinition21.Height = 100D;
-            rowDefinition21.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition5,
+            columnDefinition6,
+            columnDefinition7,
+            columnDefinition8});
+            rowDefinition10.Height = 100D;
+            rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
             this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
-            rowDefinition21});
+            rowDefinition10});
             this.layoutControlGroup1.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
             this.layoutControlGroup1.Size = new System.Drawing.Size(1336, 43);
             this.layoutControlGroup1.TextVisible = false;
@@ -2415,241 +2379,19 @@
             // 
             // tabMxPage2
             // 
-            this.tabMxPage2.Controls.Add(this.gcMx14);
-            this.tabMxPage2.Controls.Add(this.panel1);
+            this.tabMxPage2.Controls.Add(this.ucChouJianList1);
             this.tabMxPage2.Name = "tabMxPage2";
             this.tabMxPage2.Size = new System.Drawing.Size(1340, 362);
             this.tabMxPage2.Text = "浜у搧鏉$爜鏄庣粏";
             // 
-            // gcMx14
+            // ucChouJianList1
             // 
-            this.gcMx14.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gcMx14.Location = new System.Drawing.Point(0, 47);
-            this.gcMx14.MainView = this.gvMx14;
-            this.gcMx14.Name = "gcMx14";
-            this.gcMx14.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
-            this.repositoryItemButtonEdit1});
-            this.gcMx14.Size = new System.Drawing.Size(1340, 315);
-            this.gcMx14.TabIndex = 1;
-            this.gcMx14.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
-            this.gvMx14});
-            // 
-            // gvMx14
-            // 
-            this.gvMx14.Appearance.HeaderPanel.Options.UseTextOptions = true;
-            this.gvMx14.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
-            this.gvMx14.Appearance.Row.Options.UseFont = true;
-            this.gvMx14.ColumnPanelRowHeight = 50;
-            this.gvMx14.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
-            this.gvMx2guid,
-            this.gridColumn12,
-            this.gvMx2itemBarcode,
-            this.gvMx2quantity,
-            this.gridColumn16,
-            this.gvMx2itemSname,
-            this.gridColumn34,
-            this.gridColumn35,
-            this.gridColumn36,
-            this.gridColumn11,
-            this.gridColumn31});
-            this.gvMx14.GridControl = this.gcMx14;
-            this.gvMx14.Name = "gvMx14";
-            this.gvMx14.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
-            this.gvMx14.OptionsFind.ShowSearchNavButtons = false;
-            this.gvMx14.OptionsView.ShowGroupPanel = false;
-            // 
-            // gvMx2guid
-            // 
-            this.gvMx2guid.AppearanceCell.Options.UseFont = true;
-            this.gvMx2guid.Caption = "涓婚敭GUID";
-            this.gvMx2guid.FieldName = "guid";
-            this.gvMx2guid.MinWidth = 50;
-            this.gvMx2guid.Name = "gvMx2guid";
-            this.gvMx2guid.Tag = "query_a.guid";
-            this.gvMx2guid.Width = 94;
-            // 
-            // gridColumn12
-            // 
-            this.gridColumn12.Caption = "鏄惁鎶芥";
-            this.gridColumn12.FieldName = "isCheck";
-            this.gridColumn12.MaxWidth = 50;
-            this.gridColumn12.MinWidth = 50;
-            this.gridColumn12.Name = "gridColumn12";
-            this.gridColumn12.Visible = true;
-            this.gridColumn12.VisibleIndex = 0;
-            this.gridColumn12.Width = 50;
-            // 
-            // gvMx2itemBarcode
-            // 
-            this.gvMx2itemBarcode.AppearanceCell.Options.UseFont = true;
-            this.gvMx2itemBarcode.Caption = "鏉$爜缂栧彿";
-            this.gvMx2itemBarcode.FieldName = "itemBarcode";
-            this.gvMx2itemBarcode.MinWidth = 50;
-            this.gvMx2itemBarcode.Name = "gvMx2itemBarcode";
-            this.gvMx2itemBarcode.Tag = "query_a.ITEM_BARCODE";
-            this.gvMx2itemBarcode.Visible = true;
-            this.gvMx2itemBarcode.VisibleIndex = 1;
-            this.gvMx2itemBarcode.Width = 94;
-            // 
-            // gvMx2quantity
-            // 
-            this.gvMx2quantity.AppearanceCell.Options.UseFont = true;
-            this.gvMx2quantity.Caption = "宸ュ崟缂栧彿";
-            this.gvMx2quantity.FieldName = "daa001";
-            this.gvMx2quantity.MinWidth = 50;
-            this.gvMx2quantity.Name = "gvMx2quantity";
-            this.gvMx2quantity.Tag = "query_a.QUANTITY";
-            this.gvMx2quantity.Visible = true;
-            this.gvMx2quantity.VisibleIndex = 2;
-            this.gvMx2quantity.Width = 94;
-            // 
-            // gridColumn16
-            // 
-            this.gridColumn16.Caption = "浜у搧缂栫爜";
-            this.gridColumn16.FieldName = "itemNo";
-            this.gridColumn16.MinWidth = 25;
-            this.gridColumn16.Name = "gridColumn16";
-            this.gridColumn16.Visible = true;
-            this.gridColumn16.VisibleIndex = 3;
-            this.gridColumn16.Width = 94;
-            // 
-            // gvMx2itemSname
-            // 
-            this.gvMx2itemSname.AppearanceCell.Options.UseFont = true;
-            this.gvMx2itemSname.Caption = "鐗╂枡鍚嶇О ";
-            this.gvMx2itemSname.FieldName = "itemName";
-            this.gvMx2itemSname.MinWidth = 50;
-            this.gvMx2itemSname.Name = "gvMx2itemSname";
-            this.gvMx2itemSname.Tag = "query_a.ITEM_SNAME";
-            this.gvMx2itemSname.Visible = true;
-            this.gvMx2itemSname.VisibleIndex = 4;
-            this.gvMx2itemSname.Width = 94;
-            // 
-            // gridColumn34
-            // 
-            this.gridColumn34.Caption = "鍗曚綅";
-            this.gridColumn34.FieldName = "dwName";
-            this.gridColumn34.MinWidth = 25;
-            this.gridColumn34.Name = "gridColumn34";
-            this.gridColumn34.Visible = true;
-            this.gridColumn34.VisibleIndex = 5;
-            this.gridColumn34.Width = 94;
-            // 
-            // gridColumn35
-            // 
-            this.gridColumn35.Caption = "鏁伴噺";
-            this.gridColumn35.FieldName = "quantity";
-            this.gridColumn35.MinWidth = 25;
-            this.gridColumn35.Name = "gridColumn35";
-            this.gridColumn35.Visible = true;
-            this.gridColumn35.VisibleIndex = 6;
-            this.gridColumn35.Width = 94;
-            // 
-            // gridColumn36
-            // 
-            this.gridColumn36.Caption = "寰呭叆搴撴暟";
-            this.gridColumn36.FieldName = "wrkQty";
-            this.gridColumn36.MinWidth = 25;
-            this.gridColumn36.Name = "gridColumn36";
-            this.gridColumn36.Visible = true;
-            this.gridColumn36.VisibleIndex = 7;
-            this.gridColumn36.Width = 94;
-            // 
-            // gridColumn11
-            // 
-            this.gridColumn11.Caption = "宸插叆搴撴暟";
-            this.gridColumn11.FieldName = "rkQty";
-            this.gridColumn11.MinWidth = 25;
-            this.gridColumn11.Name = "gridColumn11";
-            this.gridColumn11.Visible = true;
-            this.gridColumn11.VisibleIndex = 8;
-            this.gridColumn11.Width = 94;
-            // 
-            // gridColumn31
-            // 
-            this.gridColumn31.Caption = "绠卞彿";
-            this.gridColumn31.FieldName = "tbNo";
-            this.gridColumn31.MinWidth = 25;
-            this.gridColumn31.Name = "gridColumn31";
-            this.gridColumn31.Visible = true;
-            this.gridColumn31.VisibleIndex = 9;
-            this.gridColumn31.Width = 94;
-            // 
-            // repositoryItemButtonEdit1
-            // 
-            this.repositoryItemButtonEdit1.AutoHeight = false;
-            editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
-            editorButtonImageOptions2.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, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
-            this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
-            // 
-            // panel1
-            // 
-            this.panel1.Controls.Add(this.layoutMxMsg2);
-            this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
-            this.panel1.Location = new System.Drawing.Point(0, 0);
-            this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(1340, 47);
-            this.panel1.TabIndex = 2;
-            // 
-            // layoutMxMsg2
-            // 
-            this.layoutMxMsg2.Controls.Add(this.txtChouJian);
-            this.layoutMxMsg2.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.layoutMxMsg2.Location = new System.Drawing.Point(0, 0);
-            this.layoutMxMsg2.Name = "layoutMxMsg2";
-            this.layoutMxMsg2.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1108, 157, 812, 500);
-            this.layoutMxMsg2.Root = this.layoutControlGroup2;
-            this.layoutMxMsg2.Size = new System.Drawing.Size(1340, 47);
-            this.layoutMxMsg2.TabIndex = 0;
-            this.layoutMxMsg2.Text = "layoutControl1";
-            // 
-            // txtChouJian
-            // 
-            this.txtChouJian.Location = new System.Drawing.Point(121, 4);
-            this.txtChouJian.Name = "txtChouJian";
-            this.txtChouJian.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 15F);
-            this.txtChouJian.Properties.Appearance.Options.UseFont = true;
-            this.txtChouJian.Size = new System.Drawing.Size(324, 36);
-            this.txtChouJian.StyleController = this.layoutMxMsg2;
-            this.txtChouJian.TabIndex = 4;
-            // 
-            // layoutControlGroup2
-            // 
-            this.layoutControlGroup2.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
-            this.layoutControlGroup2.GroupBordersVisible = false;
-            this.layoutControlGroup2.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
-            this.layoutControlItem30});
-            this.layoutControlGroup2.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
-            this.layoutControlGroup2.Name = "Root";
-            columnDefinition20.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition20.Width = 100D;
-            columnDefinition21.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition21.Width = 100D;
-            columnDefinition22.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition22.Width = 100D;
-            this.layoutControlGroup2.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
-            columnDefinition20,
-            columnDefinition21,
-            columnDefinition22});
-            rowDefinition22.Height = 100D;
-            rowDefinition22.SizeType = System.Windows.Forms.SizeType.Percent;
-            this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
-            rowDefinition22});
-            this.layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 2, 2);
-            this.layoutControlGroup2.Size = new System.Drawing.Size(1340, 47);
-            this.layoutControlGroup2.TextVisible = false;
-            // 
-            // layoutControlItem30
-            // 
-            this.layoutControlItem30.Control = this.txtChouJian;
-            this.layoutControlItem30.Location = new System.Drawing.Point(0, 0);
-            this.layoutControlItem30.Name = "layoutControlItem30";
-            this.layoutControlItem30.Size = new System.Drawing.Size(445, 43);
-            this.layoutControlItem30.Text = "璇锋壂鎶芥鐨勬潯鐮�";
-            this.layoutControlItem30.TextSize = new System.Drawing.Size(105, 18);
+            this.ucChouJianList1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.ucChouJianList1.Location = new System.Drawing.Point(0, 0);
+            this.ucChouJianList1.Name = "ucChouJianList1";
+            this.ucChouJianList1.pGuid = null;
+            this.ucChouJianList1.Size = new System.Drawing.Size(1340, 362);
+            this.ucChouJianList1.TabIndex = 0;
             // 
             // tabMxPage3
             // 
@@ -2836,15 +2578,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
             this.tabMxPage2.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.gcMx14)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gvMx14)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
-            this.panel1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.layoutMxMsg2)).EndInit();
-            this.layoutMxMsg2.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.txtChouJian.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).EndInit();
             this.tabMxPage3.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
@@ -3029,24 +2762,6 @@
         private DevExpress.XtraEditors.TextEdit txt_lineId;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
         private DevExpress.XtraTab.XtraTabPage tabMxPage2;
-        private DevExpress.XtraGrid.GridControl gcMx14;
-        private DevExpress.XtraGrid.Views.Grid.GridView gvMx14;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2guid;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2itemBarcode;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2quantity;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2itemSname;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn34;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn35;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn36;
-        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn31;
-        private System.Windows.Forms.Panel panel1;
-        private DevExpress.XtraLayout.LayoutControl layoutMxMsg2;
-        private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup2;
-        private DevExpress.XtraEditors.TextEdit txtChouJian;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem30;
+        private UcChouJianList ucChouJianList1;
     }
 }
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs
index 6775bc9..088781e 100644
--- a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs
@@ -699,7 +699,8 @@
         {
             if (e.Page.Name == "tabMxPage2")
             {
-                getList14();
+                ucChouJianList1.getList14();
+
             }
             if (e.Page.Name == "tabMxPage3")
             {
@@ -748,39 +749,11 @@
             }
         }
 
-        /// <summary>
-        /// 杩欐槸璁板綍琛�
-        /// </summary>
-        private void getList14()
-        {
-            var _obj = new
-            {
-                parentGuid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
-            };
-            try
-            {
-                var strJson = UtilityHelper.HttpPost("", _webServiceName + "GetModel14", JsonConvert.SerializeObject(_obj));
-                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());
-                gcMx14.BindingContext = new BindingContext();
-                gcMx14.DataSource = dt;
-                gcMx14.ForceInitialize();
-                gvMx14.BestFitColumns();
-            }
-            catch (Exception ex)
-            {
-                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
-            }
-        }
+
 
         private void setEable(bool bl)
         {
-            txtChouJian.ReadOnly=txtJianYan.ReadOnly = !bl;
+            // txtChouJian.ReadOnly=txtJianYan.ReadOnly = !bl;
             btnLoad.Enabled = bl;
             btnIpt.Text = (bl == true ? "褰曞叆鏍锋湰" : "鏌ョ湅鏍锋湰");
         }
diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/UcChouJianList.Designer.cs b/DevApp/Gs.DevApp/DevFrm/FQC/UcChouJianList.Designer.cs
new file mode 100644
index 0000000..28e5599
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/FQC/UcChouJianList.Designer.cs
@@ -0,0 +1,343 @@
+锘縩amespace Gs.DevApp.DevFrm.FQC
+{
+    partial class UcChouJianList
+    {
+        /// <summary> 
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary> 
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Component Designer generated code
+
+        /// <summary> 
+        /// Required method for Designer support - do not modify 
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            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.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
+            this.gcMx14 = new DevExpress.XtraGrid.GridControl();
+            this.gvMx14 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.gvMx2guid = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx2itemBarcode = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx2quantity = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx2itemSname = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn34 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn35 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn36 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn31 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+            this.panel1 = new System.Windows.Forms.Panel();
+            this.layoutMxMsg2 = new DevExpress.XtraLayout.LayoutControl();
+            this.txtChouJian = new DevExpress.XtraEditors.TextEdit();
+            this.layoutControlGroup2 = new DevExpress.XtraLayout.LayoutControlGroup();
+            this.layoutControlItem30 = new DevExpress.XtraLayout.LayoutControlItem();
+            ((System.ComponentModel.ISupportInitialize)(this.gcMx14)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gvMx14)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
+            this.panel1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutMxMsg2)).BeginInit();
+            this.layoutMxMsg2.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txtChouJian.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // gcMx14
+            // 
+            this.gcMx14.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMx14.Location = new System.Drawing.Point(0, 47);
+            this.gcMx14.MainView = this.gvMx14;
+            this.gcMx14.Name = "gcMx14";
+            this.gcMx14.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+            this.repositoryItemButtonEdit1});
+            this.gcMx14.Size = new System.Drawing.Size(1223, 621);
+            this.gcMx14.TabIndex = 2;
+            this.gcMx14.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+            this.gvMx14});
+            // 
+            // gvMx14
+            // 
+            this.gvMx14.Appearance.HeaderPanel.Options.UseTextOptions = true;
+            this.gvMx14.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+            this.gvMx14.Appearance.Row.Options.UseFont = true;
+            this.gvMx14.ColumnPanelRowHeight = 50;
+            this.gvMx14.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.gvMx2guid,
+            this.gridColumn12,
+            this.gvMx2itemBarcode,
+            this.gvMx2quantity,
+            this.gridColumn16,
+            this.gvMx2itemSname,
+            this.gridColumn34,
+            this.gridColumn35,
+            this.gridColumn36,
+            this.gridColumn11,
+            this.gridColumn31});
+            this.gvMx14.GridControl = this.gcMx14;
+            this.gvMx14.Name = "gvMx14";
+            this.gvMx14.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
+            this.gvMx14.OptionsFind.ShowSearchNavButtons = false;
+            this.gvMx14.OptionsView.ShowGroupPanel = false;
+            // 
+            // gvMx2guid
+            // 
+            this.gvMx2guid.AppearanceCell.Options.UseFont = true;
+            this.gvMx2guid.Caption = "涓婚敭GUID";
+            this.gvMx2guid.FieldName = "guid";
+            this.gvMx2guid.MinWidth = 50;
+            this.gvMx2guid.Name = "gvMx2guid";
+            this.gvMx2guid.Tag = "query_a.guid";
+            this.gvMx2guid.Width = 94;
+            // 
+            // gridColumn12
+            // 
+            this.gridColumn12.Caption = "鏄惁鎶芥";
+            this.gridColumn12.FieldName = "isCheck";
+            this.gridColumn12.MaxWidth = 50;
+            this.gridColumn12.MinWidth = 50;
+            this.gridColumn12.Name = "gridColumn12";
+            this.gridColumn12.Visible = true;
+            this.gridColumn12.VisibleIndex = 0;
+            this.gridColumn12.Width = 50;
+            // 
+            // gvMx2itemBarcode
+            // 
+            this.gvMx2itemBarcode.AppearanceCell.Options.UseFont = true;
+            this.gvMx2itemBarcode.Caption = "鏉$爜缂栧彿";
+            this.gvMx2itemBarcode.FieldName = "itemBarcode";
+            this.gvMx2itemBarcode.MinWidth = 50;
+            this.gvMx2itemBarcode.Name = "gvMx2itemBarcode";
+            this.gvMx2itemBarcode.Tag = "query_a.ITEM_BARCODE";
+            this.gvMx2itemBarcode.Visible = true;
+            this.gvMx2itemBarcode.VisibleIndex = 1;
+            this.gvMx2itemBarcode.Width = 94;
+            // 
+            // gvMx2quantity
+            // 
+            this.gvMx2quantity.AppearanceCell.Options.UseFont = true;
+            this.gvMx2quantity.Caption = "宸ュ崟缂栧彿";
+            this.gvMx2quantity.FieldName = "daa001";
+            this.gvMx2quantity.MinWidth = 50;
+            this.gvMx2quantity.Name = "gvMx2quantity";
+            this.gvMx2quantity.Tag = "query_a.QUANTITY";
+            this.gvMx2quantity.Visible = true;
+            this.gvMx2quantity.VisibleIndex = 2;
+            this.gvMx2quantity.Width = 94;
+            // 
+            // gridColumn16
+            // 
+            this.gridColumn16.Caption = "浜у搧缂栫爜";
+            this.gridColumn16.FieldName = "itemNo";
+            this.gridColumn16.MinWidth = 25;
+            this.gridColumn16.Name = "gridColumn16";
+            this.gridColumn16.Visible = true;
+            this.gridColumn16.VisibleIndex = 3;
+            this.gridColumn16.Width = 94;
+            // 
+            // gvMx2itemSname
+            // 
+            this.gvMx2itemSname.AppearanceCell.Options.UseFont = true;
+            this.gvMx2itemSname.Caption = "鐗╂枡鍚嶇О ";
+            this.gvMx2itemSname.FieldName = "itemName";
+            this.gvMx2itemSname.MinWidth = 50;
+            this.gvMx2itemSname.Name = "gvMx2itemSname";
+            this.gvMx2itemSname.Tag = "query_a.ITEM_SNAME";
+            this.gvMx2itemSname.Visible = true;
+            this.gvMx2itemSname.VisibleIndex = 4;
+            this.gvMx2itemSname.Width = 94;
+            // 
+            // gridColumn34
+            // 
+            this.gridColumn34.Caption = "鍗曚綅";
+            this.gridColumn34.FieldName = "dwName";
+            this.gridColumn34.MinWidth = 25;
+            this.gridColumn34.Name = "gridColumn34";
+            this.gridColumn34.Visible = true;
+            this.gridColumn34.VisibleIndex = 5;
+            this.gridColumn34.Width = 94;
+            // 
+            // gridColumn35
+            // 
+            this.gridColumn35.Caption = "鏁伴噺";
+            this.gridColumn35.FieldName = "quantity";
+            this.gridColumn35.MinWidth = 25;
+            this.gridColumn35.Name = "gridColumn35";
+            this.gridColumn35.Visible = true;
+            this.gridColumn35.VisibleIndex = 6;
+            this.gridColumn35.Width = 94;
+            // 
+            // gridColumn36
+            // 
+            this.gridColumn36.Caption = "寰呭叆搴撴暟";
+            this.gridColumn36.FieldName = "wrkQty";
+            this.gridColumn36.MinWidth = 25;
+            this.gridColumn36.Name = "gridColumn36";
+            this.gridColumn36.Visible = true;
+            this.gridColumn36.VisibleIndex = 7;
+            this.gridColumn36.Width = 94;
+            // 
+            // gridColumn11
+            // 
+            this.gridColumn11.Caption = "宸插叆搴撴暟";
+            this.gridColumn11.FieldName = "rkQty";
+            this.gridColumn11.MinWidth = 25;
+            this.gridColumn11.Name = "gridColumn11";
+            this.gridColumn11.Visible = true;
+            this.gridColumn11.VisibleIndex = 8;
+            this.gridColumn11.Width = 94;
+            // 
+            // gridColumn31
+            // 
+            this.gridColumn31.Caption = "绠卞彿";
+            this.gridColumn31.FieldName = "tbNo";
+            this.gridColumn31.MinWidth = 25;
+            this.gridColumn31.Name = "gridColumn31";
+            this.gridColumn31.Visible = true;
+            this.gridColumn31.VisibleIndex = 9;
+            this.gridColumn31.Width = 94;
+            // 
+            // repositoryItemButtonEdit1
+            // 
+            this.repositoryItemButtonEdit1.AutoHeight = false;
+            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+            editorButtonImageOptions1.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)});
+            this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
+            this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
+            // 
+            // panel1
+            // 
+            this.panel1.Controls.Add(this.layoutMxMsg2);
+            this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
+            this.panel1.Location = new System.Drawing.Point(0, 0);
+            this.panel1.Name = "panel1";
+            this.panel1.Size = new System.Drawing.Size(1223, 47);
+            this.panel1.TabIndex = 3;
+            // 
+            // layoutMxMsg2
+            // 
+            this.layoutMxMsg2.Controls.Add(this.txtChouJian);
+            this.layoutMxMsg2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.layoutMxMsg2.Location = new System.Drawing.Point(0, 0);
+            this.layoutMxMsg2.Name = "layoutMxMsg2";
+            this.layoutMxMsg2.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1108, 157, 812, 500);
+            this.layoutMxMsg2.Root = this.layoutControlGroup2;
+            this.layoutMxMsg2.Size = new System.Drawing.Size(1223, 47);
+            this.layoutMxMsg2.TabIndex = 0;
+            this.layoutMxMsg2.Text = "layoutControl1";
+            // 
+            // txtChouJian
+            // 
+            this.txtChouJian.Location = new System.Drawing.Point(121, 4);
+            this.txtChouJian.Name = "txtChouJian";
+            this.txtChouJian.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 15F);
+            this.txtChouJian.Properties.Appearance.Options.UseFont = true;
+            this.txtChouJian.Size = new System.Drawing.Size(285, 36);
+            this.txtChouJian.StyleController = this.layoutMxMsg2;
+            this.txtChouJian.TabIndex = 4;
+            // 
+            // layoutControlGroup2
+            // 
+            this.layoutControlGroup2.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
+            this.layoutControlGroup2.GroupBordersVisible = false;
+            this.layoutControlGroup2.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+            this.layoutControlItem30});
+            this.layoutControlGroup2.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
+            this.layoutControlGroup2.Name = "Root";
+            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition1.Width = 100D;
+            columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition2.Width = 100D;
+            columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition3.Width = 100D;
+            this.layoutControlGroup2.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
+            columnDefinition1,
+            columnDefinition2,
+            columnDefinition3});
+            rowDefinition1.Height = 100D;
+            rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+            this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
+            rowDefinition1});
+            this.layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 2, 2);
+            this.layoutControlGroup2.Size = new System.Drawing.Size(1223, 47);
+            this.layoutControlGroup2.TextVisible = false;
+            // 
+            // layoutControlItem30
+            // 
+            this.layoutControlItem30.Control = this.txtChouJian;
+            this.layoutControlItem30.Location = new System.Drawing.Point(0, 0);
+            this.layoutControlItem30.Name = "layoutControlItem30";
+            this.layoutControlItem30.Size = new System.Drawing.Size(406, 43);
+            this.layoutControlItem30.Text = "璇锋壂鎶芥鐨勬潯鐮�";
+            this.layoutControlItem30.TextSize = new System.Drawing.Size(105, 18);
+            // 
+            // UcChouJianList
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.Controls.Add(this.gcMx14);
+            this.Controls.Add(this.panel1);
+            this.Name = "UcChouJianList";
+            this.Size = new System.Drawing.Size(1223, 668);
+            ((System.ComponentModel.ISupportInitialize)(this.gcMx14)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gvMx14)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
+            this.panel1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.layoutMxMsg2)).EndInit();
+            this.layoutMxMsg2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.txtChouJian.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).EndInit();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private DevExpress.XtraGrid.GridControl gcMx14;
+        private DevExpress.XtraGrid.Views.Grid.GridView gvMx14;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx2guid;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx2itemBarcode;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx2quantity;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx2itemSname;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn34;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn35;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn36;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn31;
+        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
+        private System.Windows.Forms.Panel panel1;
+        private DevExpress.XtraLayout.LayoutControl layoutMxMsg2;
+        private DevExpress.XtraEditors.TextEdit txtChouJian;
+        private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup2;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem30;
+    }
+}
diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/UcChouJianList.cs b/DevApp/Gs.DevApp/DevFrm/FQC/UcChouJianList.cs
new file mode 100644
index 0000000..c93d157
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/FQC/UcChouJianList.cs
@@ -0,0 +1,68 @@
+锘縰sing DevExpress.Utils.DirectXPaint;
+using DevExpress.XtraEditors;
+using Gs.DevApp.ToolBox;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace Gs.DevApp.DevFrm.FQC
+{
+    public partial class UcChouJianList : DevExpress.XtraEditors.XtraUserControl
+    {
+        string _webServiceName = "FqcManager/";
+        public UcChouJianList()
+        {
+            InitializeComponent();
+            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx14);
+        }
+        private string _val;
+        public string pGuid
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 杩欐槸璁板綍琛�
+        /// </summary>
+        public void getList14()
+        {
+            gcMx14.DataSource = null;
+            if (string.IsNullOrEmpty(pGuid))
+                return;
+            if (pGuid.Length <= 10)
+                return;
+            var _obj = new
+            {
+                parentGuid = UtilityHelper.ToGuid(pGuid.Trim()), //涓诲缓
+            };
+            try
+            {
+                var strJson = UtilityHelper.HttpPost("", _webServiceName + "GetModel14", JsonConvert.SerializeObject(_obj));
+                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());
+                gcMx14.BindingContext = new BindingContext();
+                gcMx14.DataSource = dt;
+                gcMx14.ForceInitialize();
+                gvMx14.BestFitColumns();
+            }
+            catch (Exception ex)
+            {
+                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+            }
+        }
+    }
+}
diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/UcChouJianList.resx b/DevApp/Gs.DevApp/DevFrm/FQC/UcChouJianList.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/FQC/UcChouJianList.resx
@@ -0,0 +1,120 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 498f233..f1da09f 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -326,6 +326,12 @@
     <Compile Include="DevFrm\FQC\SelectFqcDaa.Designer.cs">
       <DependentUpon>SelectFqcDaa.cs</DependentUpon>
     </Compile>
+    <Compile Include="DevFrm\FQC\UcChouJianList.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="DevFrm\FQC\UcChouJianList.Designer.cs">
+      <DependentUpon>UcChouJianList.cs</DependentUpon>
+    </Compile>
     <Compile Include="DevFrm\IPQC\Frm_ShouJian.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -1225,6 +1231,9 @@
     <EmbeddedResource Include="DevFrm\FQC\SelectFqcDaa.resx">
       <DependentUpon>SelectFqcDaa.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="DevFrm\FQC\UcChouJianList.resx">
+      <DependentUpon>UcChouJianList.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="DevFrm\FrmLogin.resx">
       <DependentUpon>FrmLogin.cs</DependentUpon>
     </EmbeddedResource>

--
Gitblit v1.9.3