From 74202f2545445ed080b3bd2536474b9661990378 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 29 十月 2024 14:28:11 +0800
Subject: [PATCH] Merge branch 'master' of http://43.142.96.171:8080/r/~tjx/GsMesClient

---
 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.resx        |  120 ++++++
 DevApp/Gs.DevApp/Gs.DevApp.csproj                  |   17 
 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs          |  331 ++++++++++++++++
 DevApp/Gs.DevApp/DevFrm/QC/Models/MesQaMj.cs       |   66 +++
 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.Designer.cs |  645 ++++++++++++++++++++++++++++++++
 5 files changed, 1,177 insertions(+), 2 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.Designer.cs
new file mode 100644
index 0000000..6438e1c
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.Designer.cs
@@ -0,0 +1,645 @@
+/* Create By GS EasyCode */
+namespace Gs.DevApp.DevFrm.QC
+{
+    partial class Frm_MesQaMj
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.lb_suppNo = new DevExpress.XtraEditors.LabelControl();
+            this.txt_suppNo = new DevExpress.XtraEditors.TextEdit();
+            this.gv_suppNo = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.lb_itemId = new DevExpress.XtraEditors.LabelControl();
+            this.txt_itemId = new DevExpress.XtraEditors.TextEdit();
+            this.gv_itemId = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.lb_status = new DevExpress.XtraEditors.LabelControl();
+            this.txt_status = new DevExpress.XtraEditors.TextEdit();
+            this.gv_status = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.lb_checkDate = new DevExpress.XtraEditors.LabelControl();
+            this.txt_checkDate = new DevExpress.XtraEditors.TextEdit();
+            this.gv_checkDate = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.lb_checkUser = new DevExpress.XtraEditors.LabelControl();
+            this.txt_checkUser = new DevExpress.XtraEditors.TextEdit();
+            this.gv_checkUser = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.lb_lastupdateDate = new DevExpress.XtraEditors.LabelControl();
+            this.txt_lastupdateDate = new DevExpress.XtraEditors.TextEdit();
+            this.gv_lastupdateDate = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.lb_lastupdateBy = new DevExpress.XtraEditors.LabelControl();
+            this.txt_lastupdateBy = new DevExpress.XtraEditors.TextEdit();
+            this.gv_lastupdateBy = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.lb_createDate = new DevExpress.XtraEditors.LabelControl();
+            this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
+            this.gv_createDate = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.lb_createBy = new DevExpress.XtraEditors.LabelControl();
+            this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
+            this.gv_createBy = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.lb_itemNo = new DevExpress.XtraEditors.LabelControl();
+            this.txt_itemNo = new DevExpress.XtraEditors.TextEdit();
+            this.gv_itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
+            this.gcMain = new DevExpress.XtraGrid.GridControl();
+            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
+            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
+            this.pageBar1 = new UserControls.Data.UcPageBar();
+            this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
+            this.panel1 = new System.Windows.Forms.Panel();
+            this.lbGuid = new System.Windows.Forms.Label();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_suppNo.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_itemId.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateDate.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateBy.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
+            this.xtraTabControl1.SuspendLayout();
+            this.xtraTabPage1.SuspendLayout();
+            this.xtraTabPage2.SuspendLayout();
+            this.panel1.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // lb_suppNo
+            // 
+            this.lb_suppNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.lb_suppNo.Appearance.Options.UseFont = true;
+            this.lb_suppNo.Location = new System.Drawing.Point(544, 16);
+            this.lb_suppNo.Name = "lb_suppNo";
+            this.lb_suppNo.Size = new System.Drawing.Size(90, 21);
+            this.lb_suppNo.TabIndex = 235;
+            this.lb_suppNo.Text = "渚涘簲鍟嗙紪鐮� ";
+            // 
+            // txt_suppNo
+            // 
+            this.txt_suppNo.Location = new System.Drawing.Point(634, 13);
+            this.txt_suppNo.Name = "txt_suppNo";
+            this.txt_suppNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_suppNo.Properties.Appearance.Options.UseFont = true;
+            this.txt_suppNo.Size = new System.Drawing.Size(150, 28);
+            this.txt_suppNo.TabIndex = 235;
+            // 
+            // gv_suppNo
+            // 
+            this.gv_suppNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_suppNo.AppearanceCell.Options.UseFont = true;
+            this.gv_suppNo.Caption = "渚涘簲鍟嗙紪鐮� ";
+            this.gv_suppNo.FieldName = "suppNo";
+            this.gv_suppNo.MinWidth = 50;
+            this.gv_suppNo.Name = "gv_suppNo";
+            this.gv_suppNo.OptionsColumn.AllowEdit = false;
+            this.gv_suppNo.Tag = "query_a.SUPP_NO";
+            this.gv_suppNo.Visible = true;
+            this.gv_suppNo.VisibleIndex = 10;
+            this.gv_suppNo.Width = 94;
+            // 
+            // lb_itemId
+            // 
+            this.lb_itemId.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.lb_itemId.Appearance.Options.UseFont = true;
+            this.lb_itemId.Location = new System.Drawing.Point(20, 13);
+            this.lb_itemId.Name = "lb_itemId";
+            this.lb_itemId.Size = new System.Drawing.Size(57, 21);
+            this.lb_itemId.TabIndex = 231;
+            this.lb_itemId.Text = "鐗╂枡ID ";
+            // 
+            // txt_itemId
+            // 
+            this.txt_itemId.Location = new System.Drawing.Point(114, 10);
+            this.txt_itemId.Name = "txt_itemId";
+            this.txt_itemId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_itemId.Properties.Appearance.Options.UseFont = true;
+            this.txt_itemId.Size = new System.Drawing.Size(150, 28);
+            this.txt_itemId.TabIndex = 231;
+            // 
+            // gv_itemId
+            // 
+            this.gv_itemId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_itemId.AppearanceCell.Options.UseFont = true;
+            this.gv_itemId.Caption = "鐗╂枡ID ";
+            this.gv_itemId.FieldName = "itemId";
+            this.gv_itemId.MinWidth = 50;
+            this.gv_itemId.Name = "gv_itemId";
+            this.gv_itemId.OptionsColumn.AllowEdit = false;
+            this.gv_itemId.Tag = "query_a.ITEM_ID";
+            this.gv_itemId.Visible = true;
+            this.gv_itemId.VisibleIndex = 9;
+            this.gv_itemId.Width = 94;
+            // 
+            // lb_status
+            // 
+            this.lb_status.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.lb_status.Appearance.Options.UseFont = true;
+            this.lb_status.Location = new System.Drawing.Point(20, 84);
+            this.lb_status.Name = "lb_status";
+            this.lb_status.Size = new System.Drawing.Size(73, 21);
+            this.lb_status.TabIndex = 228;
+            this.lb_status.Text = "瀹℃牳鏍囪瘑 ";
+            // 
+            // txt_status
+            // 
+            this.txt_status.Location = new System.Drawing.Point(114, 81);
+            this.txt_status.Name = "txt_status";
+            this.txt_status.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_status.Properties.Appearance.Options.UseFont = true;
+            this.txt_status.Size = new System.Drawing.Size(150, 28);
+            this.txt_status.TabIndex = 228;
+            // 
+            // gv_status
+            // 
+            this.gv_status.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_status.AppearanceCell.Options.UseFont = true;
+            this.gv_status.Caption = "瀹℃牳鏍囪瘑 ";
+            this.gv_status.FieldName = "status";
+            this.gv_status.MinWidth = 50;
+            this.gv_status.Name = "gv_status";
+            this.gv_status.OptionsColumn.AllowEdit = false;
+            this.gv_status.Tag = "query_a.STATUS";
+            this.gv_status.Visible = true;
+            this.gv_status.VisibleIndex = 8;
+            this.gv_status.Width = 94;
+            // 
+            // lb_checkDate
+            // 
+            this.lb_checkDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.lb_checkDate.Appearance.Options.UseFont = true;
+            this.lb_checkDate.Location = new System.Drawing.Point(555, 84);
+            this.lb_checkDate.Name = "lb_checkDate";
+            this.lb_checkDate.Size = new System.Drawing.Size(73, 21);
+            this.lb_checkDate.TabIndex = 226;
+            this.lb_checkDate.Text = "瀹℃牳鏃堕棿 ";
+            // 
+            // txt_checkDate
+            // 
+            this.txt_checkDate.Location = new System.Drawing.Point(634, 81);
+            this.txt_checkDate.Name = "txt_checkDate";
+            this.txt_checkDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
+            this.txt_checkDate.Size = new System.Drawing.Size(150, 28);
+            this.txt_checkDate.TabIndex = 226;
+            // 
+            // gv_checkDate
+            // 
+            this.gv_checkDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_checkDate.AppearanceCell.Options.UseFont = true;
+            this.gv_checkDate.Caption = "瀹℃牳鏃堕棿 ";
+            this.gv_checkDate.FieldName = "checkDate";
+            this.gv_checkDate.MinWidth = 50;
+            this.gv_checkDate.Name = "gv_checkDate";
+            this.gv_checkDate.OptionsColumn.AllowEdit = false;
+            this.gv_checkDate.Tag = "query_a.CHECK_DATE";
+            this.gv_checkDate.Visible = true;
+            this.gv_checkDate.VisibleIndex = 7;
+            this.gv_checkDate.Width = 94;
+            // 
+            // lb_checkUser
+            // 
+            this.lb_checkUser.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.lb_checkUser.Appearance.Options.UseFont = true;
+            this.lb_checkUser.Location = new System.Drawing.Point(320, 82);
+            this.lb_checkUser.Name = "lb_checkUser";
+            this.lb_checkUser.Size = new System.Drawing.Size(56, 21);
+            this.lb_checkUser.TabIndex = 222;
+            this.lb_checkUser.Text = "瀹℃牳浜� ";
+            // 
+            // txt_checkUser
+            // 
+            this.txt_checkUser.Location = new System.Drawing.Point(382, 80);
+            this.txt_checkUser.Name = "txt_checkUser";
+            this.txt_checkUser.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_checkUser.Properties.Appearance.Options.UseFont = true;
+            this.txt_checkUser.Size = new System.Drawing.Size(150, 28);
+            this.txt_checkUser.TabIndex = 222;
+            // 
+            // gv_checkUser
+            // 
+            this.gv_checkUser.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_checkUser.AppearanceCell.Options.UseFont = true;
+            this.gv_checkUser.Caption = "瀹℃牳浜� ";
+            this.gv_checkUser.FieldName = "checkUser";
+            this.gv_checkUser.MinWidth = 50;
+            this.gv_checkUser.Name = "gv_checkUser";
+            this.gv_checkUser.OptionsColumn.AllowEdit = false;
+            this.gv_checkUser.Tag = "query_a.CHECK_USER";
+            this.gv_checkUser.Visible = true;
+            this.gv_checkUser.VisibleIndex = 6;
+            this.gv_checkUser.Width = 94;
+            // 
+            // lb_lastupdateDate
+            // 
+            this.lb_lastupdateDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.lb_lastupdateDate.Appearance.Options.UseFont = true;
+            this.lb_lastupdateDate.Location = new System.Drawing.Point(270, 48);
+            this.lb_lastupdateDate.Name = "lb_lastupdateDate";
+            this.lb_lastupdateDate.Size = new System.Drawing.Size(107, 21);
+            this.lb_lastupdateDate.TabIndex = 219;
+            this.lb_lastupdateDate.Text = "鏈�鍚庢洿鏂版椂闂� ";
+            // 
+            // txt_lastupdateDate
+            // 
+            this.txt_lastupdateDate.Location = new System.Drawing.Point(383, 45);
+            this.txt_lastupdateDate.Name = "txt_lastupdateDate";
+            this.txt_lastupdateDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_lastupdateDate.Properties.Appearance.Options.UseFont = true;
+            this.txt_lastupdateDate.Size = new System.Drawing.Size(150, 28);
+            this.txt_lastupdateDate.TabIndex = 219;
+            // 
+            // gv_lastupdateDate
+            // 
+            this.gv_lastupdateDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_lastupdateDate.AppearanceCell.Options.UseFont = true;
+            this.gv_lastupdateDate.Caption = "鏈�鍚庢洿鏂版椂闂� ";
+            this.gv_lastupdateDate.FieldName = "lastupdateDate";
+            this.gv_lastupdateDate.MinWidth = 50;
+            this.gv_lastupdateDate.Name = "gv_lastupdateDate";
+            this.gv_lastupdateDate.OptionsColumn.AllowEdit = false;
+            this.gv_lastupdateDate.Tag = "query_a.LASTUPDATE_DATE";
+            this.gv_lastupdateDate.Visible = true;
+            this.gv_lastupdateDate.VisibleIndex = 5;
+            this.gv_lastupdateDate.Width = 94;
+            // 
+            // lb_lastupdateBy
+            // 
+            this.lb_lastupdateBy.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.lb_lastupdateBy.Appearance.Options.UseFont = true;
+            this.lb_lastupdateBy.Location = new System.Drawing.Point(20, 48);
+            this.lb_lastupdateBy.Name = "lb_lastupdateBy";
+            this.lb_lastupdateBy.Size = new System.Drawing.Size(90, 21);
+            this.lb_lastupdateBy.TabIndex = 217;
+            this.lb_lastupdateBy.Text = "鏈�鍚庢洿鏂颁汉 ";
+            // 
+            // txt_lastupdateBy
+            // 
+            this.txt_lastupdateBy.Location = new System.Drawing.Point(114, 45);
+            this.txt_lastupdateBy.Name = "txt_lastupdateBy";
+            this.txt_lastupdateBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_lastupdateBy.Properties.Appearance.Options.UseFont = true;
+            this.txt_lastupdateBy.Size = new System.Drawing.Size(150, 28);
+            this.txt_lastupdateBy.TabIndex = 217;
+            // 
+            // gv_lastupdateBy
+            // 
+            this.gv_lastupdateBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_lastupdateBy.AppearanceCell.Options.UseFont = true;
+            this.gv_lastupdateBy.Caption = "鏈�鍚庢洿鏂颁汉 ";
+            this.gv_lastupdateBy.FieldName = "lastupdateBy";
+            this.gv_lastupdateBy.MinWidth = 50;
+            this.gv_lastupdateBy.Name = "gv_lastupdateBy";
+            this.gv_lastupdateBy.OptionsColumn.AllowEdit = false;
+            this.gv_lastupdateBy.Tag = "query_a.LASTUPDATE_BY";
+            this.gv_lastupdateBy.Visible = true;
+            this.gv_lastupdateBy.VisibleIndex = 4;
+            this.gv_lastupdateBy.Width = 94;
+            // 
+            // lb_createDate
+            // 
+            this.lb_createDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.lb_createDate.Appearance.Options.UseFont = true;
+            this.lb_createDate.Location = new System.Drawing.Point(800, 48);
+            this.lb_createDate.Name = "lb_createDate";
+            this.lb_createDate.Size = new System.Drawing.Size(73, 21);
+            this.lb_createDate.TabIndex = 216;
+            this.lb_createDate.Text = "鍒涘缓鏃堕棿 ";
+            // 
+            // txt_createDate
+            // 
+            this.txt_createDate.Location = new System.Drawing.Point(879, 45);
+            this.txt_createDate.Name = "txt_createDate";
+            this.txt_createDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_createDate.Properties.Appearance.Options.UseFont = true;
+            this.txt_createDate.Size = new System.Drawing.Size(150, 28);
+            this.txt_createDate.TabIndex = 216;
+            // 
+            // gv_createDate
+            // 
+            this.gv_createDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_createDate.AppearanceCell.Options.UseFont = true;
+            this.gv_createDate.Caption = "鍒涘缓鏃堕棿 ";
+            this.gv_createDate.FieldName = "createDate";
+            this.gv_createDate.MinWidth = 50;
+            this.gv_createDate.Name = "gv_createDate";
+            this.gv_createDate.OptionsColumn.AllowEdit = false;
+            this.gv_createDate.Tag = "query_a.CREATE_DATE";
+            this.gv_createDate.Visible = true;
+            this.gv_createDate.VisibleIndex = 3;
+            this.gv_createDate.Width = 94;
+            // 
+            // lb_createBy
+            // 
+            this.lb_createBy.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.lb_createBy.Appearance.Options.UseFont = true;
+            this.lb_createBy.Location = new System.Drawing.Point(555, 48);
+            this.lb_createBy.Name = "lb_createBy";
+            this.lb_createBy.Size = new System.Drawing.Size(56, 21);
+            this.lb_createBy.TabIndex = 213;
+            this.lb_createBy.Text = "鍒涘缓浜� ";
+            // 
+            // txt_createBy
+            // 
+            this.txt_createBy.Location = new System.Drawing.Point(634, 45);
+            this.txt_createBy.Name = "txt_createBy";
+            this.txt_createBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_createBy.Properties.Appearance.Options.UseFont = true;
+            this.txt_createBy.Size = new System.Drawing.Size(150, 28);
+            this.txt_createBy.TabIndex = 213;
+            // 
+            // gv_createBy
+            // 
+            this.gv_createBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_createBy.AppearanceCell.Options.UseFont = true;
+            this.gv_createBy.Caption = "鍒涘缓浜� ";
+            this.gv_createBy.FieldName = "createBy";
+            this.gv_createBy.MinWidth = 50;
+            this.gv_createBy.Name = "gv_createBy";
+            this.gv_createBy.OptionsColumn.AllowEdit = false;
+            this.gv_createBy.Tag = "query_a.CREATE_BY";
+            this.gv_createBy.Visible = true;
+            this.gv_createBy.VisibleIndex = 2;
+            this.gv_createBy.Width = 94;
+            // 
+            // lb_itemNo
+            // 
+            this.lb_itemNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.lb_itemNo.Appearance.Options.UseFont = true;
+            this.lb_itemNo.Location = new System.Drawing.Point(287, 13);
+            this.lb_itemNo.Name = "lb_itemNo";
+            this.lb_itemNo.Size = new System.Drawing.Size(73, 21);
+            this.lb_itemNo.TabIndex = 211;
+            this.lb_itemNo.Text = "鐗╂枡缂栫爜 ";
+            // 
+            // txt_itemNo
+            // 
+            this.txt_itemNo.Location = new System.Drawing.Point(383, 13);
+            this.txt_itemNo.Name = "txt_itemNo";
+            this.txt_itemNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
+            this.txt_itemNo.Size = new System.Drawing.Size(150, 28);
+            this.txt_itemNo.TabIndex = 211;
+            // 
+            // gv_itemNo
+            // 
+            this.gv_itemNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_itemNo.AppearanceCell.Options.UseFont = true;
+            this.gv_itemNo.Caption = "鐗╂枡缂栫爜 ";
+            this.gv_itemNo.FieldName = "itemNo";
+            this.gv_itemNo.MinWidth = 50;
+            this.gv_itemNo.Name = "gv_itemNo";
+            this.gv_itemNo.OptionsColumn.AllowEdit = false;
+            this.gv_itemNo.Tag = "query_a.ITEM_NO";
+            this.gv_itemNo.Visible = true;
+            this.gv_itemNo.VisibleIndex = 1;
+            this.gv_itemNo.Width = 94;
+            // 
+            // gv_guid
+            // 
+            this.gv_guid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_guid.AppearanceCell.Options.UseFont = true;
+            this.gv_guid.Caption = "guid ";
+            this.gv_guid.FieldName = "guid";
+            this.gv_guid.MinWidth = 50;
+            this.gv_guid.Name = "gv_guid";
+            this.gv_guid.OptionsColumn.AllowEdit = false;
+            this.gv_guid.Tag = "query_a.guid";
+            this.gv_guid.Visible = true;
+            this.gv_guid.VisibleIndex = 0;
+            this.gv_guid.Width = 94;
+            // 
+            // toolBarMenu1
+            // 
+            this.toolBarMenu1.chkParameter = "MES_QA_MJ,CHECK_DATE,STATUS,CHECK_USER";
+            this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
+            this.toolBarMenu1.guidKey = null;
+            this.toolBarMenu1.isSetBtn = false;
+            this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
+            this.toolBarMenu1.Name = "toolBarMenu1";
+            this.toolBarMenu1.rptParameter = null;
+            this.toolBarMenu1.Size = new System.Drawing.Size(1128, 80);
+            this.toolBarMenu1.TabIndex = 0;
+            this.toolBarMenu1.xlsInService = null;
+            this.toolBarMenu1.xlsOutParameter = null;
+            // 
+            // gcMain
+            // 
+            this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMain.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gcMain.Location = new System.Drawing.Point(0, 0);
+            this.gcMain.MainView = this.gridView1;
+            this.gcMain.Name = "gcMain";
+            this.gcMain.Size = new System.Drawing.Size(1126, 531);
+            this.gcMain.TabIndex = 1;
+            this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+            this.gridView1});
+            // 
+            // gridView1
+            // 
+            this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gridView1.Appearance.Row.Options.UseFont = true;
+            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.gv_guid,
+            this.gv_itemNo,
+            this.gv_createBy,
+            this.gv_createDate,
+            this.gv_lastupdateBy,
+            this.gv_lastupdateDate,
+            this.gv_checkUser,
+            this.gv_checkDate,
+            this.gv_status,
+            this.gv_itemId,
+            this.gv_suppNo});
+            this.gridView1.GridControl = this.gcMain;
+            this.gridView1.IndicatorWidth = 50;
+            this.gridView1.Name = "gridView1";
+            this.gridView1.OptionsFind.ShowSearchNavButtons = false;
+            this.gridView1.OptionsView.ShowAutoFilterRow = true;
+            this.gridView1.OptionsView.ShowGroupPanel = false;
+            // 
+            // xtraTabControl1
+            // 
+            this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
+            this.xtraTabControl1.Name = "xtraTabControl1";
+            this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
+            this.xtraTabControl1.Size = new System.Drawing.Size(1128, 602);
+            this.xtraTabControl1.TabIndex = 3;
+            this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
+            this.xtraTabPage1,
+            this.xtraTabPage2});
+            // 
+            // xtraTabPage1
+            // 
+            this.xtraTabPage1.Controls.Add(this.gcMain);
+            this.xtraTabPage1.Controls.Add(this.pageBar1);
+            this.xtraTabPage1.Name = "xtraTabPage1";
+            this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
+            this.xtraTabPage1.Text = "鏁版嵁鏌ヨ";
+            // 
+            // pageBar1
+            // 
+            this.pageBar1.CurrentPage = 1;
+            this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.pageBar1.Location = new System.Drawing.Point(0, 531);
+            this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
+            this.pageBar1.Name = "pageBar1";
+            this.pageBar1.RecordCount = 0;
+            this.pageBar1.RowsCount = 50;
+            this.pageBar1.Size = new System.Drawing.Size(1126, 39);
+            this.pageBar1.TabIndex = 3;
+            this.pageBar1.TotalPages = 0;
+            // 
+            // xtraTabPage2
+            // 
+            this.xtraTabPage2.Controls.Add(this.panel1);
+            this.xtraTabPage2.Name = "xtraTabPage2";
+            this.xtraTabPage2.PageEnabled = false;
+            this.xtraTabPage2.Size = new System.Drawing.Size(1126, 570);
+            this.xtraTabPage2.Text = "鏁版嵁缂栬緫";
+            // 
+            // panel1
+            // 
+            this.panel1.BackColor = System.Drawing.Color.White;
+            this.panel1.Controls.Add(this.lbGuid);
+            this.panel1.Controls.Add(this.lb_suppNo);
+            this.panel1.Controls.Add(this.txt_suppNo);
+            this.panel1.Controls.Add(this.lb_itemId);
+            this.panel1.Controls.Add(this.txt_itemId);
+            this.panel1.Controls.Add(this.lb_status);
+            this.panel1.Controls.Add(this.txt_status);
+            this.panel1.Controls.Add(this.lb_checkDate);
+            this.panel1.Controls.Add(this.txt_checkDate);
+            this.panel1.Controls.Add(this.lb_checkUser);
+            this.panel1.Controls.Add(this.txt_checkUser);
+            this.panel1.Controls.Add(this.lb_lastupdateDate);
+            this.panel1.Controls.Add(this.txt_lastupdateDate);
+            this.panel1.Controls.Add(this.lb_lastupdateBy);
+            this.panel1.Controls.Add(this.txt_lastupdateBy);
+            this.panel1.Controls.Add(this.lb_createDate);
+            this.panel1.Controls.Add(this.txt_createDate);
+            this.panel1.Controls.Add(this.lb_createBy);
+            this.panel1.Controls.Add(this.txt_createBy);
+            this.panel1.Controls.Add(this.lb_itemNo);
+            this.panel1.Controls.Add(this.txt_itemNo);
+            this.panel1.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.panel1.Location = new System.Drawing.Point(23, 20);
+            this.panel1.Name = "panel1";
+            this.panel1.Size = new System.Drawing.Size(1092, 524);
+            this.panel1.TabIndex = 1;
+            // 
+            // lbGuid
+            // 
+            this.lbGuid.AutoSize = true;
+            this.lbGuid.Location = new System.Drawing.Point(29, 125);
+            this.lbGuid.Name = "lbGuid";
+            this.lbGuid.Size = new System.Drawing.Size(0, 21);
+            this.lbGuid.TabIndex = 1;
+            // 
+            // Frm_MesQaMj
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1128, 682);
+            this.Controls.Add(this.xtraTabControl1);
+            this.Controls.Add(this.toolBarMenu1);
+            this.Name = "Frm_MesQaMj";
+            ((System.ComponentModel.ISupportInitialize)(this.txt_suppNo.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_itemId.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateDate.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateBy.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
+            this.xtraTabControl1.ResumeLayout(false);
+            this.xtraTabPage1.ResumeLayout(false);
+            this.xtraTabPage2.ResumeLayout(false);
+            this.panel1.ResumeLayout(false);
+            this.panel1.PerformLayout();
+            this.ResumeLayout(false);
+
+        }
+        #endregion
+        private UserControl.UcToolBarMenu toolBarMenu1;
+        private DevExpress.XtraGrid.GridControl gcMain;
+        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
+        private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
+        private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
+        private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
+        private UserControls.Data.UcPageBar pageBar1;
+        private System.Windows.Forms.Panel panel1;
+        private System.Windows.Forms.Label lbGuid;
+        //BQCreateConrolObejct
+        private DevExpress.XtraEditors.LabelControl lb_suppNo;
+        private DevExpress.XtraEditors.TextEdit txt_suppNo;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_suppNo;
+
+        private DevExpress.XtraEditors.LabelControl lb_itemId;
+        private DevExpress.XtraEditors.TextEdit txt_itemId;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_itemId;
+
+        private DevExpress.XtraEditors.LabelControl lb_status;
+        private DevExpress.XtraEditors.TextEdit txt_status;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_status;
+
+        private DevExpress.XtraEditors.LabelControl lb_checkDate;
+        private DevExpress.XtraEditors.TextEdit txt_checkDate;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_checkDate;
+
+        private DevExpress.XtraEditors.LabelControl lb_checkUser;
+        private DevExpress.XtraEditors.TextEdit txt_checkUser;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_checkUser;
+
+        private DevExpress.XtraEditors.LabelControl lb_lastupdateDate;
+        private DevExpress.XtraEditors.TextEdit txt_lastupdateDate;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_lastupdateDate;
+
+        private DevExpress.XtraEditors.LabelControl lb_lastupdateBy;
+        private DevExpress.XtraEditors.TextEdit txt_lastupdateBy;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_lastupdateBy;
+
+        private DevExpress.XtraEditors.LabelControl lb_createDate;
+        private DevExpress.XtraEditors.TextEdit txt_createDate;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_createDate;
+
+        private DevExpress.XtraEditors.LabelControl lb_createBy;
+        private DevExpress.XtraEditors.TextEdit txt_createBy;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_createBy;
+
+        private DevExpress.XtraEditors.LabelControl lb_itemNo;
+        private DevExpress.XtraEditors.TextEdit txt_itemNo;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_itemNo;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_guid;
+
+    }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs
new file mode 100644
index 0000000..a9243a2
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs
@@ -0,0 +1,331 @@
+using Gs.DevApp.DevFrm.QC.Models;
+using Gs.DevApp.Entity;
+using Gs.DevApp.ToolBox;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Drawing;
+using System.Windows.Forms;
+
+namespace Gs.DevApp.DevFrm.QC
+{
+    public partial class Frm_MesQaMj : DevExpress.XtraEditors.XtraForm
+    {
+        string _webServiceName = "MesQaMjManager/";
+        List<FilterEntity> _filterList = new List<FilterEntity>();
+        public Frm_MesQaMj()
+        {
+            InitializeComponent();
+            this.toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick;
+            this.toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
+            this.toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
+            this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
+            this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1;
+            this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
+            this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
+
+            toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
+            toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
+
+            gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
+            getPageList(1, UtilityHelper.GetPageSize());
+            pageBar1.PagerEvent += PageBar1_PagerEvent;
+            gridView1.CustomDrawRowIndicator += (s, e) =>
+            {
+                if (e.Info.IsRowIndicator && e.RowHandle >= 0)
+                {
+                    e.Info.DisplayText = (e.RowHandle + 1).ToString();
+                }
+            };
+            gridView1.CustomDrawEmptyForeground += (s, e) =>
+            {
+                string str = "鏆傛湭鏌ユ壘鍒板尮閰嶇殑鏁版嵁!";
+                Font f = new Font("寰蒋闆呴粦", 16);
+                Rectangle r = new Rectangle(gridView1.GridControl.Width / 2 - 100, e.Bounds.Top + 45, e.Bounds.Right - 5, e.Bounds.Height - 5);
+                e.Graphics.DrawString(str, f, Brushes.Gray, r);
+            };
+        }
+
+        /// <summary>
+        /// 鍙屽嚮浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void GcMain_MouseDoubleClick(object sender, MouseEventArgs e)
+        {
+            string rowGuid = Gs.DevApp.ToolBox.UtilityHelper.GetCurrentDoubleRow(gridView1, e, "guid");
+            if (!string.IsNullOrEmpty(rowGuid))
+                getModel(rowGuid, false, 999);
+        }
+        /// <summary>
+        /// 鍒嗛〉浜嬩欢
+        /// </summary>
+        /// <param name="curPage"></param>
+        /// <param name="pageSize"></param>
+        private void PageBar1_PagerEvent(int curPage, int pageSize)
+        {
+            getPageList(curPage, pageSize);
+        }
+        /// <summary>
+        /// 鏌ヨ浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
+        {
+            Gs.DevApp.UserControl.ShowFilter frm = new Gs.DevApp.UserControl.ShowFilter(gridView1.Columns, _filterList);
+            frm.UpdateParent += Frm_UpdateParent;
+            frm.ShowDialog();
+        }
+        /// <summary>
+        /// 鏌ヨ鍥炶皟
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Frm_UpdateParent(object sender, UpdateParentEventArgs e)
+        {
+            _filterList = e.FilterList;
+            getPageList(1, pageBar1.RowsCount);
+        }
+
+        /// <summary>
+        /// 鍙栨秷浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ToolBarMenu1_btnEscClick(object sender, EventArgs e)
+        {
+            UtilityHelper.JumpToTab(xtraTabControl1, 0);
+        }
+
+        /// <summary>
+        /// 鍒犻櫎浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e)
+        {
+            string rowGuid = "", rowName = "";
+            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_itemNo, gridView1);
+            if (string.IsNullOrEmpty(rowGuid))
+            {
+                ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+                return;
+            }
+            if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵"))
+                return;
+            List<dynamic> lst = new List<dynamic>();
+            lst.Add(rowGuid);
+            var _obj = lst;
+            try
+            {
+                string strJson = UtilityHelper.HttpPost("", _webServiceName + "DeleteModel", JsonConvert.SerializeObject(_obj));
+                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+                if (_rtn.rtnCode > 0)
+                {
+                    UtilityHelper.JumpToTab(xtraTabControl1, 0);
+                    getPageList(1, UtilityHelper.GetPageSize());
+                }
+                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+            }
+            catch (Exception ex)
+            {
+                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+            }
+        }
+
+        /// <summary>
+        /// 鍒锋柊浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
+        {
+            UtilityHelper.JumpToTab(xtraTabControl1, 0);
+            getPageList(1, UtilityHelper.GetPageSize());
+        }
+        /// <summary>
+        /// 淇敼浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
+        {
+            string rowGuid = "", rowName = "";
+            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_itemNo, gridView1);
+            if (string.IsNullOrEmpty(rowGuid))
+            {
+                ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+                return;
+            }
+            getModel(rowGuid, true, 1);
+        }
+        /// <summary>
+        /// 鏂板浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ToolBarMenu1_btnAddClick(object sender, EventArgs e)
+        {
+            UtilityHelper.JumpToTab(xtraTabControl1, 1);
+            lbGuid.Text = "";
+            UtilityHelper.CleanValueByControl(this.panel1.Controls, true);
+
+            txt_createBy.Enabled = false;
+            txt_createDate.Enabled = false;
+            txt_lastupdateBy.Enabled = false;
+            txt_lastupdateDate.Enabled = false;
+            txt_checkUser.Enabled = false;
+            txt_checkDate.Enabled = false;
+            txt_status.Enabled = false;
+
+        }
+        /// <summary>
+        /// 淇濆瓨浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
+        {
+            toolBarMenu1.isSetBtn = false;
+            if (string.IsNullOrEmpty(txt_itemNo.Text.Trim()))
+            {
+                Gs.DevApp.ToolBox.MsgHelper.Warning("鐗╂枡缂栫爜涓嶈兘涓虹┖锛�");
+                // txt_account.Focus();
+                return;
+            }
+            var _obj = new MesQaMj
+            {
+                Guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
+                ItemId = Convert.ToInt32(txt_itemId.Text.Trim()),
+                ItemNo =  txt_itemNo.Text.Trim(),
+            };
+            try
+            {
+                string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj));
+                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+                if (_rtn.rtnCode > 0)
+                {
+                    lbGuid.Text = _rtn.rtnData;
+                    toolBarMenu1.isSetBtn = true;
+                    UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false);
+                }
+            }
+            catch (Exception ex)
+            {
+                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="curPage">绗嚑椤�</param>
+        /// <param name="pageSize">姣忛〉鍑犳潯</param>
+        private void getPageList(int curPage, int pageSize)
+        {
+            System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
+            foreach (FilterEntity itm in _filterList)
+            {
+                _sbSqlWhere.Append(" and " + itm.fileId + itm.fileOper + "'" + itm.fileValue + "'");
+            }
+            PageQueryModel pgq = new PageQueryModel(curPage, pageSize, "create_date", "asc", "", _sbSqlWhere.ToString());
+            string json = JsonConvert.SerializeObject(pgq);
+            try
+            {
+                string strReturn = UtilityHelper.HttpPost("", _webServiceName + "GetListPage", json);
+                ReturnModel<PageListModel> dd = UtilityHelper.ReturnToTablePage(strReturn);
+                if (dd.rtnCode > 0)
+                {
+                    DataTable dt = dd.rtnData.list;
+                    gcMain.BindingContext = new BindingContext();
+                    gcMain.DataSource = dt;
+                    gcMain.ForceInitialize();
+                    int dddd = dd.rtnData.pages;//鎬婚〉
+                    pageBar1.TotalPages = dddd;
+                    pageBar1.RecordCount = dd.rtnData.total;//璁板綍鎬绘暟
+                    pageBar1.CurrentPage = curPage;//褰撳墠椤�
+                    pageBar1.RowsCount = pageSize;//姣忛〉鏄剧ず
+                    pageBar1.setTxt();
+                }
+                else
+                {
+                    ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg);
+                }
+            }
+            catch (Exception ex)
+            {
+                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+            }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="strGuid">涓婚敭</param>
+        /// <param name="isEdit">鏄惁鍙紪杈�</param>
+        /// <param name="tabIdx">閫夐」鍗″簭鍙�</param>
+        private void getModel(string strGuid, bool isEdit, int tabIdx)
+        {
+            if (string.IsNullOrEmpty(strGuid))
+            {
+                ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+                return;
+            }
+            UtilityHelper.JumpToTab(xtraTabControl1, tabIdx);
+            var _obj = new
+            {
+                guid = strGuid,//涓诲缓
+            };
+            try
+            {
+                string strJson = UtilityHelper.HttpPost("", _webServiceName + "GetModel", JsonConvert.SerializeObject(_obj));
+                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+                if (_rtn.rtnCode > 0)
+                {
+                    dynamic dy = _rtn.rtnData;
+                    lbGuid.Text = strGuid;
+                    UtilityHelper.SetValueByObj(this.panel1.Controls, dy, isEdit);
+
+                }
+                else
+                    ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+            }
+            catch (Exception ex)
+            {
+                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+            }
+        }
+
+
+        /// <summary>
+        ///     鍙嶅鏍�
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        /// <exception cref="NotImplementedException"></exception>
+        private void ToolBarMenu1_btnFChkClick(object sender, EventArgs e)
+        {
+            toolBarMenu1.guidKey = "";
+            string rowGuid, rowName;
+            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+                lbGuid, txt_itemId, gridView1);
+            toolBarMenu1.guidKey = rowGuid;
+        }
+
+        /// <summary>
+        ///     瀹℃牳浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ToolBarMenu1_btnChkClick(object sender, EventArgs e)
+        {
+            toolBarMenu1.guidKey = "";
+            string rowGuid, rowName;
+            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+                lbGuid, txt_itemId, gridView1);
+            toolBarMenu1.guidKey = rowGuid;
+        }
+    }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.resx b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.resx
new file mode 100644
index 0000000..d58980a
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.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/DevFrm/QC/Models/MesQaMj.cs b/DevApp/Gs.DevApp/DevFrm/QC/Models/MesQaMj.cs
new file mode 100644
index 0000000..a4dedf2
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Models/MesQaMj.cs
@@ -0,0 +1,66 @@
+锘縰sing System;
+
+namespace Gs.DevApp.DevFrm.QC.Models
+{
+/// <summary>
+///     鍏嶆琛�
+/// </summary> 
+public class MesQaMj
+{
+    /// <summary>
+    ///     榛樿鍊�: (newid())
+    /// </summary>
+    public Guid Guid { get; set; }
+
+    /// <summary>
+    ///     鐗╂枡缂栫爜
+    /// </summary>
+    public string ItemNo { get; set; }
+
+    /// <summary>
+    ///     鍒涘缓浜�
+    /// </summary>
+    public string CreateBy { get; set; }
+
+    /// <summary>
+    ///     鍒涘缓鏃堕棿
+    /// </summary>
+    public DateTime? CreateDate { get; set; }
+
+    /// <summary>
+    ///     鏈�鍚庢洿鏂颁汉
+    /// </summary>
+    public string LastupdateBy { get; set; }
+
+    /// <summary>
+    ///     鏈�鍚庢洿鏂版椂闂�
+    /// </summary>
+    public DateTime? LastupdateDate { get; set; }
+
+    /// <summary>
+    ///     瀹℃牳浜�
+    /// </summary>
+    public string CheckUser { get; set; }
+
+    /// <summary>
+    ///     瀹℃牳鏃堕棿
+    /// </summary>
+    public DateTime? CheckDate { get; set; }
+
+    /// <summary>
+    ///     瀹℃牳鏍囪瘑
+    ///     榛樿鍊�: ((0))
+    /// </summary>
+    public int? Status { get; set; }
+
+    /// <summary>
+    ///     鐗╂枡ID
+    /// </summary>
+    public int? ItemId { get; set; }
+
+    /// <summary>
+    ///     渚涘簲鍟嗙紪鐮�
+    /// </summary>
+    public string SuppNo { get; set; }
+}
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 30a7fe7..185da0a 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -229,11 +229,17 @@
     <Compile Include="DevFrm\QC\Frm_IQCLookups.Designer.cs">
       <DependentUpon>Frm_IQCLookups.cs</DependentUpon>
     </Compile>
+    <Compile Include="DevFrm\QC\Frm_MesQaItemsDetect01.Designer.cs">
+      <DependentUpon>Frm_MesQaItemsDetect01.cs</DependentUpon>
+    </Compile>
     <Compile Include="DevFrm\QC\Frm_MesQaItemsDetect01.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="DevFrm\QC\Frm_MesQaItemsDetect01.Designer.cs">
-      <DependentUpon>Frm_MesQaItemsDetect01.cs</DependentUpon>
+    <Compile Include="DevFrm\QC\Frm_MesQaMj.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="DevFrm\QC\Frm_MesQaMj.Designer.cs">
+      <DependentUpon>Frm_MesQaMj.cs</DependentUpon>
     </Compile>
     <Compile Include="DevFrm\QC\Frm_MesQmAql1.cs">
       <SubType>Form</SubType>
@@ -253,6 +259,7 @@
     <Compile Include="DevFrm\QC\Frm_MesSysLookups.Designer.cs">
       <DependentUpon>Frm_MesSysLookups.cs</DependentUpon>
     </Compile>
+    <Compile Include="DevFrm\QC\Models\MesQaMj.cs" />
     <Compile Include="DevFrm\QC\Models\MesQaItemsDetect01.cs" />
     <Compile Include="DevFrm\QC\Models\MesQaItemsDetectDetail12.cs" />
     <Compile Include="DevFrm\QC\Models\MesQaItemsDetectDetail5.cs" />
@@ -505,6 +512,9 @@
     <EmbeddedResource Include="DevFrm\QC\Frm_MesQaItemsDetect01.resx">
       <DependentUpon>Frm_MesQaItemsDetect01.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="DevFrm\QC\Frm_MesQaMj.resx">
+      <DependentUpon>Frm_MesQaMj.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="DevFrm\QC\Frm_MesQmAql1.resx">
       <DependentUpon>Frm_MesQmAql1.cs</DependentUpon>
     </EmbeddedResource>
@@ -706,6 +716,9 @@
     <None Include="Resources\spellcheck_16x16.png" />
     <None Include="Resources\clearformatting_16x16.png" />
     <None Include="Resources\sortandfilter_16x16.png" />
+    <Compile Include="DevFrm\QC\Models\MesQaItemsDetect01.cs" />
+    <Compile Include="DevFrm\QC\Models\MesQaItemsDetectDetail12.cs" />
+    <Compile Include="DevFrm\QC\Models\MesQaItemsDetectDetail5.cs" />
     <Content Include="Resources\user_16x16.png" />
   </ItemGroup>
   <ItemGroup />

--
Gitblit v1.9.3