新框架PC前端标准版(祈禧6月初版本)
lg
2025-11-25 0ac254ca6f2a75d591b1f602d34e7b46b8d01837
删除iqc称重代码
已修改5个文件
988 ■■■■ 文件已修改
DevApp/Gs.DevApp/App.config 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01.Designer.cs 166 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs 615 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs 194 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/Gs.DevApp.csproj 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/App.config
@@ -37,8 +37,8 @@
    <appSettings>
        <!--<add key="webapiurl" value="http://localhost:5263/" />-->
        <add key="WebApiUrl" value="http://192.168.1.145:8081/" />
        <!--<add key="WebApiUrl" value="http://192.168.1.145:81/" />-->
        <!--<add key="WebApiUrl" value="http://192.168.1.145:8081/" />-->
        <add key="WebApiUrl" value="http://192.168.1.145:81/" />
        <add key="LogPath" value="logs" />
        <add key="ProductName" value="G-MES V2.0" />
        <add key="PageSize" value="50" />
DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01.Designer.cs
@@ -117,6 +117,10 @@
            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem39 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
            this.xtraTabControl2 = new DevExpress.XtraTab.XtraTabControl();
            this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
            this.splitMx2 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -177,10 +181,10 @@
            this.gridView3 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gridView4 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.tips = new DevExpress.Utils.ToolTipController(this.components);
            this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem39 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
            this.txt_cjName = new DevExpress.XtraEditors.TextEdit();
            this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
            this.txt_lineName = new DevExpress.XtraEditors.TextEdit();
            this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
            this.xtraTabControl1.SuspendLayout();
@@ -236,6 +240,10 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem39)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).BeginInit();
            this.xtraTabControl2.SuspendLayout();
            this.tabMxPage1.SuspendLayout();
@@ -276,10 +284,10 @@
            ((System.ComponentModel.ISupportInitialize)(this.gridView2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView3)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView4)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem39)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_cjName.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_lineName.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
            this.SuspendLayout();
            // 
            // repositoryItemComboBox1
@@ -716,6 +724,8 @@
            this.layoutMx1.Controls.Add(this.txt_checkStates);
            this.layoutMx1.Controls.Add(this.txt_freceQty);
            this.layoutMx1.Controls.Add(this.txt_iqcRemark);
            this.layoutMx1.Controls.Add(this.txt_cjName);
            this.layoutMx1.Controls.Add(this.txt_lineName);
            this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
            this.layoutControlItem17,
@@ -989,7 +999,9 @@
            this.layoutControlItem9,
            this.layoutControlItem18,
            this.layoutControlItem39,
            this.layoutControlItem28});
            this.layoutControlItem28,
            this.layoutControlItem12,
            this.layoutControlItem13});
            this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
            this.Root.Name = "Root";
            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -1151,6 +1163,52 @@
            this.layoutControlItem3.Size = new System.Drawing.Size(354, 30);
            this.layoutControlItem3.Text = "工单单号";
            this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem9
            //
            this.layoutControlItem9.Control = this.txt_fbatchQty;
            this.layoutControlItem9.Location = new System.Drawing.Point(353, 30);
            this.layoutControlItem9.Name = "layoutControlItem9";
            this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem9.Size = new System.Drawing.Size(354, 32);
            this.layoutControlItem9.Text = "工单数量";
            this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem18
            //
            this.layoutControlItem18.Control = this.txt_slOrg;
            this.layoutControlItem18.Location = new System.Drawing.Point(353, 62);
            this.layoutControlItem18.Name = "layoutControlItem18";
            this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem18.Size = new System.Drawing.Size(354, 32);
            this.layoutControlItem18.Text = "生产组织";
            this.layoutControlItem18.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem39
            //
            this.layoutControlItem39.Control = this.txt_iqcRemark;
            this.layoutControlItem39.Location = new System.Drawing.Point(353, 94);
            this.layoutControlItem39.Name = "layoutControlItem39";
            this.layoutControlItem39.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem39.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem39.Size = new System.Drawing.Size(354, 32);
            this.layoutControlItem39.Text = "检验备注";
            this.layoutControlItem39.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem28
            //
            this.layoutControlItem28.Control = this.txt_fngDesc;
            this.layoutControlItem28.Location = new System.Drawing.Point(0, 126);
            this.layoutControlItem28.Name = "layoutControlItem28";
            this.layoutControlItem28.OptionsTableLayoutItem.ColumnSpan = 2;
            this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 4;
            this.layoutControlItem28.OptionsTableLayoutItem.RowSpan = 2;
            this.layoutControlItem28.Size = new System.Drawing.Size(707, 64);
            this.layoutControlItem28.Text = "异常备注";
            this.layoutControlItem28.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem28.TextVisible = false;
            // 
            // xtraTabControl2
            // 
@@ -1803,7 +1861,7 @@
            // 
            this.tabMxPage2.Controls.Add(this.ucUpFileList1);
            this.tabMxPage2.Name = "tabMxPage2";
            this.tabMxPage2.Size = new System.Drawing.Size(1433, 419);
            this.tabMxPage2.Size = new System.Drawing.Size(1433, 434);
            this.tabMxPage2.Text = "附件信息";
            // 
            // ucUpFileList1
@@ -1814,7 +1872,7 @@
            this.ucUpFileList1.Name = "ucUpFileList1";
            this.ucUpFileList1.parentGroup = null;
            this.ucUpFileList1.pGuid = null;
            this.ucUpFileList1.Size = new System.Drawing.Size(1433, 419);
            this.ucUpFileList1.Size = new System.Drawing.Size(1433, 434);
            this.ucUpFileList1.TabIndex = 0;
            // 
            // repositoryItemComboBox2
@@ -1850,51 +1908,45 @@
            // 
            this.gridView4.Name = "gridView4";
            // 
            // layoutControlItem9
            // txt_cjName
            // 
            this.layoutControlItem9.Control = this.txt_fbatchQty;
            this.layoutControlItem9.Location = new System.Drawing.Point(353, 30);
            this.layoutControlItem9.Name = "layoutControlItem9";
            this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem9.Size = new System.Drawing.Size(354, 32);
            this.layoutControlItem9.Text = "工单数量";
            this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
            this.txt_cjName.Location = new System.Drawing.Point(1145, 106);
            this.txt_cjName.Name = "txt_cjName";
            this.txt_cjName.Size = new System.Drawing.Size(278, 24);
            this.txt_cjName.StyleController = this.layoutMx1;
            this.txt_cjName.TabIndex = 820;
            this.txt_cjName.Tag = "readonly";
            // 
            // layoutControlItem18
            // layoutControlItem12
            // 
            this.layoutControlItem18.Control = this.txt_slOrg;
            this.layoutControlItem18.Location = new System.Drawing.Point(353, 62);
            this.layoutControlItem18.Name = "layoutControlItem18";
            this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem18.Size = new System.Drawing.Size(354, 32);
            this.layoutControlItem18.Text = "生产组织";
            this.layoutControlItem18.TextSize = new System.Drawing.Size(60, 18);
            this.layoutControlItem12.Control = this.txt_cjName;
            this.layoutControlItem12.Location = new System.Drawing.Point(1061, 94);
            this.layoutControlItem12.Name = "layoutControlItem12";
            this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem12.Size = new System.Drawing.Size(354, 32);
            this.layoutControlItem12.Text = "生产车间";
            this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem39
            // txt_lineName
            // 
            this.layoutControlItem39.Control = this.txt_iqcRemark;
            this.layoutControlItem39.Location = new System.Drawing.Point(353, 94);
            this.layoutControlItem39.Name = "layoutControlItem39";
            this.layoutControlItem39.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem39.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem39.Size = new System.Drawing.Size(354, 32);
            this.layoutControlItem39.Text = "检验备注";
            this.layoutControlItem39.TextSize = new System.Drawing.Size(60, 18);
            this.txt_lineName.Location = new System.Drawing.Point(791, 138);
            this.txt_lineName.Name = "txt_lineName";
            this.txt_lineName.Size = new System.Drawing.Size(278, 24);
            this.txt_lineName.StyleController = this.layoutMx1;
            this.txt_lineName.TabIndex = 821;
            this.txt_lineName.Tag = "readonly";
            // 
            // layoutControlItem28
            // layoutControlItem13
            // 
            this.layoutControlItem28.Control = this.txt_fngDesc;
            this.layoutControlItem28.Location = new System.Drawing.Point(0, 126);
            this.layoutControlItem28.Name = "layoutControlItem28";
            this.layoutControlItem28.OptionsTableLayoutItem.ColumnSpan = 2;
            this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 4;
            this.layoutControlItem28.OptionsTableLayoutItem.RowSpan = 2;
            this.layoutControlItem28.Size = new System.Drawing.Size(707, 64);
            this.layoutControlItem28.Text = "异常备注";
            this.layoutControlItem28.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem28.TextVisible = false;
            this.layoutControlItem13.Control = this.txt_lineName;
            this.layoutControlItem13.Location = new System.Drawing.Point(707, 126);
            this.layoutControlItem13.Name = "layoutControlItem13";
            this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 4;
            this.layoutControlItem13.Size = new System.Drawing.Size(354, 32);
            this.layoutControlItem13.Text = "生产线别";
            this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
            // 
            // Frm_ShouJianDetect01
            // 
@@ -1961,6 +2013,10 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem39)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).EndInit();
            this.xtraTabControl2.ResumeLayout(false);
            this.tabMxPage1.ResumeLayout(false);
@@ -2001,10 +2057,10 @@
            ((System.ComponentModel.ISupportInitialize)(this.gridView2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView3)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView4)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem39)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_cjName.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_lineName.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
            this.ResumeLayout(false);
        }
@@ -2143,5 +2199,9 @@
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem39;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28;
        private DevExpress.XtraEditors.TextEdit txt_cjName;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
        private DevExpress.XtraEditors.TextEdit txt_lineName;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
    }
}
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
@@ -34,28 +34,18 @@
            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.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 rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition9 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition10 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition11 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition12 = new DevExpress.XtraLayout.ColumnDefinition();
            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.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 rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
            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.ColumnDefinition columnDefinition16 = 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();
@@ -96,26 +86,7 @@
            this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
            this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
            this.txt_xblb = new Gs.DevApp.UserControl.UcDictionary();
            this.layWeight = new DevExpress.XtraLayout.LayoutControl();
            this.txt_weight1 = new DevExpress.XtraEditors.TextEdit();
            this.txt_weight2 = new DevExpress.XtraEditors.TextEdit();
            this.txt_weight3 = new DevExpress.XtraEditors.TextEdit();
            this.txt_weight4 = new DevExpress.XtraEditors.TextEdit();
            this.btnW = new DevExpress.XtraEditors.SimpleButton();
            this.txtWCurrent = new DevExpress.XtraEditors.TextEdit();
            this.txt_weight5 = new DevExpress.XtraEditors.TextEdit();
            this.btnClean = new DevExpress.XtraEditors.SimpleButton();
            this.layoutControlGroup2 = new DevExpress.XtraLayout.LayoutControlGroup();
            this.layoutControlItem31 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem32 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem33 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem34 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem36 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem37 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem35 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem38 = new DevExpress.XtraLayout.LayoutControlItem();
            this.txt_fngDesc = new Gs.DevApp.UserControl.UcDictionary();
            this.btnYcReport = new DevExpress.XtraEditors.SimpleButton();
            this.lbGuid = new System.Windows.Forms.Label();
            this.txt_suppName = new DevExpress.XtraEditors.TextEdit();
            this.txt_remarks = new DevExpress.XtraEditors.TextEdit();
@@ -164,11 +135,7 @@
            this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem30 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem39 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem();
            this.xtraTabControl2 = new DevExpress.XtraTab.XtraTabControl();
            this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
            this.splitMx2 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -229,6 +196,8 @@
            this.gridView3 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gridView4 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.tips = new DevExpress.Utils.ToolTipController(this.components);
            this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
            this.xtraTabControl1.SuspendLayout();
@@ -249,23 +218,6 @@
            this.splitMx1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
            this.layoutMx1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.layWeight)).BeginInit();
            this.layWeight.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.txt_weight1.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_weight2.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_weight3.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_weight4.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtWCurrent.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_weight5.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem36)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem37)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem38)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_suppName.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_remarks.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fcheckResu.Properties)).BeginInit();
@@ -313,11 +265,7 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem39)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).BeginInit();
            this.xtraTabControl2.SuspendLayout();
            this.tabMxPage1.SuspendLayout();
@@ -358,6 +306,8 @@
            ((System.ComponentModel.ISupportInitialize)(this.gridView2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView3)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView4)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit();
            this.SuspendLayout();
            // 
            // repositoryItemComboBox1
@@ -849,15 +799,13 @@
            this.splitMx1.Panel2.Text = "Panel2";
            this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
            this.splitMx1.Size = new System.Drawing.Size(1435, 688);
            this.splitMx1.SplitterPosition = 270;
            this.splitMx1.SplitterPosition = 236;
            this.splitMx1.TabIndex = 0;
            // 
            // layoutMx1
            // 
            this.layoutMx1.Controls.Add(this.txt_xblb);
            this.layoutMx1.Controls.Add(this.layWeight);
            this.layoutMx1.Controls.Add(this.txt_fngDesc);
            this.layoutMx1.Controls.Add(this.btnYcReport);
            this.layoutMx1.Controls.Add(this.lbGuid);
            this.layoutMx1.Controls.Add(this.txt_suppName);
            this.layoutMx1.Controls.Add(this.txt_remarks);
@@ -892,278 +840,31 @@
            this.layoutMx1.Name = "layoutMx1";
            this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(381, 412, 812, 500);
            this.layoutMx1.Root = this.Root;
            this.layoutMx1.Size = new System.Drawing.Size(1435, 270);
            this.layoutMx1.Size = new System.Drawing.Size(1435, 236);
            this.layoutMx1.TabIndex = 0;
            this.layoutMx1.Text = "layoutControl1";
            // 
            // txt_xblb
            // 
            this.txt_xblb.BtnTxt = "选别类别";
            this.txt_xblb.Location = new System.Drawing.Point(1073, 198);
            this.txt_xblb.Location = new System.Drawing.Point(719, 166);
            this.txt_xblb.Margin = new System.Windows.Forms.Padding(4);
            this.txt_xblb.Name = "txt_xblb";
            this.txt_xblb.Size = new System.Drawing.Size(350, 60);
            this.txt_xblb.Size = new System.Drawing.Size(350, 58);
            this.txt_xblb.TabIndex = 820;
            this.txt_xblb.TextTxt = "";
            this.txt_xblb.WhereTxt = " a.s_type=\'OA选别类别\' and a.pid<>\'00000000-0000-0000-0000-000000000000\'";
            // 
            // layWeight
            //
            this.layWeight.BackColor = System.Drawing.Color.LightBlue;
            this.layWeight.Controls.Add(this.txt_weight1);
            this.layWeight.Controls.Add(this.txt_weight2);
            this.layWeight.Controls.Add(this.txt_weight3);
            this.layWeight.Controls.Add(this.txt_weight4);
            this.layWeight.Controls.Add(this.btnW);
            this.layWeight.Controls.Add(this.txtWCurrent);
            this.layWeight.Controls.Add(this.txt_weight5);
            this.layWeight.Controls.Add(this.btnClean);
            this.layWeight.Location = new System.Drawing.Point(10, 227);
            this.layWeight.Margin = new System.Windows.Forms.Padding(0);
            this.layWeight.Name = "layWeight";
            this.layWeight.Root = this.layoutControlGroup2;
            this.layWeight.Size = new System.Drawing.Size(1061, 33);
            this.layWeight.TabIndex = 818;
            this.layWeight.Text = "layoutControl1";
            //
            // txt_weight1
            //
            this.txt_weight1.Location = new System.Drawing.Point(52, 2);
            this.txt_weight1.Name = "txt_weight1";
            this.txt_weight1.Properties.ReadOnly = true;
            this.txt_weight1.Size = new System.Drawing.Size(76, 24);
            this.txt_weight1.StyleController = this.layWeight;
            this.txt_weight1.TabIndex = 4;
            this.txt_weight1.Tag = "readonly";
            //
            // txt_weight2
            //
            this.txt_weight2.Location = new System.Drawing.Point(182, 2);
            this.txt_weight2.Name = "txt_weight2";
            this.txt_weight2.Properties.ReadOnly = true;
            this.txt_weight2.Size = new System.Drawing.Size(79, 24);
            this.txt_weight2.StyleController = this.layWeight;
            this.txt_weight2.TabIndex = 5;
            this.txt_weight2.Tag = "readonly";
            //
            // txt_weight3
            //
            this.txt_weight3.Location = new System.Drawing.Point(315, 2);
            this.txt_weight3.Name = "txt_weight3";
            this.txt_weight3.Properties.ReadOnly = true;
            this.txt_weight3.Size = new System.Drawing.Size(79, 24);
            this.txt_weight3.StyleController = this.layWeight;
            this.txt_weight3.TabIndex = 6;
            this.txt_weight3.Tag = "readonly";
            //
            // txt_weight4
            //
            this.txt_weight4.Location = new System.Drawing.Point(448, 2);
            this.txt_weight4.Name = "txt_weight4";
            this.txt_weight4.Properties.ReadOnly = true;
            this.txt_weight4.Size = new System.Drawing.Size(79, 24);
            this.txt_weight4.StyleController = this.layWeight;
            this.txt_weight4.TabIndex = 7;
            this.txt_weight4.Tag = "readonly";
            //
            // btnW
            //
            this.btnW.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Success;
            this.btnW.Appearance.ForeColor = System.Drawing.Color.White;
            this.btnW.Appearance.Options.UseBackColor = true;
            this.btnW.Appearance.Options.UseForeColor = true;
            this.btnW.Location = new System.Drawing.Point(797, 2);
            this.btnW.Name = "btnW";
            this.btnW.Size = new System.Drawing.Size(129, 27);
            this.btnW.StyleController = this.layWeight;
            this.btnW.TabIndex = 9;
            this.btnW.Text = "获取";
            //
            // txtWCurrent
            //
            this.txtWCurrent.Location = new System.Drawing.Point(664, 2);
            this.txtWCurrent.Name = "txtWCurrent";
            this.txtWCurrent.Properties.Appearance.BackColor = System.Drawing.Color.DeepSkyBlue;
            this.txtWCurrent.Properties.Appearance.ForeColor = System.Drawing.Color.Black;
            this.txtWCurrent.Properties.Appearance.Options.UseBackColor = true;
            this.txtWCurrent.Properties.Appearance.Options.UseForeColor = true;
            this.txtWCurrent.Properties.ReadOnly = true;
            this.txtWCurrent.Size = new System.Drawing.Size(129, 24);
            this.txtWCurrent.StyleController = this.layWeight;
            this.txtWCurrent.TabIndex = 10;
            //
            // txt_weight5
            //
            this.txt_weight5.Location = new System.Drawing.Point(581, 2);
            this.txt_weight5.Name = "txt_weight5";
            this.txt_weight5.Properties.ReadOnly = true;
            this.txt_weight5.Size = new System.Drawing.Size(79, 24);
            this.txt_weight5.StyleController = this.layWeight;
            this.txt_weight5.TabIndex = 11;
            this.txt_weight5.Tag = "readonly";
            //
            // btnClean
            //
            this.btnClean.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Success;
            this.btnClean.Appearance.Options.UseBackColor = true;
            this.btnClean.Location = new System.Drawing.Point(930, 2);
            this.btnClean.Name = "btnClean";
            this.btnClean.Size = new System.Drawing.Size(129, 27);
            this.btnClean.StyleController = this.layWeight;
            this.btnClean.TabIndex = 12;
            this.btnClean.Text = "清空";
            //
            // layoutControlGroup2
            //
            this.layoutControlGroup2.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
            this.layoutControlGroup2.GroupBordersVisible = false;
            this.layoutControlGroup2.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
            this.layoutControlItem31,
            this.layoutControlItem32,
            this.layoutControlItem33,
            this.layoutControlItem34,
            this.layoutControlItem36,
            this.layoutControlItem37,
            this.layoutControlItem35,
            this.layoutControlItem38});
            this.layoutControlGroup2.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
            this.layoutControlGroup2.Name = "layoutControlGroup2";
            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;
            columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition5.Width = 100D;
            columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition6.Width = 100D;
            columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition7.Width = 100D;
            columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition8.Width = 100D;
            this.layoutControlGroup2.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
            columnDefinition1,
            columnDefinition2,
            columnDefinition3,
            columnDefinition4,
            columnDefinition5,
            columnDefinition6,
            columnDefinition7,
            columnDefinition8});
            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(0, 0, 0, 0);
            this.layoutControlGroup2.Size = new System.Drawing.Size(1061, 33);
            this.layoutControlGroup2.TextVisible = false;
            //
            // layoutControlItem31
            //
            this.layoutControlItem31.Control = this.txt_weight1;
            this.layoutControlItem31.Location = new System.Drawing.Point(0, 0);
            this.layoutControlItem31.Name = "layoutControlItem31";
            this.layoutControlItem31.Size = new System.Drawing.Size(130, 33);
            this.layoutControlItem31.Text = "重量1";
            this.layoutControlItem31.TextSize = new System.Drawing.Size(38, 18);
            //
            // layoutControlItem32
            //
            this.layoutControlItem32.Control = this.txt_weight2;
            this.layoutControlItem32.Location = new System.Drawing.Point(130, 0);
            this.layoutControlItem32.Name = "layoutControlItem32";
            this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem32.Size = new System.Drawing.Size(133, 33);
            this.layoutControlItem32.Text = "重量2";
            this.layoutControlItem32.TextSize = new System.Drawing.Size(38, 18);
            //
            // layoutControlItem33
            //
            this.layoutControlItem33.Control = this.txt_weight3;
            this.layoutControlItem33.Location = new System.Drawing.Point(263, 0);
            this.layoutControlItem33.Name = "layoutControlItem33";
            this.layoutControlItem33.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem33.Size = new System.Drawing.Size(133, 33);
            this.layoutControlItem33.Text = "重量3";
            this.layoutControlItem33.TextSize = new System.Drawing.Size(38, 18);
            //
            // layoutControlItem34
            //
            this.layoutControlItem34.Control = this.txt_weight4;
            this.layoutControlItem34.Location = new System.Drawing.Point(396, 0);
            this.layoutControlItem34.Name = "layoutControlItem34";
            this.layoutControlItem34.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem34.Size = new System.Drawing.Size(133, 33);
            this.layoutControlItem34.Text = "重量4";
            this.layoutControlItem34.TextSize = new System.Drawing.Size(38, 18);
            //
            // layoutControlItem36
            //
            this.layoutControlItem36.Control = this.btnW;
            this.layoutControlItem36.Location = new System.Drawing.Point(795, 0);
            this.layoutControlItem36.Name = "layoutControlItem36";
            this.layoutControlItem36.OptionsTableLayoutItem.ColumnIndex = 6;
            this.layoutControlItem36.Size = new System.Drawing.Size(133, 33);
            this.layoutControlItem36.Text = "获取";
            this.layoutControlItem36.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem36.TextVisible = false;
            //
            // layoutControlItem37
            //
            this.layoutControlItem37.Control = this.txtWCurrent;
            this.layoutControlItem37.Location = new System.Drawing.Point(662, 0);
            this.layoutControlItem37.Name = "layoutControlItem37";
            this.layoutControlItem37.OptionsTableLayoutItem.ColumnIndex = 5;
            this.layoutControlItem37.Size = new System.Drawing.Size(133, 33);
            this.layoutControlItem37.Text = "实时重量";
            this.layoutControlItem37.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem37.TextVisible = false;
            //
            // layoutControlItem35
            //
            this.layoutControlItem35.Control = this.txt_weight5;
            this.layoutControlItem35.Location = new System.Drawing.Point(529, 0);
            this.layoutControlItem35.Name = "layoutControlItem35";
            this.layoutControlItem35.OptionsTableLayoutItem.ColumnIndex = 4;
            this.layoutControlItem35.Size = new System.Drawing.Size(133, 33);
            this.layoutControlItem35.Text = "称重5";
            this.layoutControlItem35.TextSize = new System.Drawing.Size(38, 18);
            //
            // layoutControlItem38
            //
            this.layoutControlItem38.Control = this.btnClean;
            this.layoutControlItem38.Location = new System.Drawing.Point(928, 0);
            this.layoutControlItem38.Name = "layoutControlItem38";
            this.layoutControlItem38.OptionsTableLayoutItem.ColumnIndex = 7;
            this.layoutControlItem38.Size = new System.Drawing.Size(133, 33);
            this.layoutControlItem38.Text = "清空";
            this.layoutControlItem38.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem38.TextVisible = false;
            //
            // txt_fngDesc
            // 
            this.txt_fngDesc.BtnTxt = "异常描述";
            this.txt_fngDesc.Location = new System.Drawing.Point(12, 167);
            this.txt_fngDesc.Location = new System.Drawing.Point(12, 166);
            this.txt_fngDesc.Margin = new System.Windows.Forms.Padding(4);
            this.txt_fngDesc.Name = "txt_fngDesc";
            this.txt_fngDesc.Size = new System.Drawing.Size(703, 58);
            this.txt_fngDesc.TabIndex = 815;
            this.txt_fngDesc.TextTxt = "";
            this.txt_fngDesc.WhereTxt = " a.s_type=\'QC异常描述\' and a.pid<>\'00000000-0000-0000-0000-000000000000\'";
            //
            // btnYcReport
            //
            this.btnYcReport.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.exporttopdf_16x16;
            this.btnYcReport.Location = new System.Drawing.Point(719, 198);
            this.btnYcReport.Name = "btnYcReport";
            this.btnYcReport.Size = new System.Drawing.Size(116, 27);
            this.btnYcReport.StyleController = this.layoutMx1;
            this.btnYcReport.TabIndex = 814;
            this.btnYcReport.Tag = "gvBtnAlawys";
            this.btnYcReport.Text = "查看异常报告";
            // 
            // lbGuid
            // 
@@ -1176,7 +877,7 @@
            // 
            // txt_suppName
            // 
            this.txt_suppName.Location = new System.Drawing.Point(437, 105);
            this.txt_suppName.Location = new System.Drawing.Point(437, 104);
            this.txt_suppName.Name = "txt_suppName";
            this.txt_suppName.Size = new System.Drawing.Size(278, 24);
            this.txt_suppName.StyleController = this.layoutMx1;
@@ -1185,17 +886,17 @@
            // 
            // txt_remarks
            // 
            this.txt_remarks.Location = new System.Drawing.Point(791, 167);
            this.txt_remarks.Location = new System.Drawing.Point(437, 135);
            this.txt_remarks.Name = "txt_remarks";
            this.txt_remarks.Properties.Appearance.Options.UseFont = true;
            this.txt_remarks.Size = new System.Drawing.Size(632, 24);
            this.txt_remarks.Size = new System.Drawing.Size(278, 24);
            this.txt_remarks.StyleController = this.layoutMx1;
            this.txt_remarks.TabIndex = 797;
            this.txt_remarks.Tag = "readonly";
            // 
            // txt_fcheckResu
            // 
            this.txt_fcheckResu.Location = new System.Drawing.Point(791, 105);
            this.txt_fcheckResu.Location = new System.Drawing.Point(791, 104);
            this.txt_fcheckResu.Name = "txt_fcheckResu";
            this.txt_fcheckResu.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
            this.txt_fcheckResu.Properties.Appearance.Options.UseForeColor = true;
@@ -1206,7 +907,7 @@
            // 
            // txt_itemName
            // 
            this.txt_itemName.Location = new System.Drawing.Point(84, 43);
            this.txt_itemName.Location = new System.Drawing.Point(84, 42);
            this.txt_itemName.Name = "txt_itemName";
            this.txt_itemName.Properties.Appearance.Options.UseFont = true;
            this.txt_itemName.Size = new System.Drawing.Size(277, 24);
@@ -1246,7 +947,7 @@
            // 
            // txt_itemNo
            // 
            this.txt_itemNo.Location = new System.Drawing.Point(84, 74);
            this.txt_itemNo.Location = new System.Drawing.Point(84, 73);
            this.txt_itemNo.Name = "txt_itemNo";
            this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
            this.txt_itemNo.Size = new System.Drawing.Size(277, 24);
@@ -1256,7 +957,7 @@
            // 
            // txt_itemModel
            // 
            this.txt_itemModel.Location = new System.Drawing.Point(84, 105);
            this.txt_itemModel.Location = new System.Drawing.Point(84, 104);
            this.txt_itemModel.Name = "txt_itemModel";
            this.txt_itemModel.Size = new System.Drawing.Size(277, 24);
            this.txt_itemModel.StyleController = this.layoutMx1;
@@ -1274,7 +975,7 @@
            // 
            // txt_fcheckByName
            // 
            this.txt_fcheckByName.Location = new System.Drawing.Point(791, 43);
            this.txt_fcheckByName.Location = new System.Drawing.Point(791, 42);
            this.txt_fcheckByName.Name = "txt_fcheckByName";
            this.txt_fcheckByName.Properties.Appearance.Options.UseFont = true;
            this.txt_fcheckByName.Size = new System.Drawing.Size(278, 24);
@@ -1284,7 +985,7 @@
            // 
            // txt_fbatchQty
            // 
            this.txt_fbatchQty.Location = new System.Drawing.Point(437, 74);
            this.txt_fbatchQty.Location = new System.Drawing.Point(437, 73);
            this.txt_fbatchQty.Name = "txt_fbatchQty";
            this.txt_fbatchQty.Properties.Appearance.Options.UseFont = true;
            this.txt_fbatchQty.Size = new System.Drawing.Size(278, 24);
@@ -1294,7 +995,7 @@
            // 
            // txt_fsubmitDate
            // 
            this.txt_fsubmitDate.Location = new System.Drawing.Point(1145, 43);
            this.txt_fsubmitDate.Location = new System.Drawing.Point(1145, 42);
            this.txt_fsubmitDate.Name = "txt_fsubmitDate";
            this.txt_fsubmitDate.Size = new System.Drawing.Size(278, 24);
            this.txt_fsubmitDate.StyleController = this.layoutMx1;
@@ -1303,7 +1004,7 @@
            // 
            // txt_fsubmitBy
            // 
            this.txt_fsubmitBy.Location = new System.Drawing.Point(1145, 74);
            this.txt_fsubmitBy.Location = new System.Drawing.Point(1145, 73);
            this.txt_fsubmitBy.Name = "txt_fsubmitBy";
            this.txt_fsubmitBy.Size = new System.Drawing.Size(278, 24);
            this.txt_fsubmitBy.StyleController = this.layoutMx1;
@@ -1322,7 +1023,7 @@
            // 
            // txt_slOrg
            // 
            this.txt_slOrg.Location = new System.Drawing.Point(791, 136);
            this.txt_slOrg.Location = new System.Drawing.Point(791, 135);
            this.txt_slOrg.Name = "txt_slOrg";
            this.txt_slOrg.Size = new System.Drawing.Size(278, 24);
            this.txt_slOrg.StyleController = this.layoutMx1;
@@ -1340,7 +1041,7 @@
            // 
            // txt_checkStates
            // 
            this.txt_checkStates.Location = new System.Drawing.Point(791, 74);
            this.txt_checkStates.Location = new System.Drawing.Point(791, 73);
            this.txt_checkStates.Name = "txt_checkStates";
            this.txt_checkStates.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
            this.txt_checkStates.Properties.Appearance.Options.UseForeColor = true;
@@ -1362,7 +1063,7 @@
            // 
            // txt_cgdNo
            // 
            this.txt_cgdNo.Location = new System.Drawing.Point(437, 43);
            this.txt_cgdNo.Location = new System.Drawing.Point(437, 42);
            this.txt_cgdNo.Name = "txt_cgdNo";
            this.txt_cgdNo.Size = new System.Drawing.Size(278, 24);
            this.txt_cgdNo.StyleController = this.layoutMx1;
@@ -1371,7 +1072,7 @@
            // 
            // txt_fngHandle
            // 
            this.txt_fngHandle.Location = new System.Drawing.Point(1145, 105);
            this.txt_fngHandle.Location = new System.Drawing.Point(1145, 104);
            this.txt_fngHandle.Name = "txt_fngHandle";
            this.txt_fngHandle.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
            this.txt_fngHandle.Properties.Appearance.Options.UseForeColor = true;
@@ -1382,7 +1083,7 @@
            // 
            // txt_xbsl
            // 
            this.txt_xbsl.Location = new System.Drawing.Point(1145, 136);
            this.txt_xbsl.Location = new System.Drawing.Point(1145, 135);
            this.txt_xbsl.Name = "txt_xbsl";
            this.txt_xbsl.Size = new System.Drawing.Size(278, 24);
            this.txt_xbsl.StyleController = this.layoutMx1;
@@ -1391,7 +1092,7 @@
            // 
            // txt_iqcRemark
            // 
            this.txt_iqcRemark.Location = new System.Drawing.Point(84, 136);
            this.txt_iqcRemark.Location = new System.Drawing.Point(84, 135);
            this.txt_iqcRemark.Name = "txt_iqcRemark";
            this.txt_iqcRemark.Size = new System.Drawing.Size(277, 24);
            this.txt_iqcRemark.StyleController = this.layoutMx1;
@@ -1465,26 +1166,26 @@
            this.layoutControlItem28,
            this.layoutControlItem25,
            this.layoutControlItem29,
            this.layoutControlItem30,
            this.layoutControlItem12,
            this.layoutControlItem39,
            this.layoutControlItem27,
            this.layoutControlItem12,
            this.layoutControlItem26});
            this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
            this.Root.Name = "Root";
            columnDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition9.Width = 100D;
            columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition10.Width = 100D;
            columnDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition11.Width = 100D;
            columnDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition12.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[] {
            columnDefinition9,
            columnDefinition10,
            columnDefinition11,
            columnDefinition12});
            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;
@@ -1497,20 +1198,15 @@
            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[] {
            rowDefinition1,
            rowDefinition2,
            rowDefinition3,
            rowDefinition4,
            rowDefinition5,
            rowDefinition6,
            rowDefinition7,
            rowDefinition8,
            rowDefinition9});
            this.Root.Size = new System.Drawing.Size(1435, 270);
            rowDefinition7});
            this.Root.Size = new System.Drawing.Size(1435, 236);
            this.Root.TextVisible = false;
            // 
            // layoutControlItem1
@@ -1518,14 +1214,14 @@
            this.layoutControlItem1.Control = this.txt_releaseNo;
            this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
            this.layoutControlItem1.Name = "layoutControlItem1";
            this.layoutControlItem1.Size = new System.Drawing.Size(353, 31);
            this.layoutControlItem1.Size = new System.Drawing.Size(353, 30);
            this.layoutControlItem1.Text = "检验单号";
            this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem4
            // 
            this.layoutControlItem4.Control = this.txt_itemName;
            this.layoutControlItem4.Location = new System.Drawing.Point(0, 31);
            this.layoutControlItem4.Location = new System.Drawing.Point(0, 30);
            this.layoutControlItem4.Name = "layoutControlItem4";
            this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem4.Size = new System.Drawing.Size(353, 31);
@@ -1535,7 +1231,7 @@
            // layoutControlItem5
            // 
            this.layoutControlItem5.Control = this.txt_itemNo;
            this.layoutControlItem5.Location = new System.Drawing.Point(0, 62);
            this.layoutControlItem5.Location = new System.Drawing.Point(0, 61);
            this.layoutControlItem5.Name = "layoutControlItem5";
            this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem5.Size = new System.Drawing.Size(353, 31);
@@ -1545,7 +1241,7 @@
            // layoutControlItem6
            // 
            this.layoutControlItem6.Control = this.txt_itemModel;
            this.layoutControlItem6.Location = new System.Drawing.Point(0, 93);
            this.layoutControlItem6.Location = new System.Drawing.Point(0, 92);
            this.layoutControlItem6.Name = "layoutControlItem6";
            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem6.Size = new System.Drawing.Size(353, 31);
@@ -1555,7 +1251,7 @@
            // layoutControlItem15
            // 
            this.layoutControlItem15.Control = this.txt_fsubmitDate;
            this.layoutControlItem15.Location = new System.Drawing.Point(1061, 31);
            this.layoutControlItem15.Location = new System.Drawing.Point(1061, 30);
            this.layoutControlItem15.Name = "layoutControlItem15";
            this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1;
@@ -1566,7 +1262,7 @@
            // layoutControlItem16
            // 
            this.layoutControlItem16.Control = this.txt_fsubmitBy;
            this.layoutControlItem16.Location = new System.Drawing.Point(1061, 62);
            this.layoutControlItem16.Location = new System.Drawing.Point(1061, 61);
            this.layoutControlItem16.Name = "layoutControlItem16";
            this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 2;
@@ -1580,7 +1276,7 @@
            this.layoutControlItem14.Location = new System.Drawing.Point(1061, 0);
            this.layoutControlItem14.Name = "layoutControlItem14";
            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem14.Size = new System.Drawing.Size(354, 31);
            this.layoutControlItem14.Size = new System.Drawing.Size(354, 30);
            this.layoutControlItem14.Text = "审核标识";
            this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem14.TextVisible = false;
@@ -1588,7 +1284,7 @@
            // layoutControlItem10
            // 
            this.layoutControlItem10.Control = this.txt_fcheckResu;
            this.layoutControlItem10.Location = new System.Drawing.Point(707, 93);
            this.layoutControlItem10.Location = new System.Drawing.Point(707, 92);
            this.layoutControlItem10.Name = "layoutControlItem10";
            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 3;
@@ -1599,7 +1295,7 @@
            // layoutControlItem13
            // 
            this.layoutControlItem13.Control = this.txt_suppName;
            this.layoutControlItem13.Location = new System.Drawing.Point(353, 93);
            this.layoutControlItem13.Location = new System.Drawing.Point(353, 92);
            this.layoutControlItem13.Name = "layoutControlItem13";
            this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
@@ -1610,7 +1306,7 @@
            // layoutControlItem22
            // 
            this.layoutControlItem22.Control = this.txt_checkStates;
            this.layoutControlItem22.Location = new System.Drawing.Point(707, 62);
            this.layoutControlItem22.Location = new System.Drawing.Point(707, 61);
            this.layoutControlItem22.Name = "layoutControlItem22";
            this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 2;
@@ -1621,7 +1317,7 @@
            // layoutControlItem9
            // 
            this.layoutControlItem9.Control = this.txt_fbatchQty;
            this.layoutControlItem9.Location = new System.Drawing.Point(353, 62);
            this.layoutControlItem9.Location = new System.Drawing.Point(353, 61);
            this.layoutControlItem9.Name = "layoutControlItem9";
            this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
@@ -1632,7 +1328,7 @@
            // layoutControlItem8
            // 
            this.layoutControlItem8.Control = this.txt_fcheckByName;
            this.layoutControlItem8.Location = new System.Drawing.Point(707, 31);
            this.layoutControlItem8.Location = new System.Drawing.Point(707, 30);
            this.layoutControlItem8.Name = "layoutControlItem8";
            this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
@@ -1646,7 +1342,7 @@
            this.layoutControlItem2.Location = new System.Drawing.Point(707, 0);
            this.layoutControlItem2.Name = "layoutControlItem2";
            this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem2.Size = new System.Drawing.Size(354, 31);
            this.layoutControlItem2.Size = new System.Drawing.Size(354, 30);
            this.layoutControlItem2.Text = "检验日期";
            this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
            // 
@@ -1656,14 +1352,14 @@
            this.layoutControlItem3.Location = new System.Drawing.Point(353, 0);
            this.layoutControlItem3.Name = "layoutControlItem3";
            this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem3.Size = new System.Drawing.Size(354, 31);
            this.layoutControlItem3.Size = new System.Drawing.Size(354, 30);
            this.layoutControlItem3.Text = "送检批号";
            this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem24
            // 
            this.layoutControlItem24.Control = this.txt_cgdNo;
            this.layoutControlItem24.Location = new System.Drawing.Point(353, 31);
            this.layoutControlItem24.Location = new System.Drawing.Point(353, 30);
            this.layoutControlItem24.Name = "layoutControlItem24";
            this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 1;
@@ -1674,7 +1370,7 @@
            // layoutControlItem18
            // 
            this.layoutControlItem18.Control = this.txt_slOrg;
            this.layoutControlItem18.Location = new System.Drawing.Point(707, 124);
            this.layoutControlItem18.Location = new System.Drawing.Point(707, 123);
            this.layoutControlItem18.Name = "layoutControlItem18";
            this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 4;
@@ -1685,7 +1381,7 @@
            // layoutControlItem28
            // 
            this.layoutControlItem28.Control = this.txt_fngDesc;
            this.layoutControlItem28.Location = new System.Drawing.Point(0, 155);
            this.layoutControlItem28.Location = new System.Drawing.Point(0, 154);
            this.layoutControlItem28.Name = "layoutControlItem28";
            this.layoutControlItem28.OptionsTableLayoutItem.ColumnSpan = 2;
            this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 5;
@@ -1698,7 +1394,7 @@
            // layoutControlItem25
            // 
            this.layoutControlItem25.Control = this.txt_fngHandle;
            this.layoutControlItem25.Location = new System.Drawing.Point(1061, 93);
            this.layoutControlItem25.Location = new System.Drawing.Point(1061, 92);
            this.layoutControlItem25.Name = "layoutControlItem25";
            this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 3;
@@ -1709,7 +1405,7 @@
            // layoutControlItem29
            // 
            this.layoutControlItem29.Control = this.txt_xbsl;
            this.layoutControlItem29.Location = new System.Drawing.Point(1061, 124);
            this.layoutControlItem29.Location = new System.Drawing.Point(1061, 123);
            this.layoutControlItem29.Name = "layoutControlItem29";
            this.layoutControlItem29.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem29.OptionsTableLayoutItem.RowIndex = 4;
@@ -1717,68 +1413,15 @@
            this.layoutControlItem29.Text = "挑选数量";
            this.layoutControlItem29.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem30
            //
            this.layoutControlItem30.Control = this.layWeight;
            this.layoutControlItem30.Location = new System.Drawing.Point(0, 217);
            this.layoutControlItem30.Name = "layoutControlItem30";
            this.layoutControlItem30.OptionsTableLayoutItem.ColumnSpan = 3;
            this.layoutControlItem30.OptionsTableLayoutItem.RowIndex = 7;
            this.layoutControlItem30.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
            this.layoutControlItem30.Size = new System.Drawing.Size(1061, 33);
            this.layoutControlItem30.Text = "称重";
            this.layoutControlItem30.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem30.TextVisible = false;
            //
            // layoutControlItem12
            //
            this.layoutControlItem12.Control = this.txt_remarks;
            this.layoutControlItem12.Location = new System.Drawing.Point(707, 155);
            this.layoutControlItem12.Name = "layoutControlItem12";
            this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem12.OptionsTableLayoutItem.ColumnSpan = 2;
            this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 5;
            this.layoutControlItem12.Size = new System.Drawing.Size(708, 31);
            this.layoutControlItem12.Text = "收料备注";
            this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem39
            // 
            this.layoutControlItem39.Control = this.txt_iqcRemark;
            this.layoutControlItem39.Location = new System.Drawing.Point(0, 124);
            this.layoutControlItem39.Location = new System.Drawing.Point(0, 123);
            this.layoutControlItem39.Name = "layoutControlItem39";
            this.layoutControlItem39.OptionsTableLayoutItem.RowIndex = 4;
            this.layoutControlItem39.Size = new System.Drawing.Size(353, 31);
            this.layoutControlItem39.Text = "检验备注";
            this.layoutControlItem39.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem27
            //
            this.layoutControlItem27.Control = this.btnYcReport;
            this.layoutControlItem27.Location = new System.Drawing.Point(707, 186);
            this.layoutControlItem27.MaxSize = new System.Drawing.Size(120, 31);
            this.layoutControlItem27.MinSize = new System.Drawing.Size(120, 31);
            this.layoutControlItem27.Name = "layoutControlItem27";
            this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 6;
            this.layoutControlItem27.Size = new System.Drawing.Size(354, 31);
            this.layoutControlItem27.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
            this.layoutControlItem27.Text = "查看异常报告";
            this.layoutControlItem27.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem27.TextVisible = false;
            //
            // layoutControlItem26
            //
            this.layoutControlItem26.Control = this.txt_xblb;
            this.layoutControlItem26.Location = new System.Drawing.Point(1061, 186);
            this.layoutControlItem26.Name = "layoutControlItem26";
            this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 6;
            this.layoutControlItem26.OptionsTableLayoutItem.RowSpan = 2;
            this.layoutControlItem26.Size = new System.Drawing.Size(354, 64);
            this.layoutControlItem26.Text = "选别类别";
            this.layoutControlItem26.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem26.TextVisible = false;
            // 
            // xtraTabControl2
            // 
@@ -1786,7 +1429,7 @@
            this.xtraTabControl2.Location = new System.Drawing.Point(0, 0);
            this.xtraTabControl2.Name = "xtraTabControl2";
            this.xtraTabControl2.SelectedTabPage = this.tabMxPage1;
            this.xtraTabControl2.Size = new System.Drawing.Size(1435, 406);
            this.xtraTabControl2.Size = new System.Drawing.Size(1435, 440);
            this.xtraTabControl2.TabIndex = 3;
            this.xtraTabControl2.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
            this.tabMxPage1,
@@ -1797,7 +1440,7 @@
            this.tabMxPage1.Controls.Add(this.splitMx2);
            this.tabMxPage1.Controls.Add(this.panMsg);
            this.tabMxPage1.Name = "tabMxPage1";
            this.tabMxPage1.Size = new System.Drawing.Size(1433, 374);
            this.tabMxPage1.Size = new System.Drawing.Size(1433, 408);
            this.tabMxPage1.Text = "抽样信息";
            // 
            // splitMx2
@@ -1816,7 +1459,7 @@
            // 
            this.splitMx2.Panel2.Controls.Add(this.splitYangLi);
            this.splitMx2.Panel2.Text = "Panel2";
            this.splitMx2.Size = new System.Drawing.Size(1433, 327);
            this.splitMx2.Size = new System.Drawing.Size(1433, 361);
            this.splitMx2.SplitterPosition = 317;
            this.splitMx2.TabIndex = 3;
            // 
@@ -1826,7 +1469,7 @@
            this.gcMx1.Location = new System.Drawing.Point(0, 0);
            this.gcMx1.MainView = this.gvMx1;
            this.gcMx1.Name = "gcMx1";
            this.gcMx1.Size = new System.Drawing.Size(1433, 315);
            this.gcMx1.Size = new System.Drawing.Size(1433, 317);
            this.gcMx1.TabIndex = 1;
            this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gvMx1});
@@ -2089,7 +1732,7 @@
            // 
            this.splitYangLi.Panel2.Controls.Add(this.groupControl2);
            this.splitYangLi.Panel2.Text = "Panel2";
            this.splitYangLi.Size = new System.Drawing.Size(0, 0);
            this.splitYangLi.Size = new System.Drawing.Size(1433, 32);
            this.splitYangLi.SplitterPosition = 676;
            this.splitYangLi.TabIndex = 4;
            // 
@@ -2099,17 +1742,17 @@
            this.groupControl1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.groupControl1.Location = new System.Drawing.Point(0, 0);
            this.groupControl1.Name = "groupControl1";
            this.groupControl1.Size = new System.Drawing.Size(0, 0);
            this.groupControl1.Size = new System.Drawing.Size(676, 32);
            this.groupControl1.TabIndex = 3;
            this.groupControl1.Text = "检测结果";
            // 
            // gcMx2
            // 
            this.gcMx2.Dock = System.Windows.Forms.DockStyle.Fill;
            this.gcMx2.Location = new System.Drawing.Point(0, 27);
            this.gcMx2.Location = new System.Drawing.Point(2, 28);
            this.gcMx2.MainView = this.gvMx2;
            this.gcMx2.Name = "gcMx2";
            this.gcMx2.Size = new System.Drawing.Size(0, 0);
            this.gcMx2.Size = new System.Drawing.Size(672, 2);
            this.gcMx2.TabIndex = 0;
            this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gvMx2});
@@ -2197,17 +1840,17 @@
            this.groupControl2.Dock = System.Windows.Forms.DockStyle.Fill;
            this.groupControl2.Location = new System.Drawing.Point(0, 0);
            this.groupControl2.Name = "groupControl2";
            this.groupControl2.Size = new System.Drawing.Size(0, 0);
            this.groupControl2.Size = new System.Drawing.Size(745, 32);
            this.groupControl2.TabIndex = 4;
            this.groupControl2.Text = "样本结果";
            // 
            // gcMx3
            // 
            this.gcMx3.Dock = System.Windows.Forms.DockStyle.Fill;
            this.gcMx3.Location = new System.Drawing.Point(0, 27);
            this.gcMx3.Location = new System.Drawing.Point(2, 28);
            this.gcMx3.MainView = this.gvMx3;
            this.gcMx3.Name = "gcMx3";
            this.gcMx3.Size = new System.Drawing.Size(0, 0);
            this.gcMx3.Size = new System.Drawing.Size(741, 2);
            this.gcMx3.TabIndex = 0;
            this.gcMx3.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gvMx3});
@@ -2365,23 +2008,23 @@
            this.layoutControlItem19});
            this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
            this.layoutControlGroup1.Name = "Root";
            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;
            columnDefinition16.SizeType = System.Windows.Forms.SizeType.AutoSize;
            columnDefinition16.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[] {
            columnDefinition13,
            columnDefinition14,
            columnDefinition15,
            columnDefinition16});
            rowDefinition10.Height = 100D;
            rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition5,
            columnDefinition6,
            columnDefinition7,
            columnDefinition8});
            rowDefinition8.Height = 100D;
            rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
            this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
            rowDefinition10});
            rowDefinition8});
            this.layoutControlGroup1.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
            this.layoutControlGroup1.Size = new System.Drawing.Size(1429, 43);
            this.layoutControlGroup1.TextVisible = false;
@@ -2478,6 +2121,30 @@
            // 
            this.gridView4.Name = "gridView4";
            // 
            // layoutControlItem12
            //
            this.layoutControlItem12.Control = this.txt_remarks;
            this.layoutControlItem12.Location = new System.Drawing.Point(353, 123);
            this.layoutControlItem12.Name = "layoutControlItem12";
            this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 4;
            this.layoutControlItem12.Size = new System.Drawing.Size(354, 31);
            this.layoutControlItem12.Text = "收料备注";
            this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem26
            //
            this.layoutControlItem26.Control = this.txt_xblb;
            this.layoutControlItem26.Location = new System.Drawing.Point(707, 154);
            this.layoutControlItem26.Name = "layoutControlItem26";
            this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 5;
            this.layoutControlItem26.OptionsTableLayoutItem.RowSpan = 2;
            this.layoutControlItem26.Size = new System.Drawing.Size(354, 62);
            this.layoutControlItem26.Text = "选别类别";
            this.layoutControlItem26.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem26.TextVisible = false;
            //
            // Frm_MesQaItemsDetect01
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -2508,23 +2175,6 @@
            this.splitMx1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
            this.layoutMx1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.layWeight)).EndInit();
            this.layWeight.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.txt_weight1.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_weight2.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_weight3.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_weight4.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtWCurrent.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_weight5.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem36)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem37)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem38)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_suppName.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_remarks.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fcheckResu.Properties)).EndInit();
@@ -2572,11 +2222,7 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem39)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).EndInit();
            this.xtraTabControl2.ResumeLayout(false);
            this.tabMxPage1.ResumeLayout(false);
@@ -2617,6 +2263,8 @@
            ((System.ComponentModel.ISupportInitialize)(this.gridView2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView3)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView4)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit();
            this.ResumeLayout(false);
        }
@@ -2762,37 +2410,16 @@
        private DevExpress.XtraEditors.TextEdit txt_fngHandle;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23;
        private DevExpress.XtraEditors.SimpleButton btnYcReport;
        private UserControl.UcDictionary txt_fngDesc;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28;
        private DevExpress.XtraEditors.TextEdit txt_xbsl;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem29;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
        private DevExpress.XtraLayout.LayoutControl layWeight;
        private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup2;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem30;
        private DevExpress.XtraEditors.TextEdit txt_weight1;
        private DevExpress.XtraEditors.TextEdit txt_weight2;
        private DevExpress.XtraEditors.TextEdit txt_weight3;
        private DevExpress.XtraEditors.TextEdit txt_weight4;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem31;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem32;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem33;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem34;
        private DevExpress.XtraEditors.SimpleButton btnW;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem36;
        private DevExpress.XtraEditors.TextEdit txtWCurrent;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem37;
        private DevExpress.XtraEditors.TextEdit txt_weight5;
        private DevExpress.XtraEditors.SimpleButton btnClean;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem35;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem38;
        private DevExpress.XtraEditors.TextEdit txt_iqcRemark;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem39;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27;
        private UserControl.UcDictionary txt_xblb;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26;
    }
}
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
@@ -20,23 +20,10 @@
        string _strTag = "N:不合格";
        string _webServiceName = "MesQaItemsDetect01Manager/";
        List<FilterEntity> _filterList = new List<FilterEntity>();
        /// <summary>
        /// 定时刷新
        /// </summary>
        System.Timers.Timer timer;
        public Frm_MesQaItemsDetect01()
        {
            InitializeComponent();
            #region 设置时间
            int int32 = 3000;
            string _vanishingSeconds = ConfigurationManager.AppSettings["IqcGetWeight"];
            if (!string.IsNullOrEmpty(_vanishingSeconds))
                int32 = int.Parse(_vanishingSeconds);
            timer = new System.Timers.Timer(int32);
            #endregion
            this.toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
            this.toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
            this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
@@ -68,159 +55,8 @@
            xtraTabControl2.SelectedPageChanged += XtraTabControl2_SelectedPageChanged;
            gvMx1.FocusedRowChanged += GvMx1_FocusedRowChanged;
            btnIpt.Click += BtnIpt_Click;
            btnYcReport.Click += BtnYcReport_Click;
            #region 五次重量
            //关闭时释放timer
            this.Disposed += (s, e) =>
            {
                // MessageBox.Show("ddddddd");
                if (timer != null)
                {
                    timer.Stop();
                    timer.Dispose();
                }
            };
            timer.Elapsed += (s, e) =>
            {
                var _obj = new
                {
                };
                try
                {
                    var strReturn = UtilityHelper.HttpPost("", "WorkWeight/GetIqcWeight", JsonConvert.SerializeObject(_obj), false);
                    var dd = UtilityHelper.ReturnToDynamic(strReturn);
                    if (dd.rtnCode > 0)
                    {
                        BeginInvoke(new Action(() =>
                        {
                            txtWCurrent.Text = dd.rtnData;
                        }));
                    }
                }
                catch (Exception ex)
                {
                    Gs.DevApp.ToolBox.LogHelper.Debug(this.ToString(), "WorkWeight/GetIqcWeight:" + ex.Message);
                }
            };
            timer.AutoReset = true; // 设置为true表示重复执行,false表示执行一次后停止
            timer.Enabled = true; // 开始计时
            //读取重量
            this.btnW.Click += (s, e) =>
            {
                string _strCurrent = this.txtWCurrent.Text.Trim();
                bool _isNumeric = decimal.TryParse(_strCurrent, out _);
                if (!_isNumeric)
                {
                    ToolBox.MsgHelper.ShowError("请检查称重设置!");
                    return;
                }
                decimal _decCurrent = decimal.Parse(_strCurrent);
                if (_decCurrent * 1 <= 0)
                {
                    ToolBox.MsgHelper.ShowError("请检查称重设置!");
                    return;
                }
                if (txt_weight1.Text.Trim().Length <= 0)
                {
                    _setWeigth(1, _strCurrent);
                    return;
                }
                if (txt_weight2.Text.Trim().Length <= 0)
                {
                    _setWeigth(2, _strCurrent);
                    return;
                }
                if (txt_weight3.Text.Trim().Length <= 0)
                {
                    _setWeigth(3, _strCurrent);
                    return;
                }
                if (txt_weight4.Text.Trim().Length <= 0)
                {
                    _setWeigth(4, _strCurrent);
                    return;
                }
                if (txt_weight5.Text.Trim().Length <= 0)
                {
                    _setWeigth(5, _strCurrent);
                    return;
                }
                ToolBox.MsgHelper.ShowError("重量已获取完毕!");
                return;
            };
            //清空
            this.btnClean.Click += (s, e) =>
            {
                if (!MsgHelper.AskQuestion("你选择了【" + txt_releaseNo.Text.Trim() + "】,确定清除所有称重数据吗?"))
                    return;
                _setWeigth(99, "");
            };
            #endregion
        }
        /// <summary>
        /// 提交称重
        /// </summary>
        /// <param name="_weightType"></param>
        /// <param name="_weight"></param>
        private void _setWeigth(int _weightType, string _weight)
        {
            var _obj = new
            {
                iqcGuid = this.txt_guid.Text.Trim(),
                weightType = _weightType,
                weight = _weight
            };
            try
            {
                var strReturn = UtilityHelper.HttpPost("", "WorkWeight/EditIqcWeight", JsonConvert.SerializeObject(_obj), false);
                var dd = UtilityHelper.ReturnToDynamic(strReturn);
                if (dd.rtnCode <= 0)
                {
                    ToolBox.MsgHelper.ShowError("提示:" + dd.rtnMsg);
                }
                else
                {
                    if (_weightType == 1)
                    {
                        txt_weight1.Text = _weight;
                        return;
                    }
                    if (_weightType == 2)
                    {
                        txt_weight2.Text = _weight;
                        return;
                    }
                    if (_weightType == 3)
                    {
                        txt_weight3.Text = _weight;
                        return;
                    }
                    if (_weightType == 4)
                    {
                        txt_weight4.Text = _weight;
                        return;
                    }
                    if (_weightType == 5)
                    {
                        txt_weight5.Text = _weight;
                        return;
                    }
                    if (_weightType == 99)
                    {
                        this.txt_weight1.Text = this.txt_weight2.Text = this.txt_weight3.Text = this.txt_weight4.Text = this.txt_weight5.Text = "";
                        return;
                    }
                }
            }
            catch (Exception ex)
            {
                ToolBox.MsgHelper.ShowError("提示:" + ex.Message);
            }
        }
        /// <summary>
        /// 批量录入
        /// </summary>
@@ -403,8 +239,6 @@
                lbGuid, txt_releaseNo, gridView1);
            toolBarMenu1.guidKey = rowGuid;
        }
        private void ToolBarMenu1_btnChkClick(object sender, EventArgs e)
        {
            _toolCk("EditModelSubmit");
@@ -766,31 +600,7 @@
            txtJianYan.ReadOnly = !bl;
            btnLoad.Enabled = bl;
            btnIpt.Text = (bl == true ? "录入样本" : "查看样本");
            btnW.Enabled = btnClean.Enabled = bl;
        }
        #region 打开父亲窗口委托,查看异常报告
        public event EventHandler<UpdateParentEventArgs> ToUpdateParent;
        private void BtnYcReport_Click(object sender, EventArgs e)
        {
            string _toGuid = (btnYcReport.ToolTip == null ? "" : btnYcReport.ToolTip.ToString());
            if (string.IsNullOrEmpty(_toGuid))
            {
                Gs.DevApp.ToolBox.MsgHelper.ShowInformation("该单无异常报告,查看失败!");
                return;
            }
            if (ToUpdateParent != null)
            {
                List<string> lst = new List<string>();
                lst.Add("Gs.DevApp.DevFrm.QC.MesQcExceptional");//类名
                lst.Add(_toGuid);//异常报告主键
                lst.Add("tab1");//其它
                ToUpdateParent?.Invoke(this,
                new UpdateParentEventArgs { StringList = lst });
            }
        }
        #endregion
        /// <summary>
        /// 检验和反检验
DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -389,12 +389,6 @@
    <Compile Include="DevFrm\FrmMain.Designer.cs">
      <DependentUpon>FrmMain.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\IPQC\Frm_ShouJianDetect01H5.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\IPQC\Frm_ShouJianDetect01H5.Designer.cs">
      <DependentUpon>Frm_ShouJianDetect01H5.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\IPQC\Frm_XunJianDetect01Show.cs">
      <SubType>Form</SubType>
    </Compile>
@@ -1849,9 +1843,6 @@
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\IPQC\Frm_ShouJianDetect01.resx">
      <DependentUpon>Frm_ShouJianDetect01.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\IPQC\Frm_ShouJianDetect01H5.resx">
      <DependentUpon>Frm_ShouJianDetect01H5.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\IPQC\Frm_XunJianDetect01.resx">
      <DependentUpon>Frm_XunJianDetect01.cs</DependentUpon>