lu
2024-12-28 d2738f94682e35cf38b9cbcb82d4808099040457
基础信息
已修改5个文件
已添加3个文件
1649 ■■■■ 文件已修改
DevApp/Gs.DevApp/App.config 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Customer.Designer.cs 57 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemType.Designer.cs 371 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.Designer.cs 104 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.Designer.cs 69 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.Designer.cs 603 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.cs 321 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.resx 120 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/App.config
@@ -28,8 +28,8 @@
        </assemblyBinding>
    </runtime>
    <appSettings>
         <add key="WebApiUrl" value="http://localhost:5263/" />
        <!--<add key="WebApiUrl" value="http://192.168.1.145:81/" />-->
         <!--<add key="WebApiUrl" value="http://localhost:5263/" />-->
        <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/BasicData/Frm_Customer.Designer.cs
@@ -58,11 +58,11 @@
            this.gv_custNo = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_id = new DevExpress.XtraEditors.LabelControl();
            this.txt_id = new DevExpress.XtraEditors.TextEdit();
            this.gv_id = new DevExpress.XtraGrid.Columns.GridColumn();
            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
            this.gcMain = new DevExpress.XtraGrid.GridControl();
            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gv_org = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
            this.pageBar1 = new UserControls.Data.UcPageBar();
@@ -70,7 +70,6 @@
            this.panel1 = new System.Windows.Forms.Panel();
            this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
            this.lbGuid = new System.Windows.Forms.Label();
            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fseller.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fforbidstatus.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
@@ -120,7 +119,7 @@
            this.gv_fseller.OptionsColumn.AllowEdit = false;
            this.gv_fseller.Tag = "query_a.fseller";
            this.gv_fseller.Visible = true;
            this.gv_fseller.VisibleIndex = 9;
            this.gv_fseller.VisibleIndex = 8;
            this.gv_fseller.Width = 94;
            // 
            // lb_fforbidstatus
@@ -153,7 +152,7 @@
            this.gv_fforbidstatus.OptionsColumn.AllowEdit = false;
            this.gv_fforbidstatus.Tag = "query_a.fforbidstatus";
            this.gv_fforbidstatus.Visible = true;
            this.gv_fforbidstatus.VisibleIndex = 8;
            this.gv_fforbidstatus.VisibleIndex = 7;
            this.gv_fforbidstatus.Width = 94;
            // 
            // lb_remark
@@ -186,7 +185,7 @@
            this.gv_remark.OptionsColumn.AllowEdit = false;
            this.gv_remark.Tag = "query_a.remark";
            this.gv_remark.Visible = true;
            this.gv_remark.VisibleIndex = 7;
            this.gv_remark.VisibleIndex = 6;
            this.gv_remark.Width = 94;
            // 
            // lb_lastupdateDate
@@ -238,7 +237,7 @@
            this.gv_anred.OptionsColumn.AllowEdit = false;
            this.gv_anred.Tag = "query_a.anred";
            this.gv_anred.Visible = true;
            this.gv_anred.VisibleIndex = 6;
            this.gv_anred.VisibleIndex = 5;
            this.gv_anred.Width = 94;
            // 
            // lb_telf1
@@ -271,7 +270,7 @@
            this.gv_telf1.OptionsColumn.AllowEdit = false;
            this.gv_telf1.Tag = "query_a.telf1";
            this.gv_telf1.Visible = true;
            this.gv_telf1.VisibleIndex = 5;
            this.gv_telf1.VisibleIndex = 4;
            this.gv_telf1.Width = 94;
            // 
            // lb_custSname
@@ -304,7 +303,7 @@
            this.gv_custSname.OptionsColumn.AllowEdit = false;
            this.gv_custSname.Tag = "query_a.cust_sname";
            this.gv_custSname.Visible = true;
            this.gv_custSname.VisibleIndex = 4;
            this.gv_custSname.VisibleIndex = 3;
            this.gv_custSname.Width = 94;
            // 
            // lb_custName
@@ -337,7 +336,7 @@
            this.gv_custName.OptionsColumn.AllowEdit = false;
            this.gv_custName.Tag = "query_a.cust_name";
            this.gv_custName.Visible = true;
            this.gv_custName.VisibleIndex = 3;
            this.gv_custName.VisibleIndex = 2;
            this.gv_custName.Width = 200;
            // 
            // lb_custNo
@@ -370,7 +369,7 @@
            this.gv_custNo.OptionsColumn.AllowEdit = false;
            this.gv_custNo.Tag = "query_a.cust_no";
            this.gv_custNo.Visible = true;
            this.gv_custNo.VisibleIndex = 2;
            this.gv_custNo.VisibleIndex = 1;
            this.gv_custNo.Width = 94;
            // 
            // lb_id
@@ -391,20 +390,6 @@
            this.txt_id.Properties.Appearance.Options.UseFont = true;
            this.txt_id.Size = new System.Drawing.Size(150, 28);
            this.txt_id.TabIndex = 211;
            //
            // gv_id
            //
            this.gv_id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_id.AppearanceCell.Options.UseFont = true;
            this.gv_id.Caption = "ID ";
            this.gv_id.FieldName = "id";
            this.gv_id.MinWidth = 50;
            this.gv_id.Name = "gv_id";
            this.gv_id.OptionsColumn.AllowEdit = false;
            this.gv_id.Tag = "query_a.id";
            this.gv_id.Visible = true;
            this.gv_id.VisibleIndex = 1;
            this.gv_id.Width = 94;
            // 
            // toolBarMenu1
            // 
@@ -439,7 +424,6 @@
            this.gridView1.Appearance.Row.Options.UseFont = true;
            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gv_org,
            this.gv_id,
            this.gv_custNo,
            this.gv_custName,
            this.gv_custSname,
@@ -466,6 +450,17 @@
            this.gv_org.Visible = true;
            this.gv_org.VisibleIndex = 0;
            this.gv_org.Width = 250;
            //
            // gridColumn1
            //
            this.gridColumn1.Caption = "同步时间";
            this.gridColumn1.FieldName = "lastupdateDate";
            this.gridColumn1.MinWidth = 25;
            this.gridColumn1.Name = "gridColumn1";
            this.gridColumn1.Tag = "query_a.lastupdate_date";
            this.gridColumn1.Visible = true;
            this.gridColumn1.VisibleIndex = 9;
            this.gridColumn1.Width = 180;
            // 
            // xtraTabControl1
            // 
@@ -556,17 +551,6 @@
            this.lbGuid.TabIndex = 1;
            this.lbGuid.Visible = false;
            // 
            // gridColumn1
            //
            this.gridColumn1.Caption = "同步时间";
            this.gridColumn1.FieldName = "lastupdateDate";
            this.gridColumn1.MinWidth = 25;
            this.gridColumn1.Name = "gridColumn1";
            this.gridColumn1.Tag = "query_a.lastupdate_date";
            this.gridColumn1.Visible = true;
            this.gridColumn1.VisibleIndex = 10;
            this.gridColumn1.Width = 180;
            //
            // Frm_Customer
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -646,7 +630,6 @@
        private DevExpress.XtraEditors.LabelControl lb_id;
        private DevExpress.XtraEditors.TextEdit txt_id;
        private DevExpress.XtraGrid.Columns.GridColumn gv_id;
        private DevExpress.XtraGrid.Columns.GridColumn gv_org;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
    }
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemType.Designer.cs
@@ -35,25 +35,8 @@
            this.lb_pgroup = new DevExpress.XtraEditors.LabelControl();
            this.txt_pgroup = new DevExpress.XtraEditors.TextEdit();
            this.gv_pgroup = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_iqcTypeName = new DevExpress.XtraEditors.LabelControl();
            this.txt_iqcTypeName = new DevExpress.XtraEditors.TextEdit();
            this.gv_iqcTypeName = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_iqcType = new DevExpress.XtraEditors.LabelControl();
            this.txt_iqcType = new DevExpress.XtraEditors.TextEdit();
            this.gv_iqcType = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_factory = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_lastupdateDate = new DevExpress.XtraEditors.LabelControl();
            this.txt_lastupdateDate = new DevExpress.XtraEditors.TextEdit();
            this.gv_lastupdateDate = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_lastupdateBy = new DevExpress.XtraEditors.LabelControl();
            this.txt_lastupdateBy = new DevExpress.XtraEditors.TextEdit();
            this.gv_lastupdateBy = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_createDate = new DevExpress.XtraEditors.LabelControl();
            this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
            this.gv_createDate = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_createBy = new DevExpress.XtraEditors.LabelControl();
            this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
            this.gv_createBy = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_remark = new DevExpress.XtraEditors.LabelControl();
            this.txt_remark = new DevExpress.XtraEditors.TextEdit();
            this.gv_remark = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -63,9 +46,6 @@
            this.lb_tcode = new DevExpress.XtraEditors.LabelControl();
            this.txt_tcode = new DevExpress.XtraEditors.TextEdit();
            this.gv_tcode = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_id = new DevExpress.XtraEditors.LabelControl();
            this.txt_id = new DevExpress.XtraEditors.TextEdit();
            this.gv_id = new DevExpress.XtraGrid.Columns.GridColumn();
            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
            this.gcMain = new DevExpress.XtraGrid.GridControl();
            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -76,18 +56,13 @@
            this.panel1 = new System.Windows.Forms.Panel();
            this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
            this.lbGuid = new System.Windows.Forms.Label();
            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
            ((System.ComponentModel.ISupportInitialize)(this.txt_description.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_pgroup.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_iqcTypeName.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_iqcType.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateDate.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateBy.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_tname.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_tcode.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_id.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
@@ -101,7 +76,7 @@
            // 
            this.lb_description.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_description.Appearance.Options.UseFont = true;
            this.lb_description.Location = new System.Drawing.Point(304, 121);
            this.lb_description.Location = new System.Drawing.Point(306, 52);
            this.lb_description.Name = "lb_description";
            this.lb_description.Size = new System.Drawing.Size(39, 21);
            this.lb_description.TabIndex = 252;
@@ -109,7 +84,7 @@
            // 
            // txt_description
            // 
            this.txt_description.Location = new System.Drawing.Point(348, 117);
            this.txt_description.Location = new System.Drawing.Point(350, 48);
            this.txt_description.Name = "txt_description";
            this.txt_description.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_description.Properties.Appearance.Options.UseFont = true;
@@ -127,14 +102,14 @@
            this.gv_description.OptionsColumn.AllowEdit = false;
            this.gv_description.Tag = "query_a.description";
            this.gv_description.Visible = true;
            this.gv_description.VisibleIndex = 12;
            this.gv_description.Width = 94;
            this.gv_description.VisibleIndex = 4;
            this.gv_description.Width = 147;
            // 
            // lb_pgroup
            // 
            this.lb_pgroup.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_pgroup.Appearance.Options.UseFont = true;
            this.lb_pgroup.Location = new System.Drawing.Point(270, 89);
            this.lb_pgroup.Location = new System.Drawing.Point(272, 18);
            this.lb_pgroup.Name = "lb_pgroup";
            this.lb_pgroup.Size = new System.Drawing.Size(73, 21);
            this.lb_pgroup.TabIndex = 247;
@@ -142,7 +117,7 @@
            // 
            // txt_pgroup
            // 
            this.txt_pgroup.Location = new System.Drawing.Point(348, 85);
            this.txt_pgroup.Location = new System.Drawing.Point(350, 14);
            this.txt_pgroup.Name = "txt_pgroup";
            this.txt_pgroup.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_pgroup.Properties.Appearance.Options.UseFont = true;
@@ -160,226 +135,33 @@
            this.gv_pgroup.OptionsColumn.AllowEdit = false;
            this.gv_pgroup.Tag = "query_a.pgroup";
            this.gv_pgroup.Visible = true;
            this.gv_pgroup.VisibleIndex = 11;
            this.gv_pgroup.Width = 94;
            //
            // lb_iqcTypeName
            //
            this.lb_iqcTypeName.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_iqcTypeName.Appearance.Options.UseFont = true;
            this.lb_iqcTypeName.Location = new System.Drawing.Point(4, 121);
            this.lb_iqcTypeName.Name = "lb_iqcTypeName";
            this.lb_iqcTypeName.Size = new System.Drawing.Size(101, 21);
            this.lb_iqcTypeName.TabIndex = 243;
            this.lb_iqcTypeName.Text = "IQC分类名称 ";
            //
            // txt_iqcTypeName
            //
            this.txt_iqcTypeName.Location = new System.Drawing.Point(110, 117);
            this.txt_iqcTypeName.Name = "txt_iqcTypeName";
            this.txt_iqcTypeName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_iqcTypeName.Properties.Appearance.Options.UseFont = true;
            this.txt_iqcTypeName.Size = new System.Drawing.Size(150, 28);
            this.txt_iqcTypeName.TabIndex = 243;
            //
            // gv_iqcTypeName
            //
            this.gv_iqcTypeName.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_iqcTypeName.AppearanceCell.Options.UseFont = true;
            this.gv_iqcTypeName.Caption = "IQC分类名称 ";
            this.gv_iqcTypeName.FieldName = "iqcTypeName";
            this.gv_iqcTypeName.MinWidth = 50;
            this.gv_iqcTypeName.Name = "gv_iqcTypeName";
            this.gv_iqcTypeName.OptionsColumn.AllowEdit = false;
            this.gv_iqcTypeName.Tag = "query_a.iqc_type_name";
            this.gv_iqcTypeName.Visible = true;
            this.gv_iqcTypeName.VisibleIndex = 10;
            this.gv_iqcTypeName.Width = 94;
            //
            // lb_iqcType
            //
            this.lb_iqcType.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_iqcType.Appearance.Options.UseFont = true;
            this.lb_iqcType.Location = new System.Drawing.Point(38, 89);
            this.lb_iqcType.Name = "lb_iqcType";
            this.lb_iqcType.Size = new System.Drawing.Size(67, 21);
            this.lb_iqcType.TabIndex = 240;
            this.lb_iqcType.Text = "IQC分类 ";
            //
            // txt_iqcType
            //
            this.txt_iqcType.Location = new System.Drawing.Point(110, 85);
            this.txt_iqcType.Name = "txt_iqcType";
            this.txt_iqcType.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_iqcType.Properties.Appearance.Options.UseFont = true;
            this.txt_iqcType.Size = new System.Drawing.Size(150, 28);
            this.txt_iqcType.TabIndex = 240;
            //
            // gv_iqcType
            //
            this.gv_iqcType.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_iqcType.AppearanceCell.Options.UseFont = true;
            this.gv_iqcType.Caption = "IQC分类 ";
            this.gv_iqcType.FieldName = "iqcType";
            this.gv_iqcType.MinWidth = 50;
            this.gv_iqcType.Name = "gv_iqcType";
            this.gv_iqcType.OptionsColumn.AllowEdit = false;
            this.gv_iqcType.Tag = "query_a.iqc_type";
            this.gv_iqcType.Visible = true;
            this.gv_iqcType.VisibleIndex = 9;
            this.gv_iqcType.Width = 94;
            //
            // gv_factory
            //
            this.gv_factory.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_factory.AppearanceCell.Options.UseFont = true;
            this.gv_factory.Caption = "工厂";
            this.gv_factory.FieldName = "factory";
            this.gv_factory.MinWidth = 50;
            this.gv_factory.Name = "gv_factory";
            this.gv_factory.OptionsColumn.AllowEdit = false;
            this.gv_factory.Tag = "query_a.factory";
            this.gv_factory.Visible = true;
            this.gv_factory.VisibleIndex = 1;
            this.gv_factory.Width = 94;
            this.gv_pgroup.VisibleIndex = 3;
            this.gv_pgroup.Width = 147;
            // 
            // lb_lastupdateDate
            // 
            this.lb_lastupdateDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_lastupdateDate.Appearance.Options.UseFont = true;
            this.lb_lastupdateDate.Location = new System.Drawing.Point(520, 121);
            this.lb_lastupdateDate.Location = new System.Drawing.Point(520, 52);
            this.lb_lastupdateDate.Name = "lb_lastupdateDate";
            this.lb_lastupdateDate.Size = new System.Drawing.Size(73, 21);
            this.lb_lastupdateDate.TabIndex = 228;
            this.lb_lastupdateDate.Text = "更新时间 ";
            this.lb_lastupdateDate.Text = "同步时间 ";
            // 
            // txt_lastupdateDate
            // 
            this.txt_lastupdateDate.Location = new System.Drawing.Point(598, 117);
            this.txt_lastupdateDate.Location = new System.Drawing.Point(598, 48);
            this.txt_lastupdateDate.Name = "txt_lastupdateDate";
            this.txt_lastupdateDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_lastupdateDate.Properties.Appearance.Options.UseFont = true;
            this.txt_lastupdateDate.Size = new System.Drawing.Size(150, 28);
            this.txt_lastupdateDate.TabIndex = 228;
            // 
            // gv_lastupdateDate
            //
            this.gv_lastupdateDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_lastupdateDate.AppearanceCell.Options.UseFont = true;
            this.gv_lastupdateDate.Caption = "最后更新时间 ";
            this.gv_lastupdateDate.FieldName = "lastupdateDate";
            this.gv_lastupdateDate.MinWidth = 50;
            this.gv_lastupdateDate.Name = "gv_lastupdateDate";
            this.gv_lastupdateDate.OptionsColumn.AllowEdit = false;
            this.gv_lastupdateDate.Tag = "query_a.lastupdate_date";
            this.gv_lastupdateDate.Visible = true;
            this.gv_lastupdateDate.VisibleIndex = 8;
            this.gv_lastupdateDate.Width = 94;
            //
            // lb_lastupdateBy
            //
            this.lb_lastupdateBy.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_lastupdateBy.Appearance.Options.UseFont = true;
            this.lb_lastupdateBy.Location = new System.Drawing.Point(537, 89);
            this.lb_lastupdateBy.Name = "lb_lastupdateBy";
            this.lb_lastupdateBy.Size = new System.Drawing.Size(56, 21);
            this.lb_lastupdateBy.TabIndex = 226;
            this.lb_lastupdateBy.Text = "更新人 ";
            //
            // txt_lastupdateBy
            //
            this.txt_lastupdateBy.Location = new System.Drawing.Point(598, 85);
            this.txt_lastupdateBy.Name = "txt_lastupdateBy";
            this.txt_lastupdateBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_lastupdateBy.Properties.Appearance.Options.UseFont = true;
            this.txt_lastupdateBy.Size = new System.Drawing.Size(150, 28);
            this.txt_lastupdateBy.TabIndex = 226;
            //
            // gv_lastupdateBy
            //
            this.gv_lastupdateBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_lastupdateBy.AppearanceCell.Options.UseFont = true;
            this.gv_lastupdateBy.Caption = "最后更新人 ";
            this.gv_lastupdateBy.FieldName = "lastupdateBy";
            this.gv_lastupdateBy.MinWidth = 50;
            this.gv_lastupdateBy.Name = "gv_lastupdateBy";
            this.gv_lastupdateBy.OptionsColumn.AllowEdit = false;
            this.gv_lastupdateBy.Tag = "query_a.lastupdate_by";
            this.gv_lastupdateBy.Visible = true;
            this.gv_lastupdateBy.VisibleIndex = 7;
            this.gv_lastupdateBy.Width = 94;
            //
            // lb_createDate
            //
            this.lb_createDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_createDate.Appearance.Options.UseFont = true;
            this.lb_createDate.Location = new System.Drawing.Point(520, 52);
            this.lb_createDate.Name = "lb_createDate";
            this.lb_createDate.Size = new System.Drawing.Size(73, 21);
            this.lb_createDate.TabIndex = 222;
            this.lb_createDate.Text = "创建时间 ";
            //
            // txt_createDate
            //
            this.txt_createDate.Location = new System.Drawing.Point(599, 52);
            this.txt_createDate.Name = "txt_createDate";
            this.txt_createDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_createDate.Properties.Appearance.Options.UseFont = true;
            this.txt_createDate.Size = new System.Drawing.Size(150, 28);
            this.txt_createDate.TabIndex = 222;
            //
            // gv_createDate
            //
            this.gv_createDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_createDate.AppearanceCell.Options.UseFont = true;
            this.gv_createDate.Caption = "创建时间 ";
            this.gv_createDate.FieldName = "createDate";
            this.gv_createDate.MinWidth = 50;
            this.gv_createDate.Name = "gv_createDate";
            this.gv_createDate.OptionsColumn.AllowEdit = false;
            this.gv_createDate.Tag = "query_a.create_date";
            this.gv_createDate.Visible = true;
            this.gv_createDate.VisibleIndex = 6;
            this.gv_createDate.Width = 94;
            //
            // lb_createBy
            //
            this.lb_createBy.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_createBy.Appearance.Options.UseFont = true;
            this.lb_createBy.Location = new System.Drawing.Point(287, 52);
            this.lb_createBy.Name = "lb_createBy";
            this.lb_createBy.Size = new System.Drawing.Size(56, 21);
            this.lb_createBy.TabIndex = 219;
            this.lb_createBy.Text = "创建人 ";
            //
            // txt_createBy
            //
            this.txt_createBy.Location = new System.Drawing.Point(348, 52);
            this.txt_createBy.Name = "txt_createBy";
            this.txt_createBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_createBy.Properties.Appearance.Options.UseFont = true;
            this.txt_createBy.Size = new System.Drawing.Size(150, 28);
            this.txt_createBy.TabIndex = 219;
            //
            // gv_createBy
            //
            this.gv_createBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_createBy.AppearanceCell.Options.UseFont = true;
            this.gv_createBy.Caption = "创建人 ";
            this.gv_createBy.FieldName = "createBy";
            this.gv_createBy.MinWidth = 50;
            this.gv_createBy.Name = "gv_createBy";
            this.gv_createBy.OptionsColumn.AllowEdit = false;
            this.gv_createBy.Tag = "query_a.create_by";
            this.gv_createBy.Visible = true;
            this.gv_createBy.VisibleIndex = 5;
            this.gv_createBy.Width = 94;
            //
            // lb_remark
            // 
            this.lb_remark.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_remark.Appearance.Options.UseFont = true;
            this.lb_remark.Location = new System.Drawing.Point(66, 52);
            this.lb_remark.Location = new System.Drawing.Point(72, 52);
            this.lb_remark.Name = "lb_remark";
            this.lb_remark.Size = new System.Drawing.Size(39, 21);
            this.lb_remark.TabIndex = 217;
@@ -387,7 +169,7 @@
            // 
            // txt_remark
            // 
            this.txt_remark.Location = new System.Drawing.Point(110, 52);
            this.txt_remark.Location = new System.Drawing.Point(116, 48);
            this.txt_remark.Name = "txt_remark";
            this.txt_remark.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_remark.Properties.Appearance.Options.UseFont = true;
@@ -405,8 +187,8 @@
            this.gv_remark.OptionsColumn.AllowEdit = false;
            this.gv_remark.Tag = "query_a.remark";
            this.gv_remark.Visible = true;
            this.gv_remark.VisibleIndex = 4;
            this.gv_remark.Width = 94;
            this.gv_remark.VisibleIndex = 2;
            this.gv_remark.Width = 147;
            // 
            // lb_tname
            // 
@@ -420,7 +202,7 @@
            // 
            // txt_tname
            // 
            this.txt_tname.Location = new System.Drawing.Point(599, 18);
            this.txt_tname.Location = new System.Drawing.Point(599, 14);
            this.txt_tname.Name = "txt_tname";
            this.txt_tname.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_tname.Properties.Appearance.Options.UseFont = true;
@@ -438,14 +220,14 @@
            this.gv_tname.OptionsColumn.AllowEdit = false;
            this.gv_tname.Tag = "query_a.tname";
            this.gv_tname.Visible = true;
            this.gv_tname.VisibleIndex = 3;
            this.gv_tname.Width = 94;
            this.gv_tname.VisibleIndex = 1;
            this.gv_tname.Width = 147;
            // 
            // lb_tcode
            // 
            this.lb_tcode.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_tcode.Appearance.Options.UseFont = true;
            this.lb_tcode.Location = new System.Drawing.Point(270, 18);
            this.lb_tcode.Location = new System.Drawing.Point(38, 18);
            this.lb_tcode.Name = "lb_tcode";
            this.lb_tcode.Size = new System.Drawing.Size(73, 21);
            this.lb_tcode.TabIndex = 213;
@@ -453,7 +235,7 @@
            // 
            // txt_tcode
            // 
            this.txt_tcode.Location = new System.Drawing.Point(348, 18);
            this.txt_tcode.Location = new System.Drawing.Point(116, 14);
            this.txt_tcode.Name = "txt_tcode";
            this.txt_tcode.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_tcode.Properties.Appearance.Options.UseFont = true;
@@ -471,41 +253,8 @@
            this.gv_tcode.OptionsColumn.AllowEdit = false;
            this.gv_tcode.Tag = "query_a.tcode";
            this.gv_tcode.Visible = true;
            this.gv_tcode.VisibleIndex = 2;
            this.gv_tcode.Width = 94;
            //
            // lb_id
            //
            this.lb_id.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_id.Appearance.Options.UseFont = true;
            this.lb_id.Location = new System.Drawing.Point(82, 18);
            this.lb_id.Name = "lb_id";
            this.lb_id.Size = new System.Drawing.Size(23, 21);
            this.lb_id.TabIndex = 211;
            this.lb_id.Text = "ID ";
            //
            // txt_id
            //
            this.txt_id.Location = new System.Drawing.Point(110, 18);
            this.txt_id.Name = "txt_id";
            this.txt_id.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_id.Properties.Appearance.Options.UseFont = true;
            this.txt_id.Size = new System.Drawing.Size(150, 28);
            this.txt_id.TabIndex = 211;
            //
            // gv_id
            //
            this.gv_id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_id.AppearanceCell.Options.UseFont = true;
            this.gv_id.Caption = "ID ";
            this.gv_id.FieldName = "id";
            this.gv_id.MinWidth = 50;
            this.gv_id.Name = "gv_id";
            this.gv_id.OptionsColumn.AllowEdit = false;
            this.gv_id.Tag = "query_a.id";
            this.gv_id.Visible = true;
            this.gv_id.VisibleIndex = 0;
            this.gv_id.Width = 94;
            this.gv_tcode.VisibleIndex = 0;
            this.gv_tcode.Width = 147;
            // 
            // toolBarMenu1
            // 
@@ -539,19 +288,12 @@
            this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gridView1.Appearance.Row.Options.UseFont = true;
            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gv_id,
            this.gv_factory,
            this.gv_tcode,
            this.gv_tname,
            this.gv_remark,
            this.gv_createBy,
            this.gv_createDate,
            this.gv_lastupdateBy,
            this.gv_lastupdateDate,
            this.gv_iqcType,
            this.gv_iqcTypeName,
            this.gv_pgroup,
            this.gv_description});
            this.gv_description,
            this.gridColumn1});
            this.gridView1.GridControl = this.gcMain;
            this.gridView1.IndicatorWidth = 50;
            this.gridView1.Name = "gridView1";
@@ -607,35 +349,23 @@
            this.panel1.Controls.Add(this.txt_description);
            this.panel1.Controls.Add(this.lb_pgroup);
            this.panel1.Controls.Add(this.txt_pgroup);
            this.panel1.Controls.Add(this.lb_iqcTypeName);
            this.panel1.Controls.Add(this.txt_iqcTypeName);
            this.panel1.Controls.Add(this.lb_iqcType);
            this.panel1.Controls.Add(this.txt_iqcType);
            this.panel1.Controls.Add(this.lb_lastupdateDate);
            this.panel1.Controls.Add(this.txt_lastupdateDate);
            this.panel1.Controls.Add(this.lb_lastupdateBy);
            this.panel1.Controls.Add(this.txt_lastupdateBy);
            this.panel1.Controls.Add(this.lb_createDate);
            this.panel1.Controls.Add(this.txt_createDate);
            this.panel1.Controls.Add(this.lb_createBy);
            this.panel1.Controls.Add(this.txt_createBy);
            this.panel1.Controls.Add(this.lb_remark);
            this.panel1.Controls.Add(this.txt_remark);
            this.panel1.Controls.Add(this.lb_tname);
            this.panel1.Controls.Add(this.txt_tname);
            this.panel1.Controls.Add(this.lb_tcode);
            this.panel1.Controls.Add(this.txt_tcode);
            this.panel1.Controls.Add(this.lb_id);
            this.panel1.Controls.Add(this.txt_id);
            this.panel1.Font = new System.Drawing.Font("Tahoma", 10F);
            this.panel1.Location = new System.Drawing.Point(76, 20);
            this.panel1.Name = "panel1";
            this.panel1.Size = new System.Drawing.Size(782, 286);
            this.panel1.Size = new System.Drawing.Size(782, 176);
            this.panel1.TabIndex = 1;
            // 
            // labelControl11
            // 
            this.labelControl11.Location = new System.Drawing.Point(60, 226);
            this.labelControl11.Location = new System.Drawing.Point(105, 116);
            this.labelControl11.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
            this.labelControl11.Name = "labelControl11";
            this.labelControl11.Size = new System.Drawing.Size(45, 18);
@@ -646,11 +376,22 @@
            // lbGuid
            // 
            this.lbGuid.AutoSize = true;
            this.lbGuid.Location = new System.Drawing.Point(111, 226);
            this.lbGuid.Location = new System.Drawing.Point(156, 116);
            this.lbGuid.Name = "lbGuid";
            this.lbGuid.Size = new System.Drawing.Size(0, 21);
            this.lbGuid.TabIndex = 1;
            this.lbGuid.Visible = false;
            //
            // gridColumn1
            //
            this.gridColumn1.Caption = "同步时间";
            this.gridColumn1.FieldName = "lastupdateDate";
            this.gridColumn1.MinWidth = 25;
            this.gridColumn1.Name = "gridColumn1";
            this.gridColumn1.Tag = "query_a.lastupdate_date";
            this.gridColumn1.Visible = true;
            this.gridColumn1.VisibleIndex = 5;
            this.gridColumn1.Width = 180;
            // 
            // Frm_MesItemType
            // 
@@ -663,16 +404,10 @@
            this.Text = "物料类别";
            ((System.ComponentModel.ISupportInitialize)(this.txt_description.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_pgroup.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_iqcTypeName.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_iqcType.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateDate.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateBy.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_tname.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_tcode.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_id.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
@@ -704,30 +439,8 @@
private DevExpress.XtraEditors.TextEdit txt_pgroup;
 private DevExpress.XtraGrid.Columns.GridColumn gv_pgroup;
private DevExpress.XtraEditors.LabelControl lb_iqcTypeName;
private DevExpress.XtraEditors.TextEdit txt_iqcTypeName;
 private DevExpress.XtraGrid.Columns.GridColumn gv_iqcTypeName;
private DevExpress.XtraEditors.LabelControl lb_iqcType;
private DevExpress.XtraEditors.TextEdit txt_iqcType;
 private DevExpress.XtraGrid.Columns.GridColumn gv_iqcType;
 private DevExpress.XtraGrid.Columns.GridColumn gv_factory;
private DevExpress.XtraEditors.LabelControl lb_lastupdateDate;
private DevExpress.XtraEditors.TextEdit txt_lastupdateDate;
 private DevExpress.XtraGrid.Columns.GridColumn gv_lastupdateDate;
private DevExpress.XtraEditors.LabelControl lb_lastupdateBy;
private DevExpress.XtraEditors.TextEdit txt_lastupdateBy;
 private DevExpress.XtraGrid.Columns.GridColumn gv_lastupdateBy;
private DevExpress.XtraEditors.LabelControl lb_createDate;
private DevExpress.XtraEditors.TextEdit txt_createDate;
 private DevExpress.XtraGrid.Columns.GridColumn gv_createDate;
private DevExpress.XtraEditors.LabelControl lb_createBy;
private DevExpress.XtraEditors.TextEdit txt_createBy;
 private DevExpress.XtraGrid.Columns.GridColumn gv_createBy;
private DevExpress.XtraEditors.LabelControl lb_remark;
private DevExpress.XtraEditors.TextEdit txt_remark;
@@ -740,10 +453,6 @@
private DevExpress.XtraEditors.LabelControl lb_tcode;
private DevExpress.XtraEditors.TextEdit txt_tcode;
 private DevExpress.XtraGrid.Columns.GridColumn gv_tcode;
private DevExpress.XtraEditors.LabelControl lb_id;
private DevExpress.XtraEditors.TextEdit txt_id;
 private DevExpress.XtraGrid.Columns.GridColumn gv_id;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
    }
}
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.Designer.cs
@@ -89,7 +89,6 @@
            this.gv_itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_factory = new DevExpress.XtraEditors.LabelControl();
            this.txt_factory = new DevExpress.XtraEditors.TextEdit();
            this.gv_id = new DevExpress.XtraGrid.Columns.GridColumn();
            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
            this.gcMain = new DevExpress.XtraGrid.GridControl();
            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -111,6 +110,7 @@
            this.lbGuid = new System.Windows.Forms.Label();
            this.txt_itemName = new DevExpress.XtraEditors.MemoEdit();
            this.txt_itemModel = new DevExpress.XtraEditors.MemoEdit();
            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fissueType.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_ffinishreceiptoverrate.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_materialProperti.Properties)).BeginInit();
@@ -214,7 +214,7 @@
            this.gv_materialGroup.OptionsColumn.AllowEdit = false;
            this.gv_materialGroup.Tag = "query_a.materialGroup";
            this.gv_materialGroup.Visible = true;
            this.gv_materialGroup.VisibleIndex = 9;
            this.gv_materialGroup.VisibleIndex = 8;
            this.gv_materialGroup.Width = 130;
            // 
            // lb_isStatus
@@ -244,13 +244,14 @@
            this.gv_isStatus.AppearanceCell.Options.UseFont = true;
            this.gv_isStatus.Caption = "禁用状态";
            this.gv_isStatus.FieldName = "fforbidstatus";
            this.gv_isStatus.MaxWidth = 50;
            this.gv_isStatus.MinWidth = 50;
            this.gv_isStatus.Name = "gv_isStatus";
            this.gv_isStatus.OptionsColumn.AllowEdit = false;
            this.gv_isStatus.Tag = "query_a.fforbidstatus";
            this.gv_isStatus.Visible = true;
            this.gv_isStatus.VisibleIndex = 17;
            this.gv_isStatus.Width = 94;
            this.gv_isStatus.VisibleIndex = 16;
            this.gv_isStatus.Width = 50;
            // 
            // lb_produceWorkNo
            // 
@@ -305,7 +306,7 @@
            this.gv_bomNo.OptionsColumn.AllowEdit = false;
            this.gv_bomNo.Tag = "query_a.bomNo";
            this.gv_bomNo.Visible = true;
            this.gv_bomNo.VisibleIndex = 8;
            this.gv_bomNo.VisibleIndex = 7;
            this.gv_bomNo.Width = 94;
            // 
            // lb_depotNo
@@ -330,7 +331,7 @@
            this.gv_depotNo.OptionsColumn.AllowEdit = false;
            this.gv_depotNo.Tag = "query_m.depot_name";
            this.gv_depotNo.Visible = true;
            this.gv_depotNo.VisibleIndex = 16;
            this.gv_depotNo.VisibleIndex = 15;
            this.gv_depotNo.Width = 94;
            // 
            // lb_subconUnitNo
@@ -350,13 +351,14 @@
            this.gv_subconUnitNo.AppearanceCell.Options.UseFont = true;
            this.gv_subconUnitNo.Caption = "委外单位";
            this.gv_subconUnitNo.FieldName = "subconUnit";
            this.gv_subconUnitNo.MaxWidth = 50;
            this.gv_subconUnitNo.MinWidth = 50;
            this.gv_subconUnitNo.Name = "gv_subconUnitNo";
            this.gv_subconUnitNo.OptionsColumn.AllowEdit = false;
            this.gv_subconUnitNo.Tag = "query_g.fname";
            this.gv_subconUnitNo.Visible = true;
            this.gv_subconUnitNo.VisibleIndex = 14;
            this.gv_subconUnitNo.Width = 94;
            this.gv_subconUnitNo.VisibleIndex = 13;
            this.gv_subconUnitNo.Width = 50;
            // 
            // lb_purchaseUnitNo
            // 
@@ -375,13 +377,14 @@
            this.gv_purchaseUnitNo.AppearanceCell.Options.UseFont = true;
            this.gv_purchaseUnitNo.Caption = "采购单位";
            this.gv_purchaseUnitNo.FieldName = "fpurchaseunitid";
            this.gv_purchaseUnitNo.MaxWidth = 50;
            this.gv_purchaseUnitNo.MinWidth = 50;
            this.gv_purchaseUnitNo.Name = "gv_purchaseUnitNo";
            this.gv_purchaseUnitNo.OptionsColumn.AllowEdit = false;
            this.gv_purchaseUnitNo.Tag = "query_d.fname";
            this.gv_purchaseUnitNo.Visible = true;
            this.gv_purchaseUnitNo.VisibleIndex = 11;
            this.gv_purchaseUnitNo.Width = 94;
            this.gv_purchaseUnitNo.VisibleIndex = 10;
            this.gv_purchaseUnitNo.Width = 50;
            // 
            // lb_produceUnitNo
            // 
@@ -400,13 +403,14 @@
            this.gv_produceUnitNo.AppearanceCell.Options.UseFont = true;
            this.gv_produceUnitNo.Caption = "生产单位";
            this.gv_produceUnitNo.FieldName = "produceUnit";
            this.gv_produceUnitNo.MaxWidth = 50;
            this.gv_produceUnitNo.MinWidth = 50;
            this.gv_produceUnitNo.Name = "gv_produceUnitNo";
            this.gv_produceUnitNo.OptionsColumn.AllowEdit = false;
            this.gv_produceUnitNo.Tag = "query_h.fname";
            this.gv_produceUnitNo.Visible = true;
            this.gv_produceUnitNo.VisibleIndex = 15;
            this.gv_produceUnitNo.Width = 94;
            this.gv_produceUnitNo.VisibleIndex = 14;
            this.gv_produceUnitNo.Width = 50;
            // 
            // lb_storeUnitNo
            // 
@@ -425,13 +429,14 @@
            this.gv_storeUnitNo.AppearanceCell.Options.UseFont = true;
            this.gv_storeUnitNo.Caption = "库存单位";
            this.gv_storeUnitNo.FieldName = "storeunit";
            this.gv_storeUnitNo.MaxWidth = 50;
            this.gv_storeUnitNo.MinWidth = 50;
            this.gv_storeUnitNo.Name = "gv_storeUnitNo";
            this.gv_storeUnitNo.OptionsColumn.AllowEdit = false;
            this.gv_storeUnitNo.Tag = "query_f.fname";
            this.gv_storeUnitNo.Visible = true;
            this.gv_storeUnitNo.VisibleIndex = 13;
            this.gv_storeUnitNo.Width = 94;
            this.gv_storeUnitNo.VisibleIndex = 12;
            this.gv_storeUnitNo.Width = 50;
            // 
            // lb_saleUnitNo
            // 
@@ -450,13 +455,14 @@
            this.gv_saleUnitNo.AppearanceCell.Options.UseFont = true;
            this.gv_saleUnitNo.Caption = "销售单位";
            this.gv_saleUnitNo.FieldName = "saleunit";
            this.gv_saleUnitNo.MaxWidth = 50;
            this.gv_saleUnitNo.MinWidth = 50;
            this.gv_saleUnitNo.Name = "gv_saleUnitNo";
            this.gv_saleUnitNo.OptionsColumn.AllowEdit = false;
            this.gv_saleUnitNo.Tag = "query_e.fname";
            this.gv_saleUnitNo.Visible = true;
            this.gv_saleUnitNo.VisibleIndex = 12;
            this.gv_saleUnitNo.Width = 94;
            this.gv_saleUnitNo.VisibleIndex = 11;
            this.gv_saleUnitNo.Width = 50;
            // 
            // lb_orderUnitNo
            // 
@@ -496,13 +502,14 @@
            this.gv_prdPack.AppearanceCell.Options.UseFont = true;
            this.gv_prdPack.Caption = "最小包装数";
            this.gv_prdPack.FieldName = "prdPack";
            this.gv_prdPack.MaxWidth = 50;
            this.gv_prdPack.MinWidth = 50;
            this.gv_prdPack.Name = "gv_prdPack";
            this.gv_prdPack.OptionsColumn.AllowEdit = false;
            this.gv_prdPack.Tag = "query_a.prd_pack";
            this.gv_prdPack.Visible = true;
            this.gv_prdPack.VisibleIndex = 7;
            this.gv_prdPack.Width = 94;
            this.gv_prdPack.VisibleIndex = 6;
            this.gv_prdPack.Width = 50;
            // 
            // lb_highLimt
            // 
@@ -531,13 +538,14 @@
            this.gv_highLimt.AppearanceCell.Options.UseFont = true;
            this.gv_highLimt.Caption = "最大库存";
            this.gv_highLimt.FieldName = "highlimit";
            this.gv_highLimt.MaxWidth = 50;
            this.gv_highLimt.MinWidth = 50;
            this.gv_highLimt.Name = "gv_highLimt";
            this.gv_highLimt.OptionsColumn.AllowEdit = false;
            this.gv_highLimt.Tag = "query_a.highLimt";
            this.gv_highLimt.Visible = true;
            this.gv_highLimt.VisibleIndex = 6;
            this.gv_highLimt.Width = 94;
            this.gv_highLimt.VisibleIndex = 5;
            this.gv_highLimt.Width = 50;
            // 
            // lb_lowLimt
            // 
@@ -566,13 +574,14 @@
            this.gv_lowLimt.AppearanceCell.Options.UseFont = true;
            this.gv_lowLimt.Caption = "最低库存";
            this.gv_lowLimt.FieldName = "lowlimit";
            this.gv_lowLimt.MaxWidth = 50;
            this.gv_lowLimt.MinWidth = 50;
            this.gv_lowLimt.Name = "gv_lowLimt";
            this.gv_lowLimt.OptionsColumn.AllowEdit = false;
            this.gv_lowLimt.Tag = "query_a.lowlimit";
            this.gv_lowLimt.Visible = true;
            this.gv_lowLimt.VisibleIndex = 5;
            this.gv_lowLimt.Width = 94;
            this.gv_lowLimt.VisibleIndex = 4;
            this.gv_lowLimt.Width = 50;
            // 
            // lb_custNO
            // 
@@ -654,13 +663,14 @@
            this.gv_itemUnitNo.AppearanceCell.Options.UseFont = true;
            this.gv_itemUnitNo.Caption = "基本单位";
            this.gv_itemUnitNo.FieldName = "itemUnit";
            this.gv_itemUnitNo.MaxWidth = 50;
            this.gv_itemUnitNo.MinWidth = 50;
            this.gv_itemUnitNo.Name = "gv_itemUnitNo";
            this.gv_itemUnitNo.OptionsColumn.AllowEdit = false;
            this.gv_itemUnitNo.Tag = "query_c.fname";
            this.gv_itemUnitNo.Visible = true;
            this.gv_itemUnitNo.VisibleIndex = 10;
            this.gv_itemUnitNo.Width = 94;
            this.gv_itemUnitNo.VisibleIndex = 9;
            this.gv_itemUnitNo.Width = 50;
            // 
            // lb_itemDescription
            // 
@@ -706,7 +716,7 @@
            this.gv_itemModel.OptionsColumn.AllowEdit = false;
            this.gv_itemModel.Tag = "query_a.item_model";
            this.gv_itemModel.Visible = true;
            this.gv_itemModel.VisibleIndex = 4;
            this.gv_itemModel.VisibleIndex = 3;
            this.gv_itemModel.Width = 360;
            // 
            // repositoryItemMemoEdit1
@@ -759,8 +769,8 @@
            this.gv_itemName.OptionsColumn.AllowEdit = false;
            this.gv_itemName.Tag = "query_a.item_name";
            this.gv_itemName.Visible = true;
            this.gv_itemName.VisibleIndex = 3;
            this.gv_itemName.Width = 260;
            this.gv_itemName.VisibleIndex = 2;
            this.gv_itemName.Width = 250;
            // 
            // repositoryItemMemoEdit2
            // 
@@ -793,13 +803,13 @@
            this.gv_itemNo.AppearanceCell.Options.UseFont = true;
            this.gv_itemNo.Caption = "物料编码";
            this.gv_itemNo.FieldName = "itemNo";
            this.gv_itemNo.MinWidth = 120;
            this.gv_itemNo.MinWidth = 100;
            this.gv_itemNo.Name = "gv_itemNo";
            this.gv_itemNo.OptionsColumn.AllowEdit = false;
            this.gv_itemNo.Tag = "query_a.item_no";
            this.gv_itemNo.Visible = true;
            this.gv_itemNo.VisibleIndex = 2;
            this.gv_itemNo.Width = 160;
            this.gv_itemNo.VisibleIndex = 1;
            this.gv_itemNo.Width = 120;
            // 
            // lb_factory
            // 
@@ -821,22 +831,6 @@
            this.txt_factory.Size = new System.Drawing.Size(150, 28);
            this.txt_factory.TabIndex = 211;
            this.txt_factory.Tag = "factory";
            //
            // gv_id
            //
            this.gv_id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_id.AppearanceCell.Options.UseFont = true;
            this.gv_id.Caption = "物料ID";
            this.gv_id.FieldName = "id";
            this.gv_id.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left;
            this.gv_id.MinWidth = 80;
            this.gv_id.Name = "gv_id";
            this.gv_id.OptionsColumn.AllowEdit = false;
            this.gv_id.OptionsColumn.ReadOnly = true;
            this.gv_id.Tag = "query_a.id";
            this.gv_id.Visible = true;
            this.gv_id.VisibleIndex = 1;
            this.gv_id.Width = 94;
            // 
            // toolBarMenu1
            // 
@@ -879,7 +873,6 @@
            this.gridView1.ColumnPanelRowHeight = 50;
            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gridColumn4,
            this.gv_id,
            this.gv_itemNo,
            this.gv_itemName,
            this.gv_itemModel,
@@ -895,7 +888,8 @@
            this.gv_subconUnitNo,
            this.gv_produceUnitNo,
            this.gv_depotNo,
            this.gv_isStatus});
            this.gv_isStatus,
            this.gridColumn1});
            this.gridView1.GridControl = this.gcMain;
            this.gridView1.HorzScrollVisibility = DevExpress.XtraGrid.Views.Base.ScrollVisibility.Always;
            this.gridView1.IndicatorWidth = 50;
@@ -909,7 +903,6 @@
            // 
            this.gridColumn4.Caption = "使用组织";
            this.gridColumn4.FieldName = "fSubsidiary";
            this.gridColumn4.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left;
            this.gridColumn4.MinWidth = 250;
            this.gridColumn4.Name = "gridColumn4";
            this.gridColumn4.OptionsColumn.AllowEdit = false;
@@ -1124,6 +1117,17 @@
            this.txt_itemModel.TabIndex = 219;
            this.txt_itemModel.Tag = "itemModel";
            // 
            // gridColumn1
            //
            this.gridColumn1.Caption = "同步时间";
            this.gridColumn1.FieldName = "lastupdateDate";
            this.gridColumn1.MinWidth = 180;
            this.gridColumn1.Name = "gridColumn1";
            this.gridColumn1.Tag = "query_a.lastupdate_date";
            this.gridColumn1.Visible = true;
            this.gridColumn1.VisibleIndex = 17;
            this.gridColumn1.Width = 180;
            //
            // Frm_MesItems
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1259,7 +1263,6 @@
        private DevExpress.XtraEditors.LabelControl lb_factory;
        private DevExpress.XtraEditors.TextEdit txt_factory;
        private DevExpress.XtraGrid.Columns.GridColumn gv_id;
        private DevExpress.XtraEditors.MemoEdit txt_itemName;
        private DevExpress.XtraEditors.MemoEdit txt_itemModel;
        private DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit repositoryItemMemoEdit1;
@@ -1273,5 +1276,6 @@
        private UserControl.UcLookUnit txt_saleunit;
        private UserControl.UcLookUnit txt_produceUnit;
        private UserControl.UcLookUnit txt_itemUnit;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
    }
}
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.Designer.cs
@@ -66,7 +66,6 @@
            this.lb_oldunit = new DevExpress.XtraEditors.LabelControl();
            this.lb_id = new DevExpress.XtraEditors.LabelControl();
            this.txt_id = new DevExpress.XtraEditors.TextEdit();
            this.gv_id = new DevExpress.XtraGrid.Columns.GridColumn();
            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
            this.gcMain = new DevExpress.XtraGrid.GridControl();
            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -81,6 +80,7 @@
            this.txt_oldunit = new Gs.DevApp.UserControl.UcLookUnit();
            this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
            this.lbGuid = new System.Windows.Forms.Label();
            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fforbidstatus.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fdescription.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fprecision.Properties)).BeginInit();
@@ -131,8 +131,8 @@
            this.gv_fforbidstatus.Name = "gv_fforbidstatus";
            this.gv_fforbidstatus.Tag = "query_a.fforbidstatus";
            this.gv_fforbidstatus.Visible = true;
            this.gv_fforbidstatus.VisibleIndex = 9;
            this.gv_fforbidstatus.Width = 94;
            this.gv_fforbidstatus.VisibleIndex = 8;
            this.gv_fforbidstatus.Width = 91;
            // 
            // lb_fdescription
            // 
@@ -163,8 +163,8 @@
            this.gv_fdescription.Name = "gv_fdescription";
            this.gv_fdescription.Tag = "query_a.fdescription";
            this.gv_fdescription.Visible = true;
            this.gv_fdescription.VisibleIndex = 8;
            this.gv_fdescription.Width = 94;
            this.gv_fdescription.VisibleIndex = 7;
            this.gv_fdescription.Width = 91;
            // 
            // lb_fprecision
            // 
@@ -195,8 +195,8 @@
            this.gv_fprecision.Name = "gv_fprecision";
            this.gv_fprecision.Tag = "query_a.fprecision";
            this.gv_fprecision.Visible = true;
            this.gv_fprecision.VisibleIndex = 7;
            this.gv_fprecision.Width = 94;
            this.gv_fprecision.VisibleIndex = 6;
            this.gv_fprecision.Width = 91;
            // 
            // lb_froundtype
            // 
@@ -227,8 +227,8 @@
            this.gv_froundtype.Name = "gv_froundtype";
            this.gv_froundtype.Tag = "query_a.froundtype";
            this.gv_froundtype.Visible = true;
            this.gv_froundtype.VisibleIndex = 6;
            this.gv_froundtype.Width = 94;
            this.gv_froundtype.VisibleIndex = 5;
            this.gv_froundtype.Width = 91;
            // 
            // lb_fbaseunit
            // 
@@ -269,8 +269,8 @@
            this.gv_fconvertnumerator.Name = "gv_fconvertnumerator";
            this.gv_fconvertnumerator.Tag = "query_a.fconvertnumerator";
            this.gv_fconvertnumerator.Visible = true;
            this.gv_fconvertnumerator.VisibleIndex = 5;
            this.gv_fconvertnumerator.Width = 94;
            this.gv_fconvertnumerator.VisibleIndex = 4;
            this.gv_fconvertnumerator.Width = 91;
            // 
            // lb_fcurrentunitid
            // 
@@ -312,8 +312,8 @@
            this.gv_fconvertdenominator.OptionsColumn.ReadOnly = true;
            this.gv_fconvertdenominator.Tag = "query_a.fconvertdenominator";
            this.gv_fconvertdenominator.Visible = true;
            this.gv_fconvertdenominator.VisibleIndex = 4;
            this.gv_fconvertdenominator.Width = 94;
            this.gv_fconvertdenominator.VisibleIndex = 3;
            this.gv_fconvertdenominator.Width = 91;
            // 
            // lb_funitgroupid
            // 
@@ -345,8 +345,8 @@
            this.gv_funitgroupid.OptionsColumn.ReadOnly = true;
            this.gv_funitgroupid.Tag = "query_a.funitgroupid";
            this.gv_funitgroupid.Visible = true;
            this.gv_funitgroupid.VisibleIndex = 3;
            this.gv_funitgroupid.Width = 94;
            this.gv_funitgroupid.VisibleIndex = 2;
            this.gv_funitgroupid.Width = 91;
            // 
            // lb_fname
            // 
@@ -378,8 +378,8 @@
            this.gv_fname.OptionsColumn.ReadOnly = true;
            this.gv_fname.Tag = "query_a.fname";
            this.gv_fname.Visible = true;
            this.gv_fname.VisibleIndex = 2;
            this.gv_fname.Width = 94;
            this.gv_fname.VisibleIndex = 1;
            this.gv_fname.Width = 91;
            // 
            // lb_fnumber
            // 
@@ -411,8 +411,8 @@
            this.gv_fnumber.OptionsColumn.ReadOnly = true;
            this.gv_fnumber.Tag = "query_a.fnumber";
            this.gv_fnumber.Visible = true;
            this.gv_fnumber.VisibleIndex = 1;
            this.gv_fnumber.Width = 94;
            this.gv_fnumber.VisibleIndex = 0;
            this.gv_fnumber.Width = 91;
            // 
            // lb_newqty
            // 
@@ -491,20 +491,6 @@
            this.txt_id.Size = new System.Drawing.Size(150, 28);
            this.txt_id.TabIndex = 211;
            // 
            // gv_id
            //
            this.gv_id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_id.AppearanceCell.Options.UseFont = true;
            this.gv_id.Caption = "单位ID";
            this.gv_id.FieldName = "id";
            this.gv_id.MinWidth = 50;
            this.gv_id.Name = "gv_id";
            this.gv_id.OptionsColumn.ReadOnly = true;
            this.gv_id.Tag = "query_a.id";
            this.gv_id.Visible = true;
            this.gv_id.VisibleIndex = 0;
            this.gv_id.Width = 94;
            //
            // toolBarMenu1
            // 
            this.toolBarMenu1.chkParameter = null;
@@ -537,7 +523,6 @@
            this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gridView1.Appearance.Row.Options.UseFont = true;
            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gv_id,
            this.gv_fnumber,
            this.gv_fname,
            this.gv_funitgroupid,
@@ -546,7 +531,8 @@
            this.gv_froundtype,
            this.gv_fprecision,
            this.gv_fdescription,
            this.gv_fforbidstatus});
            this.gv_fforbidstatus,
            this.gridColumn1});
            this.gridView1.GridControl = this.gcMain;
            this.gridView1.IndicatorWidth = 50;
            this.gridView1.Name = "gridView1";
@@ -687,6 +673,17 @@
            this.lbGuid.TabIndex = 1;
            this.lbGuid.Visible = false;
            // 
            // gridColumn1
            //
            this.gridColumn1.Caption = "同步时间";
            this.gridColumn1.FieldName = "lastupdateDate";
            this.gridColumn1.MinWidth = 25;
            this.gridColumn1.Name = "gridColumn1";
            this.gridColumn1.Tag = "query_a.lastupdate_date";
            this.gridColumn1.Visible = true;
            this.gridColumn1.VisibleIndex = 9;
            this.gridColumn1.Width = 180;
            //
            // Frm_MesUnit
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -783,10 +780,10 @@
private DevExpress.XtraEditors.LabelControl lb_id;
private DevExpress.XtraEditors.TextEdit txt_id;
 private DevExpress.XtraGrid.Columns.GridColumn gv_id;
        private UserControl.UcLookUnit txt_oldunit;
        private UserControl.UcLookUnit txt_newunit;
        private UserControl.UcLookUnit txt_fcurrentunitid;
        private UserControl.UcLookUnit txt_fbaseunit;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
    }
}
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.Designer.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,603 @@
/* Create By GS EasyCode */
namespace Gs.DevApp.DevFrm
{
    partial class Frm_MesWorkshopLine
    {
        /// <summary>
        /// Required designer variable.
        /// </summary>
        private System.ComponentModel.IContainer components = null;
        /// <summary>
        /// Clean up any resources being used.
        /// </summary>
        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
        protected override void Dispose(bool disposing)
        {
            if (disposing && (components != null))
            {
                components.Dispose();
            }
            base.Dispose(disposing);
        }
        #region Windows Form Designer generated code
        /// <summary>
        /// Required method for Designer support - do not modify
        /// the contents of this method with the code editor.
        /// </summary>
        private void InitializeComponent()
        {
            this.lb_isZxbg = new DevExpress.XtraEditors.LabelControl();
            this.gv_isZxbg = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_lineType = new DevExpress.XtraEditors.LabelControl();
            this.gv_lineType = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_lastupdateDate = new DevExpress.XtraEditors.LabelControl();
            this.txt_lastupdateDate = new DevExpress.XtraEditors.TextEdit();
            this.gv_lastupdateDate = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_lastupdateBy = new DevExpress.XtraEditors.LabelControl();
            this.txt_lastupdateBy = new DevExpress.XtraEditors.TextEdit();
            this.gv_lastupdateBy = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_createBy = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_createDate = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_remark = new DevExpress.XtraEditors.LabelControl();
            this.txt_remark = new DevExpress.XtraEditors.TextEdit();
            this.gv_remark = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_name = new DevExpress.XtraEditors.LabelControl();
            this.txt_name = new DevExpress.XtraEditors.TextEdit();
            this.gv_name = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_lineNo = new DevExpress.XtraEditors.LabelControl();
            this.txt_lineNo = new DevExpress.XtraEditors.TextEdit();
            this.gv_lineNo = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_org = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_workshopGuid = new DevExpress.XtraEditors.LabelControl();
            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
            this.gcMain = new DevExpress.XtraGrid.GridControl();
            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
            this.pageBar1 = new UserControls.Data.UcPageBar();
            this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
            this.panel1 = new System.Windows.Forms.Panel();
            this.txt_isZxbg = new DevExpress.XtraEditors.CheckEdit();
            this.txt_lineType = new DevExpress.XtraEditors.ComboBoxEdit();
            this.txt_dptId = new Gs.DevApp.UserControl.UcLookDepartment();
            this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
            this.lbGuid = new System.Windows.Forms.Label();
            ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateDate.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateBy.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_name.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_lineNo.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
            this.xtraTabControl1.SuspendLayout();
            this.xtraTabPage1.SuspendLayout();
            this.xtraTabPage2.SuspendLayout();
            this.panel1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.txt_isZxbg.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_lineType.Properties)).BeginInit();
            this.SuspendLayout();
            //
            // lb_isZxbg
            //
            this.lb_isZxbg.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_isZxbg.Appearance.Options.UseFont = true;
            this.lb_isZxbg.Location = new System.Drawing.Point(328, 116);
            this.lb_isZxbg.Name = "lb_isZxbg";
            this.lb_isZxbg.Size = new System.Drawing.Size(73, 21);
            this.lb_isZxbg.TabIndex = 243;
            this.lb_isZxbg.Text = "整线报工 ";
            //
            // gv_isZxbg
            //
            this.gv_isZxbg.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_isZxbg.AppearanceCell.Options.UseFont = true;
            this.gv_isZxbg.Caption = "整线报工";
            this.gv_isZxbg.FieldName = "isZxbg";
            this.gv_isZxbg.MinWidth = 50;
            this.gv_isZxbg.Name = "gv_isZxbg";
            this.gv_isZxbg.OptionsColumn.AllowEdit = false;
            this.gv_isZxbg.Tag = "query_a.is_zxbg";
            this.gv_isZxbg.Visible = true;
            this.gv_isZxbg.VisibleIndex = 10;
            this.gv_isZxbg.Width = 50;
            //
            // lb_lineType
            //
            this.lb_lineType.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_lineType.Appearance.Options.UseFont = true;
            this.lb_lineType.Location = new System.Drawing.Point(328, 84);
            this.lb_lineType.Name = "lb_lineType";
            this.lb_lineType.Size = new System.Drawing.Size(73, 21);
            this.lb_lineType.TabIndex = 240;
            this.lb_lineType.Text = "线体类别 ";
            //
            // gv_lineType
            //
            this.gv_lineType.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_lineType.AppearanceCell.Options.UseFont = true;
            this.gv_lineType.Caption = "线体类别";
            this.gv_lineType.FieldName = "lineType";
            this.gv_lineType.MinWidth = 80;
            this.gv_lineType.Name = "gv_lineType";
            this.gv_lineType.OptionsColumn.AllowEdit = false;
            this.gv_lineType.Tag = "query_a.line_type";
            this.gv_lineType.Visible = true;
            this.gv_lineType.VisibleIndex = 9;
            this.gv_lineType.Width = 80;
            //
            // lb_lastupdateDate
            //
            this.lb_lastupdateDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_lastupdateDate.Appearance.Options.UseFont = true;
            this.lb_lastupdateDate.Location = new System.Drawing.Point(328, 52);
            this.lb_lastupdateDate.Name = "lb_lastupdateDate";
            this.lb_lastupdateDate.Size = new System.Drawing.Size(73, 21);
            this.lb_lastupdateDate.TabIndex = 231;
            this.lb_lastupdateDate.Text = "更新时间 ";
            //
            // txt_lastupdateDate
            //
            this.txt_lastupdateDate.Enabled = false;
            this.txt_lastupdateDate.Location = new System.Drawing.Point(405, 48);
            this.txt_lastupdateDate.Name = "txt_lastupdateDate";
            this.txt_lastupdateDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_lastupdateDate.Properties.Appearance.Options.UseFont = true;
            this.txt_lastupdateDate.Size = new System.Drawing.Size(150, 28);
            this.txt_lastupdateDate.TabIndex = 231;
            //
            // gv_lastupdateDate
            //
            this.gv_lastupdateDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_lastupdateDate.AppearanceCell.Options.UseFont = true;
            this.gv_lastupdateDate.Caption = "更新时间";
            this.gv_lastupdateDate.FieldName = "lastupdateDate";
            this.gv_lastupdateDate.MinWidth = 180;
            this.gv_lastupdateDate.Name = "gv_lastupdateDate";
            this.gv_lastupdateDate.OptionsColumn.AllowEdit = false;
            this.gv_lastupdateDate.Tag = "query_a.lastupdate_date";
            this.gv_lastupdateDate.Visible = true;
            this.gv_lastupdateDate.VisibleIndex = 8;
            this.gv_lastupdateDate.Width = 180;
            //
            // lb_lastupdateBy
            //
            this.lb_lastupdateBy.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_lastupdateBy.Appearance.Options.UseFont = true;
            this.lb_lastupdateBy.Location = new System.Drawing.Point(345, 20);
            this.lb_lastupdateBy.Name = "lb_lastupdateBy";
            this.lb_lastupdateBy.Size = new System.Drawing.Size(56, 21);
            this.lb_lastupdateBy.TabIndex = 228;
            this.lb_lastupdateBy.Text = "更新者 ";
            //
            // txt_lastupdateBy
            //
            this.txt_lastupdateBy.Enabled = false;
            this.txt_lastupdateBy.Location = new System.Drawing.Point(405, 16);
            this.txt_lastupdateBy.Name = "txt_lastupdateBy";
            this.txt_lastupdateBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_lastupdateBy.Properties.Appearance.Options.UseFont = true;
            this.txt_lastupdateBy.Size = new System.Drawing.Size(150, 28);
            this.txt_lastupdateBy.TabIndex = 228;
            //
            // gv_lastupdateBy
            //
            this.gv_lastupdateBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_lastupdateBy.AppearanceCell.Options.UseFont = true;
            this.gv_lastupdateBy.Caption = "更新者";
            this.gv_lastupdateBy.FieldName = "lastupdateBy";
            this.gv_lastupdateBy.MinWidth = 50;
            this.gv_lastupdateBy.Name = "gv_lastupdateBy";
            this.gv_lastupdateBy.OptionsColumn.AllowEdit = false;
            this.gv_lastupdateBy.Tag = "query_a.lastupdate_by";
            this.gv_lastupdateBy.Visible = true;
            this.gv_lastupdateBy.VisibleIndex = 7;
            this.gv_lastupdateBy.Width = 63;
            //
            // gv_createBy
            //
            this.gv_createBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_createBy.AppearanceCell.Options.UseFont = true;
            this.gv_createBy.Caption = "建立者";
            this.gv_createBy.FieldName = "createBy";
            this.gv_createBy.MinWidth = 50;
            this.gv_createBy.Name = "gv_createBy";
            this.gv_createBy.OptionsColumn.AllowEdit = false;
            this.gv_createBy.Tag = "query_a.create_by";
            this.gv_createBy.Visible = true;
            this.gv_createBy.VisibleIndex = 5;
            this.gv_createBy.Width = 63;
            //
            // gv_createDate
            //
            this.gv_createDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_createDate.AppearanceCell.Options.UseFont = true;
            this.gv_createDate.Caption = "建立时间";
            this.gv_createDate.FieldName = "createDate";
            this.gv_createDate.MinWidth = 180;
            this.gv_createDate.Name = "gv_createDate";
            this.gv_createDate.OptionsColumn.AllowEdit = false;
            this.gv_createDate.Tag = "query_a.create_date";
            this.gv_createDate.Visible = true;
            this.gv_createDate.VisibleIndex = 6;
            this.gv_createDate.Width = 180;
            //
            // lb_remark
            //
            this.lb_remark.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_remark.Appearance.Options.UseFont = true;
            this.lb_remark.Location = new System.Drawing.Point(49, 116);
            this.lb_remark.Name = "lb_remark";
            this.lb_remark.Size = new System.Drawing.Size(39, 21);
            this.lb_remark.TabIndex = 219;
            this.lb_remark.Text = "备注 ";
            //
            // txt_remark
            //
            this.txt_remark.Location = new System.Drawing.Point(94, 112);
            this.txt_remark.Name = "txt_remark";
            this.txt_remark.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_remark.Properties.Appearance.Options.UseFont = true;
            this.txt_remark.Size = new System.Drawing.Size(220, 28);
            this.txt_remark.TabIndex = 219;
            //
            // gv_remark
            //
            this.gv_remark.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_remark.AppearanceCell.Options.UseFont = true;
            this.gv_remark.Caption = "备注";
            this.gv_remark.FieldName = "remark";
            this.gv_remark.MinWidth = 50;
            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 = 4;
            this.gv_remark.Width = 79;
            //
            // lb_name
            //
            this.lb_name.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_name.Appearance.Options.UseFont = true;
            this.lb_name.Location = new System.Drawing.Point(15, 84);
            this.lb_name.Name = "lb_name";
            this.lb_name.Size = new System.Drawing.Size(73, 21);
            this.lb_name.TabIndex = 217;
            this.lb_name.Text = "产线名称 ";
            //
            // txt_name
            //
            this.txt_name.Location = new System.Drawing.Point(94, 80);
            this.txt_name.Name = "txt_name";
            this.txt_name.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_name.Properties.Appearance.Options.UseFont = true;
            this.txt_name.Size = new System.Drawing.Size(220, 28);
            this.txt_name.TabIndex = 217;
            //
            // gv_name
            //
            this.gv_name.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_name.AppearanceCell.Options.UseFont = true;
            this.gv_name.Caption = "产线名称";
            this.gv_name.FieldName = "name";
            this.gv_name.MinWidth = 60;
            this.gv_name.Name = "gv_name";
            this.gv_name.OptionsColumn.AllowEdit = false;
            this.gv_name.Tag = "query_a.name";
            this.gv_name.Visible = true;
            this.gv_name.VisibleIndex = 2;
            this.gv_name.Width = 100;
            //
            // lb_lineNo
            //
            this.lb_lineNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_lineNo.Appearance.Options.UseFont = true;
            this.lb_lineNo.Location = new System.Drawing.Point(15, 52);
            this.lb_lineNo.Name = "lb_lineNo";
            this.lb_lineNo.Size = new System.Drawing.Size(73, 21);
            this.lb_lineNo.TabIndex = 216;
            this.lb_lineNo.Text = "产线编号 ";
            //
            // txt_lineNo
            //
            this.txt_lineNo.Location = new System.Drawing.Point(94, 48);
            this.txt_lineNo.Name = "txt_lineNo";
            this.txt_lineNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_lineNo.Properties.Appearance.Options.UseFont = true;
            this.txt_lineNo.Size = new System.Drawing.Size(220, 28);
            this.txt_lineNo.TabIndex = 216;
            //
            // gv_lineNo
            //
            this.gv_lineNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_lineNo.AppearanceCell.Options.UseFont = true;
            this.gv_lineNo.Caption = "产线编号";
            this.gv_lineNo.FieldName = "lineNo";
            this.gv_lineNo.MinWidth = 50;
            this.gv_lineNo.Name = "gv_lineNo";
            this.gv_lineNo.OptionsColumn.AllowEdit = false;
            this.gv_lineNo.Tag = "query_a.line_no";
            this.gv_lineNo.Visible = true;
            this.gv_lineNo.VisibleIndex = 1;
            this.gv_lineNo.Width = 82;
            //
            // gv_org
            //
            this.gv_org.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_org.AppearanceCell.Options.UseFont = true;
            this.gv_org.Caption = "使用组织";
            this.gv_org.FieldName = "fSubsidiary";
            this.gv_org.MinWidth = 50;
            this.gv_org.Name = "gv_org";
            this.gv_org.OptionsColumn.AllowEdit = false;
            this.gv_org.Tag = "org.fnamber";
            this.gv_org.Visible = true;
            this.gv_org.VisibleIndex = 0;
            this.gv_org.Width = 254;
            //
            // lb_workshopGuid
            //
            this.lb_workshopGuid.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_workshopGuid.Appearance.Options.UseFont = true;
            this.lb_workshopGuid.Location = new System.Drawing.Point(20, 20);
            this.lb_workshopGuid.Name = "lb_workshopGuid";
            this.lb_workshopGuid.Size = new System.Drawing.Size(68, 21);
            this.lb_workshopGuid.TabIndex = 211;
            this.lb_workshopGuid.Text = "所在部门";
            //
            // toolBarMenu1
            //
            this.toolBarMenu1.chkParameter = null;
            this.toolBarMenu1.currentAction = null;
            this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
            this.toolBarMenu1.guidKey = null;
            this.toolBarMenu1.isSetBtn = false;
            this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
            this.toolBarMenu1.Name = "toolBarMenu1";
            this.toolBarMenu1.rptParameter = null;
            this.toolBarMenu1.Size = new System.Drawing.Size(1128, 80);
            this.toolBarMenu1.TabIndex = 0;
            this.toolBarMenu1.xlsInService = null;
            this.toolBarMenu1.xlsOutParameter = null;
            //
            // gcMain
            //
            this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
            this.gcMain.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gcMain.Location = new System.Drawing.Point(0, 0);
            this.gcMain.MainView = this.gridView1;
            this.gcMain.Name = "gcMain";
            this.gcMain.Size = new System.Drawing.Size(1126, 531);
            this.gcMain.TabIndex = 1;
            this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gridView1});
            //
            // gridView1
            //
            this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
            this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
            this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gridView1.Appearance.Row.Options.UseFont = true;
            this.gridView1.ColumnPanelRowHeight = 50;
            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gv_org,
            this.gv_lineNo,
            this.gv_name,
            this.gridColumn1,
            this.gv_remark,
            this.gv_createBy,
            this.gv_createDate,
            this.gv_lastupdateBy,
            this.gv_lastupdateDate,
            this.gv_lineType,
            this.gv_isZxbg});
            this.gridView1.GridControl = this.gcMain;
            this.gridView1.IndicatorWidth = 50;
            this.gridView1.Name = "gridView1";
            this.gridView1.OptionsFind.ShowSearchNavButtons = false;
            this.gridView1.OptionsView.ShowAutoFilterRow = true;
            this.gridView1.OptionsView.ShowGroupPanel = false;
            //
            // gridColumn1
            //
            this.gridColumn1.Caption = "所在部门";
            this.gridColumn1.FieldName = "departName";
            this.gridColumn1.MinWidth = 60;
            this.gridColumn1.Name = "gridColumn1";
            this.gridColumn1.Tag = "query_a.departName";
            this.gridColumn1.Visible = true;
            this.gridColumn1.VisibleIndex = 3;
            this.gridColumn1.Width = 94;
            //
            // xtraTabControl1
            //
            this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
            this.xtraTabControl1.Name = "xtraTabControl1";
            this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
            this.xtraTabControl1.Size = new System.Drawing.Size(1128, 602);
            this.xtraTabControl1.TabIndex = 3;
            this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
            this.xtraTabPage1,
            this.xtraTabPage2});
            //
            // xtraTabPage1
            //
            this.xtraTabPage1.Controls.Add(this.gcMain);
            this.xtraTabPage1.Controls.Add(this.pageBar1);
            this.xtraTabPage1.Name = "xtraTabPage1";
            this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
            this.xtraTabPage1.Text = "数据查询";
            //
            // pageBar1
            //
            this.pageBar1.CurrentPage = 1;
            this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
            this.pageBar1.Location = new System.Drawing.Point(0, 531);
            this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
            this.pageBar1.Name = "pageBar1";
            this.pageBar1.RecordCount = 0;
            this.pageBar1.Size = new System.Drawing.Size(1126, 39);
            this.pageBar1.TabIndex = 3;
            this.pageBar1.TotalPages = 0;
            //
            // xtraTabPage2
            //
            this.xtraTabPage2.Controls.Add(this.panel1);
            this.xtraTabPage2.Name = "xtraTabPage2";
            this.xtraTabPage2.Size = new System.Drawing.Size(1126, 570);
            this.xtraTabPage2.Text = "数据编辑";
            //
            // panel1
            //
            this.panel1.BackColor = System.Drawing.Color.White;
            this.panel1.Controls.Add(this.txt_isZxbg);
            this.panel1.Controls.Add(this.txt_lineType);
            this.panel1.Controls.Add(this.txt_dptId);
            this.panel1.Controls.Add(this.labelControl11);
            this.panel1.Controls.Add(this.lbGuid);
            this.panel1.Controls.Add(this.lb_isZxbg);
            this.panel1.Controls.Add(this.lb_lineType);
            this.panel1.Controls.Add(this.lb_lastupdateDate);
            this.panel1.Controls.Add(this.txt_lastupdateDate);
            this.panel1.Controls.Add(this.lb_lastupdateBy);
            this.panel1.Controls.Add(this.txt_lastupdateBy);
            this.panel1.Controls.Add(this.lb_remark);
            this.panel1.Controls.Add(this.txt_remark);
            this.panel1.Controls.Add(this.lb_name);
            this.panel1.Controls.Add(this.txt_name);
            this.panel1.Controls.Add(this.lb_lineNo);
            this.panel1.Controls.Add(this.txt_lineNo);
            this.panel1.Controls.Add(this.lb_workshopGuid);
            this.panel1.Font = new System.Drawing.Font("Tahoma", 10F);
            this.panel1.Location = new System.Drawing.Point(76, 20);
            this.panel1.Name = "panel1";
            this.panel1.Size = new System.Drawing.Size(673, 249);
            this.panel1.TabIndex = 1;
            //
            // txt_isZxbg
            //
            this.txt_isZxbg.Location = new System.Drawing.Point(405, 114);
            this.txt_isZxbg.Name = "txt_isZxbg";
            this.txt_isZxbg.Properties.Caption = "";
            this.txt_isZxbg.Size = new System.Drawing.Size(46, 24);
            this.txt_isZxbg.TabIndex = 246;
            //
            // txt_lineType
            //
            this.txt_lineType.Location = new System.Drawing.Point(405, 82);
            this.txt_lineType.Name = "txt_lineType";
            this.txt_lineType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
            this.txt_lineType.Properties.Items.AddRange(new object[] {
            "手工线",
            "自动线"});
            this.txt_lineType.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
            this.txt_lineType.Size = new System.Drawing.Size(150, 24);
            this.txt_lineType.TabIndex = 245;
            //
            // txt_dptId
            //
            this.txt_dptId.IsReadly = false;
            this.txt_dptId.Location = new System.Drawing.Point(94, 16);
            this.txt_dptId.Name = "txt_dptId";
            this.txt_dptId.Size = new System.Drawing.Size(220, 28);
            this.txt_dptId.TabIndex = 244;
            //
            // labelControl11
            //
            this.labelControl11.Location = new System.Drawing.Point(485, 122);
            this.labelControl11.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
            this.labelControl11.Name = "labelControl11";
            this.labelControl11.Size = new System.Drawing.Size(45, 18);
            this.labelControl11.TabIndex = 130;
            this.labelControl11.Text = "主键:";
            this.labelControl11.Visible = false;
            //
            // lbGuid
            //
            this.lbGuid.AutoSize = true;
            this.lbGuid.Location = new System.Drawing.Point(536, 122);
            this.lbGuid.Name = "lbGuid";
            this.lbGuid.Size = new System.Drawing.Size(0, 21);
            this.lbGuid.TabIndex = 1;
            this.lbGuid.Visible = false;
            //
            // Frm_MesWorkshopLine
            //
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
            this.ClientSize = new System.Drawing.Size(1128, 682);
            this.Controls.Add(this.xtraTabControl1);
            this.Controls.Add(this.toolBarMenu1);
            this.Name = "Frm_MesWorkshopLine";
            ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateDate.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateBy.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_name.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_lineNo.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
            this.xtraTabControl1.ResumeLayout(false);
            this.xtraTabPage1.ResumeLayout(false);
            this.xtraTabPage2.ResumeLayout(false);
            this.panel1.ResumeLayout(false);
            this.panel1.PerformLayout();
            ((System.ComponentModel.ISupportInitialize)(this.txt_isZxbg.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_lineType.Properties)).EndInit();
            this.ResumeLayout(false);
        }
        #endregion
      private UserControl.UcToolBarMenu toolBarMenu1;
        private DevExpress.XtraGrid.GridControl gcMain;
        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
        private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
        private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
        private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
        private UserControls.Data.UcPageBar pageBar1;
        private System.Windows.Forms.Panel panel1;
        private System.Windows.Forms.Label lbGuid;
        private DevExpress.XtraEditors.LabelControl labelControl11;
       //BQCreateConrolObejct
private DevExpress.XtraEditors.LabelControl lb_isZxbg;
 private DevExpress.XtraGrid.Columns.GridColumn gv_isZxbg;
private DevExpress.XtraEditors.LabelControl lb_lineType;
 private DevExpress.XtraGrid.Columns.GridColumn gv_lineType;
private DevExpress.XtraEditors.LabelControl lb_lastupdateDate;
private DevExpress.XtraEditors.TextEdit txt_lastupdateDate;
 private DevExpress.XtraGrid.Columns.GridColumn gv_lastupdateDate;
private DevExpress.XtraEditors.LabelControl lb_lastupdateBy;
private DevExpress.XtraEditors.TextEdit txt_lastupdateBy;
 private DevExpress.XtraGrid.Columns.GridColumn gv_lastupdateBy;
 private DevExpress.XtraGrid.Columns.GridColumn gv_createBy;
 private DevExpress.XtraGrid.Columns.GridColumn gv_createDate;
private DevExpress.XtraEditors.LabelControl lb_remark;
private DevExpress.XtraEditors.TextEdit txt_remark;
 private DevExpress.XtraGrid.Columns.GridColumn gv_remark;
private DevExpress.XtraEditors.LabelControl lb_name;
private DevExpress.XtraEditors.TextEdit txt_name;
 private DevExpress.XtraGrid.Columns.GridColumn gv_name;
private DevExpress.XtraEditors.LabelControl lb_lineNo;
private DevExpress.XtraEditors.TextEdit txt_lineNo;
 private DevExpress.XtraGrid.Columns.GridColumn gv_lineNo;
 private DevExpress.XtraGrid.Columns.GridColumn gv_org;
private DevExpress.XtraEditors.LabelControl lb_workshopGuid;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
        private UserControl.UcLookDepartment txt_dptId;
        private DevExpress.XtraEditors.CheckEdit txt_isZxbg;
        private DevExpress.XtraEditors.ComboBoxEdit txt_lineType;
    }
}
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,321 @@
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Data;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace Gs.DevApp.DevFrm
{
    public partial class Frm_MesWorkshopLine : DevExpress.XtraEditors.XtraForm
    {
        string _webServiceName = "MesWorkshopLineManager/";
        List<FilterEntity> _filterList = new List<FilterEntity>();
        public Frm_MesWorkshopLine()
        {
            InitializeComponent();
            this.toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick;
            this.toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
            this.toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
            this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
            this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1;
            this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
            this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, "", "", (value) =>
            {
                Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
            });
            Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
            {
                getModel(value);
            }, (value) =>
            {
                getPageList(this.pageBar1.CurrentPage);
            });
            getPageList(1);
            pageBar1.PagerEvent += PageBar1_PagerEvent;
        }
        private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
        {
            _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns);
            await Task.Delay(100);
            getPageList(1);
        }
        /// <summary>
        /// åˆ†é¡µäº‹ä»¶
        /// </summary>
        /// <param name="curPage"></param>
        /// <param name="pageSize"></param>
        private void PageBar1_PagerEvent(int curPage, int pageSize)
        {
            getPageList(curPage);
        }
        /// <summary>
        /// æŸ¥è¯¢äº‹ä»¶
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
        {
            gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
            gridView1.ActiveFilter.Clear();
            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
            var frm = new ShowFilter(gridView1.Columns, _filterList);
            frm.UpdateParent += Frm_UpdateParent;
            frm.ShowDialog();
        }
        /// <summary>
        /// æŸ¥è¯¢å›žè°ƒ
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void Frm_UpdateParent(object sender, UpdateParentEventArgs e)
        {
            _filterList = e.FilterList;
            getPageList(1);
        }
        /// <summary>
        /// å–消事件
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void ToolBarMenu1_btnEscClick(object sender, EventArgs e)
        {
            Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 1);
        }
        /// <summary>
        /// åˆ é™¤äº‹ä»¶
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e)
        {
            string rowGuid = "", rowName = "";
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_lineNo, gridView1, "lineNo");
            if (string.IsNullOrEmpty(rowGuid))
            {
                ToolBox.MsgHelper.Warning("请先选择你要操作的行!");
                return;
            }
            if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】,确定删除吗?"))
                return;
            List<dynamic> lst = new List<dynamic>();
            lst.Add(rowGuid);
            var _obj = lst;
            try
            {
                string strJson = UtilityHelper.HttpPost("", _webServiceName + "DeleteModel", JsonConvert.SerializeObject(_obj));
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
                if (_rtn.rtnCode > 0)
                {
                    UtilityHelper.JumpToTab(xtraTabControl1, 0);
                    getPageList(this.pageBar1.CurrentPage);
                }
                ToolBox.MsgHelper.Warning("提示:" + _rtn.rtnMsg);
            }
            catch (Exception ex)
            {
                ToolBox.MsgHelper.Warning("提示:" + ex.Message);
            }
        }
        /// <summary>
        /// åˆ·æ–°äº‹ä»¶
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
        {
            if (xtraTabControl1.SelectedTabPageIndex == 1)
                getModel(lbGuid.Text.Trim());
            else
            {
                _filterList.Clear();
                if (gridView1.ActiveFilter.Count > 0)
                {
                    gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
                    gridView1.ActiveFilter.Clear();
                    gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
                }
                getPageList(1);
            }
        }
        /// <summary>
        /// ä¿®æ”¹äº‹ä»¶
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
        {
            string rowGuid, rowName;
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
                lbGuid, txt_name, gridView1);
            if (string.IsNullOrEmpty(rowGuid))
            {
                MsgHelper.Warning("请先选择你要操作的行!");
                return;
            }
            Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
            UtilityHelper.ChangeEnableByControl(panel1.Controls, true);
        }
        /// <summary>
        /// æ–°å¢žäº‹ä»¶
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void ToolBarMenu1_btnAddClick(object sender, EventArgs e)
        {
            lbGuid.Text = "";
            Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 4);
            UtilityHelper.CleanValueByControl(panel1.Controls, true);
        }
        /// <summary>
        /// ä¿å­˜äº‹ä»¶
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
        {
            toolBarMenu1.isSetBtn = false;
            if (string.IsNullOrEmpty(txt_dptId.GetId().Trim()))
            {
                Gs.DevApp.ToolBox.MsgHelper.Warning("请选择所在部门!");
                txt_dptId.Focus();
                return;
            }
            if (string.IsNullOrEmpty(txt_lineNo.Text.Trim()))
            {
                Gs.DevApp.ToolBox.MsgHelper.Warning("产线编号不能为空!");
                txt_lineNo.Focus();
                return;
            }
            if (string.IsNullOrEmpty(txt_name.Text.Trim()))
            {
                Gs.DevApp.ToolBox.MsgHelper.Warning("产线名称不能为空!");
                txt_name.Focus();
                return;
            }
            if (string.IsNullOrEmpty(txt_lineType.Text.Trim()))
            {
                Gs.DevApp.ToolBox.MsgHelper.Warning("产线类别不能为空!");
                txt_lineType.Focus();
                return;
            }
            var _obj = new
            {
                Guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //主建
                DptId = txt_dptId.GetId(),
                Name=txt_name.Text.Trim(),
                LineNo=txt_lineNo.Text.Trim(),
                Remark=txt_remark.Text.Trim(),
                LineType = txt_lineType.Text.Trim(),
                isZxbg=txt_isZxbg.Checked
            };
            try
            {
                string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj));
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
                ToolBox.MsgHelper.Warning("提示:" + _rtn.rtnMsg);
                if (_rtn.rtnCode > 0)
                {
                    lbGuid.Text = _rtn.rtnData;
                    toolBarMenu1.isSetBtn = true;
                    UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false);
                }
            }
            catch (Exception ex)
            {
                ToolBox.MsgHelper.Warning("提示:" + ex.Message);
            }
        }
        /// <summary>
        ///
        /// </summary>
        /// <param name="curPage">第几页</param>
        /// <param name="pageSize">每页几条</param>
        private  void getPageList(int curPage)
        {
            var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
            var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "a.create_date",
            "asc", "", _sbSqlWhere.ToString());
            var json = JsonConvert.SerializeObject(pgq);
            try
            {
                var strReturn =  UtilityHelper.HttpPost("",
                    _webServiceName + "GetListPage", json);
                var dd = UtilityHelper.ReturnToTablePage(strReturn);
                if (dd.rtnCode > 0)
                {
                    DataTable dt = dd.rtnData.list;
                    gcMain.BindingContext = new BindingContext();
                    gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
                    if (dt.Rows.Count > 0)
                    {
                        gcMain.DataSource = dt;
                        gcMain.ForceInitialize();
                    }
                    else
                        UtilityHelper.SetDefaultTable(gcMain, gridView1);
                    gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
                    pageBar1.TotalPages = dd.rtnData.pages;//总页
                    pageBar1.CurrentPage = curPage;//当前页
                    pageBar1.RecordCount = dd.rtnData.total;//总记录数
                }
                else
                {
                    ToolBox.MsgHelper.ShowError("提示:" + dd.rtnMsg);
                }
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示:" + ex.Message);
            }
        }
        /// <summary>
        ///
        /// </summary>
        /// <param name="strGuid">主键</param>
        /// <param name="isEdit">是否可编辑</param>
        /// <param name="tabIdx">选项卡序号</param>
        private void getModel(string strGuid)
        {
            bool isEdit = false;
            if (toolBarMenu1.currentAction == "add") return;
            if (toolBarMenu1.currentAction == "edit") isEdit = true;
            if (string.IsNullOrEmpty(strGuid))
            {
                ToolBox.MsgHelper.Warning("请先选择你要操作的行!");
                return;
            }
            var _obj = new
            {
                guid = strGuid,//主建
            };
            try
            {
                string strJson = UtilityHelper.HttpPost("", _webServiceName + "GetModel", JsonConvert.SerializeObject(_obj));
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
                if (_rtn.rtnCode > 0)
                {
                    dynamic dy = _rtn.rtnData;
                    lbGuid.Text = strGuid;
                    UtilityHelper.SetValueByObj(this.panel1.Controls, dy, isEdit);
                }
                else
                    ToolBox.MsgHelper.Warning("提示:" + _rtn.rtnMsg);
            }
            catch (Exception ex)
            {
                ToolBox.MsgHelper.Warning("提示:" + ex.Message);
            }
        }
    }
}
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.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>