超期

lu

15 小时以前 7ee945cea3e619d5776d7e155cb6cd7b73cc476f

超期

 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" />

 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 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();
            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();
            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -85,31 +85,16 @@
            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
            this.tabMx = new DevExpress.XtraTab.XtraTabControl();
            this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
            this.gcMx1 = new DevExpress.XtraGrid.GridControl();
            this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.mxGuid = new DevExpress.XtraGrid.Columns.GridColumn();
            this.pGuid = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1itemId = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1sqNum = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1ysNum = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1remark = 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();
            this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -127,8 +112,22 @@
            this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
            this.gcMx2 = new DevExpress.XtraGrid.GridControl();
            this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.mxGuid = new DevExpress.XtraGrid.Columns.GridColumn();
            this.pGuid = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1itemId = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1sqNum = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1ysNum = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1remark = new DevExpress.XtraGrid.Columns.GridColumn();
            this.picCheckBox = new System.Windows.Forms.PictureBox();
            this.tips = new DevExpress.Utils.ToolTipController(this.components);
            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
            this.xtraTabControl1.SuspendLayout();
            this.xtraTabPage1.SuspendLayout();
@@ -164,22 +163,22 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
            this.tabMx.SuspendLayout();
            this.tabMxPage1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
            this.tabMxPage2.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
            this.SuspendLayout();
            // 
            // toolBarMenu1
@@ -526,7 +525,7 @@
            // btnSelect
            // 
            this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
            this.btnSelect.Location = new System.Drawing.Point(12, 69);
            this.btnSelect.Location = new System.Drawing.Point(12, 74);
            this.btnSelect.Name = "btnSelect";
            this.btnSelect.Size = new System.Drawing.Size(116, 27);
            this.btnSelect.StyleController = this.layoutMx1;
@@ -545,14 +544,14 @@
            // txt_kcOrgId
            // 
            this.txt_kcOrgId.IsReadly = false;
            this.txt_kcOrgId.Location = new System.Drawing.Point(114, 38);
            this.txt_kcOrgId.Location = new System.Drawing.Point(114, 43);
            this.txt_kcOrgId.Name = "txt_kcOrgId";
            this.txt_kcOrgId.Size = new System.Drawing.Size(165, 24);
            this.txt_kcOrgId.TabIndex = 526;
            // 
            // txt_billNo
            // 
            this.txt_billNo.Location = new System.Drawing.Point(114, 7);
            this.txt_billNo.Location = new System.Drawing.Point(114, 12);
            this.txt_billNo.Name = "txt_billNo";
            this.txt_billNo.Properties.Appearance.Options.UseFont = true;
            this.txt_billNo.Size = new System.Drawing.Size(165, 24);
@@ -563,7 +562,7 @@
            // txt_billType
            // 
            this.txt_billType.EditValue = "-请选择-";
            this.txt_billType.Location = new System.Drawing.Point(385, 7);
            this.txt_billType.Location = new System.Drawing.Point(385, 43);
            this.txt_billType.Name = "txt_billType";
            this.txt_billType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -582,7 +581,7 @@
            // 
            // txt_checkDate
            // 
            this.txt_checkDate.Location = new System.Drawing.Point(927, 38);
            this.txt_checkDate.Location = new System.Drawing.Point(927, 43);
            this.txt_checkDate.Name = "txt_checkDate";
            this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
            this.txt_checkDate.Size = new System.Drawing.Size(166, 24);
@@ -592,7 +591,7 @@
            // 
            // txt_remark
            // 
            this.txt_remark.Location = new System.Drawing.Point(385, 69);
            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);
@@ -601,7 +600,7 @@
            // 
            // txt_checkUser
            // 
            this.txt_checkUser.Location = new System.Drawing.Point(927, 7);
            this.txt_checkUser.Location = new System.Drawing.Point(927, 12);
            this.txt_checkUser.Name = "txt_checkUser";
            this.txt_checkUser.Properties.Appearance.Options.UseFont = true;
            this.txt_checkUser.Size = new System.Drawing.Size(166, 24);
@@ -611,17 +610,17 @@
            // 
            // txt_status
            // 
            this.txt_status.Location = new System.Drawing.Point(825, 69);
            this.txt_status.Location = new System.Drawing.Point(554, 43);
            this.txt_status.Name = "txt_status";
            this.txt_status.Properties.Caption = "审核标识";
            this.txt_status.Size = new System.Drawing.Size(268, 24);
            this.txt_status.Size = new System.Drawing.Size(267, 24);
            this.txt_status.StyleController = this.layoutMx1;
            this.txt_status.TabIndex = 528;
            this.txt_status.Tag = "readonly";
            // 
            // lastUpdateUser
            // 
            this.lastUpdateUser.Location = new System.Drawing.Point(656, 7);
            this.lastUpdateUser.Location = new System.Drawing.Point(385, 12);
            this.lastUpdateUser.Name = "lastUpdateUser";
            this.lastUpdateUser.Size = new System.Drawing.Size(165, 24);
            this.lastUpdateUser.StyleController = this.layoutMx1;
@@ -630,7 +629,7 @@
            // 
            // lastUpdateTime
            // 
            this.lastUpdateTime.Location = new System.Drawing.Point(656, 38);
            this.lastUpdateTime.Location = new System.Drawing.Point(656, 12);
            this.lastUpdateTime.Name = "lastUpdateTime";
            this.lastUpdateTime.Size = new System.Drawing.Size(165, 24);
            this.lastUpdateTime.StyleController = this.layoutMx1;
@@ -677,37 +676,37 @@
            this.layoutControlItem2,
            this.layoutControlItem9,
            this.layoutControlItem10,
            this.layoutControlItem7,
            this.layoutControlItem16,
            this.layoutControlItem5,
            this.layoutControlItem14,
            this.layoutControlItem15,
            this.layoutControlItem11,
            this.layoutControlItem5,
            this.layoutControlItem7,
            this.layoutControlItem16});
            this.layoutControlItem11});
            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});
            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;
            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;
            this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
            rowDefinition4,
            rowDefinition5,
            rowDefinition6});
            rowDefinition1,
            rowDefinition2,
            rowDefinition3});
            this.Root.Size = new System.Drawing.Size(1105, 113);
            this.Root.TextVisible = false;
            // 
@@ -752,49 +751,6 @@
            this.layoutControlItem10.Text = "审核时间";
            this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem14
            // 
            this.layoutControlItem14.Control = this.lastUpdateUser;
            this.layoutControlItem14.Location = new System.Drawing.Point(542, 0);
            this.layoutControlItem14.Name = "layoutControlItem14";
            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem14.Size = new System.Drawing.Size(271, 31);
            this.layoutControlItem14.Text = "最后更新人";
            this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem15
            // 
            this.layoutControlItem15.Control = this.lastUpdateTime;
            this.layoutControlItem15.Location = new System.Drawing.Point(542, 31);
            this.layoutControlItem15.Name = "layoutControlItem15";
            this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem15.Size = new System.Drawing.Size(271, 31);
            this.layoutControlItem15.Text = "最后更新时间";
            this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem11
            // 
            this.layoutControlItem11.Control = this.txt_status;
            this.layoutControlItem11.Location = new System.Drawing.Point(813, 62);
            this.layoutControlItem11.Name = "layoutControlItem11";
            this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem11.Size = new System.Drawing.Size(272, 31);
            this.layoutControlItem11.Text = "审核标识";
            this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem11.TextVisible = false;
            // 
            // layoutControlItem5
            // 
            this.layoutControlItem5.Control = this.txt_billType;
            this.layoutControlItem5.Location = new System.Drawing.Point(271, 0);
            this.layoutControlItem5.Name = "layoutControlItem5";
            this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem5.Size = new System.Drawing.Size(271, 31);
            this.layoutControlItem5.Text = "申请类型";
            this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem7
            // 
            this.layoutControlItem7.Control = this.txt_remark;
@@ -821,6 +777,49 @@
            this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem16.TextVisible = false;
            // 
            // layoutControlItem5
            // 
            this.layoutControlItem5.Control = this.txt_billType;
            this.layoutControlItem5.Location = new System.Drawing.Point(271, 31);
            this.layoutControlItem5.Name = "layoutControlItem5";
            this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem5.Size = new System.Drawing.Size(271, 31);
            this.layoutControlItem5.Text = "申请类型";
            this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem14
            // 
            this.layoutControlItem14.Control = this.lastUpdateUser;
            this.layoutControlItem14.Location = new System.Drawing.Point(271, 0);
            this.layoutControlItem14.Name = "layoutControlItem14";
            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem14.Size = new System.Drawing.Size(271, 31);
            this.layoutControlItem14.Text = "最后更新人";
            this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem15
            // 
            this.layoutControlItem15.Control = this.lastUpdateTime;
            this.layoutControlItem15.Location = new System.Drawing.Point(542, 0);
            this.layoutControlItem15.Name = "layoutControlItem15";
            this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem15.Size = new System.Drawing.Size(271, 31);
            this.layoutControlItem15.Text = "最后更新时间";
            this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem11
            // 
            this.layoutControlItem11.Control = this.txt_status;
            this.layoutControlItem11.Location = new System.Drawing.Point(542, 31);
            this.layoutControlItem11.Name = "layoutControlItem11";
            this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem11.Size = new System.Drawing.Size(271, 31);
            this.layoutControlItem11.Text = "审核标识";
            this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem11.TextVisible = false;
            // 
            // tabMx
            // 
            this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -838,7 +837,7 @@
            this.tabMxPage1.Controls.Add(this.gcMx1);
            this.tabMxPage1.Name = "tabMxPage1";
            this.tabMxPage1.Size = new System.Drawing.Size(1124, 418);
            this.tabMxPage1.Text = "申请明细";
            this.tabMxPage1.Text = "条码明细";
            // 
            // gcMx1
            // 
@@ -849,13 +848,226 @@
            this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
            this.repositoryItemButtonEdit1});
            this.gcMx1.Size = new System.Drawing.Size(1124, 418);
            this.gcMx1.TabIndex = 0;
            this.gcMx1.TabIndex = 1;
            this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gvMx1});
            // 
            // gvMx1
            // 
            this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gridColumn6,
            this.gridColumn8,
            this.gridColumn9,
            this.gridColumn10,
            this.gridColumn11,
            this.gridColumn12,
            this.gridColumn13,
            this.gridColumn14,
            this.gridColumn15,
            this.gridColumn16,
            this.gridColumn17,
            this.gridColumn18,
            this.gridColumn19,
            this.gridColumn20,
            this.gridColumn21,
            this.gridColumn22,
            this.gridColumn23});
            this.gvMx1.GridControl = this.gcMx1;
            this.gvMx1.Name = "gvMx1";
            this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
            this.gvMx1.OptionsFind.ShowSearchNavButtons = false;
            this.gvMx1.OptionsView.ShowGroupPanel = false;
            // 
            // gridColumn6
            // 
            this.gridColumn6.Caption = "明细GUID";
            this.gridColumn6.FieldName = "guid";
            this.gridColumn6.MinWidth = 25;
            this.gridColumn6.Name = "gridColumn6";
            this.gridColumn6.Width = 94;
            // 
            // gridColumn8
            // 
            this.gridColumn8.AppearanceCell.Options.UseFont = true;
            this.gridColumn8.Caption = "主表GUID";
            this.gridColumn8.FieldName = "pGuid";
            this.gridColumn8.MinWidth = 50;
            this.gridColumn8.Name = "gridColumn8";
            this.gridColumn8.Tag = "query_a.MID";
            this.gridColumn8.Width = 94;
            // 
            // gridColumn9
            // 
            this.gridColumn9.AppearanceCell.Options.UseFont = true;
            this.gridColumn9.Caption = "物料ID";
            this.gridColumn9.FieldName = "itemId";
            this.gridColumn9.MinWidth = 50;
            this.gridColumn9.Name = "gridColumn9";
            this.gridColumn9.Tag = "query_a.ITEM_ID";
            this.gridColumn9.Width = 94;
            // 
            // gridColumn10
            // 
            this.gridColumn10.Caption = "物料编码";
            this.gridColumn10.FieldName = "itemNo";
            this.gridColumn10.MinWidth = 25;
            this.gridColumn10.Name = "gridColumn10";
            this.gridColumn10.Visible = true;
            this.gridColumn10.VisibleIndex = 1;
            this.gridColumn10.Width = 94;
            // 
            // gridColumn11
            // 
            this.gridColumn11.Caption = "物料名称";
            this.gridColumn11.FieldName = "itemName";
            this.gridColumn11.MinWidth = 25;
            this.gridColumn11.Name = "gridColumn11";
            this.gridColumn11.Visible = true;
            this.gridColumn11.VisibleIndex = 2;
            this.gridColumn11.Width = 94;
            // 
            // gridColumn12
            // 
            this.gridColumn12.Caption = "物料规格";
            this.gridColumn12.FieldName = "itemModel";
            this.gridColumn12.MinWidth = 25;
            this.gridColumn12.Name = "gridColumn12";
            this.gridColumn12.Visible = true;
            this.gridColumn12.VisibleIndex = 3;
            this.gridColumn12.Width = 94;
            // 
            // gridColumn13
            // 
            this.gridColumn13.AppearanceCell.Options.UseFont = true;
            this.gridColumn13.Caption = "数量";
            this.gridColumn13.FieldName = "gqsl";
            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.Width = 94;
            // 
            // gridColumn14
            // 
            this.gridColumn14.AppearanceCell.Options.UseFont = true;
            this.gridColumn14.Caption = "有效期至(复检前)";
            this.gridColumn14.FieldName = "sqsl";
            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.Width = 94;
            // 
            // gridColumn15
            // 
            this.gridColumn15.Caption = "重检次数";
            this.gridColumn15.FieldName = "wcsl";
            this.gridColumn15.MinWidth = 25;
            this.gridColumn15.Name = "gridColumn15";
            this.gridColumn15.Visible = true;
            this.gridColumn15.VisibleIndex = 7;
            this.gridColumn15.Width = 94;
            // 
            // gridColumn16
            // 
            this.gridColumn16.AppearanceCell.Options.UseFont = true;
            this.gridColumn16.Caption = "剩余超期天数";
            this.gridColumn16.FieldName = "remark";
            this.gridColumn16.MinWidth = 50;
            this.gridColumn16.Name = "gridColumn16";
            this.gridColumn16.Tag = "edit";
            this.gridColumn16.Visible = true;
            this.gridColumn16.VisibleIndex = 6;
            this.gridColumn16.Width = 94;
            // 
            // gridColumn17
            // 
            this.gridColumn17.Caption = "物料条码";
            this.gridColumn17.FieldName = "itemBarCode";
            this.gridColumn17.MinWidth = 25;
            this.gridColumn17.Name = "gridColumn17";
            this.gridColumn17.Visible = true;
            this.gridColumn17.VisibleIndex = 0;
            this.gridColumn17.Width = 94;
            // 
            // gridColumn18
            // 
            this.gridColumn18.Caption = "送检人";
            this.gridColumn18.MinWidth = 25;
            this.gridColumn18.Name = "gridColumn18";
            this.gridColumn18.Visible = true;
            this.gridColumn18.VisibleIndex = 8;
            this.gridColumn18.Width = 94;
            // 
            // gridColumn19
            // 
            this.gridColumn19.Caption = "送检时间";
            this.gridColumn19.MinWidth = 25;
            this.gridColumn19.Name = "gridColumn19";
            this.gridColumn19.Visible = true;
            this.gridColumn19.VisibleIndex = 9;
            this.gridColumn19.Width = 94;
            // 
            // gridColumn20
            // 
            this.gridColumn20.Caption = "取出库位";
            this.gridColumn20.MinWidth = 25;
            this.gridColumn20.Name = "gridColumn20";
            this.gridColumn20.Visible = true;
            this.gridColumn20.VisibleIndex = 10;
            this.gridColumn20.Width = 94;
            // 
            // gridColumn21
            // 
            this.gridColumn21.Caption = "复检结果";
            this.gridColumn21.MinWidth = 25;
            this.gridColumn21.Name = "gridColumn21";
            this.gridColumn21.Visible = true;
            this.gridColumn21.VisibleIndex = 11;
            this.gridColumn21.Width = 94;
            // 
            // gridColumn22
            // 
            this.gridColumn22.Caption = "有效期至(复检后)";
            this.gridColumn22.MinWidth = 25;
            this.gridColumn22.Name = "gridColumn22";
            this.gridColumn22.Visible = true;
            this.gridColumn22.VisibleIndex = 12;
            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 = 13;
            this.gridColumn23.Width = 94;
            // 
            // tabMxPage2
            // 
            this.tabMxPage2.Controls.Add(this.gcMx2);
            this.tabMxPage2.Name = "tabMxPage2";
            this.tabMxPage2.Size = new System.Drawing.Size(1124, 418);
            this.tabMxPage2.Text = "物料明细";
            // 
            // gcMx2
            // 
            this.gcMx2.Dock = System.Windows.Forms.DockStyle.Fill;
            this.gcMx2.Location = new System.Drawing.Point(0, 0);
            this.gcMx2.MainView = this.gvMx2;
            this.gcMx2.Name = "gcMx2";
            this.gcMx2.Size = new System.Drawing.Size(1124, 418);
            this.gcMx2.TabIndex = 1;
            this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gvMx2});
            // 
            // gvMx2
            // 
            this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.mxGuid,
            this.pGuid,
            this.gvMx1itemId,
@@ -865,13 +1077,12 @@
            this.gvMx1sqNum,
            this.gvMx1ysNum,
            this.gridColumn4,
            this.gvMx1remark,
            this.gvMxDel});
            this.gvMx1.GridControl = this.gcMx1;
            this.gvMx1.Name = "gvMx1";
            this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
            this.gvMx1.OptionsFind.ShowSearchNavButtons = false;
            this.gvMx1.OptionsView.ShowGroupPanel = false;
            this.gvMx1remark});
            this.gvMx2.GridControl = this.gcMx2;
            this.gvMx2.Name = "gvMx2";
            this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
            this.gvMx2.OptionsFind.ShowSearchNavButtons = false;
            this.gvMx2.OptionsView.ShowGroupPanel = false;
            // 
            // mxGuid
            // 
@@ -985,238 +1196,6 @@
            this.gvMx1remark.VisibleIndex = 5;
            this.gvMx1remark.Width = 94;
            // 
            // gvMxDel
            // 
            this.gvMxDel.Caption = "移出";
            this.gvMxDel.ColumnEdit = this.repositoryItemButtonEdit1;
            this.gvMxDel.MinWidth = 25;
            this.gvMxDel.Name = "gvMxDel";
            this.gvMxDel.Visible = true;
            this.gvMxDel.VisibleIndex = 7;
            this.gvMxDel.Width = 94;
            // 
            // repositoryItemButtonEdit1
            // 
            this.repositoryItemButtonEdit1.AutoHeight = false;
            editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "移出", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
            this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
            // 
            // tabMxPage2
            // 
            this.tabMxPage2.Controls.Add(this.gcMx2);
            this.tabMxPage2.Name = "tabMxPage2";
            this.tabMxPage2.Size = new System.Drawing.Size(1124, 418);
            this.tabMxPage2.Text = "条码明细";
            // 
            // gcMx2
            // 
            this.gcMx2.Dock = System.Windows.Forms.DockStyle.Fill;
            this.gcMx2.Location = new System.Drawing.Point(0, 0);
            this.gcMx2.MainView = this.gvMx2;
            this.gcMx2.Name = "gcMx2";
            this.gcMx2.Size = new System.Drawing.Size(1124, 418);
            this.gcMx2.TabIndex = 1;
            this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gvMx2});
            // 
            // gvMx2
            // 
            this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gridColumn6,
            this.gridColumn8,
            this.gridColumn9,
            this.gridColumn10,
            this.gridColumn11,
            this.gridColumn12,
            this.gridColumn13,
            this.gridColumn14,
            this.gridColumn15,
            this.gridColumn16,
            this.gridColumn17,
            this.gridColumn18,
            this.gridColumn19,
            this.gridColumn20,
            this.gridColumn21,
            this.gridColumn22,
            this.gridColumn23});
            this.gvMx2.GridControl = this.gcMx2;
            this.gvMx2.Name = "gvMx2";
            this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
            this.gvMx2.OptionsFind.ShowSearchNavButtons = false;
            this.gvMx2.OptionsView.ShowGroupPanel = false;
            // 
            // gridColumn6
            // 
            this.gridColumn6.Caption = "明细GUID";
            this.gridColumn6.FieldName = "guid";
            this.gridColumn6.MinWidth = 25;
            this.gridColumn6.Name = "gridColumn6";
            this.gridColumn6.Width = 94;
            // 
            // gridColumn8
            // 
            this.gridColumn8.AppearanceCell.Options.UseFont = true;
            this.gridColumn8.Caption = "主表GUID";
            this.gridColumn8.FieldName = "pGuid";
            this.gridColumn8.MinWidth = 50;
            this.gridColumn8.Name = "gridColumn8";
            this.gridColumn8.Tag = "query_a.MID";
            this.gridColumn8.Width = 94;
            // 
            // gridColumn9
            // 
            this.gridColumn9.AppearanceCell.Options.UseFont = true;
            this.gridColumn9.Caption = "物料ID";
            this.gridColumn9.FieldName = "itemId";
            this.gridColumn9.MinWidth = 50;
            this.gridColumn9.Name = "gridColumn9";
            this.gridColumn9.Tag = "query_a.ITEM_ID";
            this.gridColumn9.Width = 94;
            // 
            // gridColumn10
            // 
            this.gridColumn10.Caption = "物料编码";
            this.gridColumn10.FieldName = "itemNo";
            this.gridColumn10.MinWidth = 25;
            this.gridColumn10.Name = "gridColumn10";
            this.gridColumn10.Visible = true;
            this.gridColumn10.VisibleIndex = 1;
            this.gridColumn10.Width = 94;
            // 
            // gridColumn11
            // 
            this.gridColumn11.Caption = "物料名称";
            this.gridColumn11.FieldName = "itemName";
            this.gridColumn11.MinWidth = 25;
            this.gridColumn11.Name = "gridColumn11";
            this.gridColumn11.Visible = true;
            this.gridColumn11.VisibleIndex = 2;
            this.gridColumn11.Width = 94;
            // 
            // gridColumn12
            // 
            this.gridColumn12.Caption = "物料规格";
            this.gridColumn12.FieldName = "itemModel";
            this.gridColumn12.MinWidth = 25;
            this.gridColumn12.Name = "gridColumn12";
            this.gridColumn12.Visible = true;
            this.gridColumn12.VisibleIndex = 3;
            this.gridColumn12.Width = 94;
            // 
            // gridColumn13
            // 
            this.gridColumn13.AppearanceCell.Options.UseFont = true;
            this.gridColumn13.Caption = "数量";
            this.gridColumn13.FieldName = "gqsl";
            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.Width = 94;
            // 
            // gridColumn14
            // 
            this.gridColumn14.AppearanceCell.Options.UseFont = true;
            this.gridColumn14.Caption = "有效期至(复检前)";
            this.gridColumn14.FieldName = "sqsl";
            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.Width = 94;
            // 
            // gridColumn15
            // 
            this.gridColumn15.Caption = "重检次数";
            this.gridColumn15.FieldName = "wcsl";
            this.gridColumn15.MinWidth = 25;
            this.gridColumn15.Name = "gridColumn15";
            this.gridColumn15.Visible = true;
            this.gridColumn15.VisibleIndex = 7;
            this.gridColumn15.Width = 94;
            // 
            // gridColumn16
            // 
            this.gridColumn16.AppearanceCell.Options.UseFont = true;
            this.gridColumn16.Caption = "剩余超期天数";
            this.gridColumn16.FieldName = "remark";
            this.gridColumn16.MinWidth = 50;
            this.gridColumn16.Name = "gridColumn16";
            this.gridColumn16.Tag = "edit";
            this.gridColumn16.Visible = true;
            this.gridColumn16.VisibleIndex = 6;
            this.gridColumn16.Width = 94;
            // 
            // gridColumn17
            // 
            this.gridColumn17.Caption = "物料条码";
            this.gridColumn17.MinWidth = 25;
            this.gridColumn17.Name = "gridColumn17";
            this.gridColumn17.Visible = true;
            this.gridColumn17.VisibleIndex = 0;
            this.gridColumn17.Width = 94;
            // 
            // gridColumn18
            // 
            this.gridColumn18.Caption = "送检人";
            this.gridColumn18.MinWidth = 25;
            this.gridColumn18.Name = "gridColumn18";
            this.gridColumn18.Visible = true;
            this.gridColumn18.VisibleIndex = 8;
            this.gridColumn18.Width = 94;
            // 
            // gridColumn19
            // 
            this.gridColumn19.Caption = "送检时间";
            this.gridColumn19.MinWidth = 25;
            this.gridColumn19.Name = "gridColumn19";
            this.gridColumn19.Visible = true;
            this.gridColumn19.VisibleIndex = 9;
            this.gridColumn19.Width = 94;
            // 
            // gridColumn20
            // 
            this.gridColumn20.Caption = "取出库位";
            this.gridColumn20.MinWidth = 25;
            this.gridColumn20.Name = "gridColumn20";
            this.gridColumn20.Visible = true;
            this.gridColumn20.VisibleIndex = 10;
            this.gridColumn20.Width = 94;
            // 
            // gridColumn21
            // 
            this.gridColumn21.Caption = "复检结果";
            this.gridColumn21.MinWidth = 25;
            this.gridColumn21.Name = "gridColumn21";
            this.gridColumn21.Visible = true;
            this.gridColumn21.VisibleIndex = 11;
            this.gridColumn21.Width = 94;
            // 
            // gridColumn22
            // 
            this.gridColumn22.Caption = "有效期至(复检后)";
            this.gridColumn22.MinWidth = 25;
            this.gridColumn22.Name = "gridColumn22";
            this.gridColumn22.Visible = true;
            this.gridColumn22.VisibleIndex = 12;
            this.gridColumn22.Width = 94;
            // 
            // gridColumn23
            // 
            this.gridColumn23.Caption = "gridColumn23";
            this.gridColumn23.MinWidth = 25;
            this.gridColumn23.Name = "gridColumn23";
            this.gridColumn23.Visible = true;
            this.gridColumn23.VisibleIndex = 13;
            this.gridColumn23.Width = 94;
            // 
            // picCheckBox
            // 
            this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
@@ -1227,6 +1206,17 @@
            this.picCheckBox.TabIndex = 8;
            this.picCheckBox.TabStop = false;
            this.picCheckBox.Visible = false;
            // 
            // 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_Cqsq
            // 
@@ -1273,22 +1263,22 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
            this.tabMx.ResumeLayout(false);
            this.tabMxPage1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
            this.tabMxPage2.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
            this.ResumeLayout(false);

        }
@@ -1335,35 +1325,16 @@
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
        private DevExpress.XtraEditors.TextEdit lastUpdateUser;
        private DevExpress.XtraEditors.TextEdit lastUpdateTime;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
        private DevExpress.XtraTab.XtraTabControl tabMx;
        private DevExpress.XtraTab.XtraTabPage tabMxPage1;
        private DevExpress.XtraGrid.GridControl gcMx1;
        private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
        private DevExpress.XtraGrid.Columns.GridColumn mxGuid;
        private DevExpress.XtraGrid.Columns.GridColumn pGuid;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1itemId;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1sqNum;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1ysNum;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1remark;
        private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
        private DevExpress.XtraEditors.TextEdit txt_guid;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
        private DevExpress.Utils.ToolTipController tips;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
        private DevExpress.XtraTab.XtraTabPage tabMxPage2;
        private DevExpress.XtraGrid.GridControl gcMx2;
        private DevExpress.XtraGrid.Views.Grid.GridView gvMx2;
        private DevExpress.XtraTab.XtraTabPage tabMxPage1;
        private DevExpress.XtraGrid.GridControl gcMx1;
        private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
@@ -1381,5 +1352,23 @@
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn21;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn22;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn23;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
        private DevExpress.XtraTab.XtraTabPage tabMxPage2;
        private DevExpress.XtraGrid.GridControl gcMx2;
        private DevExpress.XtraGrid.Views.Grid.GridView gvMx2;
        private DevExpress.XtraGrid.Columns.GridColumn mxGuid;
        private DevExpress.XtraGrid.Columns.GridColumn pGuid;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1itemId;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1sqNum;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1ysNum;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1remark;
        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
    }
}

 DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqsq.cs

@@ -13,7 +13,7 @@
{
    public partial class Frm_Cqsq : DevExpress.XtraEditors.XtraForm
    {
        string _webServiceName = "MesCgthSqManager/";
        string _webServiceName = "RkqcSqManager/";
        List<FilterEntity> _filterList = new List<FilterEntity>();
        public Frm_Cqsq()
        {
@@ -60,10 +60,38 @@
                    return;
                }
                 var frm = new SelectCqsq(this.txt_kcOrgId.GetId());
                ////赋值给明细表
                //赋值给明细表
                frm.UpdateParent += (ss, ee) =>
                {
                     
                    try
                    {
                        var lst = ee.DynamicList;
                        DataTable _Table = (DataTable)gcMx1.DataSource;
                        foreach (dynamic dym in lst)
                        {
                            DataRow _row = _Table.NewRow();
                            _row["guid"] = "";//明细guid
                            _row["pGuid"] = "";//主表guid
                            _row["itemBarCode"] = dym.itemBarCode;
                            _row["itemId"] = dym.itemId;
                            _row["itemNo"] = dym.itemNo;
                            _row["itemName"] = dym.itemName;
                            _row["itemModel"] = dym.itemModel;
                            _Table.Rows.Add(_row);
                        }
                        gcMx1.BindingContext = new BindingContext();
                        gcMx1.DataSource = _Table;
                        gcMx1.ForceInitialize();
                        gvMx1.CloseEditor();
                        gvMx1.PostEditor();
                        gvMx1.UpdateCurrentRow();
                        gvMx1.BestFitColumns();
                        Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
                    }
                    catch (Exception ex)
                    {
                        MessageBox.Show(ex.Message);
                    }
                };
                frm.ShowDialog();
            };
@@ -242,7 +270,7 @@
            else
            {
                List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
                gvList.Add(gvMx1);
                gvList.Add(gvMx2);
                UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList);
            }
        }
@@ -257,8 +285,10 @@
            Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 4);
            List<DevExpress.XtraGrid.Views.Grid.GridView> gridViews = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
            gridViews.Add(gvMx1);
            gridViews.Add(gvMx2);
            UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true, gridViews);
            Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
            Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx2, gvMx2);
            //增加时，默认组织
            string deftOrg = UtilityHelper.GetFirstOrg(txt_kcOrgId);

@@ -288,7 +318,7 @@
            {
                Guid = Gs.DevApp.ToolBox.UtilityHelper.ToGuid(lbGuid.Text.Trim()), //到货单主键
                Remark = txt_remark.Text.Trim(), //备注
                BillType = txt_billType.Text,//退料方式
                BillType = txt_billType.Text,
                KcOrgId = _orgId,
                list = new List<dynamic>(),
            };
@@ -306,18 +336,10 @@
                if (row != null)
                {
                    Guid _guid = UtilityHelper.ToGuid(row["guid"].ToString());
                    string _msl = row["sqsl"].ToString();
                    if (string.IsNullOrEmpty(_msl))
                    {
                        MsgHelper.ShowError("申请数量不能为空！");
                        return;
                    }
                    _obj.list.Add(new
                    {
                        Guid = _guid,
                        DepotSectionCode = row["depotSectionCode"].ToString(),
                        Gqsl = row["gqsl"].ToString(),
                        ItemId = row["itemId"].ToString(),
                        ItemBarCode = row["itemBarCode"].ToString(),
                    });
                }
            }
@@ -327,7 +349,6 @@
                    _webServiceName + "EditModel",
                    JsonConvert.SerializeObject(_obj));
                var _rtn = UtilityHelper.ReturnToDynamic(strJson);

                if (_rtn.rtnCode > 0)
                {
                    MsgHelper.ShowInformation("提示：" + _rtn.rtnMsg);
@@ -335,7 +356,7 @@
                    txt_billNo.Text = _rtn.rtnData.outNo;
                    toolBarMenu1.isSetBtn = true;
                    List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
                    gvList.Add(gvMx1);
                    gvList.Add(gvMx2);
                    UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false, gvList);
                    toolBarMenu1.currentAction = "";
                    Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
@@ -440,7 +461,6 @@
                    {
                        Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
                    }

                    JArray array2 = new JArray();
                    foreach (var a in _job["rtnData"]["list2"])
                    {
@@ -526,8 +546,9 @@
            }
        }


        /// <summary>
        /// 删除明细
        /// 移出明细
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
@@ -563,7 +584,7 @@
                    var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                    if (_rtn.rtnCode > 0)
                    {
                        if (_rtn.rtnCode > 0) getModel(lbGuid.Text);
                     getModel(lbGuid.Text);
                    }
                    MsgHelper.Warning("提示：" + _rtn.rtnMsg);
                }
@@ -573,7 +594,5 @@
                }
            }
        }

        
    }
}

 DevApp/Gs.DevApp/DevFrm/RkQC/SelectCqsq.Designer.cs

@@ -32,18 +32,13 @@
            this.gcMain = new DevExpress.XtraGrid.GridControl();
            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.colChkInt = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_billNo = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_ebelnK3id = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_billNo = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_purchaseUnit = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_supplierItemCode = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_supplierItemName = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_purchaseUnit = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_remarks = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
            this.btnIn = new DevExpress.XtraEditors.SimpleButton();
@@ -84,18 +79,13 @@
            this.gridView1.ColumnPanelRowHeight = 50;
            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.colChkInt,
            this.gv_billNo,
            this.gv_guid,
            this.gv_ebelnK3id,
            this.gridColumn3,
            this.gv_billNo,
            this.gv_purchaseUnit,
            this.gv_supplierItemCode,
            this.gv_supplierItemName,
            this.gridColumn6,
            this.gridColumn9,
            this.gridColumn7,
            this.gv_purchaseUnit,
            this.gv_remarks,
            this.gridColumn5,
            this.gridColumn6,
            this.gridColumn2});
            this.gridView1.GridControl = this.gcMain;
            this.gridView1.IndicatorWidth = 50;
@@ -116,21 +106,6 @@
            this.colChkInt.VisibleIndex = 0;
            this.colChkInt.Width = 94;
            // 
            // gv_billNo
            // 
            this.gv_billNo.AppearanceCell.Options.UseFont = true;
            this.gv_billNo.Caption = "采购单号";
            this.gv_billNo.FieldName = "billNo";
            this.gv_billNo.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left;
            this.gv_billNo.MinWidth = 10;
            this.gv_billNo.Name = "gv_billNo";
            this.gv_billNo.OptionsColumn.AllowEdit = false;
            this.gv_billNo.OptionsColumn.ReadOnly = true;
            this.gv_billNo.Tag = "query_a.BILL_NO";
            this.gv_billNo.Visible = true;
            this.gv_billNo.VisibleIndex = 1;
            this.gv_billNo.Width = 10;
            // 
            // gv_guid
            // 
            this.gv_guid.AppearanceCell.Options.UseFont = true;
@@ -143,34 +118,40 @@
            this.gv_guid.Tag = "query_a.guid";
            this.gv_guid.Width = 94;
            // 
            // gv_ebelnK3id
            // gv_billNo
            // 
            this.gv_ebelnK3id.AppearanceCell.Options.UseFont = true;
            this.gv_ebelnK3id.Caption = "ERP行ID号";
            this.gv_ebelnK3id.FieldName = "erpMxId";
            this.gv_ebelnK3id.MinWidth = 100;
            this.gv_ebelnK3id.Name = "gv_ebelnK3id";
            this.gv_ebelnK3id.OptionsColumn.AllowEdit = false;
            this.gv_ebelnK3id.OptionsColumn.ReadOnly = true;
            this.gv_ebelnK3id.Tag = "query_a.EBELN_K3ID";
            this.gv_ebelnK3id.Width = 100;
            this.gv_billNo.AppearanceCell.Options.UseFont = true;
            this.gv_billNo.Caption = "条码";
            this.gv_billNo.FieldName = "itemBarCode";
            this.gv_billNo.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left;
            this.gv_billNo.MinWidth = 10;
            this.gv_billNo.Name = "gv_billNo";
            this.gv_billNo.OptionsColumn.AllowEdit = false;
            this.gv_billNo.OptionsColumn.ReadOnly = true;
            this.gv_billNo.Tag = "query_a.BILL_NO";
            this.gv_billNo.Visible = true;
            this.gv_billNo.VisibleIndex = 1;
            this.gv_billNo.Width = 118;
            // 
            // gridColumn3
            // gv_purchaseUnit
            // 
            this.gridColumn3.Caption = "采购时间";
            this.gridColumn3.FieldName = "purchaseDate";
            this.gridColumn3.MinWidth = 10;
            this.gridColumn3.Name = "gridColumn3";
            this.gridColumn3.OptionsColumn.ReadOnly = true;
            this.gridColumn3.Visible = true;
            this.gridColumn3.VisibleIndex = 2;
            this.gridColumn3.Width = 10;
            this.gv_purchaseUnit.AppearanceCell.Options.UseFont = true;
            this.gv_purchaseUnit.Caption = "物料ID";
            this.gv_purchaseUnit.FieldName = "itemId";
            this.gv_purchaseUnit.MinWidth = 10;
            this.gv_purchaseUnit.Name = "gv_purchaseUnit";
            this.gv_purchaseUnit.OptionsColumn.AllowEdit = false;
            this.gv_purchaseUnit.OptionsColumn.ReadOnly = true;
            this.gv_purchaseUnit.Tag = "query_a.PURCHASE_UNIT";
            this.gv_purchaseUnit.Visible = true;
            this.gv_purchaseUnit.VisibleIndex = 2;
            this.gv_purchaseUnit.Width = 168;
            // 
            // gv_supplierItemCode
            // 
            this.gv_supplierItemCode.AppearanceCell.Options.UseFont = true;
            this.gv_supplierItemCode.Caption = "物料编码";
            this.gv_supplierItemCode.FieldName = "wlbm";
            this.gv_supplierItemCode.FieldName = "itemNo";
            this.gv_supplierItemCode.MinWidth = 10;
            this.gv_supplierItemCode.Name = "gv_supplierItemCode";
            this.gv_supplierItemCode.OptionsColumn.AllowEdit = false;
@@ -178,13 +159,13 @@
            this.gv_supplierItemCode.Tag = "query_a.SUPPLIER_ITEM_CODE";
            this.gv_supplierItemCode.Visible = true;
            this.gv_supplierItemCode.VisibleIndex = 3;
            this.gv_supplierItemCode.Width = 10;
            this.gv_supplierItemCode.Width = 82;
            // 
            // gv_supplierItemName
            // 
            this.gv_supplierItemName.AppearanceCell.Options.UseFont = true;
            this.gv_supplierItemName.Caption = "物料名称";
            this.gv_supplierItemName.FieldName = "wlmc";
            this.gv_supplierItemName.FieldName = "itemName";
            this.gv_supplierItemName.MinWidth = 10;
            this.gv_supplierItemName.Name = "gv_supplierItemName";
            this.gv_supplierItemName.OptionsColumn.AllowEdit = false;
@@ -192,93 +173,39 @@
            this.gv_supplierItemName.Tag = "query_a.SUPPLIER_ITEM_NAME";
            this.gv_supplierItemName.Visible = true;
            this.gv_supplierItemName.VisibleIndex = 4;
            this.gv_supplierItemName.Width = 10;
            // 
            // gridColumn6
            // 
            this.gridColumn6.Caption = "采购数量";
            this.gridColumn6.FieldName = "purchaseQty";
            this.gridColumn6.MinWidth = 10;
            this.gridColumn6.Name = "gridColumn6";
            this.gridColumn6.OptionsColumn.ReadOnly = true;
            this.gridColumn6.Visible = true;
            this.gridColumn6.VisibleIndex = 5;
            this.gridColumn6.Width = 11;
            // 
            // gridColumn9
            // 
            this.gridColumn9.Caption = "已收数量";
            this.gridColumn9.FieldName = "yssl";
            this.gridColumn9.MinWidth = 10;
            this.gridColumn9.Name = "gridColumn9";
            this.gridColumn9.OptionsColumn.ReadOnly = true;
            this.gridColumn9.Visible = true;
            this.gridColumn9.VisibleIndex = 6;
            this.gridColumn9.Width = 50;
            // 
            // gridColumn7
            // 
            this.gridColumn7.AppearanceCell.ForeColor = System.Drawing.Color.Red;
            this.gridColumn7.AppearanceCell.Options.UseForeColor = true;
            this.gridColumn7.AppearanceHeader.ForeColor = System.Drawing.Color.Red;
            this.gridColumn7.AppearanceHeader.Options.UseForeColor = true;
            this.gridColumn7.Caption = "未收数量";
            this.gridColumn7.FieldName = "wssl";
            this.gridColumn7.MinWidth = 10;
            this.gridColumn7.Name = "gridColumn7";
            this.gridColumn7.OptionsColumn.ReadOnly = true;
            this.gridColumn7.Visible = true;
            this.gridColumn7.VisibleIndex = 7;
            this.gridColumn7.Width = 10;
            // 
            // gv_purchaseUnit
            // 
            this.gv_purchaseUnit.AppearanceCell.Options.UseFont = true;
            this.gv_purchaseUnit.Caption = "采购单位";
            this.gv_purchaseUnit.FieldName = "fname";
            this.gv_purchaseUnit.MinWidth = 10;
            this.gv_purchaseUnit.Name = "gv_purchaseUnit";
            this.gv_purchaseUnit.OptionsColumn.AllowEdit = false;
            this.gv_purchaseUnit.OptionsColumn.ReadOnly = true;
            this.gv_purchaseUnit.Tag = "query_a.PURCHASE_UNIT";
            this.gv_purchaseUnit.Visible = true;
            this.gv_purchaseUnit.VisibleIndex = 8;
            this.gv_purchaseUnit.Width = 50;
            // 
            // gv_remarks
            // 
            this.gv_remarks.AppearanceCell.Options.UseFont = true;
            this.gv_remarks.Caption = "备注";
            this.gv_remarks.FieldName = "remarks";
            this.gv_remarks.MinWidth = 10;
            this.gv_remarks.Name = "gv_remarks";
            this.gv_remarks.OptionsColumn.AllowEdit = false;
            this.gv_remarks.OptionsColumn.ReadOnly = true;
            this.gv_remarks.Tag = "query_a.REMARKS";
            this.gv_remarks.Visible = true;
            this.gv_remarks.VisibleIndex = 9;
            this.gv_remarks.Width = 10;
            this.gv_supplierItemName.Width = 82;
            // 
            // gridColumn5
            // 
            this.gridColumn5.Caption = "物料规格";
            this.gridColumn5.FieldName = "wlgg";
            this.gridColumn5.FieldName = "itemModel";
            this.gridColumn5.MinWidth = 10;
            this.gridColumn5.Name = "gridColumn5";
            this.gridColumn5.OptionsColumn.ReadOnly = true;
            this.gridColumn5.Visible = true;
            this.gridColumn5.VisibleIndex = 10;
            this.gridColumn5.Width = 11;
            this.gridColumn5.VisibleIndex = 5;
            this.gridColumn5.Width = 218;
            // 
            // gridColumn6
            // 
            this.gridColumn6.Caption = "条码数量";
            this.gridColumn6.FieldName = "quantity";
            this.gridColumn6.MinWidth = 10;
            this.gridColumn6.Name = "gridColumn6";
            this.gridColumn6.OptionsColumn.ReadOnly = true;
            this.gridColumn6.Visible = true;
            this.gridColumn6.VisibleIndex = 6;
            this.gridColumn6.Width = 92;
            // 
            // gridColumn2
            // 
            this.gridColumn2.Caption = "收料组织";
            this.gridColumn2.FieldName = "fSubsidiary";
            this.gridColumn2.Caption = "库存组织";
            this.gridColumn2.FieldName = "orgName";
            this.gridColumn2.MinWidth = 10;
            this.gridColumn2.Name = "gridColumn2";
            this.gridColumn2.Visible = true;
            this.gridColumn2.VisibleIndex = 12;
            this.gridColumn2.Width = 10;
            this.gridColumn2.VisibleIndex = 7;
            this.gridColumn2.Width = 216;
            // 
            // panelControl1
            // 
@@ -328,17 +255,12 @@
        private DevExpress.XtraGrid.GridControl gcMain;
        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
        private DevExpress.XtraGrid.Columns.GridColumn gv_guid;
        private DevExpress.XtraGrid.Columns.GridColumn gv_ebelnK3id;
        private DevExpress.XtraGrid.Columns.GridColumn gv_billNo;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
        private DevExpress.XtraGrid.Columns.GridColumn gv_supplierItemCode;
        private DevExpress.XtraGrid.Columns.GridColumn gv_supplierItemName;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
        private DevExpress.XtraGrid.Columns.GridColumn gv_purchaseUnit;
        private DevExpress.XtraGrid.Columns.GridColumn gv_remarks;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
        private DevExpress.XtraEditors.PanelControl panelControl1;
        private DevExpress.XtraEditors.SimpleButton btnIn;

 DevApp/Gs.DevApp/DevFrm/RkQC/SelectCqsq.cs

@@ -15,7 +15,7 @@
{
    public partial class SelectCqsq : DevExpress.XtraEditors.XtraForm
    {
        private readonly string _webServiceName = "MesInvItemArnManager/";
        private readonly string _webServiceName = "RkqcSqManager/";
        private string kcOrgId = "";
        /// <summary>
        /// 
@@ -37,7 +37,7 @@
            {
                gridView1.PostEditor();
                gridView1.UpdateCurrentRow();
                var list = new List<string>();
                var list = new List<dynamic>();
                DataTable dt = this.gcMain.DataSource as DataTable;
                {
                    foreach (DataRow dr in dt.Rows)
@@ -46,11 +46,20 @@
                        string _guid = dr["guid"].ToString();
                        if (Gs.DevApp.ToolBox.UtilityHelper.ToCheck(checkBox))
                        {
                            list.Add(_guid);
                            list.Add(new
                            {
                                guid = _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(),
                            });
                        }
                    }
                }
                UpdateParent?.Invoke(this, new UpdateParentEventArgs { StringList = list }); Close();
                UpdateParent?.Invoke(this, new UpdateParentEventArgs { DynamicList = list }); Close();
            };
        }


 DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs

@@ -411,6 +411,7 @@
            dataTable.Rows.Add("FQCYC(FQC异常)");
            dataTable.Rows.Add("ZSM(追溯码)");
            dataTable.Rows.Add("TB(托板码)");
            dataTable.Rows.Add("JYSQ(检验申请)");
            txt_docCode.Properties.DataSource = dataTable;
            txt_docCode.Properties.DisplayMember = "docCode"; // 显示的列
            txt_docCode.Properties.ValueMember = "docCode"; // 实际值的列

 DevApp/Gs.DevApp/Gs.DevApp.csproj

@@ -614,6 +614,12 @@
    <Compile Include="DevFrm\RkQC\RkDetect01.Designer.cs">
      <DependentUpon>RkDetect01.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\RkQC\SelectCqsq.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\RkQC\SelectCqsq.Designer.cs">
      <DependentUpon>SelectCqsq.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\Rk\Frm_MesInvItemIns.cs">
      <SubType>Form</SubType>
    </Compile>
@@ -1546,6 +1552,9 @@
    <EmbeddedResource Include="DevFrm\RkQC\RkDetect01.resx">
      <DependentUpon>RkDetect01.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\RkQC\SelectCqsq.resx">
      <DependentUpon>SelectCqsq.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\Rk\Frm_MesInvItemIns.resx">
      <DependentUpon>Frm_MesInvItemIns.cs</DependentUpon>
    </EmbeddedResource>