委外

lu

2025-06-05 7dcfafef34981ce8a77cfcda7d18e3386c09ea05

委外

 DevApp/Gs.DevApp/App.config

@@ -32,7 +32,7 @@
        <add key="WebApiUrl" value="http://192.168.1.145:8081/" />
        <!--<add key="WebApiUrl" value="http://192.168.1.145:81/" />--> 
        <add key="LogPath" value="logs" />
        <add key="ProductName" value="GS-MES V2.0" />
        <add key="ProductName" value="G-MES V2.0" />
        <add key="PageSize" value="50" />
        <add key="Version" value="0.1" />
        <add key="IsAutoUpdater" value="0" />

 DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.Designer.cs

@@ -64,6 +64,7 @@
            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();
@@ -130,7 +131,6 @@
            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.picCheckBox = new System.Windows.Forms.PictureBox();
            this.tips = new DevExpress.Utils.ToolTipController(this.components);
            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
            this.xtraTabControl1.SuspendLayout();
            this.xtraTabPage1.SuspendLayout();
@@ -457,6 +457,14 @@
            this.gv_remark.Visible = true;
            this.gv_remark.VisibleIndex = 13;
            this.gv_remark.Width = 94;
            // 
            // gridColumn7
            // 
            this.gridColumn7.Caption = "主键GUID";
            this.gridColumn7.FieldName = "guid";
            this.gridColumn7.MinWidth = 25;
            this.gridColumn7.Name = "gridColumn7";
            this.gridColumn7.Width = 94;
            // 
            // pageBar1
            // 
@@ -1245,16 +1253,6 @@
            this.picCheckBox.TabIndex = 8;
            this.picCheckBox.TabStop = false;
            this.picCheckBox.Visible = false;
            // 
            // gridColumn7
            // 
            this.gridColumn7.Caption = "主键GUID";
            this.gridColumn7.FieldName = "guid";
            this.gridColumn7.MinWidth = 25;
            this.gridColumn7.Name = "gridColumn7";
            this.gridColumn7.Visible = true;
            this.gridColumn7.VisibleIndex = 14;
            this.gridColumn7.Width = 94;
            // 
            // Frm_MesCgthSq
            // 

 DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.Designer.cs

@@ -50,12 +50,12 @@
            this.gcMain1 = new DevExpress.XtraGrid.GridControl();
            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gv_orderNo = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_businessStatus = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_erpProductionOrderNo = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_orderType = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_businessStatus = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_workOrderQty = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_nostockinqty = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_stockinqty = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -428,6 +428,19 @@
            this.gv_orderNo.VisibleIndex = 0;
            this.gv_orderNo.Width = 120;
            // 
            // gv_businessStatus
            // 
            this.gv_businessStatus.AppearanceCell.Options.UseFont = true;
            this.gv_businessStatus.Caption = "业务状态";
            this.gv_businessStatus.FieldName = "businessStatus";
            this.gv_businessStatus.MinWidth = 25;
            this.gv_businessStatus.Name = "gv_businessStatus";
            this.gv_businessStatus.OptionsColumn.AllowEdit = false;
            this.gv_businessStatus.Tag = "query_a.BUSINESS_STATUS";
            this.gv_businessStatus.Visible = true;
            this.gv_businessStatus.VisibleIndex = 1;
            this.gv_businessStatus.Width = 50;
            // 
            // gridColumn3
            // 
            this.gridColumn3.Caption = "产品编码";
@@ -484,19 +497,6 @@
            this.gv_orderType.VisibleIndex = 6;
            this.gv_orderType.Width = 94;
            // 
            // gv_businessStatus
            // 
            this.gv_businessStatus.AppearanceCell.Options.UseFont = true;
            this.gv_businessStatus.Caption = "业务状态";
            this.gv_businessStatus.FieldName = "businessStatus";
            this.gv_businessStatus.MinWidth = 25;
            this.gv_businessStatus.Name = "gv_businessStatus";
            this.gv_businessStatus.OptionsColumn.AllowEdit = false;
            this.gv_businessStatus.Tag = "query_a.BUSINESS_STATUS";
            this.gv_businessStatus.Visible = true;
            this.gv_businessStatus.VisibleIndex = 1;
            this.gv_businessStatus.Width = 50;
            // 
            // gv_workOrderQty
            // 
            this.gv_workOrderQty.AppearanceCell.Options.UseFont = true;
@@ -520,7 +520,7 @@
            this.gv_nostockinqty.OptionsColumn.AllowEdit = false;
            this.gv_nostockinqty.Tag = "query_a.NOSTOCKINQTY";
            this.gv_nostockinqty.Visible = true;
            this.gv_nostockinqty.VisibleIndex = 8;
            this.gv_nostockinqty.VisibleIndex = 9;
            this.gv_nostockinqty.Width = 50;
            // 
            // gv_stockinqty
@@ -533,7 +533,7 @@
            this.gv_stockinqty.OptionsColumn.AllowEdit = false;
            this.gv_stockinqty.Tag = "query_a.STOCKINQTY";
            this.gv_stockinqty.Visible = true;
            this.gv_stockinqty.VisibleIndex = 9;
            this.gv_stockinqty.VisibleIndex = 8;
            this.gv_stockinqty.Width = 50;
            // 
            // gv_unit
@@ -546,13 +546,13 @@
            this.gv_unit.OptionsColumn.AllowEdit = false;
            this.gv_unit.Tag = "query_a.UNIT";
            this.gv_unit.Visible = true;
            this.gv_unit.VisibleIndex = 11;
            this.gv_unit.VisibleIndex = 12;
            this.gv_unit.Width = 50;
            // 
            // gv_estimatedStartTime
            // 
            this.gv_estimatedStartTime.AppearanceCell.Options.UseFont = true;
            this.gv_estimatedStartTime.Caption = "预计开工时间 ";
            this.gv_estimatedStartTime.Caption = "Erp预计开工";
            this.gv_estimatedStartTime.FieldName = "estimatedStartTime";
            this.gv_estimatedStartTime.MinWidth = 10;
            this.gv_estimatedStartTime.Name = "gv_estimatedStartTime";
@@ -565,14 +565,14 @@
            // gv_estimatedEndTime
            // 
            this.gv_estimatedEndTime.AppearanceCell.Options.UseFont = true;
            this.gv_estimatedEndTime.Caption = "预计完工时间 ";
            this.gv_estimatedEndTime.Caption = "Erp预计完工";
            this.gv_estimatedEndTime.FieldName = "estimatedEndTime";
            this.gv_estimatedEndTime.MinWidth = 10;
            this.gv_estimatedEndTime.Name = "gv_estimatedEndTime";
            this.gv_estimatedEndTime.OptionsColumn.AllowEdit = false;
            this.gv_estimatedEndTime.Tag = "query_a.ESTIMATED_END_TIME";
            this.gv_estimatedEndTime.Visible = true;
            this.gv_estimatedEndTime.VisibleIndex = 12;
            this.gv_estimatedEndTime.VisibleIndex = 11;
            this.gv_estimatedEndTime.Width = 180;
            // 
            // gv_planReleaseDate
@@ -611,7 +611,7 @@
            this.gv_storageLowerLimit.OptionsColumn.AllowEdit = false;
            this.gv_storageLowerLimit.Tag = "query_a.STORAGE_LOWER_LIMIT";
            this.gv_storageLowerLimit.Visible = true;
            this.gv_storageLowerLimit.VisibleIndex = 16;
            this.gv_storageLowerLimit.VisibleIndex = 15;
            this.gv_storageLowerLimit.Width = 50;
            // 
            // gv_trackingNo
@@ -623,8 +623,6 @@
            this.gv_trackingNo.Name = "gv_trackingNo";
            this.gv_trackingNo.OptionsColumn.AllowEdit = false;
            this.gv_trackingNo.Tag = "query_a.TRACKING_NO";
            this.gv_trackingNo.Visible = true;
            this.gv_trackingNo.VisibleIndex = 15;
            this.gv_trackingNo.Width = 94;
            // 
            // gv_batchNo
@@ -637,7 +635,7 @@
            this.gv_batchNo.OptionsColumn.AllowEdit = false;
            this.gv_batchNo.Tag = "query_a.BATCH_NO";
            this.gv_batchNo.Visible = true;
            this.gv_batchNo.VisibleIndex = 17;
            this.gv_batchNo.VisibleIndex = 16;
            this.gv_batchNo.Width = 94;
            // 
            // gv_bomVersion
@@ -650,7 +648,7 @@
            this.gv_bomVersion.OptionsColumn.AllowEdit = false;
            this.gv_bomVersion.Tag = "query_a.BOM_VERSION";
            this.gv_bomVersion.Visible = true;
            this.gv_bomVersion.VisibleIndex = 18;
            this.gv_bomVersion.VisibleIndex = 17;
            this.gv_bomVersion.Width = 94;
            // 
            // gv_generationMethod
@@ -663,7 +661,7 @@
            this.gv_generationMethod.OptionsColumn.AllowEdit = false;
            this.gv_generationMethod.Tag = "query_a.GENERATION_METHOD";
            this.gv_generationMethod.Visible = true;
            this.gv_generationMethod.VisibleIndex = 19;
            this.gv_generationMethod.VisibleIndex = 18;
            this.gv_generationMethod.Width = 94;
            // 
            // gv_demandOrderNo
@@ -676,7 +674,7 @@
            this.gv_demandOrderNo.OptionsColumn.AllowEdit = false;
            this.gv_demandOrderNo.Tag = "query_a.DEMAND_ORDER_NO";
            this.gv_demandOrderNo.Visible = true;
            this.gv_demandOrderNo.VisibleIndex = 20;
            this.gv_demandOrderNo.VisibleIndex = 19;
            this.gv_demandOrderNo.Width = 94;
            // 
            // gv_demandOrderLineNo
@@ -689,7 +687,7 @@
            this.gv_demandOrderLineNo.OptionsColumn.AllowEdit = false;
            this.gv_demandOrderLineNo.Tag = "query_a.DEMAND_ORDER_LINE_NO";
            this.gv_demandOrderLineNo.Visible = true;
            this.gv_demandOrderLineNo.VisibleIndex = 21;
            this.gv_demandOrderLineNo.VisibleIndex = 20;
            this.gv_demandOrderLineNo.Width = 60;
            // 
            // gv_closingPerson
@@ -701,8 +699,6 @@
            this.gv_closingPerson.Name = "gv_closingPerson";
            this.gv_closingPerson.OptionsColumn.AllowEdit = false;
            this.gv_closingPerson.Tag = "query_a.CLOSING_PERSON";
            this.gv_closingPerson.Visible = true;
            this.gv_closingPerson.VisibleIndex = 22;
            this.gv_closingPerson.Width = 94;
            // 
            // gv_closingType
@@ -714,8 +710,6 @@
            this.gv_closingType.Name = "gv_closingType";
            this.gv_closingType.OptionsColumn.AllowEdit = false;
            this.gv_closingType.Tag = "query_a.CLOSING_TYPE";
            this.gv_closingType.Visible = true;
            this.gv_closingType.VisibleIndex = 23;
            this.gv_closingType.Width = 94;
            // 
            // gv_remarks
@@ -728,7 +722,7 @@
            this.gv_remarks.OptionsColumn.AllowEdit = false;
            this.gv_remarks.Tag = "query_a.REMARKS";
            this.gv_remarks.Visible = true;
            this.gv_remarks.VisibleIndex = 24;
            this.gv_remarks.VisibleIndex = 21;
            this.gv_remarks.Width = 94;
            // 
            // gv_purchaseorderno
@@ -741,7 +735,7 @@
            this.gv_purchaseorderno.OptionsColumn.AllowEdit = false;
            this.gv_purchaseorderno.Tag = "query_a.PURCHASEORDERNO";
            this.gv_purchaseorderno.Visible = true;
            this.gv_purchaseorderno.VisibleIndex = 25;
            this.gv_purchaseorderno.VisibleIndex = 22;
            this.gv_purchaseorderno.Width = 94;
            // 
            // gv_purchaseorderentryseq
@@ -754,7 +748,7 @@
            this.gv_purchaseorderentryseq.OptionsColumn.AllowEdit = false;
            this.gv_purchaseorderentryseq.Tag = "query_a.PURCHASEORDERENTRYSEQ";
            this.gv_purchaseorderentryseq.Visible = true;
            this.gv_purchaseorderentryseq.VisibleIndex = 26;
            this.gv_purchaseorderentryseq.VisibleIndex = 23;
            this.gv_purchaseorderentryseq.Width = 70;
            // 
            // gv_auditor
@@ -805,7 +799,7 @@
            this.gridColumn7.MinWidth = 25;
            this.gridColumn7.Name = "gridColumn7";
            this.gridColumn7.Visible = true;
            this.gridColumn7.VisibleIndex = 27;
            this.gridColumn7.VisibleIndex = 24;
            this.gridColumn7.Width = 94;
            // 
            // gridColumn14
@@ -815,7 +809,7 @@
            this.gridColumn14.MinWidth = 25;
            this.gridColumn14.Name = "gridColumn14";
            this.gridColumn14.Visible = true;
            this.gridColumn14.VisibleIndex = 28;
            this.gridColumn14.VisibleIndex = 25;
            this.gridColumn14.Width = 94;
            // 
            // gridColumn15
@@ -1546,12 +1540,13 @@
            // layoutControlItem15
            // 
            this.layoutControlItem15.Control = this.txt_estimatedStartTime;
            this.layoutControlItem15.CustomizationFormText = "Erp预计开工";
            this.layoutControlItem15.Location = new System.Drawing.Point(828, 31);
            this.layoutControlItem15.Name = "layoutControlItem15";
            this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem15.Size = new System.Drawing.Size(278, 31);
            this.layoutControlItem15.Text = "预计开工时间";
            this.layoutControlItem15.Text = "Erp预计开工";
            this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem19
@@ -1562,7 +1557,7 @@
            this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem19.Size = new System.Drawing.Size(278, 31);
            this.layoutControlItem19.Text = "预计完工时间";
            this.layoutControlItem19.Text = "Erp预计完工";
            this.layoutControlItem19.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem23
@@ -1910,7 +1905,7 @@
            // 
            this.gvMx1warehouse.AppearanceCell.Options.UseFont = true;
            this.gvMx1warehouse.Caption = "仓库 ";
            this.gvMx1warehouse.FieldName = "warehouse";
            this.gvMx1warehouse.FieldName = "warehouseTxt";
            this.gvMx1warehouse.MinWidth = 50;
            this.gvMx1warehouse.Name = "gvMx1warehouse";
            this.gvMx1warehouse.Tag = "query_a.WAREHOUSE";

 DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.cs

@@ -299,5 +299,6 @@
            }
        }

     
    }
}

 DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.Designer.cs

@@ -39,15 +39,12 @@
            DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Frm_WwGd));
            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
            this.split1 = new DevExpress.XtraEditors.SplitContainerControl();
            this.gcMain1 = new DevExpress.XtraGrid.GridControl();
            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gv_pcSh = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_daa001 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -70,14 +67,14 @@
            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();
            this.gridColumn12 = 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.lbGuid = new System.Windows.Forms.Label();
            this.txt_remark = new DevExpress.XtraEditors.TextEdit();
            this.txt_blUser = new DevExpress.XtraEditors.TextEdit();
            this.txt_blTime = new DevExpress.XtraEditors.TextEdit();
            this.txt_daa001 = new DevExpress.XtraEditors.TextEdit();
            this.txt_wgTime = new DevExpress.XtraEditors.TextEdit();
            this.txt_wgUser = new DevExpress.XtraEditors.TextEdit();
@@ -107,16 +104,14 @@
            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
            this.tabMx = new DevExpress.XtraTab.XtraTabControl();
            this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
            this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -137,7 +132,6 @@
            this.gvMx1dab001 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1dab012 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1dab002 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.picCheckBox = new System.Windows.Forms.PictureBox();
            this.tips = new DevExpress.Utils.ToolTipController(this.components);
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
            this.xtraTabControl1.SuspendLayout();
@@ -159,8 +153,6 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
            this.layoutMx1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_blUser.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_blTime.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_daa001.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_wgTime.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_wgUser.Properties)).BeginInit();
@@ -190,22 +182,19 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).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.picCheckBox)).BeginInit();
            this.SuspendLayout();
            // 
            // toolBarMenu1
@@ -283,7 +272,6 @@
            this.gridView1.Appearance.Row.Options.UseFont = true;
            this.gridView1.ColumnPanelRowHeight = 50;
            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gv_pcSh,
            this.gv_daa001,
            this.gridColumn3,
            this.gridColumn2,
@@ -305,26 +293,15 @@
            this.gridColumn7,
            this.gridColumn8,
            this.gridColumn9,
            this.gridColumn10});
            this.gridColumn10,
            this.gridColumn11,
            this.gridColumn12});
            this.gridView1.GridControl = this.gcMain1;
            this.gridView1.IndicatorWidth = 50;
            this.gridView1.Name = "gridView1";
            this.gridView1.OptionsFind.ShowSearchNavButtons = false;
            this.gridView1.OptionsView.ShowAutoFilterRow = true;
            this.gridView1.OptionsView.ShowGroupPanel = false;
            // 
            // gv_pcSh
            // 
            this.gv_pcSh.AppearanceCell.Options.UseFont = true;
            this.gv_pcSh.Caption = "排产审核 ";
            this.gv_pcSh.FieldName = "pcShChk";
            this.gv_pcSh.MinWidth = 25;
            this.gv_pcSh.Name = "gv_pcSh";
            this.gv_pcSh.OptionsColumn.AllowEdit = false;
            this.gv_pcSh.Tag = "query_a.pc_sh";
            this.gv_pcSh.Visible = true;
            this.gv_pcSh.VisibleIndex = 0;
            this.gv_pcSh.Width = 50;
            // 
            // gv_daa001
            // 
@@ -336,7 +313,7 @@
            this.gv_daa001.OptionsColumn.AllowEdit = false;
            this.gv_daa001.Tag = "query_a.daa001";
            this.gv_daa001.Visible = true;
            this.gv_daa001.VisibleIndex = 1;
            this.gv_daa001.VisibleIndex = 0;
            this.gv_daa001.Width = 100;
            // 
            // gridColumn3
@@ -417,34 +394,32 @@
            this.gv_daa011.Name = "gv_daa011";
            this.gv_daa011.OptionsColumn.AllowEdit = false;
            this.gv_daa011.Tag = "query_a.daa011";
            this.gv_daa011.Visible = true;
            this.gv_daa011.VisibleIndex = 8;
            this.gv_daa011.Width = 50;
            // 
            // gv_mesStartProd
            // 
            this.gv_mesStartProd.AppearanceCell.Options.UseFont = true;
            this.gv_mesStartProd.Caption = "预计开工时间 ";
            this.gv_mesStartProd.Caption = "Mes预计开工";
            this.gv_mesStartProd.FieldName = "mesStartProd";
            this.gv_mesStartProd.MinWidth = 50;
            this.gv_mesStartProd.Name = "gv_mesStartProd";
            this.gv_mesStartProd.OptionsColumn.AllowEdit = false;
            this.gv_mesStartProd.Tag = "query_a.mes_start_prod";
            this.gv_mesStartProd.Visible = true;
            this.gv_mesStartProd.VisibleIndex = 9;
            this.gv_mesStartProd.VisibleIndex = 8;
            this.gv_mesStartProd.Width = 180;
            // 
            // gv_mesEndProd
            // 
            this.gv_mesEndProd.AppearanceCell.Options.UseFont = true;
            this.gv_mesEndProd.Caption = "预计完工时间 ";
            this.gv_mesEndProd.Caption = "Mes预计完工";
            this.gv_mesEndProd.FieldName = "mesEndProd";
            this.gv_mesEndProd.MinWidth = 50;
            this.gv_mesEndProd.Name = "gv_mesEndProd";
            this.gv_mesEndProd.OptionsColumn.AllowEdit = false;
            this.gv_mesEndProd.Tag = "query_a.mes_end_prod";
            this.gv_mesEndProd.Visible = true;
            this.gv_mesEndProd.VisibleIndex = 10;
            this.gv_mesEndProd.VisibleIndex = 9;
            this.gv_mesEndProd.Width = 180;
            // 
            // gv_blState
@@ -456,8 +431,6 @@
            this.gv_blState.Name = "gv_blState";
            this.gv_blState.OptionsColumn.AllowEdit = false;
            this.gv_blState.Tag = "query_a.bl_state";
            this.gv_blState.Visible = true;
            this.gv_blState.VisibleIndex = 11;
            this.gv_blState.Width = 50;
            // 
            // gv_blTime
@@ -469,8 +442,6 @@
            this.gv_blTime.Name = "gv_blTime";
            this.gv_blTime.OptionsColumn.AllowEdit = false;
            this.gv_blTime.Tag = "query_a.bl_time";
            this.gv_blTime.Visible = true;
            this.gv_blTime.VisibleIndex = 12;
            this.gv_blTime.Width = 180;
            // 
            // gv_blUser
@@ -482,8 +453,6 @@
            this.gv_blUser.Name = "gv_blUser";
            this.gv_blUser.OptionsColumn.AllowEdit = false;
            this.gv_blUser.Tag = "query_a.bl_user";
            this.gv_blUser.Visible = true;
            this.gv_blUser.VisibleIndex = 13;
            this.gv_blUser.Width = 94;
            // 
            // gv_daa018
@@ -496,7 +465,7 @@
            this.gv_daa018.OptionsColumn.AllowEdit = false;
            this.gv_daa018.Tag = "query_a.daa018";
            this.gv_daa018.Visible = true;
            this.gv_daa018.VisibleIndex = 14;
            this.gv_daa018.VisibleIndex = 1;
            this.gv_daa018.Width = 94;
            // 
            // gv_wgTime
@@ -508,8 +477,6 @@
            this.gv_wgTime.Name = "gv_wgTime";
            this.gv_wgTime.OptionsColumn.AllowEdit = false;
            this.gv_wgTime.Tag = "query_a.wg_time";
            this.gv_wgTime.Visible = true;
            this.gv_wgTime.VisibleIndex = 15;
            this.gv_wgTime.Width = 180;
            // 
            // gv_wgUser
@@ -521,8 +488,6 @@
            this.gv_wgUser.Name = "gv_wgUser";
            this.gv_wgUser.OptionsColumn.AllowEdit = false;
            this.gv_wgUser.Tag = "query_a.wg_user";
            this.gv_wgUser.Visible = true;
            this.gv_wgUser.VisibleIndex = 16;
            this.gv_wgUser.Width = 94;
            // 
            // gv_pcTime
@@ -535,7 +500,7 @@
            this.gv_pcTime.OptionsColumn.AllowEdit = false;
            this.gv_pcTime.Tag = "query_a.pc_time";
            this.gv_pcTime.Visible = true;
            this.gv_pcTime.VisibleIndex = 17;
            this.gv_pcTime.VisibleIndex = 13;
            this.gv_pcTime.Width = 180;
            // 
            // gv_remark
@@ -548,7 +513,7 @@
            this.gv_remark.OptionsColumn.AllowEdit = false;
            this.gv_remark.Tag = "query_a.remark";
            this.gv_remark.Visible = true;
            this.gv_remark.VisibleIndex = 18;
            this.gv_remark.VisibleIndex = 10;
            this.gv_remark.Width = 94;
            // 
            // gridColumn7
@@ -558,7 +523,7 @@
            this.gridColumn7.MinWidth = 25;
            this.gridColumn7.Name = "gridColumn7";
            this.gridColumn7.Visible = true;
            this.gridColumn7.VisibleIndex = 19;
            this.gridColumn7.VisibleIndex = 14;
            this.gridColumn7.Width = 94;
            // 
            // gridColumn8
@@ -568,7 +533,7 @@
            this.gridColumn8.MinWidth = 25;
            this.gridColumn8.Name = "gridColumn8";
            this.gridColumn8.Visible = true;
            this.gridColumn8.VisibleIndex = 20;
            this.gridColumn8.VisibleIndex = 11;
            this.gridColumn8.Width = 94;
            // 
            // gridColumn9
@@ -578,7 +543,7 @@
            this.gridColumn9.MinWidth = 25;
            this.gridColumn9.Name = "gridColumn9";
            this.gridColumn9.Visible = true;
            this.gridColumn9.VisibleIndex = 21;
            this.gridColumn9.VisibleIndex = 12;
            this.gridColumn9.Width = 94;
            // 
            // gridColumn10
@@ -588,8 +553,28 @@
            this.gridColumn10.MinWidth = 25;
            this.gridColumn10.Name = "gridColumn10";
            this.gridColumn10.Visible = true;
            this.gridColumn10.VisibleIndex = 22;
            this.gridColumn10.VisibleIndex = 15;
            this.gridColumn10.Width = 94;
            // 
            // gridColumn11
            // 
            this.gridColumn11.Caption = "通知备料";
            this.gridColumn11.FieldName = "tzbs";
            this.gridColumn11.MinWidth = 25;
            this.gridColumn11.Name = "gridColumn11";
            this.gridColumn11.Visible = true;
            this.gridColumn11.VisibleIndex = 16;
            this.gridColumn11.Width = 94;
            // 
            // gridColumn12
            // 
            this.gridColumn12.Caption = "备料情况";
            this.gridColumn12.FieldName = "daa022Remark";
            this.gridColumn12.MinWidth = 25;
            this.gridColumn12.Name = "gridColumn12";
            this.gridColumn12.Visible = true;
            this.gridColumn12.VisibleIndex = 17;
            this.gridColumn12.Width = 94;
            // 
            // pageBar1
            // 
@@ -628,15 +613,13 @@
            this.splitMx1.Panel2.Text = "Panel2";
            this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
            this.splitMx1.Size = new System.Drawing.Size(1126, 570);
            this.splitMx1.SplitterPosition = 185;
            this.splitMx1.SplitterPosition = 157;
            this.splitMx1.TabIndex = 0;
            // 
            // layoutMx1
            // 
            this.layoutMx1.Controls.Add(this.lbGuid);
            this.layoutMx1.Controls.Add(this.txt_remark);
            this.layoutMx1.Controls.Add(this.txt_blUser);
            this.layoutMx1.Controls.Add(this.txt_blTime);
            this.layoutMx1.Controls.Add(this.txt_daa001);
            this.layoutMx1.Controls.Add(this.txt_wgTime);
            this.layoutMx1.Controls.Add(this.txt_wgUser);
@@ -661,7 +644,7 @@
            this.layoutMx1.Name = "layoutMx1";
            this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1108, 0, 812, 500);
            this.layoutMx1.Root = this.Root;
            this.layoutMx1.Size = new System.Drawing.Size(1126, 185);
            this.layoutMx1.Size = new System.Drawing.Size(1126, 157);
            this.layoutMx1.TabIndex = 0;
            this.layoutMx1.Text = "layoutControl1";
            // 
@@ -676,191 +659,171 @@
            // 
            // txt_remark
            // 
            this.txt_remark.Location = new System.Drawing.Point(119, 152);
            this.txt_remark.Location = new System.Drawing.Point(111, 124);
            this.txt_remark.Name = "txt_remark";
            this.txt_remark.Properties.Appearance.Options.UseFont = true;
            this.txt_remark.Properties.ReadOnly = true;
            this.txt_remark.Size = new System.Drawing.Size(431, 24);
            this.txt_remark.Size = new System.Drawing.Size(439, 24);
            this.txt_remark.StyleController = this.layoutMx1;
            this.txt_remark.TabIndex = 312;
            // 
            // txt_blUser
            // 
            this.txt_blUser.Location = new System.Drawing.Point(932, 124);
            this.txt_blUser.Name = "txt_blUser";
            this.txt_blUser.Properties.Appearance.Options.UseFont = true;
            this.txt_blUser.Properties.ReadOnly = true;
            this.txt_blUser.Size = new System.Drawing.Size(161, 24);
            this.txt_blUser.StyleController = this.layoutMx1;
            this.txt_blUser.TabIndex = 247;
            // 
            // txt_blTime
            // 
            this.txt_blTime.Location = new System.Drawing.Point(932, 96);
            this.txt_blTime.Name = "txt_blTime";
            this.txt_blTime.Properties.Appearance.Options.UseFont = true;
            this.txt_blTime.Properties.ReadOnly = true;
            this.txt_blTime.Size = new System.Drawing.Size(161, 24);
            this.txt_blTime.StyleController = this.layoutMx1;
            this.txt_blTime.TabIndex = 243;
            // 
            // txt_daa001
            // 
            this.txt_daa001.Location = new System.Drawing.Point(119, 12);
            this.txt_daa001.Location = new System.Drawing.Point(111, 12);
            this.txt_daa001.Name = "txt_daa001";
            this.txt_daa001.Properties.Appearance.Options.UseFont = true;
            this.txt_daa001.Properties.ReadOnly = true;
            this.txt_daa001.Size = new System.Drawing.Size(160, 24);
            this.txt_daa001.Size = new System.Drawing.Size(168, 24);
            this.txt_daa001.StyleController = this.layoutMx1;
            this.txt_daa001.TabIndex = 216;
            // 
            // txt_wgTime
            // 
            this.txt_wgTime.Location = new System.Drawing.Point(661, 68);
            this.txt_wgTime.Location = new System.Drawing.Point(653, 68);
            this.txt_wgTime.Name = "txt_wgTime";
            this.txt_wgTime.Properties.Appearance.Options.UseFont = true;
            this.txt_wgTime.Properties.ReadOnly = true;
            this.txt_wgTime.Size = new System.Drawing.Size(160, 24);
            this.txt_wgTime.Size = new System.Drawing.Size(168, 24);
            this.txt_wgTime.StyleController = this.layoutMx1;
            this.txt_wgTime.TabIndex = 258;
            // 
            // txt_wgUser
            // 
            this.txt_wgUser.Location = new System.Drawing.Point(661, 40);
            this.txt_wgUser.Location = new System.Drawing.Point(653, 40);
            this.txt_wgUser.Name = "txt_wgUser";
            this.txt_wgUser.Properties.Appearance.Options.UseFont = true;
            this.txt_wgUser.Properties.ReadOnly = true;
            this.txt_wgUser.Size = new System.Drawing.Size(160, 24);
            this.txt_wgUser.Size = new System.Drawing.Size(168, 24);
            this.txt_wgUser.StyleController = this.layoutMx1;
            this.txt_wgUser.TabIndex = 262;
            // 
            // txt_daa014
            // 
            this.txt_daa014.Location = new System.Drawing.Point(390, 12);
            this.txt_daa014.Location = new System.Drawing.Point(382, 12);
            this.txt_daa014.Name = "txt_daa014";
            this.txt_daa014.Properties.Appearance.Options.UseFont = true;
            this.txt_daa014.Properties.ReadOnly = true;
            this.txt_daa014.Size = new System.Drawing.Size(160, 24);
            this.txt_daa014.Size = new System.Drawing.Size(168, 24);
            this.txt_daa014.StyleController = this.layoutMx1;
            this.txt_daa014.TabIndex = 226;
            // 
            // txt_daa018
            // 
            this.txt_daa018.Location = new System.Drawing.Point(661, 12);
            this.txt_daa018.Location = new System.Drawing.Point(653, 12);
            this.txt_daa018.Name = "txt_daa018";
            this.txt_daa018.Properties.Appearance.Options.UseFont = true;
            this.txt_daa018.Properties.ReadOnly = true;
            this.txt_daa018.Size = new System.Drawing.Size(160, 24);
            this.txt_daa018.Size = new System.Drawing.Size(168, 24);
            this.txt_daa018.StyleController = this.layoutMx1;
            this.txt_daa018.TabIndex = 252;
            // 
            // txt_mesStartProd
            // 
            this.txt_mesStartProd.Location = new System.Drawing.Point(932, 12);
            this.txt_mesStartProd.Location = new System.Drawing.Point(924, 12);
            this.txt_mesStartProd.Name = "txt_mesStartProd";
            this.txt_mesStartProd.Properties.Appearance.Options.UseFont = true;
            this.txt_mesStartProd.Properties.ReadOnly = true;
            this.txt_mesStartProd.Size = new System.Drawing.Size(161, 24);
            this.txt_mesStartProd.Size = new System.Drawing.Size(169, 24);
            this.txt_mesStartProd.StyleController = this.layoutMx1;
            this.txt_mesStartProd.TabIndex = 231;
            // 
            // txt_blStateTxt
            // 
            this.txt_blStateTxt.Location = new System.Drawing.Point(932, 68);
            this.txt_blStateTxt.Location = new System.Drawing.Point(924, 68);
            this.txt_blStateTxt.Name = "txt_blStateTxt";
            this.txt_blStateTxt.Properties.Appearance.Options.UseFont = true;
            this.txt_blStateTxt.Properties.ReadOnly = true;
            this.txt_blStateTxt.Size = new System.Drawing.Size(161, 24);
            this.txt_blStateTxt.Size = new System.Drawing.Size(169, 24);
            this.txt_blStateTxt.StyleController = this.layoutMx1;
            this.txt_blStateTxt.TabIndex = 240;
            // 
            // txt_itemNo
            // 
            this.txt_itemNo.Location = new System.Drawing.Point(119, 40);
            this.txt_itemNo.Location = new System.Drawing.Point(111, 40);
            this.txt_itemNo.Name = "txt_itemNo";
            this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
            this.txt_itemNo.Properties.ReadOnly = true;
            this.txt_itemNo.Size = new System.Drawing.Size(160, 24);
            this.txt_itemNo.Size = new System.Drawing.Size(168, 24);
            this.txt_itemNo.StyleController = this.layoutMx1;
            this.txt_itemNo.TabIndex = 217;
            // 
            // txt_daa008
            // 
            this.txt_daa008.Location = new System.Drawing.Point(390, 40);
            this.txt_daa008.Location = new System.Drawing.Point(382, 40);
            this.txt_daa008.Name = "txt_daa008";
            this.txt_daa008.Properties.Appearance.Options.UseFont = true;
            this.txt_daa008.Properties.ReadOnly = true;
            this.txt_daa008.Size = new System.Drawing.Size(160, 24);
            this.txt_daa008.Size = new System.Drawing.Size(168, 24);
            this.txt_daa008.StyleController = this.layoutMx1;
            this.txt_daa008.TabIndex = 219;
            // 
            // txt_mesEndProd
            // 
            this.txt_mesEndProd.Location = new System.Drawing.Point(932, 40);
            this.txt_mesEndProd.Location = new System.Drawing.Point(924, 40);
            this.txt_mesEndProd.Name = "txt_mesEndProd";
            this.txt_mesEndProd.Properties.Appearance.Options.UseFont = true;
            this.txt_mesEndProd.Properties.ReadOnly = true;
            this.txt_mesEndProd.Size = new System.Drawing.Size(161, 24);
            this.txt_mesEndProd.Size = new System.Drawing.Size(169, 24);
            this.txt_mesEndProd.StyleController = this.layoutMx1;
            this.txt_mesEndProd.TabIndex = 235;
            // 
            // txt_wrkQty
            // 
            this.txt_wrkQty.Location = new System.Drawing.Point(390, 68);
            this.txt_wrkQty.Location = new System.Drawing.Point(382, 68);
            this.txt_wrkQty.Name = "txt_wrkQty";
            this.txt_wrkQty.Properties.Appearance.Options.UseFont = true;
            this.txt_wrkQty.Properties.ReadOnly = true;
            this.txt_wrkQty.Size = new System.Drawing.Size(160, 24);
            this.txt_wrkQty.Size = new System.Drawing.Size(168, 24);
            this.txt_wrkQty.StyleController = this.layoutMx1;
            this.txt_wrkQty.TabIndex = 228;
            // 
            // txt_dwName
            // 
            this.txt_dwName.Location = new System.Drawing.Point(390, 124);
            this.txt_dwName.Location = new System.Drawing.Point(653, 96);
            this.txt_dwName.Name = "txt_dwName";
            this.txt_dwName.Properties.Appearance.Options.UseFont = true;
            this.txt_dwName.Properties.ReadOnly = true;
            this.txt_dwName.Size = new System.Drawing.Size(160, 24);
            this.txt_dwName.Size = new System.Drawing.Size(168, 24);
            this.txt_dwName.StyleController = this.layoutMx1;
            this.txt_dwName.TabIndex = 222;
            // 
            // txt_cgd
            // 
            this.txt_cgd.Location = new System.Drawing.Point(119, 68);
            this.txt_cgd.Location = new System.Drawing.Point(111, 68);
            this.txt_cgd.Name = "txt_cgd";
            this.txt_cgd.Size = new System.Drawing.Size(160, 24);
            this.txt_cgd.Size = new System.Drawing.Size(168, 24);
            this.txt_cgd.StyleController = this.layoutMx1;
            this.txt_cgd.TabIndex = 313;
            // 
            // txt_cgdxh
            // 
            this.txt_cgdxh.Location = new System.Drawing.Point(119, 96);
            this.txt_cgdxh.Location = new System.Drawing.Point(111, 96);
            this.txt_cgdxh.Name = "txt_cgdxh";
            this.txt_cgdxh.Size = new System.Drawing.Size(160, 24);
            this.txt_cgdxh.Size = new System.Drawing.Size(168, 24);
            this.txt_cgdxh.StyleController = this.layoutMx1;
            this.txt_cgdxh.TabIndex = 314;
            // 
            // txt_erpProductionOrderNo
            // 
            this.txt_erpProductionOrderNo.Location = new System.Drawing.Point(119, 124);
            this.txt_erpProductionOrderNo.Location = new System.Drawing.Point(653, 124);
            this.txt_erpProductionOrderNo.Name = "txt_erpProductionOrderNo";
            this.txt_erpProductionOrderNo.Size = new System.Drawing.Size(160, 24);
            this.txt_erpProductionOrderNo.Size = new System.Drawing.Size(168, 24);
            this.txt_erpProductionOrderNo.StyleController = this.layoutMx1;
            this.txt_erpProductionOrderNo.TabIndex = 315;
            // 
            // txt_pcHNo
            // 
            this.txt_pcHNo.Location = new System.Drawing.Point(661, 96);
            this.txt_pcHNo.Location = new System.Drawing.Point(924, 96);
            this.txt_pcHNo.Name = "txt_pcHNo";
            this.txt_pcHNo.Size = new System.Drawing.Size(160, 24);
            this.txt_pcHNo.Size = new System.Drawing.Size(169, 24);
            this.txt_pcHNo.StyleController = this.layoutMx1;
            this.txt_pcHNo.TabIndex = 316;
            // 
            // txt_yrkQty
            // 
            this.txt_yrkQty.Location = new System.Drawing.Point(390, 96);
            this.txt_yrkQty.Location = new System.Drawing.Point(382, 96);
            this.txt_yrkQty.Name = "txt_yrkQty";
            this.txt_yrkQty.Size = new System.Drawing.Size(160, 24);
            this.txt_yrkQty.Size = new System.Drawing.Size(168, 24);
            this.txt_yrkQty.StyleController = this.layoutMx1;
            this.txt_yrkQty.TabIndex = 317;
            // 
@@ -891,16 +854,14 @@
            this.layoutControlItem8,
            this.layoutControlItem11,
            this.layoutControlItem12,
            this.layoutControlItem20,
            this.layoutControlItem9,
            this.layoutControlItem15,
            this.layoutControlItem14,
            this.layoutControlItem21,
            this.layoutControlItem17,
            this.layoutControlItem18,
            this.layoutControlItem13,
            this.layoutControlItem20,
            this.layoutControlItem10,
            this.layoutControlItem19});
            this.layoutControlItem19,
            this.layoutControlItem13});
            this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
            this.Root.Name = "Root";
            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -926,16 +887,13 @@
            rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition5.Height = 100D;
            rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition6.Height = 100D;
            rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
            this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
            rowDefinition1,
            rowDefinition2,
            rowDefinition3,
            rowDefinition4,
            rowDefinition5,
            rowDefinition6});
            this.Root.Size = new System.Drawing.Size(1105, 188);
            rowDefinition5});
            this.Root.Size = new System.Drawing.Size(1105, 160);
            this.Root.TextVisible = false;
            // 
            // layoutControlItem1
@@ -946,7 +904,7 @@
            this.layoutControlItem1.Name = "layoutControlItem1";
            this.layoutControlItem1.Size = new System.Drawing.Size(271, 28);
            this.layoutControlItem1.Text = "委外工单号";
            this.layoutControlItem1.TextSize = new System.Drawing.Size(95, 18);
            this.layoutControlItem1.TextSize = new System.Drawing.Size(87, 18);
            // 
            // layoutControlItem2
            // 
@@ -956,7 +914,7 @@
            this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem2.Size = new System.Drawing.Size(271, 28);
            this.layoutControlItem2.Text = "委外订单号";
            this.layoutControlItem2.TextSize = new System.Drawing.Size(95, 18);
            this.layoutControlItem2.TextSize = new System.Drawing.Size(87, 18);
            // 
            // layoutControlItem3
            // 
@@ -966,17 +924,18 @@
            this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem3.Size = new System.Drawing.Size(271, 28);
            this.layoutControlItem3.Text = "工单状态 ";
            this.layoutControlItem3.TextSize = new System.Drawing.Size(95, 18);
            this.layoutControlItem3.TextSize = new System.Drawing.Size(87, 18);
            // 
            // layoutControlItem4
            // 
            this.layoutControlItem4.Control = this.txt_mesStartProd;
            this.layoutControlItem4.CustomizationFormText = "Mes预计开工";
            this.layoutControlItem4.Location = new System.Drawing.Point(813, 0);
            this.layoutControlItem4.Name = "layoutControlItem4";
            this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem4.Size = new System.Drawing.Size(272, 28);
            this.layoutControlItem4.Text = "预计开工时间 ";
            this.layoutControlItem4.TextSize = new System.Drawing.Size(95, 18);
            this.layoutControlItem4.Text = "Mes预计开工";
            this.layoutControlItem4.TextSize = new System.Drawing.Size(87, 18);
            // 
            // layoutControlItem5
            // 
@@ -986,7 +945,7 @@
            this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem5.Size = new System.Drawing.Size(271, 28);
            this.layoutControlItem5.Text = "物料编码";
            this.layoutControlItem5.TextSize = new System.Drawing.Size(95, 18);
            this.layoutControlItem5.TextSize = new System.Drawing.Size(87, 18);
            // 
            // layoutControlItem6
            // 
@@ -997,7 +956,7 @@
            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem6.Size = new System.Drawing.Size(271, 28);
            this.layoutControlItem6.Text = "工单数量";
            this.layoutControlItem6.TextSize = new System.Drawing.Size(95, 18);
            this.layoutControlItem6.TextSize = new System.Drawing.Size(87, 18);
            // 
            // layoutControlItem7
            // 
@@ -1008,18 +967,19 @@
            this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem7.Size = new System.Drawing.Size(271, 28);
            this.layoutControlItem7.Text = "完工人员";
            this.layoutControlItem7.TextSize = new System.Drawing.Size(95, 18);
            this.layoutControlItem7.TextSize = new System.Drawing.Size(87, 18);
            // 
            // layoutControlItem8
            // 
            this.layoutControlItem8.Control = this.txt_mesEndProd;
            this.layoutControlItem8.CustomizationFormText = "Mes预计完工";
            this.layoutControlItem8.Location = new System.Drawing.Point(813, 28);
            this.layoutControlItem8.Name = "layoutControlItem8";
            this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem8.Size = new System.Drawing.Size(272, 28);
            this.layoutControlItem8.Text = "预计完工时间 ";
            this.layoutControlItem8.TextSize = new System.Drawing.Size(95, 18);
            this.layoutControlItem8.Text = "Mes预计完工";
            this.layoutControlItem8.TextSize = new System.Drawing.Size(87, 18);
            // 
            // layoutControlItem11
            // 
@@ -1030,7 +990,7 @@
            this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem11.Size = new System.Drawing.Size(271, 28);
            this.layoutControlItem11.Text = "完工时间 ";
            this.layoutControlItem11.TextSize = new System.Drawing.Size(95, 18);
            this.layoutControlItem11.TextSize = new System.Drawing.Size(87, 18);
            // 
            // layoutControlItem12
            // 
@@ -1040,19 +1000,8 @@
            this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem12.Size = new System.Drawing.Size(272, 28);
            this.layoutControlItem12.Text = "备料状态 ";
            this.layoutControlItem12.TextSize = new System.Drawing.Size(95, 18);
            // 
            // layoutControlItem20
            // 
            this.layoutControlItem20.Control = this.txt_pcHNo;
            this.layoutControlItem20.Location = new System.Drawing.Point(542, 84);
            this.layoutControlItem20.Name = "layoutControlItem20";
            this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem20.Size = new System.Drawing.Size(271, 28);
            this.layoutControlItem20.Text = "排产编号";
            this.layoutControlItem20.TextSize = new System.Drawing.Size(95, 18);
            this.layoutControlItem12.Text = "通知备料";
            this.layoutControlItem12.TextSize = new System.Drawing.Size(87, 18);
            // 
            // layoutControlItem9
            // 
@@ -1063,29 +1012,7 @@
            this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem9.Size = new System.Drawing.Size(271, 28);
            this.layoutControlItem9.Text = "未入库数";
            this.layoutControlItem9.TextSize = new System.Drawing.Size(95, 18);
            // 
            // layoutControlItem15
            // 
            this.layoutControlItem15.Control = this.txt_blTime;
            this.layoutControlItem15.Location = new System.Drawing.Point(813, 84);
            this.layoutControlItem15.Name = "layoutControlItem15";
            this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem15.Size = new System.Drawing.Size(272, 28);
            this.layoutControlItem15.Text = "备料时间 ";
            this.layoutControlItem15.TextSize = new System.Drawing.Size(95, 18);
            // 
            // layoutControlItem14
            // 
            this.layoutControlItem14.Control = this.txt_blUser;
            this.layoutControlItem14.Location = new System.Drawing.Point(813, 112);
            this.layoutControlItem14.Name = "layoutControlItem14";
            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 4;
            this.layoutControlItem14.Size = new System.Drawing.Size(272, 28);
            this.layoutControlItem14.Text = "备料人员";
            this.layoutControlItem14.TextSize = new System.Drawing.Size(95, 18);
            this.layoutControlItem9.TextSize = new System.Drawing.Size(87, 18);
            // 
            // layoutControlItem21
            // 
@@ -1096,7 +1023,7 @@
            this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem21.Size = new System.Drawing.Size(271, 28);
            this.layoutControlItem21.Text = "已入库数";
            this.layoutControlItem21.TextSize = new System.Drawing.Size(95, 18);
            this.layoutControlItem21.TextSize = new System.Drawing.Size(87, 18);
            // 
            // layoutControlItem17
            // 
@@ -1106,7 +1033,7 @@
            this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem17.Size = new System.Drawing.Size(271, 28);
            this.layoutControlItem17.Text = "采购单号";
            this.layoutControlItem17.TextSize = new System.Drawing.Size(95, 18);
            this.layoutControlItem17.TextSize = new System.Drawing.Size(87, 18);
            // 
            // layoutControlItem18
            // 
@@ -1116,39 +1043,51 @@
            this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem18.Size = new System.Drawing.Size(271, 28);
            this.layoutControlItem18.Text = "采购单行号";
            this.layoutControlItem18.TextSize = new System.Drawing.Size(95, 18);
            this.layoutControlItem18.TextSize = new System.Drawing.Size(87, 18);
            // 
            // layoutControlItem13
            // layoutControlItem20
            // 
            this.layoutControlItem13.Control = this.txt_remark;
            this.layoutControlItem13.Location = new System.Drawing.Point(0, 140);
            this.layoutControlItem13.Name = "layoutControlItem13";
            this.layoutControlItem13.OptionsTableLayoutItem.ColumnSpan = 2;
            this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 5;
            this.layoutControlItem13.Size = new System.Drawing.Size(542, 28);
            this.layoutControlItem13.Text = "备注";
            this.layoutControlItem13.TextSize = new System.Drawing.Size(95, 18);
            this.layoutControlItem20.Control = this.txt_pcHNo;
            this.layoutControlItem20.Location = new System.Drawing.Point(813, 84);
            this.layoutControlItem20.Name = "layoutControlItem20";
            this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem20.Size = new System.Drawing.Size(272, 28);
            this.layoutControlItem20.Text = "排产编号";
            this.layoutControlItem20.TextSize = new System.Drawing.Size(87, 18);
            // 
            // layoutControlItem10
            // 
            this.layoutControlItem10.Control = this.txt_dwName;
            this.layoutControlItem10.Location = new System.Drawing.Point(271, 112);
            this.layoutControlItem10.Location = new System.Drawing.Point(542, 84);
            this.layoutControlItem10.Name = "layoutControlItem10";
            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 4;
            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem10.Size = new System.Drawing.Size(271, 28);
            this.layoutControlItem10.Text = "单位";
            this.layoutControlItem10.TextSize = new System.Drawing.Size(95, 18);
            this.layoutControlItem10.TextSize = new System.Drawing.Size(87, 18);
            // 
            // layoutControlItem19
            // 
            this.layoutControlItem19.Control = this.txt_erpProductionOrderNo;
            this.layoutControlItem19.Location = new System.Drawing.Point(0, 112);
            this.layoutControlItem19.Location = new System.Drawing.Point(542, 112);
            this.layoutControlItem19.Name = "layoutControlItem19";
            this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 4;
            this.layoutControlItem19.Size = new System.Drawing.Size(271, 28);
            this.layoutControlItem19.Text = "任务单号";
            this.layoutControlItem19.TextSize = new System.Drawing.Size(95, 18);
            this.layoutControlItem19.TextSize = new System.Drawing.Size(87, 18);
            // 
            // layoutControlItem13
            // 
            this.layoutControlItem13.Control = this.txt_remark;
            this.layoutControlItem13.Location = new System.Drawing.Point(0, 112);
            this.layoutControlItem13.Name = "layoutControlItem13";
            this.layoutControlItem13.OptionsTableLayoutItem.ColumnSpan = 2;
            this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 4;
            this.layoutControlItem13.Size = new System.Drawing.Size(542, 28);
            this.layoutControlItem13.Text = "备注";
            this.layoutControlItem13.TextSize = new System.Drawing.Size(87, 18);
            // 
            // tabMx
            // 
@@ -1156,7 +1095,7 @@
            this.tabMx.Location = new System.Drawing.Point(0, 0);
            this.tabMx.Name = "tabMx";
            this.tabMx.SelectedTabPage = this.tabMxPage1;
            this.tabMx.Size = new System.Drawing.Size(1126, 373);
            this.tabMx.Size = new System.Drawing.Size(1126, 401);
            this.tabMx.TabIndex = 3;
            this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
            this.tabMxPage1});
@@ -1165,7 +1104,7 @@
            // 
            this.tabMxPage1.Controls.Add(this.gcMx1);
            this.tabMxPage1.Name = "tabMxPage1";
            this.tabMxPage1.Size = new System.Drawing.Size(1124, 341);
            this.tabMxPage1.Size = new System.Drawing.Size(1124, 369);
            this.tabMxPage1.Text = "备料单身";
            // 
            // gcMx1
@@ -1174,7 +1113,7 @@
            this.gcMx1.Location = new System.Drawing.Point(0, 0);
            this.gcMx1.MainView = this.gvMx1;
            this.gcMx1.Name = "gcMx1";
            this.gcMx1.Size = new System.Drawing.Size(1124, 341);
            this.gcMx1.Size = new System.Drawing.Size(1124, 369);
            this.gcMx1.TabIndex = 0;
            this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gvMx1});
@@ -1382,23 +1321,11 @@
            this.gvMx1dab002.VisibleIndex = 9;
            this.gvMx1dab002.Width = 50;
            // 
            // picCheckBox
            // 
            this.picCheckBox.Image = ((System.Drawing.Image)(resources.GetObject("picCheckBox.Image")));
            this.picCheckBox.Location = new System.Drawing.Point(892, 55);
            this.picCheckBox.Name = "picCheckBox";
            this.picCheckBox.Size = new System.Drawing.Size(100, 50);
            this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
            this.picCheckBox.TabIndex = 9;
            this.picCheckBox.TabStop = false;
            this.picCheckBox.Visible = false;
            // 
            // Frm_WwGd
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
            this.ClientSize = new System.Drawing.Size(1128, 682);
            this.Controls.Add(this.picCheckBox);
            this.Controls.Add(this.xtraTabControl1);
            this.Controls.Add(this.toolBarMenu1);
            this.Name = "Frm_WwGd";
@@ -1423,8 +1350,6 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
            this.layoutMx1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_blUser.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_blTime.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_daa001.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_wgTime.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_wgUser.Properties)).EndInit();
@@ -1454,34 +1379,29 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).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.picCheckBox)).EndInit();
            this.ResumeLayout(false);

        }
        #endregion
        private UserControl.UcToolBarMenu toolBarMenu1;
        private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
        private System.Windows.Forms.PictureBox picCheckBox;
        private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
        private DevExpress.XtraEditors.SplitContainerControl split1;
        private DevExpress.XtraGrid.GridControl gcMain1;
        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
        private DevExpress.XtraGrid.Columns.GridColumn gv_pcSh;
        private DevExpress.XtraGrid.Columns.GridColumn gv_daa001;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
@@ -1509,8 +1429,6 @@
        private DevExpress.XtraEditors.TextEdit txt_wgUser;
        private DevExpress.XtraEditors.TextEdit txt_wgTime;
        private DevExpress.XtraEditors.TextEdit txt_daa018;
        private DevExpress.XtraEditors.TextEdit txt_blUser;
        private DevExpress.XtraEditors.TextEdit txt_blTime;
        private DevExpress.XtraEditors.TextEdit txt_blStateTxt;
        private DevExpress.XtraEditors.TextEdit txt_mesEndProd;
        private DevExpress.XtraEditors.TextEdit txt_mesStartProd;
@@ -1560,17 +1478,17 @@
        private DevExpress.XtraEditors.TextEdit txt_cgdxh;
        private DevExpress.XtraEditors.TextEdit txt_erpProductionOrderNo;
        private DevExpress.XtraEditors.TextEdit txt_pcHNo;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
        private DevExpress.Utils.ToolTipController tips;
        private DevExpress.XtraEditors.TextEdit txt_yrkQty;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
    }
}

 DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.cs

@@ -1,3 +1,4 @@
using Gs.DevApp.DevFrm.WW;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
@@ -28,9 +29,10 @@
            this.toolBarMenu1.btnKgClick += ToolBarMenu1_btnKgClick;
            this.toolBarMenu1.btnWgClick += ToolBarMenu1_btnWgClick;
            toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
            this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick;
            this.toolBarMenu1.getXmlConfig();
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "pcShChk", "", (value) =>
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, this, "pcShChk", "", (value) =>
            {
                Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
            }, tips);
@@ -111,7 +113,7 @@
        }
        private void ToolBarMenu1_btnZhongTaiClick(object sender, EventArgs e)
        {
            var frm = new showZhongTai();
            var frm = new showWwZhongTai();
            frm.UpdateParent += (ss, ee) =>
            {
                int _zt = int.Parse(ee.StringSingle.Split(',')[0]);
@@ -188,7 +190,49 @@
            }

        }

        /// <summary>
        /// åˆ é™¤å·¥å•
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        /// <exception cref="NotImplementedException"></exception>
        private void ToolBarMenu1_btnDelClick(object sender, EventArgs e)
        {
            string rowGuid = "", rowName = "";
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_daa001, gridView1, "daa001");
            if (string.IsNullOrEmpty(rowGuid))
            {
                MsgHelper.Warning("请先选择你要操作的行！");
                return;
            }
            if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】，确定删除吗？"))
                return;
            var _obj = new
            {
                guid = rowGuid,
                mxGuid = Guid.Empty.ToString(),
            };
            try
            {
                var strJson = UtilityHelper.HttpPost("",
                    _webServiceName + "DeleteModelOrMx",
                    JsonConvert.SerializeObject(_obj));
                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                if (_rtn.rtnCode > 0)
                {
                    if (xtraTabControl1.SelectedTabPageIndex == 0)
                    { }
                    else
                        Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2);
                    getPageList(this.pageBar1.CurrentPage);
                }
                MsgHelper.Warning("提示：" + _rtn.rtnMsg);
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示：" + ex.Message);
            }
        }
        /// <summary>
        /// ä¿å­˜äº‹ä»¶
        /// </summary>
@@ -230,7 +274,7 @@
        /// <param name="pageSize">每页几条</param>
        private void getPageList(int curPage)
        {
            gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
            gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
            PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
            string json = JsonConvert.SerializeObject(pgq);
            try
@@ -331,30 +375,30 @@
            string strMsg = "";
            switch (_inFieldValue)
            {
                case 1:
                    strMsg = "待开工";
                    break;
                //case 1:
                //    strMsg = "待开工";
                //    break;
                case 2:
                    strMsg = "工单暂停";
                    break;
                case 3:
                    strMsg = "撤回完工";
                    break;
                //case 3:
                //    strMsg = "清尾";
                //    break;
                case 4:
                    strMsg = "紧急备料";
                    break;
                case 5:
                    strMsg = "暂停备料";
                    break;
                case 6:
                    strMsg = "撤回备料";
                    break;
                //case 6:
                //    strMsg = "撤回备料";
                //    break;
                case 7:
                    strMsg = "通知备料";
                    break;
                case 8:
                    strMsg = "开工";
                    break;
                //case 8:
                //    strMsg = "开工";
                //    break;
                case 9:
                    strMsg = "手动完工";
                    break;
@@ -402,6 +446,5 @@
                MsgHelper.Warning("提示：" + ex.Message);
            }
        }

    }
}

 DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.resx

@@ -117,124 +117,10 @@
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
  <data name="picCheckBox.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        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
        2OyW1yHZAAAAAElFTkSuQmCC
</value>
  </data>
  <metadata name="tips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>17, 17</value>
  </metadata>
  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>25</value>
  </metadata>
</root>

 DevApp/Gs.DevApp/DevFrm/WW/SelectWwPc.Designer.cs

@@ -334,7 +334,7 @@
            this.MinimizeBox = false;
            this.Name = "SelectWwPc";
            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
            this.Text = "选取委外任务单【下达、用料清单审核、委外采购订单即可排产，但通知备料需要委外采购订单审核】";
            this.Text = "选取委外任务单【下达+用料清单审核+委外采购订单】即可排产，但通知备料需要委外采购订单审核";
            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).EndInit();

 DevApp/Gs.DevApp/DevFrm/WW/showWwZhongTai.Designer.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,117 @@
using Gs.DevApp.UserControl;

namespace Gs.DevApp.DevFrm.WW
{
    partial class showWwZhongTai
    {
        /// <summary>
        /// Required designer variable.
        /// </summary>
        private System.ComponentModel.IContainer components = null;

        /// <summary>
        /// Clean up any resources being used.
        /// </summary>
        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
        protected override void Dispose(bool disposing)
        {
            if (disposing && (components != null))
            {
                components.Dispose();
            }
            base.Dispose(disposing);
        }

        #region Windows Form Designer generated code

        /// <summary>
        /// Required method for Designer support - do not modify
        /// the contents of this method with the code editor.
        /// </summary>
        private void InitializeComponent()
        {
            this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
            this.comZt = new DevExpress.XtraEditors.ComboBoxEdit();
            this.btnCancel = new DevExpress.XtraEditors.SimpleButton();
            this.btnSave = new DevExpress.XtraEditors.SimpleButton();
            ((System.ComponentModel.ISupportInitialize)(this.comZt.Properties)).BeginInit();
            this.SuspendLayout();
            // 
            // labelControl1
            // 
            this.labelControl1.Location = new System.Drawing.Point(75, 59);
            this.labelControl1.Name = "labelControl1";
            this.labelControl1.Size = new System.Drawing.Size(75, 18);
            this.labelControl1.TabIndex = 0;
            this.labelControl1.Text = "选择状态：";
            // 
            // comZt
            // 
            this.comZt.EditValue = "-请选择-";
            this.comZt.Location = new System.Drawing.Point(158, 56);
            this.comZt.Name = "comZt";
            this.comZt.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
            this.comZt.Properties.Items.AddRange(new object[] {
            "-请选择-",
            "2,S:暂停",
            "4,紧急备料",
            "5,暂停备料"});
            this.comZt.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
            this.comZt.Size = new System.Drawing.Size(125, 24);
            this.comZt.TabIndex = 2;
            // 
            // btnCancel
            // 
            this.btnCancel.Appearance.Options.UseFont = true;
            this.btnCancel.ButtonStyle = DevExpress.XtraEditors.Controls.BorderStyles.HotFlat;
            this.btnCancel.Cursor = System.Windows.Forms.Cursors.Hand;
            this.btnCancel.Location = new System.Drawing.Point(196, 160);
            this.btnCancel.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
            this.btnCancel.Name = "btnCancel";
            this.btnCancel.Size = new System.Drawing.Size(87, 37);
            this.btnCancel.TabIndex = 240;
            this.btnCancel.Text = "取消 (&C)";
            // 
            // btnSave
            // 
            this.btnSave.Appearance.Options.UseFont = true;
            this.btnSave.ButtonStyle = DevExpress.XtraEditors.Controls.BorderStyles.HotFlat;
            this.btnSave.Cursor = System.Windows.Forms.Cursors.Hand;
            this.btnSave.Location = new System.Drawing.Point(79, 160);
            this.btnSave.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
            this.btnSave.Name = "btnSave";
            this.btnSave.Size = new System.Drawing.Size(87, 37);
            this.btnSave.TabIndex = 239;
            this.btnSave.Text = "确定 (&L)";
            // 
            // showWwZhongTai
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
            this.ClientSize = new System.Drawing.Size(387, 260);
            this.Controls.Add(this.btnCancel);
            this.Controls.Add(this.btnSave);
            this.Controls.Add(this.comZt);
            this.Controls.Add(this.labelControl1);
            this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
            this.MaximizeBox = false;
            this.MinimizeBox = false;
            this.Name = "showWwZhongTai";
            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
            this.Text = "修改状态";
            this.TopMost = true;
            ((System.ComponentModel.ISupportInitialize)(this.comZt.Properties)).EndInit();
            this.ResumeLayout(false);
            this.PerformLayout();

        }

        #endregion

        private DevExpress.XtraEditors.LabelControl labelControl1;
        private DevExpress.XtraEditors.ComboBoxEdit comZt;
        private DevExpress.XtraEditors.SimpleButton btnCancel;
        private DevExpress.XtraEditors.SimpleButton btnSave;
    }
}

 DevApp/Gs.DevApp/DevFrm/WW/showWwZhongTai.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,42 @@
using DevExpress.XtraEditors;
using Gs.DevApp.ToolBox;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;

namespace Gs.DevApp.DevFrm.WW
{
    public partial class showWwZhongTai : DevExpress.XtraEditors.XtraForm
    {
        public showWwZhongTai()
        {
            InitializeComponent();
            btnSave.Click += (s, e) =>
            {
                if (comZt.SelectedIndex <= 0)
                {
                    Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择状态！");
                    return;
                }
                string str = comZt.Text.Trim();
                UpdateParent?.Invoke(this, new UpdateParentEventArgs { StringSingle = str });
                Close();
            };
            btnCancel.Click += (s, e) =>
            {
                this.Close();
            };
        }

        /// <summary>
        ///     é€‰æ‹©åŽçš„回调事件
        /// </summary>
        public event EventHandler<UpdateParentEventArgs> UpdateParent;
    }
}

 DevApp/Gs.DevApp/DevFrm/WW/showWwZhongTai.resx

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
  <!-- 
    Microsoft ResX Schema 
    
    Version 2.0
    
    The primary goals of this format is to allow a simple XML format 
    that is mostly human readable. The generation and parsing of the 
    various data types are done through the TypeConverter classes 
    associated with the data types.
    
    Example:
    
    ... ado.net/XML headers & schema ...
    <resheader name="resmimetype">text/microsoft-resx</resheader>
    <resheader name="version">2.0</resheader>
    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
        <value>[base64 mime encoded serialized .NET Framework object]</value>
    </data>
    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
        <comment>This is a comment</comment>
    </data>
                
    There are any number of "resheader" rows that contain simple 
    name/value pairs.
    
    Each data row contains a name, and value. The row also contains a 
    type or mimetype. Type corresponds to a .NET class that support 
    text/value conversion through the TypeConverter architecture. 
    Classes that don't support this are serialized and stored with the 
    mimetype set.
    
    The mimetype is used for serialized objects, and tells the 
    ResXResourceReader how to depersist the object. This is currently not 
    extensible. For a given mimetype the value must be set accordingly:
    
    Note - application/x-microsoft.net.object.binary.base64 is the format 
    that the ResXResourceWriter will generate, however the reader can 
    read any of the formats listed below.
    
    mimetype: application/x-microsoft.net.object.binary.base64
    value   : The object must be serialized with 
            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
            : and then encoded with base64 encoding.
    
    mimetype: application/x-microsoft.net.object.soap.base64
    value   : The object must be serialized with 
            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
            : and then encoded with base64 encoding.

    mimetype: application/x-microsoft.net.object.bytearray.base64
    value   : The object must be serialized into a byte array 
            : using a System.ComponentModel.TypeConverter
            : and then encoded with base64 encoding.
    -->
  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
    <xsd:element name="root" msdata:IsDataSet="true">
      <xsd:complexType>
        <xsd:choice maxOccurs="unbounded">
          <xsd:element name="metadata">
            <xsd:complexType>
              <xsd:sequence>
                <xsd:element name="value" type="xsd:string" minOccurs="0" />
              </xsd:sequence>
              <xsd:attribute name="name" use="required" type="xsd:string" />
              <xsd:attribute name="type" type="xsd:string" />
              <xsd:attribute name="mimetype" type="xsd:string" />
              <xsd:attribute ref="xml:space" />
            </xsd:complexType>
          </xsd:element>
          <xsd:element name="assembly">
            <xsd:complexType>
              <xsd:attribute name="alias" type="xsd:string" />
              <xsd:attribute name="name" type="xsd:string" />
            </xsd:complexType>
          </xsd:element>
          <xsd:element name="data">
            <xsd:complexType>
              <xsd:sequence>
                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
              </xsd:sequence>
              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
              <xsd:attribute ref="xml:space" />
            </xsd:complexType>
          </xsd:element>
          <xsd:element name="resheader">
            <xsd:complexType>
              <xsd:sequence>
                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
              </xsd:sequence>
              <xsd:attribute name="name" type="xsd:string" use="required" />
            </xsd:complexType>
          </xsd:element>
        </xsd:choice>
      </xsd:complexType>
    </xsd:element>
  </xsd:schema>
  <resheader name="resmimetype">
    <value>text/microsoft-resx</value>
  </resheader>
  <resheader name="version">
    <value>2.0</value>
  </resheader>
  <resheader name="reader">
    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
</root>

 DevApp/Gs.DevApp/Gs.DevApp.csproj

@@ -873,6 +873,12 @@
    <Compile Include="DevFrm\Work\Frm_WorkTechniqueShow.Designer.cs">
      <DependentUpon>Frm_WorkTechniqueShow.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\WW\showWwZhongTai.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\WW\showWwZhongTai.Designer.cs">
      <DependentUpon>showWwZhongTai.cs</DependentUpon>
    </Compile>
    <Compile Include="Properties\Resources.Designer.cs">
      <AutoGen>True</AutoGen>
      <DesignTime>True</DesignTime>
@@ -1580,6 +1586,9 @@
    <EmbeddedResource Include="DevFrm\Work\Frm_WorkTechniqueShow.resx">
      <DependentUpon>Frm_WorkTechniqueShow.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\WW\showWwZhongTai.resx">
      <DependentUpon>showWwZhongTai.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="UserControl\SelectCk.resx">
      <DependentUpon>SelectCk.cs</DependentUpon>
    </EmbeddedResource>