超期重检

lu

2 天以前 906f79ff500541dda3626f12c1a05f2d2e57f7a8

超期重检

 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/QC/Frm_IQCLookups.cs

@@ -370,7 +370,6 @@
            }
            if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】，确定" + strMsg + "吗？"))
                return;

            var _obj = new
            {
                guid = rowGuid,

 DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqfa.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();
@@ -49,23 +49,17 @@
            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_status = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_isFinish = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_isOut = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_billNo = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_lastUpdateUser = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_lastUpdateTime = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_checkUser = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_checkDate = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_returnMethod = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_returnType = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_depotId = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_suppId = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_remark = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn7 = 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.txt_fSubsidiary = new Gs.DevApp.UserControl.UcLookOrg();
            this.txt_checkStatus = new DevExpress.XtraEditors.CheckEdit();
            this.btnSelect = new DevExpress.XtraEditors.SimpleButton();
            this.lbGuid = new System.Windows.Forms.Label();
            this.txt_fabm = new DevExpress.XtraEditors.TextEdit();
@@ -73,29 +67,15 @@
            this.txt_bz = new DevExpress.XtraEditors.TextEdit();
            this.txt_checkBy = new DevExpress.XtraEditors.TextEdit();
            this.txt_guid = new DevExpress.XtraEditors.TextEdit();
            this.txt_famc = new DevExpress.XtraEditors.TextEdit();
            this.txt_bzqx = new DevExpress.XtraEditors.TextEdit();
            this.txt_fjxz = new DevExpress.XtraEditors.TextEdit();
            this.txt_yjrq = new DevExpress.XtraEditors.TextEdit();
            this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
            this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
            this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem10 = 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.gvMx1id = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1mid = 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.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            this.picCheckBox = new System.Windows.Forms.PictureBox();
            this.tips = new DevExpress.Utils.ToolTipController(this.components);
            this.txt_famc = new DevExpress.XtraEditors.TextEdit();
            this.txt_bzqx = new DevExpress.XtraEditors.TextEdit();
            this.txt_fjxz = new DevExpress.XtraEditors.TextEdit();
            this.txt_yjrq = new DevExpress.XtraEditors.TextEdit();
            this.txt_checkStatus = new DevExpress.XtraEditors.CheckEdit();
            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -104,9 +84,27 @@
            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.layoutControlItem8 = 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.gvMx1id = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1mid = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1itemId = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            this.picCheckBox = new System.Windows.Forms.PictureBox();
            this.tips = new DevExpress.Utils.ToolTipController(this.components);
            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
            this.xtraTabControl1.SuspendLayout();
            this.xtraTabPage1.SuspendLayout();
@@ -126,28 +124,21 @@
            this.splitMx1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
            this.layoutMx1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.txt_checkStatus.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fabm.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_bz.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_checkBy.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_famc.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_bzqx.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fjxz.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_yjrq.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).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();
            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_famc.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_bzqx.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fjxz.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_yjrq.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_checkStatus.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
@@ -156,11 +147,19 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).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();
            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
            this.SuspendLayout();
            // 
            // toolBarMenu1
            // 
            this.toolBarMenu1.chkParameter = null;
            this.toolBarMenu1.chkParameter = "MES_CQJY_FA,checkDate,checkStatus,checkBy";
            this.toolBarMenu1.currentAction = null;
            this.toolBarMenu1.defaultActions = null;
            this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
@@ -233,19 +232,15 @@
            this.gridView1.Appearance.Row.Options.UseFont = true;
            this.gridView1.ColumnPanelRowHeight = 50;
            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gridColumn9,
            this.gridColumn8,
            this.gridColumn10,
            this.gridColumn1,
            this.gv_status,
            this.gv_isFinish,
            this.gv_isOut,
            this.gridColumn11,
            this.gv_billNo,
            this.gv_lastUpdateUser,
            this.gv_lastUpdateTime,
            this.gv_checkUser,
            this.gv_checkDate,
            this.gv_returnMethod,
            this.gv_returnType,
            this.gv_depotId,
            this.gv_suppId,
            this.gv_remark,
            this.gridColumn7});
            this.gridView1.GridControl = this.gcMain1;
@@ -257,19 +252,19 @@
            // 
            // gridColumn1
            // 
            this.gridColumn1.Caption = "退货组织";
            this.gridColumn1.FieldName = "receivingOrg";
            this.gridColumn1.Caption = "使用组织";
            this.gridColumn1.FieldName = "orgName";
            this.gridColumn1.Name = "gridColumn1";
            this.gridColumn1.Tag = "org.fnamber";
            this.gridColumn1.Visible = true;
            this.gridColumn1.VisibleIndex = 0;
            this.gridColumn1.Width = 250;
            this.gridColumn1.Width = 50;
            // 
            // gv_status
            // 
            this.gv_status.AppearanceCell.Options.UseFont = true;
            this.gv_status.Caption = "审核状态";
            this.gv_status.FieldName = "status";
            this.gv_status.FieldName = "checkStatus";
            this.gv_status.MaxWidth = 50;
            this.gv_status.MinWidth = 50;
            this.gv_status.Name = "gv_status";
@@ -279,79 +274,29 @@
            this.gv_status.VisibleIndex = 1;
            this.gv_status.Width = 50;
            // 
            // gv_isFinish
            // 
            this.gv_isFinish.AppearanceCell.Options.UseFont = true;
            this.gv_isFinish.Caption = "是否完成";
            this.gv_isFinish.FieldName = "isFinish";
            this.gv_isFinish.MaxWidth = 50;
            this.gv_isFinish.MinWidth = 50;
            this.gv_isFinish.Name = "gv_isFinish";
            this.gv_isFinish.OptionsColumn.AllowEdit = false;
            this.gv_isFinish.Tag = "query_a.IS_FINISH";
            this.gv_isFinish.Width = 50;
            // 
            // gv_isOut
            // 
            this.gv_isOut.AppearanceCell.Options.UseFont = true;
            this.gv_isOut.Caption = "委外标识";
            this.gv_isOut.FieldName = "isOut";
            this.gv_isOut.MaxWidth = 50;
            this.gv_isOut.MinWidth = 50;
            this.gv_isOut.Name = "gv_isOut";
            this.gv_isOut.OptionsColumn.AllowEdit = false;
            this.gv_isOut.Tag = "query_a.IS_OUT";
            this.gv_isOut.Visible = true;
            this.gv_isOut.VisibleIndex = 2;
            this.gv_isOut.Width = 50;
            // 
            // gv_billNo
            // 
            this.gv_billNo.AppearanceCell.Options.UseFont = true;
            this.gv_billNo.Caption = "单据编码";
            this.gv_billNo.FieldName = "billNo";
            this.gv_billNo.Caption = "方案编码";
            this.gv_billNo.FieldName = "fabm";
            this.gv_billNo.Name = "gv_billNo";
            this.gv_billNo.OptionsColumn.AllowEdit = false;
            this.gv_billNo.Tag = "query_a.BILL_NO";
            this.gv_billNo.Visible = true;
            this.gv_billNo.VisibleIndex = 3;
            this.gv_billNo.Width = 120;
            // 
            // gv_lastUpdateUser
            // 
            this.gv_lastUpdateUser.AppearanceCell.Options.UseFont = true;
            this.gv_lastUpdateUser.Caption = "最后跟新人 ";
            this.gv_lastUpdateUser.FieldName = "lastUpdateUser";
            this.gv_lastUpdateUser.Name = "gv_lastUpdateUser";
            this.gv_lastUpdateUser.OptionsColumn.AllowEdit = false;
            this.gv_lastUpdateUser.Tag = "query_a.LAST_UPDATE_USER";
            this.gv_lastUpdateUser.Visible = true;
            this.gv_lastUpdateUser.VisibleIndex = 4;
            this.gv_lastUpdateUser.Width = 94;
            // 
            // gv_lastUpdateTime
            // 
            this.gv_lastUpdateTime.AppearanceCell.Options.UseFont = true;
            this.gv_lastUpdateTime.Caption = "最后修改时间 ";
            this.gv_lastUpdateTime.FieldName = "lastUpdateTime";
            this.gv_lastUpdateTime.Name = "gv_lastUpdateTime";
            this.gv_lastUpdateTime.OptionsColumn.AllowEdit = false;
            this.gv_lastUpdateTime.Tag = "query_a.LAST_UPDATE_TIME";
            this.gv_lastUpdateTime.Visible = true;
            this.gv_lastUpdateTime.VisibleIndex = 5;
            this.gv_lastUpdateTime.Width = 180;
            this.gv_billNo.VisibleIndex = 2;
            this.gv_billNo.Width = 147;
            // 
            // gv_checkUser
            // 
            this.gv_checkUser.AppearanceCell.Options.UseFont = true;
            this.gv_checkUser.Caption = "审核人 ";
            this.gv_checkUser.FieldName = "checkUser";
            this.gv_checkUser.FieldName = "checkBy";
            this.gv_checkUser.Name = "gv_checkUser";
            this.gv_checkUser.OptionsColumn.AllowEdit = false;
            this.gv_checkUser.Tag = "query_a.CHECK_USER";
            this.gv_checkUser.Visible = true;
            this.gv_checkUser.VisibleIndex = 6;
            this.gv_checkUser.Width = 94;
            this.gv_checkUser.VisibleIndex = 7;
            this.gv_checkUser.Width = 115;
            // 
            // gv_checkDate
            // 
@@ -362,68 +307,20 @@
            this.gv_checkDate.OptionsColumn.AllowEdit = false;
            this.gv_checkDate.Tag = "query_a.CHECK_DATE";
            this.gv_checkDate.Visible = true;
            this.gv_checkDate.VisibleIndex = 7;
            this.gv_checkDate.Width = 94;
            // 
            // gv_returnMethod
            // 
            this.gv_returnMethod.AppearanceCell.Options.UseFont = true;
            this.gv_returnMethod.Caption = "退料方式 ";
            this.gv_returnMethod.FieldName = "returnMethod";
            this.gv_returnMethod.Name = "gv_returnMethod";
            this.gv_returnMethod.OptionsColumn.AllowEdit = false;
            this.gv_returnMethod.Tag = "query_a.RETURN_METHOD";
            this.gv_returnMethod.Visible = true;
            this.gv_returnMethod.VisibleIndex = 8;
            this.gv_returnMethod.Width = 94;
            // 
            // gv_returnType
            // 
            this.gv_returnType.AppearanceCell.Options.UseFont = true;
            this.gv_returnType.Caption = "退料类型 ";
            this.gv_returnType.FieldName = "returnType";
            this.gv_returnType.Name = "gv_returnType";
            this.gv_returnType.OptionsColumn.AllowEdit = false;
            this.gv_returnType.Tag = "query_a.RETURN_TYPE";
            this.gv_returnType.Visible = true;
            this.gv_returnType.VisibleIndex = 9;
            this.gv_returnType.Width = 94;
            // 
            // gv_depotId
            // 
            this.gv_depotId.AppearanceCell.Options.UseFont = true;
            this.gv_depotId.Caption = "仓库";
            this.gv_depotId.FieldName = "dptName";
            this.gv_depotId.Name = "gv_depotId";
            this.gv_depotId.OptionsColumn.AllowEdit = false;
            this.gv_depotId.Tag = "query_a.DEPOT_ID";
            this.gv_depotId.Visible = true;
            this.gv_depotId.VisibleIndex = 10;
            this.gv_depotId.Width = 94;
            // 
            // gv_suppId
            // 
            this.gv_suppId.AppearanceCell.Options.UseFont = true;
            this.gv_suppId.Caption = "供应商";
            this.gv_suppId.FieldName = "supName";
            this.gv_suppId.Name = "gv_suppId";
            this.gv_suppId.OptionsColumn.AllowEdit = false;
            this.gv_suppId.Tag = "query_a.SUPP_ID";
            this.gv_suppId.Visible = true;
            this.gv_suppId.VisibleIndex = 11;
            this.gv_suppId.Width = 94;
            this.gv_checkDate.VisibleIndex = 8;
            this.gv_checkDate.Width = 115;
            // 
            // gv_remark
            // 
            this.gv_remark.AppearanceCell.Options.UseFont = true;
            this.gv_remark.Caption = "申请备注";
            this.gv_remark.FieldName = "remark";
            this.gv_remark.Caption = "备注";
            this.gv_remark.FieldName = "bz";
            this.gv_remark.Name = "gv_remark";
            this.gv_remark.OptionsColumn.AllowEdit = false;
            this.gv_remark.Tag = "query_a.REMARK";
            this.gv_remark.Visible = true;
            this.gv_remark.VisibleIndex = 12;
            this.gv_remark.Width = 94;
            this.gv_remark.VisibleIndex = 9;
            this.gv_remark.Width = 137;
            // 
            // gridColumn7
            // 
@@ -475,6 +372,7 @@
            // 
            // layoutMx1
            // 
            this.layoutMx1.Controls.Add(this.txt_fSubsidiary);
            this.layoutMx1.Controls.Add(this.txt_checkStatus);
            this.layoutMx1.Controls.Add(this.btnSelect);
            this.layoutMx1.Controls.Add(this.lbGuid);
@@ -498,6 +396,24 @@
            this.layoutMx1.Size = new System.Drawing.Size(1126, 111);
            this.layoutMx1.TabIndex = 0;
            this.layoutMx1.Text = "layoutControl1";
            // 
            // txt_fSubsidiary
            // 
            this.txt_fSubsidiary.IsReadly = false;
            this.txt_fSubsidiary.Location = new System.Drawing.Point(663, 12);
            this.txt_fSubsidiary.Name = "txt_fSubsidiary";
            this.txt_fSubsidiary.Size = new System.Drawing.Size(173, 24);
            this.txt_fSubsidiary.TabIndex = 538;
            // 
            // txt_checkStatus
            // 
            this.txt_checkStatus.Location = new System.Drawing.Point(840, 74);
            this.txt_checkStatus.Name = "txt_checkStatus";
            this.txt_checkStatus.Properties.Caption = "审核标识";
            this.txt_checkStatus.Size = new System.Drawing.Size(274, 24);
            this.txt_checkStatus.StyleController = this.layoutMx1;
            this.txt_checkStatus.TabIndex = 537;
            this.txt_checkStatus.Tag = "readonly";
            // 
            // btnSelect
            // 
@@ -523,36 +439,36 @@
            this.txt_fabm.Location = new System.Drawing.Point(111, 12);
            this.txt_fabm.Name = "txt_fabm";
            this.txt_fabm.Properties.Appearance.Options.UseFont = true;
            this.txt_fabm.Size = new System.Drawing.Size(168, 24);
            this.txt_fabm.Size = new System.Drawing.Size(173, 24);
            this.txt_fabm.StyleController = this.layoutMx1;
            this.txt_fabm.TabIndex = 211;
            this.txt_fabm.Tag = "readonly";
            this.txt_fabm.Tag = "";
            // 
            // txt_checkDate
            // 
            this.txt_checkDate.Location = new System.Drawing.Point(924, 43);
            this.txt_checkDate.Location = new System.Drawing.Point(939, 43);
            this.txt_checkDate.Name = "txt_checkDate";
            this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
            this.txt_checkDate.Size = new System.Drawing.Size(169, 24);
            this.txt_checkDate.Size = new System.Drawing.Size(175, 24);
            this.txt_checkDate.StyleController = this.layoutMx1;
            this.txt_checkDate.TabIndex = 226;
            this.txt_checkDate.Tag = "readonly";
            // 
            // txt_bz
            // 
            this.txt_bz.Location = new System.Drawing.Point(382, 74);
            this.txt_bz.Location = new System.Drawing.Point(387, 74);
            this.txt_bz.Name = "txt_bz";
            this.txt_bz.Properties.Appearance.Options.UseFont = true;
            this.txt_bz.Size = new System.Drawing.Size(439, 24);
            this.txt_bz.Size = new System.Drawing.Size(449, 24);
            this.txt_bz.StyleController = this.layoutMx1;
            this.txt_bz.TabIndex = 252;
            // 
            // txt_checkBy
            // 
            this.txt_checkBy.Location = new System.Drawing.Point(924, 12);
            this.txt_checkBy.Location = new System.Drawing.Point(939, 12);
            this.txt_checkBy.Name = "txt_checkBy";
            this.txt_checkBy.Properties.Appearance.Options.UseFont = true;
            this.txt_checkBy.Size = new System.Drawing.Size(169, 24);
            this.txt_checkBy.Size = new System.Drawing.Size(175, 24);
            this.txt_checkBy.StyleController = this.layoutMx1;
            this.txt_checkBy.TabIndex = 222;
            this.txt_checkBy.Tag = "readonly";
@@ -564,6 +480,38 @@
            this.txt_guid.Size = new System.Drawing.Size(172, 24);
            this.txt_guid.StyleController = this.layoutMx1;
            this.txt_guid.TabIndex = 532;
            // 
            // txt_famc
            // 
            this.txt_famc.Location = new System.Drawing.Point(387, 12);
            this.txt_famc.Name = "txt_famc";
            this.txt_famc.Size = new System.Drawing.Size(173, 24);
            this.txt_famc.StyleController = this.layoutMx1;
            this.txt_famc.TabIndex = 533;
            // 
            // txt_bzqx
            // 
            this.txt_bzqx.Location = new System.Drawing.Point(387, 43);
            this.txt_bzqx.Name = "txt_bzqx";
            this.txt_bzqx.Size = new System.Drawing.Size(173, 24);
            this.txt_bzqx.StyleController = this.layoutMx1;
            this.txt_bzqx.TabIndex = 534;
            // 
            // txt_fjxz
            // 
            this.txt_fjxz.Location = new System.Drawing.Point(663, 43);
            this.txt_fjxz.Name = "txt_fjxz";
            this.txt_fjxz.Size = new System.Drawing.Size(173, 24);
            this.txt_fjxz.StyleController = this.layoutMx1;
            this.txt_fjxz.TabIndex = 535;
            // 
            // txt_yjrq
            // 
            this.txt_yjrq.Location = new System.Drawing.Point(111, 43);
            this.txt_yjrq.Name = "txt_yjrq";
            this.txt_yjrq.Size = new System.Drawing.Size(173, 24);
            this.txt_yjrq.StyleController = this.layoutMx1;
            this.txt_yjrq.TabIndex = 536;
            // 
            // layoutControlItem17
            // 
@@ -602,56 +550,155 @@
            this.layoutControlItem2,
            this.layoutControlItem4,
            this.layoutControlItem16,
            this.layoutControlItem7});
            this.layoutControlItem7,
            this.layoutControlItem8});
            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});
            this.Root.Size = new System.Drawing.Size(1105, 113);
            rowDefinition4,
            rowDefinition5,
            rowDefinition6});
            this.Root.Size = new System.Drawing.Size(1126, 113);
            this.Root.TextVisible = false;
            // 
            // layoutControlItem9
            // 
            this.layoutControlItem9.Control = this.txt_checkBy;
            this.layoutControlItem9.CustomizationFormText = "审核人员";
            this.layoutControlItem9.Location = new System.Drawing.Point(813, 0);
            this.layoutControlItem9.Location = new System.Drawing.Point(828, 0);
            this.layoutControlItem9.Name = "layoutControlItem9";
            this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem9.Size = new System.Drawing.Size(272, 31);
            this.layoutControlItem9.Size = new System.Drawing.Size(278, 31);
            this.layoutControlItem9.Text = "审核人员";
            this.layoutControlItem9.TextSize = new System.Drawing.Size(87, 18);
            // 
            // layoutControlItem10
            // 
            this.layoutControlItem10.Control = this.txt_checkDate;
            this.layoutControlItem10.Location = new System.Drawing.Point(813, 31);
            this.layoutControlItem10.Location = new System.Drawing.Point(828, 31);
            this.layoutControlItem10.Name = "layoutControlItem10";
            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem10.Size = new System.Drawing.Size(272, 31);
            this.layoutControlItem10.Size = new System.Drawing.Size(278, 31);
            this.layoutControlItem10.Text = "审核时间";
            this.layoutControlItem10.TextSize = new System.Drawing.Size(87, 18);
            // 
            // layoutControlItem6
            // 
            this.layoutControlItem6.Control = this.txt_checkStatus;
            this.layoutControlItem6.Location = new System.Drawing.Point(828, 62);
            this.layoutControlItem6.Name = "layoutControlItem6";
            this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem6.Size = new System.Drawing.Size(278, 31);
            this.layoutControlItem6.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem6.TextVisible = false;
            // 
            // layoutControlItem1
            // 
            this.layoutControlItem1.Control = this.txt_fabm;
            this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
            this.layoutControlItem1.Name = "layoutControlItem1";
            this.layoutControlItem1.Size = new System.Drawing.Size(276, 31);
            this.layoutControlItem1.Text = "方案编码";
            this.layoutControlItem1.TextSize = new System.Drawing.Size(87, 18);
            // 
            // layoutControlItem3
            // 
            this.layoutControlItem3.Control = this.txt_famc;
            this.layoutControlItem3.Location = new System.Drawing.Point(276, 0);
            this.layoutControlItem3.Name = "layoutControlItem3";
            this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem3.Size = new System.Drawing.Size(276, 31);
            this.layoutControlItem3.Text = "方案名称";
            this.layoutControlItem3.TextSize = new System.Drawing.Size(87, 18);
            // 
            // layoutControlItem5
            // 
            this.layoutControlItem5.Control = this.txt_yjrq;
            this.layoutControlItem5.Location = new System.Drawing.Point(0, 31);
            this.layoutControlItem5.Name = "layoutControlItem5";
            this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem5.Size = new System.Drawing.Size(276, 31);
            this.layoutControlItem5.Text = "预警日期(天)";
            this.layoutControlItem5.TextSize = new System.Drawing.Size(87, 18);
            // 
            // layoutControlItem2
            // 
            this.layoutControlItem2.Control = this.txt_bzqx;
            this.layoutControlItem2.Location = new System.Drawing.Point(276, 31);
            this.layoutControlItem2.Name = "layoutControlItem2";
            this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem2.Size = new System.Drawing.Size(276, 31);
            this.layoutControlItem2.Text = "质保期限(天)";
            this.layoutControlItem2.TextSize = new System.Drawing.Size(87, 18);
            // 
            // layoutControlItem4
            // 
            this.layoutControlItem4.Control = this.txt_fjxz;
            this.layoutControlItem4.Location = new System.Drawing.Point(552, 31);
            this.layoutControlItem4.Name = "layoutControlItem4";
            this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem4.Size = new System.Drawing.Size(276, 31);
            this.layoutControlItem4.Text = "复检限值(次)";
            this.layoutControlItem4.TextSize = new System.Drawing.Size(87, 18);
            // 
            // layoutControlItem16
            // 
            this.layoutControlItem16.Control = this.btnSelect;
            this.layoutControlItem16.Location = new System.Drawing.Point(0, 62);
            this.layoutControlItem16.MaxSize = new System.Drawing.Size(120, 31);
            this.layoutControlItem16.MinSize = new System.Drawing.Size(20, 31);
            this.layoutControlItem16.Name = "layoutControlItem16";
            this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem16.Size = new System.Drawing.Size(276, 31);
            this.layoutControlItem16.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
            this.layoutControlItem16.Text = "退货明细";
            this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem16.TextVisible = false;
            // 
            // layoutControlItem7
            // 
            this.layoutControlItem7.Control = this.txt_bz;
            this.layoutControlItem7.Location = new System.Drawing.Point(276, 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(552, 31);
            this.layoutControlItem7.Text = "方案备注";
            this.layoutControlItem7.TextSize = new System.Drawing.Size(87, 18);
            // 
            // layoutControlItem8
            // 
            this.layoutControlItem8.Control = this.txt_fSubsidiary;
            this.layoutControlItem8.Location = new System.Drawing.Point(552, 0);
            this.layoutControlItem8.Name = "layoutControlItem8";
            this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem8.Size = new System.Drawing.Size(276, 31);
            this.layoutControlItem8.Text = "使用组织";
            this.layoutControlItem8.TextSize = new System.Drawing.Size(87, 18);
            // 
            // tabMx
            // 
@@ -721,6 +768,15 @@
            this.gvMx1mid.Tag = "query_a.MID";
            this.gvMx1mid.Width = 94;
            // 
            // gridColumn6
            // 
            this.gridColumn6.Caption = "使用组织";
            this.gridColumn6.MinWidth = 25;
            this.gridColumn6.Name = "gridColumn6";
            this.gridColumn6.Visible = true;
            this.gridColumn6.VisibleIndex = 0;
            this.gridColumn6.Width = 94;
            // 
            // gvMx1itemId
            // 
            this.gvMx1itemId.AppearanceCell.Options.UseFont = true;
@@ -742,6 +798,15 @@
            this.gridColumn2.Visible = true;
            this.gridColumn2.VisibleIndex = 2;
            this.gridColumn2.Width = 94;
            // 
            // gridColumn4
            // 
            this.gridColumn4.Caption = "物料规格";
            this.gridColumn4.MinWidth = 25;
            this.gridColumn4.Name = "gridColumn4";
            this.gridColumn4.Visible = true;
            this.gridColumn4.VisibleIndex = 4;
            this.gridColumn4.Width = 94;
            // 
            // gridColumn5
            // 
@@ -766,10 +831,10 @@
            // 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);
@@ -785,136 +850,6 @@
            this.picCheckBox.TabStop = false;
            this.picCheckBox.Visible = false;
            // 
            // txt_famc
            // 
            this.txt_famc.Location = new System.Drawing.Point(382, 12);
            this.txt_famc.Name = "txt_famc";
            this.txt_famc.Size = new System.Drawing.Size(168, 24);
            this.txt_famc.StyleController = this.layoutMx1;
            this.txt_famc.TabIndex = 533;
            // 
            // txt_bzqx
            // 
            this.txt_bzqx.Location = new System.Drawing.Point(382, 43);
            this.txt_bzqx.Name = "txt_bzqx";
            this.txt_bzqx.Size = new System.Drawing.Size(168, 24);
            this.txt_bzqx.StyleController = this.layoutMx1;
            this.txt_bzqx.TabIndex = 534;
            // 
            // txt_fjxz
            // 
            this.txt_fjxz.Location = new System.Drawing.Point(653, 43);
            this.txt_fjxz.Name = "txt_fjxz";
            this.txt_fjxz.Size = new System.Drawing.Size(168, 24);
            this.txt_fjxz.StyleController = this.layoutMx1;
            this.txt_fjxz.TabIndex = 535;
            // 
            // txt_yjrq
            // 
            this.txt_yjrq.Location = new System.Drawing.Point(111, 43);
            this.txt_yjrq.Name = "txt_yjrq";
            this.txt_yjrq.Size = new System.Drawing.Size(168, 24);
            this.txt_yjrq.StyleController = this.layoutMx1;
            this.txt_yjrq.TabIndex = 536;
            // 
            // txt_checkStatus
            // 
            this.txt_checkStatus.Location = new System.Drawing.Point(825, 74);
            this.txt_checkStatus.Name = "txt_checkStatus";
            this.txt_checkStatus.Properties.Caption = "审核标识";
            this.txt_checkStatus.Size = new System.Drawing.Size(268, 24);
            this.txt_checkStatus.StyleController = this.layoutMx1;
            this.txt_checkStatus.TabIndex = 537;
            this.txt_checkStatus.Tag = "readonly";
            // 
            // layoutControlItem6
            // 
            this.layoutControlItem6.Control = this.txt_checkStatus;
            this.layoutControlItem6.Location = new System.Drawing.Point(813, 62);
            this.layoutControlItem6.Name = "layoutControlItem6";
            this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem6.Size = new System.Drawing.Size(272, 31);
            this.layoutControlItem6.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem6.TextVisible = false;
            // 
            // layoutControlItem1
            // 
            this.layoutControlItem1.Control = this.txt_fabm;
            this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
            this.layoutControlItem1.Name = "layoutControlItem1";
            this.layoutControlItem1.Size = new System.Drawing.Size(271, 31);
            this.layoutControlItem1.Text = "方案编码";
            this.layoutControlItem1.TextSize = new System.Drawing.Size(87, 18);
            // 
            // layoutControlItem3
            // 
            this.layoutControlItem3.Control = this.txt_famc;
            this.layoutControlItem3.Location = new System.Drawing.Point(271, 0);
            this.layoutControlItem3.Name = "layoutControlItem3";
            this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem3.Size = new System.Drawing.Size(271, 31);
            this.layoutControlItem3.Text = "方案名称";
            this.layoutControlItem3.TextSize = new System.Drawing.Size(87, 18);
            // 
            // layoutControlItem5
            // 
            this.layoutControlItem5.Control = this.txt_yjrq;
            this.layoutControlItem5.Location = new System.Drawing.Point(0, 31);
            this.layoutControlItem5.Name = "layoutControlItem5";
            this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem5.Size = new System.Drawing.Size(271, 31);
            this.layoutControlItem5.Text = "预警日期(天)";
            this.layoutControlItem5.TextSize = new System.Drawing.Size(87, 18);
            // 
            // layoutControlItem2
            // 
            this.layoutControlItem2.Control = this.txt_bzqx;
            this.layoutControlItem2.Location = new System.Drawing.Point(271, 31);
            this.layoutControlItem2.Name = "layoutControlItem2";
            this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem2.Size = new System.Drawing.Size(271, 31);
            this.layoutControlItem2.Text = "质保期限(天)";
            this.layoutControlItem2.TextSize = new System.Drawing.Size(87, 18);
            // 
            // layoutControlItem4
            // 
            this.layoutControlItem4.Control = this.txt_fjxz;
            this.layoutControlItem4.Location = new System.Drawing.Point(542, 31);
            this.layoutControlItem4.Name = "layoutControlItem4";
            this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem4.Size = new System.Drawing.Size(271, 31);
            this.layoutControlItem4.Text = "复检限值(次)";
            this.layoutControlItem4.TextSize = new System.Drawing.Size(87, 18);
            // 
            // layoutControlItem16
            // 
            this.layoutControlItem16.Control = this.btnSelect;
            this.layoutControlItem16.Location = new System.Drawing.Point(0, 62);
            this.layoutControlItem16.MaxSize = new System.Drawing.Size(120, 31);
            this.layoutControlItem16.MinSize = new System.Drawing.Size(20, 31);
            this.layoutControlItem16.Name = "layoutControlItem16";
            this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem16.Size = new System.Drawing.Size(271, 31);
            this.layoutControlItem16.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
            this.layoutControlItem16.Text = "退货明细";
            this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem16.TextVisible = false;
            // 
            // layoutControlItem7
            // 
            this.layoutControlItem7.Control = this.txt_bz;
            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.Text = "方案备注";
            this.layoutControlItem7.TextSize = new System.Drawing.Size(87, 18);
            // 
            // gridColumn3
            // 
            this.gridColumn3.Caption = "物料规格";
@@ -923,23 +858,45 @@
            this.gridColumn3.Name = "gridColumn3";
            this.gridColumn3.Width = 94;
            // 
            // gridColumn4
            // gridColumn8
            // 
            this.gridColumn4.Caption = "物料规格";
            this.gridColumn4.MinWidth = 25;
            this.gridColumn4.Name = "gridColumn4";
            this.gridColumn4.Visible = true;
            this.gridColumn4.VisibleIndex = 4;
            this.gridColumn4.Width = 94;
            this.gridColumn8.Caption = "预警日期";
            this.gridColumn8.FieldName = "yjrq";
            this.gridColumn8.MinWidth = 25;
            this.gridColumn8.Name = "gridColumn8";
            this.gridColumn8.Visible = true;
            this.gridColumn8.VisibleIndex = 5;
            this.gridColumn8.Width = 115;
            // 
            // gridColumn6
            // gridColumn9
            // 
            this.gridColumn6.Caption = "使用组织";
            this.gridColumn6.MinWidth = 25;
            this.gridColumn6.Name = "gridColumn6";
            this.gridColumn6.Visible = true;
            this.gridColumn6.VisibleIndex = 0;
            this.gridColumn6.Width = 94;
            this.gridColumn9.Caption = "保值期限";
            this.gridColumn9.FieldName = "bzqx";
            this.gridColumn9.MinWidth = 25;
            this.gridColumn9.Name = "gridColumn9";
            this.gridColumn9.Visible = true;
            this.gridColumn9.VisibleIndex = 4;
            this.gridColumn9.Width = 115;
            // 
            // gridColumn10
            // 
            this.gridColumn10.Caption = "复检限值";
            this.gridColumn10.FieldName = "fjxz";
            this.gridColumn10.MinWidth = 25;
            this.gridColumn10.Name = "gridColumn10";
            this.gridColumn10.Visible = true;
            this.gridColumn10.VisibleIndex = 6;
            this.gridColumn10.Width = 115;
            // 
            // gridColumn11
            // 
            this.gridColumn11.Caption = "方案名称";
            this.gridColumn11.FieldName = "famc";
            this.gridColumn11.MinWidth = 25;
            this.gridColumn11.Name = "gridColumn11";
            this.gridColumn11.Visible = true;
            this.gridColumn11.VisibleIndex = 3;
            this.gridColumn11.Width = 115;
            // 
            // Frm_Cqfa
            // 
@@ -970,28 +927,21 @@
            this.splitMx1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
            this.layoutMx1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.txt_checkStatus.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fabm.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_bz.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_checkBy.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_famc.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_bzqx.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fjxz.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_yjrq.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).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();
            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_famc.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_bzqx.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fjxz.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_yjrq.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_checkStatus.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
@@ -1000,6 +950,14 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).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();
            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
            this.ResumeLayout(false);

        }
@@ -1013,17 +971,9 @@
        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
        private DevExpress.XtraGrid.Columns.GridColumn gv_status;
        private DevExpress.XtraGrid.Columns.GridColumn gv_isFinish;
        private DevExpress.XtraGrid.Columns.GridColumn gv_isOut;
        private DevExpress.XtraGrid.Columns.GridColumn gv_billNo;
        private DevExpress.XtraGrid.Columns.GridColumn gv_lastUpdateUser;
        private DevExpress.XtraGrid.Columns.GridColumn gv_lastUpdateTime;
        private DevExpress.XtraGrid.Columns.GridColumn gv_checkUser;
        private DevExpress.XtraGrid.Columns.GridColumn gv_checkDate;
        private DevExpress.XtraGrid.Columns.GridColumn gv_returnMethod;
        private DevExpress.XtraGrid.Columns.GridColumn gv_returnType;
        private DevExpress.XtraGrid.Columns.GridColumn gv_depotId;
        private DevExpress.XtraGrid.Columns.GridColumn gv_suppId;
        private DevExpress.XtraGrid.Columns.GridColumn gv_remark;
        private UserControls.Data.UcPageBar pageBar1;
        private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
@@ -1070,5 +1020,11 @@
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
        private UserControl.UcLookOrg txt_fSubsidiary;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
    }
}

 DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqfa.cs

@@ -1,15 +1,11 @@
using DevExpress.XtraEditors;
using Gs.DevApp.Entity;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;

@@ -17,7 +13,7 @@
{
    public partial class Frm_Cqfa : DevExpress.XtraEditors.XtraForm
    {
        string _webServiceName = "MesCgthSqManager/";
        string _webServiceName = "RkqcfaManager/";
        List<FilterEntity> _filterList = new List<FilterEntity>();
        string _ucGys = "";//供应商
        public Frm_Cqfa()
@@ -34,7 +30,7 @@
            toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
            this.toolBarMenu1.getXmlConfig();
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "status", "", (value) =>
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "checkStatus", "", (value) =>
            {
                Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
            }, tips);
@@ -167,7 +163,7 @@
        {
            string rowGuid = "", rowName = "";
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
                lbGuid, txt_fabm, gridView1, "billNo");
                lbGuid, txt_fabm, gridView1, "fabm");
            if (string.IsNullOrEmpty(rowGuid))
            {
                MsgHelper.Warning("请先选择你要操作的行！");
@@ -178,7 +174,7 @@
            var _obj = new
            {
                guid = rowGuid,
                mxGuid = Guid.Empty.ToString(),
                mxGuid = "",
            };
            try
            {
@@ -201,7 +197,6 @@
            {
                MsgHelper.Warning("提示：" + ex.Message);
            }

        }

        /// <summary>
@@ -239,13 +234,15 @@
                lbGuid, txt_fabm, gridView1);
            if (string.IsNullOrEmpty(rowGuid))
            {
                MsgHelper.Warning("请先选择你要操作的行！");
                MsgHelper.ShowError("请先选择你要操作的行！");
                return;
            }
            Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
            if (xtraTabControl1.SelectedTabPageIndex == 1)
            {
                getModel(rowGuid);
                txt_fabm.ReadOnly = true;
                txt_fSubsidiary.Enabled = false;
            }
            else
            {
@@ -268,8 +265,7 @@
            UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true, gridViews);
            Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
            //增加时，默认组织
            string deftOrg = UtilityHelper.GetFirstOrg(txt_thOrgId);

            string deftOrg = UtilityHelper.GetFirstOrg(txt_fSubsidiary);
        }
        /// <summary>
        /// 保存事件
@@ -279,11 +275,25 @@
        private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
        {
            toolBarMenu1.isSetBtn = false;
            string _fabm = txt_fabm.Text.Trim();
            string _famc = txt_famc.Text.Trim();
            string _yjrq = txt_yjrq.Text.Trim();
            string _bzqx = txt_bzqx.Text.Trim();
            string _fjxz = txt_fjxz.Text.Trim();
            string _bz = txt_bz.Text.Trim();
            string _fSubsidiary = txt_fSubsidiary.GetId();
            if (string.IsNullOrEmpty(_fSubsidiary))
            {
                MsgHelper.ShowError("组织不能为空！");
                txt_fSubsidiary.Focus();
                return;
            }
            if (string.IsNullOrEmpty(_famc))
            {
                MsgHelper.ShowError("方案编码不能为空！");
                txt_fabm.Focus();
                return;
            }
            if (string.IsNullOrEmpty(_famc))
            {
                MsgHelper.ShowError("名称不能为空！");
@@ -310,22 +320,19 @@
            }
            var _obj = new
            {
                guid = Gs.DevApp.ToolBox.UtilityHelper.ToGuid(lbGuid.Text.Trim()), //到货单主键
                yjrq = int.Parse(_yjrq),
                bzqx = int.Parse(_bzqx),
                fjxz = int.Parse(_fjxz),
                guid = Gs.DevApp.ToolBox.UtilityHelper.ToGuid(lbGuid.Text.Trim()),
                yjrq = (_yjrq),
                bzqx = (_bzqx),
                fjxz = (_fjxz),
                famc = _famc.Trim(),
                fabm = _fabm.Trim(),
                bz = _bz.Trim(),
                fSubsidiary = _fSubsidiary.Trim(),
                list = new List<dynamic>(),
            };
            gvMx1.CloseEditor();
            gvMx1.PostEditor();
            gvMx1.UpdateCurrentRow();
            if (gvMx1.DataRowCount <= 0)
            {
                MsgHelper.ShowError("明细不能为空，请选择你的收料明细！");
                return;
            }
            for (var i = 0; i < gvMx1.DataRowCount; i++)
            {
                var row = gvMx1.GetDataRow(i);
@@ -378,7 +385,7 @@
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示：" + ex.Message);
                MsgHelper.ShowError("提示：" + ex.Message);
            }
        }

@@ -390,7 +397,7 @@
        private void getPageList(int curPage)
        {
            gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
            PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "BILL_NO", "asc", "", _sbSqlWhere.ToString());
            PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "a.fabm", "desc", "", _sbSqlWhere.ToString());
            string json = JsonConvert.SerializeObject(pgq);
            try
            {
@@ -476,11 +483,11 @@
                    }
                }
                else
                    ToolBox.MsgHelper.Warning("提示：" + _rtn.rtnMsg);
                    ToolBox.MsgHelper.ShowError("提示：" + _rtn.rtnMsg);
            }
            catch (Exception ex)
            {
                ToolBox.MsgHelper.Warning("提示：" + ex.Message);
                ToolBox.MsgHelper.ShowError("提示：" + ex.Message);
            }
        }
        /// <summary>
@@ -501,7 +508,7 @@
            };
            toolBarMenu1.guidKey = "";
            string rowGuid, rowName;
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_fabm, gridView1, "billNo");
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_fabm, gridView1, "fabm");
            if (string.IsNullOrEmpty(rowGuid))
            {
                MsgHelper.Warning("请先选择你要操作的行！");
@@ -512,29 +519,29 @@
            var _obj = new
            {
                guid = rowGuid,
                inFieldValue = _inFieldValue,
                ckValue = _inFieldValue,
                parameter = "MES_CQJY_FA,checkDate,checkStatus,checkBy"
            };
            try
            {
                var strJson = UtilityHelper.HttpPost("",
                    _webServiceName + "EditModelSubmit",
                var strJson = UtilityHelper.HttpPost("", "General/GeneralCheck",
                    JsonConvert.SerializeObject(_obj));
                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
                if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
                if (_rtn.rtnCode > 0)
                {
                    MsgHelper.ShowInformation(_rtn.rtnData.outMsg.ToString());
                    if (xtraTabControl1.SelectedTabPageIndex == 1)
                    {
                        getModel(lbGuid.Text.Trim());
                    }
                    int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
                    gridView1.FocusedRowHandle = rowHandle;
                    UtilityHelper.SetCheckIco(gridView1, "status", "checkUser", "checkDate", picCheckBox, this, _inFieldValue.ToString());
                    else
                        getPageList(this.pageBar1.CurrentPage);
                    UtilityHelper.SetCheckIco(gridView1, "checkStatus", "checkBy", "checkDate", picCheckBox, this, _inFieldValue.ToString());
                }
                else
                    MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString());
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示：" + ex.Message);
                MsgHelper.ShowError("提示：" + ex.Message);
            }
        }


 DevApp/Gs.DevApp/Gs.DevApp.csproj

@@ -1525,6 +1525,9 @@
    <EmbeddedResource Include="DevFrm\QC\MesQcExceptional.resx">
      <DependentUpon>MesQcExceptional.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\RkQC\Frm_Cqfa.resx">
      <DependentUpon>Frm_Cqfa.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\RkQC\Frm_Cqsq.resx">
      <DependentUpon>Frm_Cqsq.cs</DependentUpon>
    </EmbeddedResource>