From ddcd06bd597a722931e9d154d70b3cf57759b850 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 26 六月 2025 11:03:07 +0800
Subject: [PATCH] srm名单

---
 DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.Designer.cs    |  147 ++++++----
 DevApp/Gs.DevApp/DevFrm/RkQC/SelectCqsq.Designer.cs           |   45 +++
 DevApp/Gs.DevApp/DevFrm/RkQC/SelectCqsq.cs                    |   23 -
 DevApp/Gs.DevApp/DevFrm/BasicData/Frm_SupplierSrm.resx        |  120 ++++++++
 DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqsq.Designer.cs             |  142 ++++-----
 DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqsq.cs                      |   20 
 DevApp/Gs.DevApp/DevFrm/BasicData/Frm_SupplierSrm.cs          |  107 +++++++
 DevApp/Gs.DevApp/Gs.DevApp.csproj                             |    9 
 DevApp/Gs.DevApp/App.config                                   |    4 
 DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.cs             |   31 ++
 DevApp/Gs.DevApp/DevFrm/BasicData/Frm_SupplierSrm.Designer.cs |  165 +++++++++++
 11 files changed, 649 insertions(+), 164 deletions(-)

diff --git a/DevApp/Gs.DevApp/App.config b/DevApp/Gs.DevApp/App.config
index f77fd81..3d80851 100644
--- a/DevApp/Gs.DevApp/App.config
+++ b/DevApp/Gs.DevApp/App.config
@@ -28,9 +28,9 @@
 		</assemblyBinding>
 	</runtime>
     <appSettings>
-		 <!--<add key="WebApiUrl" value="http://localhost:5263/" />-->
+		 <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:81/" />--> 
         <add key="LogPath" value="logs" />
         <add key="ProductName" value="G-MES V2.0" />
         <add key="PageSize" value="50" />
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.Designer.cs
index 6b5fabf..2446f86 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.Designer.cs
@@ -33,14 +33,14 @@
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
-            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 rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
             this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
             this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
             this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -59,10 +59,12 @@
             this.gv_createDate = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.pageBar1 = new UserControls.Data.UcPageBar();
             this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
             this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
             this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
+            this.btnCopy = new DevExpress.XtraEditors.SimpleButton();
             this.lbGuid = new System.Windows.Forms.Label();
             this.txt_suppName = new DevExpress.XtraEditors.MemoEdit();
             this.txt_fforbidstatus = new DevExpress.XtraEditors.TextEdit();
@@ -78,7 +80,6 @@
             this.txt_stras = new DevExpress.XtraEditors.TextEdit();
             this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
             this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
-            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -90,8 +91,9 @@
             this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
             this.tips = new DevExpress.Utils.ToolTipController(this.components);
-            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
             this.xtraTabControl1.SuspendLayout();
             this.xtraTabPage1.SuspendLayout();
@@ -124,7 +126,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_stras.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
@@ -136,6 +137,8 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
             this.SuspendLayout();
             // 
             // toolBarMenu1
@@ -379,6 +382,16 @@
             this.gridColumn4.VisibleIndex = 9;
             this.gridColumn4.Width = 94;
             // 
+            // gridColumn5
+            // 
+            this.gridColumn5.Caption = "鏁版嵁鐘舵��";
+            this.gridColumn5.FieldName = "dataType";
+            this.gridColumn5.MinWidth = 25;
+            this.gridColumn5.Name = "gridColumn5";
+            this.gridColumn5.Visible = true;
+            this.gridColumn5.VisibleIndex = 10;
+            this.gridColumn5.Width = 94;
+            // 
             // pageBar1
             // 
             this.pageBar1.CurrentPage = 1;
@@ -420,6 +433,7 @@
             // 
             // layoutMx1
             // 
+            this.layoutMx1.Controls.Add(this.btnCopy);
             this.layoutMx1.Controls.Add(this.lbGuid);
             this.layoutMx1.Controls.Add(this.txt_suppName);
             this.layoutMx1.Controls.Add(this.txt_fforbidstatus);
@@ -438,11 +452,21 @@
             this.layoutControlItem13});
             this.layoutMx1.Location = new System.Drawing.Point(0, 0);
             this.layoutMx1.Name = "layoutMx1";
-            this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1108, 0, 812, 500);
+            this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(548, 483, 812, 500);
             this.layoutMx1.Root = this.Root;
             this.layoutMx1.Size = new System.Drawing.Size(990, 153);
             this.layoutMx1.TabIndex = 0;
             this.layoutMx1.Text = "layoutControl1";
+            // 
+            // btnCopy
+            // 
+            this.btnCopy.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
+            this.btnCopy.Location = new System.Drawing.Point(738, 111);
+            this.btnCopy.Name = "btnCopy";
+            this.btnCopy.Size = new System.Drawing.Size(116, 27);
+            this.btnCopy.StyleController = this.layoutMx1;
+            this.btnCopy.TabIndex = 444;
+            this.btnCopy.Text = "鍔犲叆SRM鍚嶅崟";
             // 
             // lbGuid
             // 
@@ -579,7 +603,6 @@
             this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
             this.Root.GroupBordersVisible = false;
             this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
-            this.layoutControlItem1,
             this.layoutControlItem2,
             this.layoutControlItem3,
             this.layoutControlItem4,
@@ -590,46 +613,39 @@
             this.layoutControlItem9,
             this.layoutControlItem10,
             this.layoutControlItem11,
-            this.layoutControlItem12});
+            this.layoutControlItem12,
+            this.layoutControlItem14,
+            this.layoutControlItem1});
             this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.Root.Name = "Root";
-            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;
+            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[] {
-            columnDefinition5,
-            columnDefinition6,
-            columnDefinition7,
-            columnDefinition8});
-            rowDefinition5.Height = 100D;
-            rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition6.Height = 100D;
-            rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition7.Height = 100D;
-            rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition8.Height = 100D;
-            rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition1,
+            columnDefinition2,
+            columnDefinition3,
+            columnDefinition4});
+            rowDefinition1.Height = 100D;
+            rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition2.Height = 100D;
+            rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition3.Height = 100D;
+            rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition4.Height = 100D;
+            rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
             this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
-            rowDefinition5,
-            rowDefinition6,
-            rowDefinition7,
-            rowDefinition8});
+            rowDefinition1,
+            rowDefinition2,
+            rowDefinition3,
+            rowDefinition4});
             this.Root.Size = new System.Drawing.Size(990, 153);
             this.Root.TextVisible = false;
-            // 
-            // layoutControlItem1
-            // 
-            this.layoutControlItem1.Control = this.txt_id;
-            this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
-            this.layoutControlItem1.Name = "layoutControlItem1";
-            this.layoutControlItem1.Size = new System.Drawing.Size(242, 33);
-            this.layoutControlItem1.Text = "渚涘簲鍟咺D";
-            this.layoutControlItem1.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem2
             // 
@@ -747,15 +763,29 @@
             this.layoutControlItem12.Text = "澶囨敞";
             this.layoutControlItem12.TextSize = new System.Drawing.Size(75, 18);
             // 
-            // gridColumn5
+            // layoutControlItem14
             // 
-            this.gridColumn5.Caption = "鏁版嵁鐘舵��";
-            this.gridColumn5.FieldName = "dataType";
-            this.gridColumn5.MinWidth = 25;
-            this.gridColumn5.Name = "gridColumn5";
-            this.gridColumn5.Visible = true;
-            this.gridColumn5.VisibleIndex = 10;
-            this.gridColumn5.Width = 94;
+            this.layoutControlItem14.Control = this.btnCopy;
+            this.layoutControlItem14.Location = new System.Drawing.Point(726, 99);
+            this.layoutControlItem14.MaxSize = new System.Drawing.Size(120, 31);
+            this.layoutControlItem14.MinSize = new System.Drawing.Size(119, 31);
+            this.layoutControlItem14.Name = "layoutControlItem14";
+            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 3;
+            this.layoutControlItem14.Size = new System.Drawing.Size(244, 34);
+            this.layoutControlItem14.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.layoutControlItem14.Text = "鍔犲叆SRM";
+            this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem14.TextVisible = false;
+            // 
+            // layoutControlItem1
+            // 
+            this.layoutControlItem1.Control = this.txt_id;
+            this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
+            this.layoutControlItem1.Name = "layoutControlItem1";
+            this.layoutControlItem1.Size = new System.Drawing.Size(242, 33);
+            this.layoutControlItem1.Text = "渚涘簲鍟咺D";
+            this.layoutControlItem1.TextSize = new System.Drawing.Size(75, 18);
             // 
             // Frm_Supplier
             // 
@@ -798,7 +828,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_stras.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
@@ -810,6 +839,8 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -848,7 +879,6 @@
         private DevExpress.XtraEditors.TextEdit txt_id;
         private DevExpress.XtraLayout.LayoutControl layoutMx1;
         private DevExpress.XtraLayout.LayoutControlGroup Root;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
@@ -865,5 +895,8 @@
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
+        private DevExpress.XtraEditors.SimpleButton btnCopy;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
     }
 }
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.cs
index 1f33c65..411b475 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.cs
@@ -1,4 +1,7 @@
 锘縰sing DevExpress.XtraEditors;
+using DevExpress.XtraGrid.Views.Base.ViewInfo;
+using DevExpress.XtraLayout.Customization;
+using Gs.DevApp.DevFrm.BasicData;
 using Gs.DevApp.Entity;
 using Gs.DevApp.ToolBox;
 using Gs.DevApp.UserControl;
@@ -34,6 +37,32 @@
             }, lbGuid);
             getPageList(1);
             pageBar1.PagerEvent += PageBar1_PagerEvent;
+            btnCopy.Click += (s, e) =>
+            {
+                if (!MsgHelper.AskQuestion("纭畾鎶婅渚涘簲鍟嗗姞鍏RM鍚嶅崟鍚楋紵"))
+                    return;
+                var _obj = new
+                {
+                    suppId = txt_id.Text.Trim(),
+                    joinType = 1,
+                };
+                try
+                {
+                    var strJson = UtilityHelper.HttpPost("", _webServiceName + "SrmJoin",JsonConvert.SerializeObject(_obj));
+                    var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+                    if (_rtn.rtnCode > 0)
+                    {
+                        Frm_SupplierSrm frm = new Frm_SupplierSrm();
+                        frm.ShowDialog();
+                    }
+                    else
+                        MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
+                }
+                catch (Exception ex)
+                {
+                    MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+                }
+            };
         }
         private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
         {
@@ -107,7 +136,7 @@
         /// <param name="pageSize">姣忛〉鍑犳潯</param>
         private void getPageList(int curPage)
         {
-            gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+            gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
             var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "org.FNumber asc ,a.supp_no",
                 "asc", "", _sbSqlWhere.ToString());
             var json = JsonConvert.SerializeObject(pgq);
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_SupplierSrm.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_SupplierSrm.Designer.cs
new file mode 100644
index 0000000..854d8e2
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_SupplierSrm.Designer.cs
@@ -0,0 +1,165 @@
+锘縩amespace Gs.DevApp.DevFrm.BasicData
+{
+    partial class Frm_SupplierSrm
+    {
+        /// <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()
+        {
+            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
+            this.gcMain = new DevExpress.XtraGrid.GridControl();
+            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.gv_operationTime = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_userName = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_operationTable = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_del = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // gcMain
+            // 
+            this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMain.Location = new System.Drawing.Point(0, 0);
+            this.gcMain.MainView = this.gridView1;
+            this.gcMain.Name = "gcMain";
+            this.gcMain.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+            this.repositoryItemButtonEdit1});
+            this.gcMain.Size = new System.Drawing.Size(933, 590);
+            this.gcMain.TabIndex = 2;
+            this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+            this.gridView1});
+            // 
+            // gridView1
+            // 
+            this.gridView1.Appearance.Row.Options.UseFont = true;
+            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.gv_operationTime,
+            this.gv_userName,
+            this.gv_operationTable,
+            this.gv_del});
+            this.gridView1.GridControl = this.gcMain;
+            this.gridView1.Name = "gridView1";
+            this.gridView1.OptionsFind.ShowSearchNavButtons = false;
+            this.gridView1.OptionsView.ShowAutoFilterRow = true;
+            this.gridView1.OptionsView.ShowGroupPanel = false;
+            // 
+            // gv_operationTime
+            // 
+            this.gv_operationTime.AppearanceCell.Options.UseFont = true;
+            this.gv_operationTime.Caption = "鍔犲叆鏃堕棿";
+            this.gv_operationTime.FieldName = "joinDate";
+            this.gv_operationTime.MinWidth = 180;
+            this.gv_operationTime.Name = "gv_operationTime";
+            this.gv_operationTime.OptionsColumn.ReadOnly = true;
+            this.gv_operationTime.ToolTip = "query_a.OPERATION_TIME";
+            this.gv_operationTime.Visible = true;
+            this.gv_operationTime.VisibleIndex = 2;
+            this.gv_operationTime.Width = 390;
+            // 
+            // gv_userName
+            // 
+            this.gv_userName.AppearanceCell.Options.UseFont = true;
+            this.gv_userName.Caption = "渚涘簲鍟嗗悕绉�";
+            this.gv_userName.FieldName = "suppName";
+            this.gv_userName.MinWidth = 80;
+            this.gv_userName.Name = "gv_userName";
+            this.gv_userName.OptionsColumn.ReadOnly = true;
+            this.gv_userName.Tag = "query_a.USER_NAME";
+            this.gv_userName.Visible = true;
+            this.gv_userName.VisibleIndex = 1;
+            this.gv_userName.Width = 310;
+            // 
+            // gv_operationTable
+            // 
+            this.gv_operationTable.AppearanceCell.Options.UseFont = true;
+            this.gv_operationTable.Caption = "浣跨敤缁勭粐";
+            this.gv_operationTable.FieldName = "orgName";
+            this.gv_operationTable.MinWidth = 50;
+            this.gv_operationTable.Name = "gv_operationTable";
+            this.gv_operationTable.OptionsColumn.ReadOnly = true;
+            this.gv_operationTable.Tag = "query_a.OPERATION_TABLE";
+            this.gv_operationTable.Visible = true;
+            this.gv_operationTable.VisibleIndex = 0;
+            this.gv_operationTable.Width = 203;
+            // 
+            // gv_del
+            // 
+            this.gv_del.Caption = "绉诲嚭";
+            this.gv_del.ColumnEdit = this.repositoryItemButtonEdit1;
+            this.gv_del.MinWidth = 25;
+            this.gv_del.Name = "gv_del";
+            this.gv_del.Visible = true;
+            this.gv_del.VisibleIndex = 3;
+            this.gv_del.Width = 94;
+            // 
+            // repositoryItemButtonEdit1
+            // 
+            this.repositoryItemButtonEdit1.AutoHeight = false;
+            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+            this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
+            this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
+            this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
+            // 
+            // Frm_SupplierSrm
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(933, 590);
+            this.Controls.Add(this.gcMain);
+            this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
+            this.MaximizeBox = false;
+            this.MinimizeBox = false;
+            this.Name = "Frm_SupplierSrm";
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+            this.Text = "SRM鍚嶅崟鍒楄〃";
+            this.TopMost = true;
+            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private DevExpress.XtraGrid.GridControl gcMain;
+        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_operationTime;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_operationTable;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_userName;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_del;
+        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
+    }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_SupplierSrm.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_SupplierSrm.cs
new file mode 100644
index 0000000..c739f1e
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_SupplierSrm.cs
@@ -0,0 +1,107 @@
+锘縰sing DevExpress.XtraEditors;
+using Gs.DevApp.Entity;
+using Gs.DevApp.ToolBox;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace Gs.DevApp.DevFrm.BasicData
+{
+    public partial class Frm_SupplierSrm : DevExpress.XtraEditors.XtraForm
+    {
+       
+        public Frm_SupplierSrm()
+        {
+            InitializeComponent();
+            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", (value) =>
+            {
+            }, null, false);
+            getPageList(1, 999999);
+        }
+
+        /// <summary>
+        /// </summary>
+        /// <param name="curPage">绗嚑椤�</param>
+        /// <param name="pageSize">姣忛〉鍑犳潯</param>
+        private void getPageList(int curPage, int pageSize)
+        {
+            var _sbSqlWhere = new StringBuilder();
+            _sbSqlWhere.Append(" and 1=1");
+            var pgq = new PageQueryModel(curPage, 999999, "b.create_date",
+                "desc", "", _sbSqlWhere.ToString());
+            var json = JsonConvert.SerializeObject(pgq);
+            try
+            {
+                var strReturn =
+                    UtilityHelper.HttpPost("", "MesSupplierManager/GetSrmListPage", json);
+                var dd = UtilityHelper.ReturnToTablePage(strReturn);
+                if (dd.rtnCode > 0)
+                {
+                    DataTable dt = dd.rtnData.list;
+                    gcMain.BindingContext = new BindingContext();
+                    gcMain.DataSource = dt;
+                    gcMain.ForceInitialize();
+                    gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
+                }
+                else
+                {
+                    ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg);
+                }
+            }
+            catch (Exception ex)
+            {
+                MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+            }
+        }
+
+
+        /// <summary>
+        /// 绉诲嚭
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
+        {
+            var rowhandle = gridView1.FocusedRowHandle;
+            if (rowhandle < 0)
+                return;
+            if (e.Button.Index == 0)
+            {
+                var dr = gridView1.GetDataRow(rowhandle);
+                var mxGuid = dr["id"].ToString();
+                if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾绉诲嚭鍚楋紵"))
+                    return;
+                var _obj = new
+                {
+                    suppId = mxGuid,
+                    joinType = -1,
+                };
+                try
+                {
+                    var strJson = UtilityHelper.HttpPost("",
+                        "MesSupplierManager/" + "SrmJoin",
+                        JsonConvert.SerializeObject(_obj));
+                    var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+                    if (_rtn.rtnCode > 0)
+                    {
+                        MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
+                        getPageList(1, 999999);
+                    }
+                    else
+                        MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
+                }
+                catch (Exception ex)
+                {
+                    MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_SupplierSrm.resx b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_SupplierSrm.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_SupplierSrm.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/RkQC/Frm_Cqsq.Designer.cs b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqsq.Designer.cs
index 4003438..f10beb3 100644
--- a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqsq.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqsq.Designer.cs
@@ -29,18 +29,18 @@
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.XtraLayout.ColumnDefinition 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 rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
             this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
             this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
             this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -103,8 +103,7 @@
             this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
             this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
             this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
             this.gcMx2 = new DevExpress.XtraGrid.GridControl();
@@ -520,7 +519,7 @@
             this.txt_remark.Location = new System.Drawing.Point(385, 74);
             this.txt_remark.Name = "txt_remark";
             this.txt_remark.Properties.Appearance.Options.UseFont = true;
-            this.txt_remark.Size = new System.Drawing.Size(436, 24);
+            this.txt_remark.Size = new System.Drawing.Size(165, 24);
             this.txt_remark.StyleController = this.layoutMx1;
             this.txt_remark.TabIndex = 252;
             // 
@@ -610,29 +609,29 @@
             this.layoutControlItem11});
             this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.Root.Name = "Root";
-            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition1.Width = 100D;
-            columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition2.Width = 100D;
-            columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition3.Width = 100D;
-            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.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
-            columnDefinition1,
-            columnDefinition2,
-            columnDefinition3,
-            columnDefinition4});
-            rowDefinition1.Height = 100D;
-            rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition2.Height = 100D;
-            rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition3.Height = 100D;
-            rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition5,
+            columnDefinition6,
+            columnDefinition7,
+            columnDefinition8});
+            rowDefinition4.Height = 100D;
+            rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition5.Height = 100D;
+            rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition6.Height = 100D;
+            rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
             this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
-            rowDefinition1,
-            rowDefinition2,
-            rowDefinition3});
+            rowDefinition4,
+            rowDefinition5,
+            rowDefinition6});
             this.Root.Size = new System.Drawing.Size(1105, 113);
             this.Root.TextVisible = false;
             // 
@@ -683,9 +682,8 @@
             this.layoutControlItem7.Location = new System.Drawing.Point(271, 62);
             this.layoutControlItem7.Name = "layoutControlItem7";
             this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem7.OptionsTableLayoutItem.ColumnSpan = 2;
             this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem7.Size = new System.Drawing.Size(542, 31);
+            this.layoutControlItem7.Size = new System.Drawing.Size(271, 31);
             this.layoutControlItem7.Text = "鐢宠澶囨敞";
             this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
             // 
@@ -794,8 +792,7 @@
             this.gridColumn17,
             this.gridColumn20,
             this.gridColumn21,
-            this.gridColumn22,
-            this.gridColumn23});
+            this.gvMxDel});
             this.gvMx1.GridControl = this.gcMx1;
             this.gvMx1.Name = "gvMx1";
             this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -828,6 +825,8 @@
             this.gridColumn9.MinWidth = 50;
             this.gridColumn9.Name = "gridColumn9";
             this.gridColumn9.Tag = "query_a.ITEM_ID";
+            this.gridColumn9.Visible = true;
+            this.gridColumn9.VisibleIndex = 0;
             this.gridColumn9.Width = 94;
             // 
             // gridColumn10
@@ -837,7 +836,7 @@
             this.gridColumn10.MinWidth = 25;
             this.gridColumn10.Name = "gridColumn10";
             this.gridColumn10.Visible = true;
-            this.gridColumn10.VisibleIndex = 1;
+            this.gridColumn10.VisibleIndex = 2;
             this.gridColumn10.Width = 94;
             // 
             // gridColumn11
@@ -847,7 +846,7 @@
             this.gridColumn11.MinWidth = 25;
             this.gridColumn11.Name = "gridColumn11";
             this.gridColumn11.Visible = true;
-            this.gridColumn11.VisibleIndex = 2;
+            this.gridColumn11.VisibleIndex = 3;
             this.gridColumn11.Width = 94;
             // 
             // gridColumn12
@@ -857,31 +856,31 @@
             this.gridColumn12.MinWidth = 25;
             this.gridColumn12.Name = "gridColumn12";
             this.gridColumn12.Visible = true;
-            this.gridColumn12.VisibleIndex = 3;
+            this.gridColumn12.VisibleIndex = 4;
             this.gridColumn12.Width = 94;
             // 
             // gridColumn13
             // 
             this.gridColumn13.AppearanceCell.Options.UseFont = true;
             this.gridColumn13.Caption = "鏁伴噺";
-            this.gridColumn13.FieldName = "quantity";
+            this.gridColumn13.FieldName = "itemBarCodeSl";
             this.gridColumn13.MinWidth = 50;
             this.gridColumn13.Name = "gridColumn13";
             this.gridColumn13.Tag = "yz_quantity_0_edit";
             this.gridColumn13.Visible = true;
-            this.gridColumn13.VisibleIndex = 4;
+            this.gridColumn13.VisibleIndex = 5;
             this.gridColumn13.Width = 94;
             // 
             // gridColumn14
             // 
             this.gridColumn14.AppearanceCell.Options.UseFont = true;
-            this.gridColumn14.Caption = "鏈夋晥鏈熻嚦(澶嶆鍓�)";
+            this.gridColumn14.Caption = "鏈夋晥鏈熻嚦";
             this.gridColumn14.FieldName = "yxqDate";
             this.gridColumn14.MinWidth = 50;
             this.gridColumn14.Name = "gridColumn14";
             this.gridColumn14.Tag = "yz_quantity_0_edit";
             this.gridColumn14.Visible = true;
-            this.gridColumn14.VisibleIndex = 5;
+            this.gridColumn14.VisibleIndex = 6;
             this.gridColumn14.Width = 94;
             // 
             // gridColumn15
@@ -891,19 +890,19 @@
             this.gridColumn15.MinWidth = 25;
             this.gridColumn15.Name = "gridColumn15";
             this.gridColumn15.Visible = true;
-            this.gridColumn15.VisibleIndex = 7;
+            this.gridColumn15.VisibleIndex = 8;
             this.gridColumn15.Width = 94;
             // 
             // gridColumn16
             // 
             this.gridColumn16.AppearanceCell.Options.UseFont = true;
-            this.gridColumn16.Caption = "鍓╀綑瓒呮湡澶╂暟";
+            this.gridColumn16.Caption = "鍓╀綑澶╂暟";
             this.gridColumn16.FieldName = "syts";
             this.gridColumn16.MinWidth = 50;
             this.gridColumn16.Name = "gridColumn16";
             this.gridColumn16.Tag = "edit";
             this.gridColumn16.Visible = true;
-            this.gridColumn16.VisibleIndex = 6;
+            this.gridColumn16.VisibleIndex = 7;
             this.gridColumn16.Width = 94;
             // 
             // gridColumn17
@@ -913,17 +912,17 @@
             this.gridColumn17.MinWidth = 25;
             this.gridColumn17.Name = "gridColumn17";
             this.gridColumn17.Visible = true;
-            this.gridColumn17.VisibleIndex = 0;
+            this.gridColumn17.VisibleIndex = 1;
             this.gridColumn17.Width = 94;
             // 
             // gridColumn20
             // 
-            this.gridColumn20.Caption = "鍙栧嚭搴撲綅";
+            this.gridColumn20.Caption = "褰撳墠搴撲綅";
             this.gridColumn20.FieldName = "qckw";
             this.gridColumn20.MinWidth = 25;
             this.gridColumn20.Name = "gridColumn20";
             this.gridColumn20.Visible = true;
-            this.gridColumn20.VisibleIndex = 8;
+            this.gridColumn20.VisibleIndex = 9;
             this.gridColumn20.Width = 94;
             // 
             // gridColumn21
@@ -933,36 +932,26 @@
             this.gridColumn21.MinWidth = 25;
             this.gridColumn21.Name = "gridColumn21";
             this.gridColumn21.Visible = true;
-            this.gridColumn21.VisibleIndex = 9;
+            this.gridColumn21.VisibleIndex = 10;
             this.gridColumn21.Width = 94;
             // 
-            // gridColumn22
+            // gvMxDel
             // 
-            this.gridColumn22.Caption = "鏈夋晥鏈熻嚦(澶嶆鍚�)";
-            this.gridColumn22.FieldName = "yxqDate2";
-            this.gridColumn22.MinWidth = 25;
-            this.gridColumn22.Name = "gridColumn22";
-            this.gridColumn22.Visible = true;
-            this.gridColumn22.VisibleIndex = 10;
-            this.gridColumn22.Width = 94;
-            // 
-            // gridColumn23
-            // 
-            this.gridColumn23.Caption = "绉诲嚭";
-            this.gridColumn23.ColumnEdit = this.repositoryItemButtonEdit1;
-            this.gridColumn23.MinWidth = 25;
-            this.gridColumn23.Name = "gridColumn23";
-            this.gridColumn23.Visible = true;
-            this.gridColumn23.VisibleIndex = 11;
-            this.gridColumn23.Width = 94;
+            this.gvMxDel.Caption = "绉诲嚭";
+            this.gvMxDel.ColumnEdit = this.repositoryItemButtonEdit1;
+            this.gvMxDel.MinWidth = 25;
+            this.gvMxDel.Name = "gvMxDel";
+            this.gvMxDel.Visible = true;
+            this.gvMxDel.VisibleIndex = 11;
+            this.gvMxDel.Width = 94;
             // 
             // repositoryItemButtonEdit1
             // 
             this.repositoryItemButtonEdit1.AutoHeight = false;
-            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
-            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+            editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+            editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
             this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
             this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
             this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
             this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -1252,8 +1241,7 @@
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn17;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn20;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn21;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn22;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn23;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
diff --git a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqsq.cs b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqsq.cs
index 091c7cf..e389197 100644
--- a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqsq.cs
+++ b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqsq.cs
@@ -77,11 +77,10 @@
                             _row["itemNo"] = dym.itemNo;
                             _row["itemName"] = dym.itemName;
                             _row["itemModel"] = dym.itemModel;
-                            _row["quantity"]= dym.quantity;
+                            _row["itemBarCodeSl"] = dym.itemBarCodeSl;
                             _row["yxqDate"] = dym.yxqDate;
                             _row["syts"] = dym.syts;
                             _row["cjcs"] = dym.cjcs;
-                            _row["yxqDate2"] = dym.yxqDate2;
                             _row["qckw"] = dym.qckw;
                             _Table.Rows.Add(_row);
                         }
@@ -96,7 +95,7 @@
                     }
                     catch (Exception ex)
                     {
-                        MessageBox.Show(ex.Message);
+                        Gs.DevApp.ToolBox.MsgHelper.ShowError(ex.Message);
                     }
                 };
                 frm.ShowDialog();
@@ -277,6 +276,7 @@
             {
                 List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
                 gvList.Add(gvMx2);
+                gvList.Add(gvMx1);
                 UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList);
             }
         }
@@ -333,7 +333,7 @@
             gvMx1.UpdateCurrentRow();
             if (gvMx1.DataRowCount <= 0)
             {
-                MsgHelper.ShowError("鏄庣粏涓嶈兘涓虹┖锛岃閫夋嫨浣犵殑鏀舵枡鏄庣粏锛�");
+                MsgHelper.ShowError("鏄庣粏涓嶈兘涓虹┖锛岃閫夋嫨浣犵殑鏉$爜鏄庣粏锛�");
                 return;
             }
             for (var i = 0; i < gvMx1.DataRowCount; i++)
@@ -429,7 +429,7 @@
             if (toolBarMenu1.currentAction == "edit") isEdit = true;
             if (string.IsNullOrEmpty(strGuid))
             {
-                ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+                ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
                 return;
             }
             var _obj = new
@@ -470,13 +470,13 @@
                     JArray array2 = new JArray();
                     foreach (var a in _job["rtnData"]["list2"])
                     {
-                        array.Add(a);
+                        array2.Add(a);
                     }
                     DataTable dt2 = JsonConvert.DeserializeObject<DataTable>(array2.ToString());
                     if (dt2.Rows.Count > 0)
                     {
                         gcMx2.BindingContext = new BindingContext();
-                        gcMx2.DataSource = dt;
+                        gcMx2.DataSource = dt2;
                         gcMx2.ForceInitialize();
                         gvMx2.BestFitColumns();
                         Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx2);
@@ -590,13 +590,15 @@
                     var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                     if (_rtn.rtnCode > 0)
                     {
+                        MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
                         getModel(lbGuid.Text);
                     }
-                    MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+                    else
+                        MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
                 }
                 catch (Exception ex)
                 {
-                    MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+                    MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
                 }
             }
         }
diff --git a/DevApp/Gs.DevApp/DevFrm/RkQC/SelectCqsq.Designer.cs b/DevApp/Gs.DevApp/DevFrm/RkQC/SelectCqsq.Designer.cs
index 4155ed2..51270a5 100644
--- a/DevApp/Gs.DevApp/DevFrm/RkQC/SelectCqsq.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/RkQC/SelectCqsq.Designer.cs
@@ -40,8 +40,11 @@
             this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
             this.btnIn = new DevExpress.XtraEditors.SimpleButton();
+            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
             ((System.ComponentModel.ISupportInitialize)(this.panelControl2)).BeginInit();
             this.panelControl2.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
@@ -86,7 +89,10 @@
             this.gv_supplierItemName,
             this.gridColumn5,
             this.gridColumn6,
-            this.gridColumn2});
+            this.gridColumn2,
+            this.gridColumn1,
+            this.gridColumn3,
+            this.gridColumn4});
             this.gridView1.GridControl = this.gcMain;
             this.gridView1.IndicatorWidth = 50;
             this.gridView1.Name = "gridView1";
@@ -204,8 +210,28 @@
             this.gridColumn2.MinWidth = 10;
             this.gridColumn2.Name = "gridColumn2";
             this.gridColumn2.Visible = true;
-            this.gridColumn2.VisibleIndex = 7;
+            this.gridColumn2.VisibleIndex = 10;
             this.gridColumn2.Width = 216;
+            // 
+            // gridColumn1
+            // 
+            this.gridColumn1.Caption = "鍓╀綑鏈夋晥澶╂暟";
+            this.gridColumn1.FieldName = "syts";
+            this.gridColumn1.MinWidth = 25;
+            this.gridColumn1.Name = "gridColumn1";
+            this.gridColumn1.Visible = true;
+            this.gridColumn1.VisibleIndex = 7;
+            this.gridColumn1.Width = 94;
+            // 
+            // gridColumn3
+            // 
+            this.gridColumn3.Caption = "鏈夋晥鏈熻嚦";
+            this.gridColumn3.FieldName = "yxqDate";
+            this.gridColumn3.MinWidth = 25;
+            this.gridColumn3.Name = "gridColumn3";
+            this.gridColumn3.Visible = true;
+            this.gridColumn3.VisibleIndex = 8;
+            this.gridColumn3.Width = 94;
             // 
             // panelControl1
             // 
@@ -228,6 +254,16 @@
             this.btnIn.TabIndex = 4;
             this.btnIn.Text = "纭畾瀵煎叆";
             // 
+            // gridColumn4
+            // 
+            this.gridColumn4.Caption = "寮�濮嬮璀︽棩鏈�";
+            this.gridColumn4.FieldName = "begYjDate";
+            this.gridColumn4.MinWidth = 25;
+            this.gridColumn4.Name = "gridColumn4";
+            this.gridColumn4.Visible = true;
+            this.gridColumn4.VisibleIndex = 9;
+            this.gridColumn4.Width = 94;
+            // 
             // SelectCqsq
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -239,7 +275,7 @@
             this.MinimizeBox = false;
             this.Name = "SelectCqsq";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-            this.Text = "閫夋嫨鐗╂枡锛屽彧鏄剧ず鏈敹鏁伴噺澶т簬0鐨�";
+            this.Text = "閫夋嫨鏉$爜锛屽彧鏄剧ず 闇�瑕佸妫�鐨�";
             this.TopMost = true;
             ((System.ComponentModel.ISupportInitialize)(this.panelControl2)).EndInit();
             this.panelControl2.ResumeLayout(false);
@@ -265,5 +301,8 @@
         private DevExpress.XtraEditors.PanelControl panelControl1;
         private DevExpress.XtraEditors.SimpleButton btnIn;
         private DevExpress.XtraGrid.Columns.GridColumn colChkInt;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
     }
 }
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/RkQC/SelectCqsq.cs b/DevApp/Gs.DevApp/DevFrm/RkQC/SelectCqsq.cs
index 378d596..3960ec2 100644
--- a/DevApp/Gs.DevApp/DevFrm/RkQC/SelectCqsq.cs
+++ b/DevApp/Gs.DevApp/DevFrm/RkQC/SelectCqsq.cs
@@ -1,14 +1,8 @@
-锘縰sing DevExpress.XtraEditors;
-using Gs.DevApp.ToolBox;
+锘縰sing Gs.DevApp.ToolBox;
 using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
 using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 
 namespace Gs.DevApp.DevFrm.RkQC
@@ -43,23 +37,22 @@
                     foreach (DataRow dr in dt.Rows)
                     {
                         string checkBox = dr["chkInt"].ToString();
-                        string _guid = dr["guid"].ToString();
+                        string _guid = dr["itemBarGuid"].ToString();
                         if (Gs.DevApp.ToolBox.UtilityHelper.ToCheck(checkBox))
                         {
                             list.Add(new
                             {
-                                guid = _guid,
+                                itemBarGuid = _guid,
                                 itemBarCode = dr["itemBarCode"].ToString(),
                                 itemModel = dr["itemModel"].ToString(),
                                 itemName = dr["itemName"].ToString(),
                                 itemNo = dr["itemNo"].ToString(),
                                 itemId = dr["itemId"].ToString(),
-                                quantity = dr["quantity"].ToString(),
-                                yxqDate = dr["鏈夋晥鏈熻嚦澶嶆鍓�"].ToString(),
-                                syts = dr["鍓╀綑瓒呮湡澶╂暟"].ToString(),
-                                cjcs = dr["閲嶆娆℃暟"].ToString(),
-                                yxqDate2 = dr["鏈夋晥鏈熻嚦澶嶆鍚�"].ToString(),
-                                qckw = dr["鍙栧嚭搴撲綅"].ToString(),
+                                itemBarCodeSl = dr["quantity"].ToString(),
+                                yxqDate = dr["yxqDate"].ToString(),
+                                syts = dr["syts"].ToString(),
+                                cjcs = dr["cjcs"].ToString(),
+                                qckw = dr["qckw"].ToString(),
                             });
                         }
                     }
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 7dcd04f..58cc302 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -233,6 +233,12 @@
     <Compile Include="DevFrm\BasicData\Frm_MesUnit.Designer.cs">
       <DependentUpon>Frm_MesUnit.cs</DependentUpon>
     </Compile>
+    <Compile Include="DevFrm\BasicData\Frm_SupplierSrm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="DevFrm\BasicData\Frm_SupplierSrm.Designer.cs">
+      <DependentUpon>Frm_SupplierSrm.cs</DependentUpon>
+    </Compile>
     <Compile Include="DevFrm\Ck\Frm_MesCgthSq.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -1392,6 +1398,9 @@
     <EmbeddedResource Include="DevFrm\BasicData\Frm_MesUnit.resx">
       <DependentUpon>Frm_MesUnit.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="DevFrm\BasicData\Frm_SupplierSrm.resx">
+      <DependentUpon>Frm_SupplierSrm.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="DevFrm\Ck\Frm_MesCgthSq.resx">
       <DependentUpon>Frm_MesCgthSq.cs</DependentUpon>
     </EmbeddedResource>

--
Gitblit v1.9.3