bug

lu

2025-09-17 2e44301eda2efb4b61e6dc53d4fff668229f7321

bug

 DevApp/Gs.DevApp/App.config

@@ -1,85 +1,89 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
  <configSections>
    <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System">
      <section name="DevExpress.LookAndFeel.Design.AppSettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
    </sectionGroup>
    <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
      <section name="Gs.DevApp.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
    </sectionGroup>
  </configSections>
  <applicationSettings>
    <DevExpress.LookAndFeel.Design.AppSettings>
      <setting name="DPIAwarenessMode" serializeAs="String">
        <value>System</value>
      </setting>
      <setting name="RegisterBonusSkins" serializeAs="String">
        <value>True</value>
      </setting>
    </DevExpress.LookAndFeel.Design.AppSettings>
  </applicationSettings>
  <startup>
    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
  </startup>
  <runtime>
    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
      <probing privatePath="x86" />
      <dependentAssembly>
        <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
      </dependentAssembly>
    </assemblyBinding>
  </runtime>
	
  <appSettings>
    <add key="webapiurl" value="http://localhost:5263/" />
    <!--<add key="WebApiUrl" value="http://192.168.1.145:8081/" />-->
    <!--<add key="WebApiUrl" value="http://192.168.1.145:81/" />-->
    <add key="LogPath" value="logs" />
    <add key="ProductName" value="G-MES V2.0" />
    <add key="PageSize" value="50" />
    <add key="Version" value="0.1" />
    <add key="IsAutoUpdater" value="0" />
    <add key="AutoUpdaterXml" value="http://192.168.1.145:86/AutoUpdater/AutoUpdater.xml" />
    <add key="ToastSeconds" value="5" /><!--提示框时间-->
    <add key="AsyncSeconds" value="2" /><!--水检超时时间-->
    <add key="IsWater" value="0" /><!--是否要水检及工位码-->
    <add key="IqcGetWeight" value="3000" /><!--iqc读称重时-->
    <add key="TimingMailInterval" value="10000" />
  </appSettings>
  <userSettings>
    <Gs.DevApp.Properties.Settings>
      <setting name="userName" serializeAs="String">
        <value />
      </setting>
      <setting name="userPwd" serializeAs="String">
        <value />
      </setting>
      <setting name="remember" serializeAs="String">
        <value>False</value>
      </setting>
      <setting name="fontSizeName" serializeAs="String">
        <value>宋体,10</value>
      </setting>
      <setting name="isWeight" serializeAs="String">
        <value>False</value>
      </setting>
    </Gs.DevApp.Properties.Settings>
  </userSettings>
  <system.web>
    <membership defaultProvider="ClientAuthenticationMembershipProvider">
      <providers>
        <add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" />
      </providers>
    </membership>
    <roleManager defaultProvider="ClientRoleProvider" enabled="true">
      <providers>
        <add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400" />
      </providers>
    </roleManager>
  </system.web>
    <configSections>
        <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System">
            <section name="DevExpress.LookAndFeel.Design.AppSettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
        </sectionGroup>
        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
            <section name="Gs.DevApp.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
        </sectionGroup>
    </configSections>
    <applicationSettings>
        <DevExpress.LookAndFeel.Design.AppSettings>
            <setting name="DPIAwarenessMode" serializeAs="String">
                <value>System</value>
            </setting>
            <setting name="RegisterBonusSkins" serializeAs="String">
                <value>True</value>
            </setting>
        </DevExpress.LookAndFeel.Design.AppSettings>
    </applicationSettings>
    <startup>
        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
    </startup>
    <runtime>
        <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
            <probing privatePath="x86" />
            <dependentAssembly>
                <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
                <bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2" />
            </dependentAssembly>
            <dependentAssembly>
                <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
                <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
            </dependentAssembly>
        </assemblyBinding>
    </runtime>

    <appSettings>
        <!--<add key="webapiurl" value="http://localhost:5263/" />-->
        <!--<add key="WebApiUrl" value="http://192.168.1.145:8081/" />-->
        <add key="WebApiUrl" value="http://192.168.1.145:81/" />
        <add key="LogPath" value="logs" />
        <add key="ProductName" value="G-MES V2.0" />
        <add key="PageSize" value="50" />
        <add key="Version" value="0.1" />
        <add key="IsAutoUpdater" value="0" />
        <add key="AutoUpdaterXml" value="http://192.168.1.145:86/AutoUpdater/AutoUpdater.xml" />
        <add key="ToastSeconds" value="5" />
        <!--提示框时间-->
        <add key="AsyncSeconds" value="2" />
        <!--水检超时时间-->
        <add key="IsWater" value="0" />
        <!--是否要水检及工位码-->
        <add key="IqcGetWeight" value="3000" />
        <!--iqc读称重时-->
        <add key="TimingMailInterval" value="10000" />
    </appSettings>
    <userSettings>
        <Gs.DevApp.Properties.Settings>
            <setting name="userName" serializeAs="String">
                <value />
            </setting>
            <setting name="userPwd" serializeAs="String">
                <value />
            </setting>
            <setting name="remember" serializeAs="String">
                <value>False</value>
            </setting>
            <setting name="fontSizeName" serializeAs="String">
                <value>宋体,10</value>
            </setting>
            <setting name="isWeight" serializeAs="String">
                <value>False</value>
            </setting>
        </Gs.DevApp.Properties.Settings>
    </userSettings>
    <system.web>
        <membership defaultProvider="ClientAuthenticationMembershipProvider">
            <providers>
                <add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" />
            </providers>
        </membership>
        <roleManager defaultProvider="ClientRoleProvider" enabled="true">
            <providers>
                <add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400" />
            </providers>
        </roleManager>
    </system.web>
</configuration>

 DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcDaa.Designer.cs

@@ -116,8 +116,6 @@
            this.gridColumn3.FieldName = "itemId";
            this.gridColumn3.MinWidth = 25;
            this.gridColumn3.Name = "gridColumn3";
            this.gridColumn3.Visible = true;
            this.gridColumn3.VisibleIndex = 2;
            this.gridColumn3.Width = 94;
            // 
            // gridColumn4
@@ -166,7 +164,7 @@
            this.gv_Btn.MinWidth = 25;
            this.gv_Btn.Name = "gv_Btn";
            this.gv_Btn.Visible = true;
            this.gv_Btn.VisibleIndex = 6;
            this.gv_Btn.VisibleIndex = 5;
            this.gv_Btn.Width = 94;
            // 
            // repositoryItemButtonEdit1
@@ -191,7 +189,7 @@
            this.MinimizeBox = false;
            this.Name = "SelectFqcDaa";
            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
            this.Text = "选择工单，只显示（M:生产中,Q:清尾,W:完工,S:暂停）的工单";
            this.Text = "选择工单，只显示（M:生产中,Q:清尾,S:暂停）的工单";
            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();

 DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01.Designer.cs

@@ -475,8 +475,6 @@
            this.gv_itemId.Name = "gv_itemId";
            this.gv_itemId.OptionsColumn.AllowEdit = false;
            this.gv_itemId.Tag = "query_a.item_id";
            this.gv_itemId.Visible = true;
            this.gv_itemId.VisibleIndex = 7;
            this.gv_itemId.Width = 30;
            // 
            // gv_itemNo
@@ -489,7 +487,7 @@
            this.gv_itemNo.OptionsColumn.AllowEdit = false;
            this.gv_itemNo.Tag = "query_a.item_no";
            this.gv_itemNo.Visible = true;
            this.gv_itemNo.VisibleIndex = 8;
            this.gv_itemNo.VisibleIndex = 7;
            this.gv_itemNo.Width = 136;
            // 
            // gv_boardStyle
@@ -502,7 +500,7 @@
            this.gv_boardStyle.OptionsColumn.AllowEdit = false;
            this.gv_boardStyle.Tag = "query_a.board_style";
            this.gv_boardStyle.Visible = true;
            this.gv_boardStyle.VisibleIndex = 9;
            this.gv_boardStyle.VisibleIndex = 8;
            this.gv_boardStyle.Width = 164;
            // 
            // gridColumn14
@@ -513,7 +511,7 @@
            this.gridColumn14.Name = "gridColumn14";
            this.gridColumn14.OptionsColumn.ReadOnly = true;
            this.gridColumn14.Visible = true;
            this.gridColumn14.VisibleIndex = 10;
            this.gridColumn14.VisibleIndex = 9;
            this.gridColumn14.Width = 200;
            // 
            // gv_fcovertQty
@@ -527,7 +525,7 @@
            this.gv_fcovertQty.OptionsColumn.ReadOnly = true;
            this.gv_fcovertQty.Tag = "query_a.fcovert_qty";
            this.gv_fcovertQty.Visible = true;
            this.gv_fcovertQty.VisibleIndex = 11;
            this.gv_fcovertQty.VisibleIndex = 10;
            this.gv_fcovertQty.Width = 60;
            // 
            // gv_fbatchQty
@@ -539,8 +537,6 @@
            this.gv_fbatchQty.Name = "gv_fbatchQty";
            this.gv_fbatchQty.OptionsColumn.AllowEdit = false;
            this.gv_fbatchQty.Tag = "query_a.fbatch_qty";
            this.gv_fbatchQty.Visible = true;
            this.gv_fbatchQty.VisibleIndex = 12;
            this.gv_fbatchQty.Width = 80;
            // 
            // gv_fcheckResu
@@ -569,8 +565,6 @@
            this.gv_remarks.Name = "gv_remarks";
            this.gv_remarks.OptionsColumn.AllowEdit = false;
            this.gv_remarks.Tag = "query_a.remarks";
            this.gv_remarks.Visible = true;
            this.gv_remarks.VisibleIndex = 13;
            this.gv_remarks.Width = 100;
            // 
            // gv_fcheckBy
@@ -583,7 +577,7 @@
            this.gv_fcheckBy.OptionsColumn.AllowEdit = false;
            this.gv_fcheckBy.Tag = "query_a.fcheck_by";
            this.gv_fcheckBy.Visible = true;
            this.gv_fcheckBy.VisibleIndex = 14;
            this.gv_fcheckBy.VisibleIndex = 11;
            this.gv_fcheckBy.Width = 118;
            // 
            // gv_fcheckDate
@@ -596,7 +590,7 @@
            this.gv_fcheckDate.OptionsColumn.AllowEdit = false;
            this.gv_fcheckDate.Tag = "query_a.fcheck_date";
            this.gv_fcheckDate.Visible = true;
            this.gv_fcheckDate.VisibleIndex = 15;
            this.gv_fcheckDate.VisibleIndex = 12;
            this.gv_fcheckDate.Width = 182;
            // 
            // gv_createBy
@@ -609,7 +603,7 @@
            this.gv_createBy.OptionsColumn.AllowEdit = false;
            this.gv_createBy.Tag = "query_a.create_by";
            this.gv_createBy.Visible = true;
            this.gv_createBy.VisibleIndex = 16;
            this.gv_createBy.VisibleIndex = 13;
            this.gv_createBy.Width = 67;
            // 
            // gridColumn15
@@ -619,7 +613,7 @@
            this.gridColumn15.MinWidth = 25;
            this.gridColumn15.Name = "gridColumn15";
            this.gridColumn15.Visible = true;
            this.gridColumn15.VisibleIndex = 17;
            this.gridColumn15.VisibleIndex = 14;
            this.gridColumn15.Width = 94;
            // 
            // gv_lastupdateBy
@@ -632,7 +626,7 @@
            this.gv_lastupdateBy.OptionsColumn.AllowEdit = false;
            this.gv_lastupdateBy.Tag = "query_a.lastupdate_by";
            this.gv_lastupdateBy.Visible = true;
            this.gv_lastupdateBy.VisibleIndex = 18;
            this.gv_lastupdateBy.VisibleIndex = 15;
            this.gv_lastupdateBy.Width = 60;
            // 
            // gv_lastupdateDate
@@ -645,7 +639,7 @@
            this.gv_lastupdateDate.OptionsColumn.AllowEdit = false;
            this.gv_lastupdateDate.Tag = "query_a.lastupdate_date";
            this.gv_lastupdateDate.Visible = true;
            this.gv_lastupdateDate.VisibleIndex = 19;
            this.gv_lastupdateDate.VisibleIndex = 16;
            this.gv_lastupdateDate.Width = 120;
            // 
            // gridColumn18
@@ -655,7 +649,7 @@
            this.gridColumn18.MinWidth = 25;
            this.gridColumn18.Name = "gridColumn18";
            this.gridColumn18.Visible = true;
            this.gridColumn18.VisibleIndex = 20;
            this.gridColumn18.VisibleIndex = 17;
            this.gridColumn18.Width = 94;
            // 
            // gridColumn19
@@ -665,7 +659,7 @@
            this.gridColumn19.MinWidth = 25;
            this.gridColumn19.Name = "gridColumn19";
            this.gridColumn19.Visible = true;
            this.gridColumn19.VisibleIndex = 21;
            this.gridColumn19.VisibleIndex = 18;
            this.gridColumn19.Width = 94;
            // 
            // gridColumn30
@@ -682,8 +676,6 @@
            this.gridColumn13.FieldName = "daa020";
            this.gridColumn13.MinWidth = 25;
            this.gridColumn13.Name = "gridColumn13";
            this.gridColumn13.Visible = true;
            this.gridColumn13.VisibleIndex = 22;
            this.gridColumn13.Width = 94;
            // 
            // gridColumn17
@@ -732,7 +724,7 @@
            this.gridColumn7.MinWidth = 25;
            this.gridColumn7.Name = "gridColumn7";
            this.gridColumn7.Visible = true;
            this.gridColumn7.VisibleIndex = 23;
            this.gridColumn7.VisibleIndex = 19;
            this.gridColumn7.Width = 94;
            // 
            // pageBar1

 DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs

@@ -30,36 +30,36 @@
        private void InitializeComponent()
        {
            this.components = new System.ComponentModel.Container();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition9 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition10 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition10 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition11 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition12 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition13 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition14 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition11 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition12 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition13 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition14 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition15 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition16 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition15 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition16 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition17 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition17 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition18 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition19 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition20 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition18 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition19 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition20 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject13 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject();
            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -115,6 +115,7 @@
            this.txt_tbl028 = new DevExpress.XtraEditors.TextEdit();
            this.txt_tbl029 = new DevExpress.XtraEditors.TextEdit();
            this.txt_tbl027 = new DevExpress.XtraEditors.CheckEdit();
            this.txt_line = new DevExpress.XtraEditors.TextEdit();
            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -126,7 +127,6 @@
            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -139,9 +139,11 @@
            this.layoutControlItem35 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
            this.lab_daa014 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem34 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem34 = new DevExpress.XtraLayout.LayoutControlItem();
            this.lab_daa014 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem39 = new DevExpress.XtraLayout.LayoutControlItem();
            this.tabMx = new DevExpress.XtraTab.XtraTabControl();
            this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
            this.split99 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -215,6 +217,7 @@
            this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.picCheckBox = new System.Windows.Forms.PictureBox();
            this.tips = new DevExpress.Utils.ToolTipController(this.components);
            this.gridColumn25 = new DevExpress.XtraGrid.Columns.GridColumn();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
            this.xtraTabControl1.SuspendLayout();
            this.xtraTabPage1.SuspendLayout();
@@ -256,6 +259,7 @@
            ((System.ComponentModel.ISupportInitialize)(this.txt_tbl028.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_tbl029.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_tbl027.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_line.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
@@ -267,7 +271,6 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
@@ -280,9 +283,11 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.lab_daa014)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.lab_daa014)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem39)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
            this.tabMx.SuspendLayout();
            this.tabMxPage1.SuspendLayout();
@@ -424,7 +429,8 @@
            this.gridColumn11,
            this.gridColumn12,
            this.gridColumn21,
            this.gridColumn24});
            this.gridColumn24,
            this.gridColumn25});
            this.gridView1.GridControl = this.gcMain1;
            this.gridView1.IndicatorWidth = 50;
            this.gridView1.Name = "gridView1";
@@ -518,7 +524,7 @@
            this.gv_tbl021.OptionsColumn.AllowEdit = false;
            this.gv_tbl021.Tag = "query_a.tbl021";
            this.gv_tbl021.Visible = true;
            this.gv_tbl021.VisibleIndex = 7;
            this.gv_tbl021.VisibleIndex = 8;
            this.gv_tbl021.Width = 94;
            // 
            // gridColumn6
@@ -528,7 +534,7 @@
            this.gridColumn6.MinWidth = 25;
            this.gridColumn6.Name = "gridColumn6";
            this.gridColumn6.Visible = true;
            this.gridColumn6.VisibleIndex = 8;
            this.gridColumn6.VisibleIndex = 9;
            this.gridColumn6.Width = 94;
            // 
            // gridColumn10
@@ -538,7 +544,7 @@
            this.gridColumn10.MinWidth = 25;
            this.gridColumn10.Name = "gridColumn10";
            this.gridColumn10.Visible = true;
            this.gridColumn10.VisibleIndex = 9;
            this.gridColumn10.VisibleIndex = 10;
            this.gridColumn10.Width = 94;
            // 
            // gv_tbl004
@@ -551,7 +557,7 @@
            this.gv_tbl004.OptionsColumn.AllowEdit = false;
            this.gv_tbl004.Tag = "query_a.tbl004";
            this.gv_tbl004.Visible = true;
            this.gv_tbl004.VisibleIndex = 10;
            this.gv_tbl004.VisibleIndex = 11;
            this.gv_tbl004.Width = 94;
            // 
            // gv_tbl005
@@ -564,7 +570,7 @@
            this.gv_tbl005.OptionsColumn.AllowEdit = false;
            this.gv_tbl005.Tag = "query_a.tbl005";
            this.gv_tbl005.Visible = true;
            this.gv_tbl005.VisibleIndex = 11;
            this.gv_tbl005.VisibleIndex = 12;
            this.gv_tbl005.Width = 94;
            // 
            // gv_tbl009
@@ -577,7 +583,7 @@
            this.gv_tbl009.OptionsColumn.AllowEdit = false;
            this.gv_tbl009.Tag = "query_a.tbl009";
            this.gv_tbl009.Visible = true;
            this.gv_tbl009.VisibleIndex = 12;
            this.gv_tbl009.VisibleIndex = 13;
            this.gv_tbl009.Width = 94;
            // 
            // gv_tbl010
@@ -590,7 +596,7 @@
            this.gv_tbl010.OptionsColumn.AllowEdit = false;
            this.gv_tbl010.Tag = "query_a.tbl010";
            this.gv_tbl010.Visible = true;
            this.gv_tbl010.VisibleIndex = 13;
            this.gv_tbl010.VisibleIndex = 14;
            this.gv_tbl010.Width = 94;
            // 
            // gv_tbl011
@@ -603,7 +609,7 @@
            this.gv_tbl011.OptionsColumn.AllowEdit = false;
            this.gv_tbl011.Tag = "query_a.tbl011";
            this.gv_tbl011.Visible = true;
            this.gv_tbl011.VisibleIndex = 14;
            this.gv_tbl011.VisibleIndex = 15;
            this.gv_tbl011.Width = 94;
            // 
            // gv_tbl012
@@ -616,7 +622,7 @@
            this.gv_tbl012.OptionsColumn.AllowEdit = false;
            this.gv_tbl012.Tag = "query_a.tbl012";
            this.gv_tbl012.Visible = true;
            this.gv_tbl012.VisibleIndex = 15;
            this.gv_tbl012.VisibleIndex = 16;
            this.gv_tbl012.Width = 94;
            // 
            // gridColumn11
@@ -634,7 +640,7 @@
            this.gridColumn12.MinWidth = 25;
            this.gridColumn12.Name = "gridColumn12";
            this.gridColumn12.Visible = true;
            this.gridColumn12.VisibleIndex = 16;
            this.gridColumn12.VisibleIndex = 17;
            this.gridColumn12.Width = 94;
            // 
            // gridColumn21
@@ -727,6 +733,7 @@
            this.layoutMx1.Controls.Add(this.txt_tbl028);
            this.layoutMx1.Controls.Add(this.txt_tbl029);
            this.layoutMx1.Controls.Add(this.txt_tbl027);
            this.layoutMx1.Controls.Add(this.txt_line);
            this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
            this.layoutControlItem7,
@@ -764,7 +771,7 @@
            this.txt_tbl023.IsReadly = false;
            this.txt_tbl023.Location = new System.Drawing.Point(114, 43);
            this.txt_tbl023.Name = "txt_tbl023";
            this.txt_tbl023.Size = new System.Drawing.Size(198, 24);
            this.txt_tbl023.Size = new System.Drawing.Size(203, 24);
            this.txt_tbl023.TabIndex = 462;
            // 
            // txt_tbl005
@@ -780,7 +787,7 @@
            "来料不良退料",
            "作业不良退料"});
            this.txt_tbl005.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
            this.txt_tbl005.Size = new System.Drawing.Size(198, 24);
            this.txt_tbl005.Size = new System.Drawing.Size(203, 24);
            this.txt_tbl005.StyleController = this.layoutMx1;
            this.txt_tbl005.TabIndex = 459;
            // 
@@ -789,7 +796,7 @@
            this.txt_tbl006.Location = new System.Drawing.Point(114, 136);
            this.txt_tbl006.Name = "txt_tbl006";
            this.txt_tbl006.Properties.Appearance.Options.UseFont = true;
            this.txt_tbl006.Size = new System.Drawing.Size(198, 24);
            this.txt_tbl006.Size = new System.Drawing.Size(203, 24);
            this.txt_tbl006.StyleController = this.layoutMx1;
            this.txt_tbl006.TabIndex = 226;
            // 
@@ -799,25 +806,25 @@
            this.txt_tbl002.IsReadly = false;
            this.txt_tbl002.Location = new System.Drawing.Point(114, 74);
            this.txt_tbl002.Name = "txt_tbl002";
            this.txt_tbl002.Size = new System.Drawing.Size(198, 24);
            this.txt_tbl002.Size = new System.Drawing.Size(203, 24);
            this.txt_tbl002.TabIndex = 458;
            // 
            // txt_workName
            // 
            this.txt_workName.Location = new System.Drawing.Point(418, 43);
            this.txt_workName.Location = new System.Drawing.Point(423, 43);
            this.txt_workName.Name = "txt_workName";
            this.txt_workName.Properties.Appearance.Options.UseFont = true;
            this.txt_workName.Size = new System.Drawing.Size(198, 24);
            this.txt_workName.Size = new System.Drawing.Size(203, 24);
            this.txt_workName.StyleController = this.layoutMx1;
            this.txt_workName.TabIndex = 298;
            this.txt_workName.Tag = "readonly";
            // 
            // txt_tbl012
            // 
            this.txt_tbl012.Location = new System.Drawing.Point(722, 136);
            this.txt_tbl012.Location = new System.Drawing.Point(732, 136);
            this.txt_tbl012.Name = "txt_tbl012";
            this.txt_tbl012.Properties.Appearance.Options.UseFont = true;
            this.txt_tbl012.Size = new System.Drawing.Size(198, 24);
            this.txt_tbl012.Size = new System.Drawing.Size(203, 24);
            this.txt_tbl012.StyleController = this.layoutMx1;
            this.txt_tbl012.TabIndex = 247;
            this.txt_tbl012.Tag = "readonly";
@@ -827,66 +834,66 @@
            this.txt_billNo.Location = new System.Drawing.Point(114, 12);
            this.txt_billNo.Name = "txt_billNo";
            this.txt_billNo.Properties.Appearance.Options.UseFont = true;
            this.txt_billNo.Size = new System.Drawing.Size(198, 24);
            this.txt_billNo.Size = new System.Drawing.Size(203, 24);
            this.txt_billNo.StyleController = this.layoutMx1;
            this.txt_billNo.TabIndex = 211;
            this.txt_billNo.Tag = "readonly";
            // 
            // txt_rwd
            // 
            this.txt_rwd.Location = new System.Drawing.Point(418, 12);
            this.txt_rwd.Location = new System.Drawing.Point(423, 12);
            this.txt_rwd.Name = "txt_rwd";
            this.txt_rwd.Properties.Appearance.Options.UseFont = true;
            this.txt_rwd.Size = new System.Drawing.Size(198, 24);
            this.txt_rwd.Size = new System.Drawing.Size(203, 24);
            this.txt_rwd.StyleController = this.layoutMx1;
            this.txt_rwd.TabIndex = 217;
            this.txt_rwd.Tag = "readonly";
            // 
            // txt_tbl011
            // 
            this.txt_tbl011.Location = new System.Drawing.Point(722, 105);
            this.txt_tbl011.Location = new System.Drawing.Point(732, 105);
            this.txt_tbl011.Name = "txt_tbl011";
            this.txt_tbl011.Properties.Appearance.Options.UseFont = true;
            this.txt_tbl011.Size = new System.Drawing.Size(198, 24);
            this.txt_tbl011.Size = new System.Drawing.Size(203, 24);
            this.txt_tbl011.StyleController = this.layoutMx1;
            this.txt_tbl011.TabIndex = 243;
            this.txt_tbl011.Tag = "readonly";
            // 
            // txt_itemName
            // 
            this.txt_itemName.Location = new System.Drawing.Point(418, 74);
            this.txt_itemName.Location = new System.Drawing.Point(423, 105);
            this.txt_itemName.Name = "txt_itemName";
            this.txt_itemName.Properties.Appearance.Options.UseFont = true;
            this.txt_itemName.Size = new System.Drawing.Size(198, 24);
            this.txt_itemName.Size = new System.Drawing.Size(203, 24);
            this.txt_itemName.StyleController = this.layoutMx1;
            this.txt_itemName.TabIndex = 219;
            this.txt_itemName.Tag = "readonly";
            // 
            // txt_tbl013
            // 
            this.txt_tbl013.Location = new System.Drawing.Point(620, 167);
            this.txt_tbl013.Location = new System.Drawing.Point(630, 167);
            this.txt_tbl013.Name = "txt_tbl013";
            this.txt_tbl013.Properties.Caption = "审核状态";
            this.txt_tbl013.RightToLeft = System.Windows.Forms.RightToLeft.No;
            this.txt_tbl013.Size = new System.Drawing.Size(300, 24);
            this.txt_tbl013.Size = new System.Drawing.Size(305, 24);
            this.txt_tbl013.StyleController = this.layoutMx1;
            this.txt_tbl013.TabIndex = 463;
            this.txt_tbl013.Tag = "readonly";
            // 
            // txt_tbl009
            // 
            this.txt_tbl009.Location = new System.Drawing.Point(722, 12);
            this.txt_tbl009.Location = new System.Drawing.Point(732, 12);
            this.txt_tbl009.Name = "txt_tbl009";
            this.txt_tbl009.Size = new System.Drawing.Size(198, 24);
            this.txt_tbl009.Size = new System.Drawing.Size(203, 24);
            this.txt_tbl009.StyleController = this.layoutMx1;
            this.txt_tbl009.TabIndex = 464;
            this.txt_tbl009.Tag = "readonly";
            // 
            // txt_tbl010
            // 
            this.txt_tbl010.Location = new System.Drawing.Point(722, 43);
            this.txt_tbl010.Location = new System.Drawing.Point(732, 43);
            this.txt_tbl010.Name = "txt_tbl010";
            this.txt_tbl010.Size = new System.Drawing.Size(198, 24);
            this.txt_tbl010.Size = new System.Drawing.Size(203, 24);
            this.txt_tbl010.StyleController = this.layoutMx1;
            this.txt_tbl010.TabIndex = 465;
            this.txt_tbl010.Tag = "readonly";
@@ -903,9 +910,9 @@
            // 
            // txt_itemNo
            // 
            this.txt_itemNo.Location = new System.Drawing.Point(722, 74);
            this.txt_itemNo.Location = new System.Drawing.Point(732, 74);
            this.txt_itemNo.Name = "txt_itemNo";
            this.txt_itemNo.Size = new System.Drawing.Size(198, 24);
            this.txt_itemNo.Size = new System.Drawing.Size(203, 24);
            this.txt_itemNo.StyleController = this.layoutMx1;
            this.txt_itemNo.TabIndex = 467;
            this.txt_itemNo.Tag = "readonly";
@@ -921,79 +928,88 @@
            // 
            // txt_daa014
            // 
            this.txt_daa014.Location = new System.Drawing.Point(418, 105);
            this.txt_daa014.Location = new System.Drawing.Point(423, 136);
            this.txt_daa014.Name = "txt_daa014";
            this.txt_daa014.Size = new System.Drawing.Size(198, 24);
            this.txt_daa014.Size = new System.Drawing.Size(203, 24);
            this.txt_daa014.StyleController = this.layoutMx1;
            this.txt_daa014.TabIndex = 469;
            this.txt_daa014.Tag = "readonly";
            // 
            // txt_tbl026
            // 
            this.txt_tbl026.Location = new System.Drawing.Point(1026, 105);
            this.txt_tbl026.Location = new System.Drawing.Point(1041, 105);
            this.txt_tbl026.Name = "txt_tbl026";
            this.txt_tbl026.Size = new System.Drawing.Size(199, 24);
            this.txt_tbl026.Size = new System.Drawing.Size(205, 24);
            this.txt_tbl026.StyleController = this.layoutMx1;
            this.txt_tbl026.TabIndex = 470;
            this.txt_tbl026.Tag = "readonly";
            // 
            // txt_tbl025
            // 
            this.txt_tbl025.Location = new System.Drawing.Point(1026, 136);
            this.txt_tbl025.Location = new System.Drawing.Point(1041, 136);
            this.txt_tbl025.Name = "txt_tbl025";
            this.txt_tbl025.Size = new System.Drawing.Size(199, 24);
            this.txt_tbl025.Size = new System.Drawing.Size(205, 24);
            this.txt_tbl025.StyleController = this.layoutMx1;
            this.txt_tbl025.TabIndex = 471;
            this.txt_tbl025.Tag = "readonly";
            // 
            // txt_chkOut
            // 
            this.txt_chkOut.Location = new System.Drawing.Point(316, 136);
            this.txt_chkOut.Location = new System.Drawing.Point(321, 167);
            this.txt_chkOut.Name = "txt_chkOut";
            this.txt_chkOut.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
            this.txt_chkOut.Properties.Appearance.Options.UseForeColor = true;
            this.txt_chkOut.Properties.Caption = "是否自动生成补料单";
            this.txt_chkOut.Size = new System.Drawing.Size(300, 24);
            this.txt_chkOut.Size = new System.Drawing.Size(305, 24);
            this.txt_chkOut.StyleController = this.layoutMx1;
            this.txt_chkOut.TabIndex = 472;
            // 
            // checkEdit1
            // 
            this.checkEdit1.Location = new System.Drawing.Point(924, 167);
            this.checkEdit1.Location = new System.Drawing.Point(939, 167);
            this.checkEdit1.Name = "checkEdit1";
            this.checkEdit1.Properties.Caption = "批准状态";
            this.checkEdit1.Size = new System.Drawing.Size(301, 24);
            this.checkEdit1.Size = new System.Drawing.Size(307, 24);
            this.checkEdit1.StyleController = this.layoutMx1;
            this.checkEdit1.TabIndex = 473;
            this.checkEdit1.Tag = "readonly";
            // 
            // txt_tbl028
            // 
            this.txt_tbl028.Location = new System.Drawing.Point(1026, 43);
            this.txt_tbl028.Location = new System.Drawing.Point(1041, 43);
            this.txt_tbl028.Name = "txt_tbl028";
            this.txt_tbl028.Size = new System.Drawing.Size(199, 24);
            this.txt_tbl028.Size = new System.Drawing.Size(205, 24);
            this.txt_tbl028.StyleController = this.layoutMx1;
            this.txt_tbl028.TabIndex = 475;
            this.txt_tbl028.Tag = "readonly";
            // 
            // txt_tbl029
            // 
            this.txt_tbl029.Location = new System.Drawing.Point(1026, 12);
            this.txt_tbl029.Location = new System.Drawing.Point(1041, 12);
            this.txt_tbl029.Name = "txt_tbl029";
            this.txt_tbl029.Size = new System.Drawing.Size(199, 24);
            this.txt_tbl029.Size = new System.Drawing.Size(205, 24);
            this.txt_tbl029.StyleController = this.layoutMx1;
            this.txt_tbl029.TabIndex = 476;
            this.txt_tbl029.Tag = "readonly";
            // 
            // txt_tbl027
            // 
            this.txt_tbl027.Location = new System.Drawing.Point(924, 74);
            this.txt_tbl027.Location = new System.Drawing.Point(939, 74);
            this.txt_tbl027.Name = "txt_tbl027";
            this.txt_tbl027.Properties.Caption = "品质审核状态";
            this.txt_tbl027.Size = new System.Drawing.Size(301, 24);
            this.txt_tbl027.Size = new System.Drawing.Size(307, 24);
            this.txt_tbl027.StyleController = this.layoutMx1;
            this.txt_tbl027.TabIndex = 477;
            this.txt_tbl027.Tag = "readonly";
            // 
            // txt_line
            // 
            this.txt_line.Location = new System.Drawing.Point(423, 74);
            this.txt_line.Name = "txt_line";
            this.txt_line.Size = new System.Drawing.Size(203, 24);
            this.txt_line.StyleController = this.layoutMx1;
            this.txt_line.TabIndex = 478;
            this.txt_line.Tag = "readonly";
            // 
            // layoutControlItem7
            // 
@@ -1042,7 +1058,6 @@
            this.layoutControlItem3,
            this.layoutControlItem18,
            this.layoutControlItem1,
            this.layoutControlItem8,
            this.layoutControlItem6,
            this.layoutControlItem2,
            this.layoutControlItem9,
@@ -1055,64 +1070,66 @@
            this.layoutControlItem35,
            this.layoutControlItem20,
            this.layoutControlItem19,
            this.lab_daa014,
            this.layoutControlItem15,
            this.layoutControlItem34,
            this.layoutControlItem15});
            this.lab_daa014,
            this.layoutControlItem8,
            this.layoutControlItem39});
            this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
            this.Root.Name = "Root";
            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition1.Width = 100D;
            columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition2.Width = 100D;
            columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition3.Width = 100D;
            columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition4.Width = 100D;
            columnDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition11.Width = 100D;
            columnDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition12.Width = 100D;
            columnDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition13.Width = 100D;
            columnDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition14.Width = 100D;
            this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
            columnDefinition1,
            columnDefinition2,
            columnDefinition3,
            columnDefinition4});
            rowDefinition1.Height = 100D;
            rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition2.Height = 100D;
            rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition3.Height = 100D;
            rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition4.Height = 100D;
            rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition5.Height = 100D;
            rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition6.Height = 100D;
            rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition11,
            columnDefinition12,
            columnDefinition13,
            columnDefinition14});
            rowDefinition11.Height = 100D;
            rowDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition12.Height = 100D;
            rowDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition13.Height = 100D;
            rowDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition14.Height = 100D;
            rowDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition15.Height = 100D;
            rowDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition16.Height = 100D;
            rowDefinition16.SizeType = System.Windows.Forms.SizeType.Percent;
            this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
            rowDefinition1,
            rowDefinition2,
            rowDefinition3,
            rowDefinition4,
            rowDefinition5,
            rowDefinition6});
            this.Root.Size = new System.Drawing.Size(1237, 206);
            rowDefinition11,
            rowDefinition12,
            rowDefinition13,
            rowDefinition14,
            rowDefinition15,
            rowDefinition16});
            this.Root.Size = new System.Drawing.Size(1258, 206);
            this.Root.TextVisible = false;
            // 
            // layoutControlItem12
            // 
            this.layoutControlItem12.Control = this.txt_tbl009;
            this.layoutControlItem12.Location = new System.Drawing.Point(608, 0);
            this.layoutControlItem12.Location = new System.Drawing.Point(618, 0);
            this.layoutControlItem12.Name = "layoutControlItem12";
            this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem12.Size = new System.Drawing.Size(304, 31);
            this.layoutControlItem12.Size = new System.Drawing.Size(309, 31);
            this.layoutControlItem12.Text = "制单人员";
            this.layoutControlItem12.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem13
            // 
            this.layoutControlItem13.Control = this.txt_tbl010;
            this.layoutControlItem13.Location = new System.Drawing.Point(608, 31);
            this.layoutControlItem13.Location = new System.Drawing.Point(618, 31);
            this.layoutControlItem13.Name = "layoutControlItem13";
            this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem13.Size = new System.Drawing.Size(304, 31);
            this.layoutControlItem13.Size = new System.Drawing.Size(309, 31);
            this.layoutControlItem13.Text = "制单时间";
            this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);
            // 
@@ -1122,7 +1139,7 @@
            this.layoutControlItem5.Location = new System.Drawing.Point(0, 93);
            this.layoutControlItem5.Name = "layoutControlItem5";
            this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem5.Size = new System.Drawing.Size(304, 31);
            this.layoutControlItem5.Size = new System.Drawing.Size(309, 31);
            this.layoutControlItem5.Text = "退料类型";
            this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18);
            // 
@@ -1132,7 +1149,7 @@
            this.layoutControlItem4.Location = new System.Drawing.Point(0, 62);
            this.layoutControlItem4.Name = "layoutControlItem4";
            this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem4.Size = new System.Drawing.Size(304, 31);
            this.layoutControlItem4.Size = new System.Drawing.Size(309, 31);
            this.layoutControlItem4.Text = "生产工单";
            this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18);
            // 
@@ -1142,18 +1159,18 @@
            this.layoutControlItem3.Location = new System.Drawing.Point(0, 31);
            this.layoutControlItem3.Name = "layoutControlItem3";
            this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem3.Size = new System.Drawing.Size(304, 31);
            this.layoutControlItem3.Size = new System.Drawing.Size(309, 31);
            this.layoutControlItem3.Text = "生产组织";
            this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem18
            // 
            this.layoutControlItem18.Control = this.txt_itemNo;
            this.layoutControlItem18.Location = new System.Drawing.Point(608, 62);
            this.layoutControlItem18.Location = new System.Drawing.Point(618, 62);
            this.layoutControlItem18.Name = "layoutControlItem18";
            this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem18.Size = new System.Drawing.Size(304, 31);
            this.layoutControlItem18.Size = new System.Drawing.Size(309, 31);
            this.layoutControlItem18.Text = "产品编号";
            this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 18);
            // 
@@ -1162,72 +1179,61 @@
            this.layoutControlItem1.Control = this.txt_billNo;
            this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
            this.layoutControlItem1.Name = "layoutControlItem1";
            this.layoutControlItem1.Size = new System.Drawing.Size(304, 31);
            this.layoutControlItem1.Size = new System.Drawing.Size(309, 31);
            this.layoutControlItem1.Text = "申请单号";
            this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem8
            // 
            this.layoutControlItem8.Control = this.txt_itemName;
            this.layoutControlItem8.Location = new System.Drawing.Point(304, 62);
            this.layoutControlItem8.Name = "layoutControlItem8";
            this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem8.Size = new System.Drawing.Size(304, 31);
            this.layoutControlItem8.Text = "产品名称";
            this.layoutControlItem8.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem6
            // 
            this.layoutControlItem6.Control = this.txt_workName;
            this.layoutControlItem6.Location = new System.Drawing.Point(304, 31);
            this.layoutControlItem6.Location = new System.Drawing.Point(309, 31);
            this.layoutControlItem6.Name = "layoutControlItem6";
            this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem6.Size = new System.Drawing.Size(304, 31);
            this.layoutControlItem6.Size = new System.Drawing.Size(309, 31);
            this.layoutControlItem6.Text = "生产车间";
            this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem2
            // 
            this.layoutControlItem2.Control = this.txt_rwd;
            this.layoutControlItem2.Location = new System.Drawing.Point(304, 0);
            this.layoutControlItem2.Location = new System.Drawing.Point(309, 0);
            this.layoutControlItem2.Name = "layoutControlItem2";
            this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem2.Size = new System.Drawing.Size(304, 31);
            this.layoutControlItem2.Size = new System.Drawing.Size(309, 31);
            this.layoutControlItem2.Text = "任务单号";
            this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem9
            // 
            this.layoutControlItem9.Control = this.txt_tbl011;
            this.layoutControlItem9.Location = new System.Drawing.Point(608, 93);
            this.layoutControlItem9.Location = new System.Drawing.Point(618, 93);
            this.layoutControlItem9.Name = "layoutControlItem9";
            this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem9.Size = new System.Drawing.Size(304, 31);
            this.layoutControlItem9.Size = new System.Drawing.Size(309, 31);
            this.layoutControlItem9.Text = "制单审核人员";
            this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem10
            // 
            this.layoutControlItem10.Control = this.txt_tbl012;
            this.layoutControlItem10.Location = new System.Drawing.Point(608, 124);
            this.layoutControlItem10.Location = new System.Drawing.Point(618, 124);
            this.layoutControlItem10.Name = "layoutControlItem10";
            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 4;
            this.layoutControlItem10.Size = new System.Drawing.Size(304, 31);
            this.layoutControlItem10.Size = new System.Drawing.Size(309, 31);
            this.layoutControlItem10.Text = "制单审核时间";
            this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem11
            // 
            this.layoutControlItem11.Control = this.txt_tbl013;
            this.layoutControlItem11.Location = new System.Drawing.Point(608, 155);
            this.layoutControlItem11.Location = new System.Drawing.Point(618, 155);
            this.layoutControlItem11.Name = "layoutControlItem11";
            this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 5;
            this.layoutControlItem11.Size = new System.Drawing.Size(304, 31);
            this.layoutControlItem11.Size = new System.Drawing.Size(309, 31);
            this.layoutControlItem11.Text = "审核状态";
            this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem11.TextVisible = false;
@@ -1240,7 +1246,7 @@
            this.layoutControlItem16.MinSize = new System.Drawing.Size(30, 31);
            this.layoutControlItem16.Name = "layoutControlItem16";
            this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 5;
            this.layoutControlItem16.Size = new System.Drawing.Size(304, 31);
            this.layoutControlItem16.Size = new System.Drawing.Size(309, 31);
            this.layoutControlItem16.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
            this.layoutControlItem16.Text = "选取物料";
            this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
@@ -1249,89 +1255,67 @@
            // layoutControlItem36
            // 
            this.layoutControlItem36.Control = this.txt_tbl029;
            this.layoutControlItem36.Location = new System.Drawing.Point(912, 0);
            this.layoutControlItem36.Location = new System.Drawing.Point(927, 0);
            this.layoutControlItem36.Name = "layoutControlItem36";
            this.layoutControlItem36.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem36.Size = new System.Drawing.Size(305, 31);
            this.layoutControlItem36.Size = new System.Drawing.Size(311, 31);
            this.layoutControlItem36.Text = "品质审核人员";
            this.layoutControlItem36.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem37
            // 
            this.layoutControlItem37.Control = this.txt_tbl028;
            this.layoutControlItem37.Location = new System.Drawing.Point(912, 31);
            this.layoutControlItem37.Location = new System.Drawing.Point(927, 31);
            this.layoutControlItem37.Name = "layoutControlItem37";
            this.layoutControlItem37.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem37.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem37.Size = new System.Drawing.Size(305, 31);
            this.layoutControlItem37.Size = new System.Drawing.Size(311, 31);
            this.layoutControlItem37.Text = "品质审核时间";
            this.layoutControlItem37.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem38
            // 
            this.layoutControlItem38.Control = this.txt_tbl027;
            this.layoutControlItem38.Location = new System.Drawing.Point(912, 62);
            this.layoutControlItem38.Location = new System.Drawing.Point(927, 62);
            this.layoutControlItem38.Name = "layoutControlItem38";
            this.layoutControlItem38.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem38.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem38.Size = new System.Drawing.Size(305, 31);
            this.layoutControlItem38.Size = new System.Drawing.Size(311, 31);
            this.layoutControlItem38.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem38.TextVisible = false;
            // 
            // layoutControlItem35
            // 
            this.layoutControlItem35.Control = this.checkEdit1;
            this.layoutControlItem35.Location = new System.Drawing.Point(912, 155);
            this.layoutControlItem35.Location = new System.Drawing.Point(927, 155);
            this.layoutControlItem35.Name = "layoutControlItem35";
            this.layoutControlItem35.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem35.OptionsTableLayoutItem.RowIndex = 5;
            this.layoutControlItem35.Size = new System.Drawing.Size(305, 31);
            this.layoutControlItem35.Size = new System.Drawing.Size(311, 31);
            this.layoutControlItem35.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem35.TextVisible = false;
            // 
            // layoutControlItem20
            // 
            this.layoutControlItem20.Control = this.txt_tbl025;
            this.layoutControlItem20.Location = new System.Drawing.Point(912, 124);
            this.layoutControlItem20.Location = new System.Drawing.Point(927, 124);
            this.layoutControlItem20.Name = "layoutControlItem20";
            this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 4;
            this.layoutControlItem20.Size = new System.Drawing.Size(305, 31);
            this.layoutControlItem20.Size = new System.Drawing.Size(311, 31);
            this.layoutControlItem20.Text = "批准时间";
            this.layoutControlItem20.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem19
            // 
            this.layoutControlItem19.Control = this.txt_tbl026;
            this.layoutControlItem19.Location = new System.Drawing.Point(912, 93);
            this.layoutControlItem19.Location = new System.Drawing.Point(927, 93);
            this.layoutControlItem19.Name = "layoutControlItem19";
            this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem19.Size = new System.Drawing.Size(305, 31);
            this.layoutControlItem19.Size = new System.Drawing.Size(311, 31);
            this.layoutControlItem19.Text = "批准人员";
            this.layoutControlItem19.TextSize = new System.Drawing.Size(90, 18);
            // 
            // lab_daa014
            // 
            this.lab_daa014.Control = this.txt_daa014;
            this.lab_daa014.Location = new System.Drawing.Point(304, 93);
            this.lab_daa014.Name = "lab_daa014";
            this.lab_daa014.OptionsTableLayoutItem.ColumnIndex = 1;
            this.lab_daa014.OptionsTableLayoutItem.RowIndex = 3;
            this.lab_daa014.Size = new System.Drawing.Size(304, 31);
            this.lab_daa014.Text = "投料单号";
            this.lab_daa014.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem34
            // 
            this.layoutControlItem34.Control = this.txt_chkOut;
            this.layoutControlItem34.Location = new System.Drawing.Point(304, 124);
            this.layoutControlItem34.Name = "layoutControlItem34";
            this.layoutControlItem34.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem34.OptionsTableLayoutItem.RowIndex = 4;
            this.layoutControlItem34.Size = new System.Drawing.Size(304, 31);
            this.layoutControlItem34.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem34.TextVisible = false;
            // 
            // layoutControlItem15
            // 
@@ -1339,9 +1323,53 @@
            this.layoutControlItem15.Location = new System.Drawing.Point(0, 124);
            this.layoutControlItem15.Name = "layoutControlItem15";
            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 4;
            this.layoutControlItem15.Size = new System.Drawing.Size(304, 31);
            this.layoutControlItem15.Size = new System.Drawing.Size(309, 31);
            this.layoutControlItem15.Text = "备注说明";
            this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem34
            // 
            this.layoutControlItem34.Control = this.txt_chkOut;
            this.layoutControlItem34.Location = new System.Drawing.Point(309, 155);
            this.layoutControlItem34.Name = "layoutControlItem34";
            this.layoutControlItem34.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem34.OptionsTableLayoutItem.RowIndex = 5;
            this.layoutControlItem34.Size = new System.Drawing.Size(309, 31);
            this.layoutControlItem34.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem34.TextVisible = false;
            // 
            // lab_daa014
            // 
            this.lab_daa014.Control = this.txt_daa014;
            this.lab_daa014.Location = new System.Drawing.Point(309, 124);
            this.lab_daa014.Name = "lab_daa014";
            this.lab_daa014.OptionsTableLayoutItem.ColumnIndex = 1;
            this.lab_daa014.OptionsTableLayoutItem.RowIndex = 4;
            this.lab_daa014.Size = new System.Drawing.Size(309, 31);
            this.lab_daa014.Text = "投料单号";
            this.lab_daa014.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem8
            // 
            this.layoutControlItem8.Control = this.txt_itemName;
            this.layoutControlItem8.Location = new System.Drawing.Point(309, 93);
            this.layoutControlItem8.Name = "layoutControlItem8";
            this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem8.Size = new System.Drawing.Size(309, 31);
            this.layoutControlItem8.Text = "产品名称";
            this.layoutControlItem8.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem39
            // 
            this.layoutControlItem39.Control = this.txt_line;
            this.layoutControlItem39.Location = new System.Drawing.Point(309, 62);
            this.layoutControlItem39.Name = "layoutControlItem39";
            this.layoutControlItem39.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem39.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem39.Size = new System.Drawing.Size(309, 31);
            this.layoutControlItem39.Text = "生产线别";
            this.layoutControlItem39.TextSize = new System.Drawing.Size(90, 18);
            // 
            // tabMx
            // 
@@ -1420,11 +1448,11 @@
            // 
            this.ucBtnPrint1.allClickKey = null;
            this.ucBtnPrint1.guidKey = null;
            this.ucBtnPrint1.Location = new System.Drawing.Point(1032, 48);
            this.ucBtnPrint1.Location = new System.Drawing.Point(1032, 51);
            this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);
            this.ucBtnPrint1.Name = "ucBtnPrint1";
            this.ucBtnPrint1.rptParameter = null;
            this.ucBtnPrint1.Size = new System.Drawing.Size(336, 32);
            this.ucBtnPrint1.Size = new System.Drawing.Size(336, 35);
            this.ucBtnPrint1.TabIndex = 478;
            // 
            // radOut
@@ -1438,7 +1466,7 @@
            new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "只打整张"),
            new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "手动打")});
            this.radOut.Properties.Padding = new System.Windows.Forms.Padding(0);
            this.radOut.Size = new System.Drawing.Size(336, 32);
            this.radOut.Size = new System.Drawing.Size(336, 35);
            this.radOut.StyleController = this.lay99;
            this.radOut.TabIndex = 477;
            // 
@@ -1446,11 +1474,11 @@
            // 
            this.dataLayoutControl1.Controls.Add(this.txt_iCount_1);
            this.dataLayoutControl1.Controls.Add(this.txt_yuliang_1);
            this.dataLayoutControl1.Location = new System.Drawing.Point(692, 84);
            this.dataLayoutControl1.Location = new System.Drawing.Point(692, 90);
            this.dataLayoutControl1.Name = "dataLayoutControl1";
            this.dataLayoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1108, 186, 812, 500);
            this.dataLayoutControl1.Root = this.layoutControlGroup2;
            this.dataLayoutControl1.Size = new System.Drawing.Size(336, 32);
            this.dataLayoutControl1.Size = new System.Drawing.Size(336, 36);
            this.dataLayoutControl1.TabIndex = 227;
            this.dataLayoutControl1.Text = "dataLayoutControl1";
            // 
@@ -1482,19 +1510,19 @@
            this.layoutControlItem29});
            this.layoutControlGroup2.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
            this.layoutControlGroup2.Name = "Root";
            columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition5.Width = 100D;
            columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition6.Width = 100D;
            columnDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition15.Width = 100D;
            columnDefinition16.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition16.Width = 100D;
            this.layoutControlGroup2.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
            columnDefinition5,
            columnDefinition6});
            rowDefinition7.Height = 100D;
            rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition15,
            columnDefinition16});
            rowDefinition17.Height = 100D;
            rowDefinition17.SizeType = System.Windows.Forms.SizeType.Percent;
            this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
            rowDefinition7});
            rowDefinition17});
            this.layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
            this.layoutControlGroup2.Size = new System.Drawing.Size(336, 32);
            this.layoutControlGroup2.Size = new System.Drawing.Size(336, 36);
            this.layoutControlGroup2.TextVisible = false;
            // 
            // layoutControlItem30
@@ -1505,7 +1533,7 @@
            this.layoutControlItem30.Location = new System.Drawing.Point(168, 0);
            this.layoutControlItem30.Name = "layoutControlItem30";
            this.layoutControlItem30.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem30.Size = new System.Drawing.Size(168, 32);
            this.layoutControlItem30.Size = new System.Drawing.Size(168, 36);
            this.layoutControlItem30.Text = "打印余数";
            this.layoutControlItem30.TextSize = new System.Drawing.Size(90, 18);
            // 
@@ -1516,7 +1544,7 @@
            this.layoutControlItem29.CustomizationFormText = "打印整张数值";
            this.layoutControlItem29.Location = new System.Drawing.Point(0, 0);
            this.layoutControlItem29.Name = "layoutControlItem29";
            this.layoutControlItem29.Size = new System.Drawing.Size(168, 32);
            this.layoutControlItem29.Size = new System.Drawing.Size(168, 36);
            this.layoutControlItem29.Text = "打印整张数值";
            this.layoutControlItem29.TextSize = new System.Drawing.Size(90, 18);
            // 
@@ -1554,7 +1582,7 @@
            // 
            // txtWlmc
            // 
            this.txtWlmc.Location = new System.Drawing.Point(114, 48);
            this.txtWlmc.Location = new System.Drawing.Point(114, 51);
            this.txtWlmc.Name = "txtWlmc";
            this.txtWlmc.Properties.Appearance.Options.UseFont = true;
            this.txtWlmc.Properties.ReadOnly = true;
@@ -1564,7 +1592,7 @@
            // 
            // txt_yQty
            // 
            this.txt_yQty.Location = new System.Drawing.Point(454, 48);
            this.txt_yQty.Location = new System.Drawing.Point(454, 51);
            this.txt_yQty.Name = "txt_yQty";
            this.txt_yQty.Properties.Appearance.Options.UseFont = true;
            this.txt_yQty.Properties.ReadOnly = true;
@@ -1574,7 +1602,7 @@
            // 
            // txt_psnQty_1
            // 
            this.txt_psnQty_1.Location = new System.Drawing.Point(794, 48);
            this.txt_psnQty_1.Location = new System.Drawing.Point(794, 51);
            this.txt_psnQty_1.Name = "txt_psnQty_1";
            this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true;
            this.txt_psnQty_1.Size = new System.Drawing.Size(234, 24);
@@ -1583,7 +1611,7 @@
            // 
            // txtWlgg
            // 
            this.txtWlgg.Location = new System.Drawing.Point(114, 84);
            this.txtWlgg.Location = new System.Drawing.Point(114, 90);
            this.txtWlgg.Name = "txtWlgg";
            this.txtWlgg.Properties.Appearance.Options.UseFont = true;
            this.txtWlgg.Properties.ReadOnly = true;
@@ -1620,30 +1648,30 @@
            this.layoutControlItem32});
            this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
            this.layoutControlGroup1.Name = "Root";
            columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition7.Width = 100D;
            columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition8.Width = 100D;
            columnDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition9.Width = 100D;
            columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition10.Width = 100D;
            columnDefinition17.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition17.Width = 100D;
            columnDefinition18.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition18.Width = 100D;
            columnDefinition19.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition19.Width = 100D;
            columnDefinition20.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition20.Width = 100D;
            this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
            columnDefinition7,
            columnDefinition8,
            columnDefinition9,
            columnDefinition10});
            rowDefinition8.Height = 100D;
            rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition9.Height = 100D;
            rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition10.Height = 100D;
            rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition17,
            columnDefinition18,
            columnDefinition19,
            columnDefinition20});
            rowDefinition18.Height = 100D;
            rowDefinition18.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition19.Height = 100D;
            rowDefinition19.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition20.Height = 100D;
            rowDefinition20.SizeType = System.Windows.Forms.SizeType.Percent;
            this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
            rowDefinition8,
            rowDefinition9,
            rowDefinition10});
            this.layoutControlGroup1.Size = new System.Drawing.Size(1380, 128);
            rowDefinition18,
            rowDefinition19,
            rowDefinition20});
            this.layoutControlGroup1.Size = new System.Drawing.Size(1380, 138);
            this.layoutControlGroup1.TextVisible = false;
            // 
            // layoutControlItem22
@@ -1654,7 +1682,7 @@
            this.layoutControlItem22.Location = new System.Drawing.Point(340, 0);
            this.layoutControlItem22.Name = "layoutControlItem22";
            this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem22.Size = new System.Drawing.Size(340, 36);
            this.layoutControlItem22.Size = new System.Drawing.Size(340, 39);
            this.layoutControlItem22.Text = "本次申请总量";
            this.layoutControlItem22.TextSize = new System.Drawing.Size(90, 18);
            // 
@@ -1666,7 +1694,7 @@
            this.layoutControlItem23.Location = new System.Drawing.Point(680, 0);
            this.layoutControlItem23.Name = "layoutControlItem23";
            this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem23.Size = new System.Drawing.Size(340, 36);
            this.layoutControlItem23.Size = new System.Drawing.Size(340, 39);
            this.layoutControlItem23.Text = "可打印总数";
            this.layoutControlItem23.TextSize = new System.Drawing.Size(90, 18);
            // 
@@ -1675,11 +1703,11 @@
            this.layoutControlItem27.Control = this.txtWlgg;
            this.layoutControlItem27.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
            this.layoutControlItem27.CustomizationFormText = "物料规格";
            this.layoutControlItem27.Location = new System.Drawing.Point(0, 72);
            this.layoutControlItem27.Location = new System.Drawing.Point(0, 78);
            this.layoutControlItem27.Name = "layoutControlItem27";
            this.layoutControlItem27.OptionsTableLayoutItem.ColumnSpan = 2;
            this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem27.Size = new System.Drawing.Size(680, 36);
            this.layoutControlItem27.Size = new System.Drawing.Size(680, 40);
            this.layoutControlItem27.Text = "物料规格";
            this.layoutControlItem27.TextSize = new System.Drawing.Size(90, 18);
            // 
@@ -1688,10 +1716,10 @@
            this.layoutControlItem24.Control = this.txtWlmc;
            this.layoutControlItem24.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
            this.layoutControlItem24.CustomizationFormText = "物料名称";
            this.layoutControlItem24.Location = new System.Drawing.Point(0, 36);
            this.layoutControlItem24.Location = new System.Drawing.Point(0, 39);
            this.layoutControlItem24.Name = "layoutControlItem24";
            this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem24.Size = new System.Drawing.Size(340, 36);
            this.layoutControlItem24.Size = new System.Drawing.Size(340, 39);
            this.layoutControlItem24.Text = "物料名称";
            this.layoutControlItem24.TextSize = new System.Drawing.Size(90, 18);
            // 
@@ -1700,11 +1728,11 @@
            this.layoutControlItem25.Control = this.txt_yQty;
            this.layoutControlItem25.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
            this.layoutControlItem25.CustomizationFormText = "已打印总量";
            this.layoutControlItem25.Location = new System.Drawing.Point(340, 36);
            this.layoutControlItem25.Location = new System.Drawing.Point(340, 39);
            this.layoutControlItem25.Name = "layoutControlItem25";
            this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem25.Size = new System.Drawing.Size(340, 36);
            this.layoutControlItem25.Size = new System.Drawing.Size(340, 39);
            this.layoutControlItem25.Text = "已打印总量";
            this.layoutControlItem25.TextSize = new System.Drawing.Size(90, 18);
            // 
@@ -1713,22 +1741,22 @@
            this.layoutControlItem26.Control = this.txt_psnQty_1;
            this.layoutControlItem26.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
            this.layoutControlItem26.CustomizationFormText = "每张条码数量";
            this.layoutControlItem26.Location = new System.Drawing.Point(680, 36);
            this.layoutControlItem26.Location = new System.Drawing.Point(680, 39);
            this.layoutControlItem26.Name = "layoutControlItem26";
            this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem26.Size = new System.Drawing.Size(340, 36);
            this.layoutControlItem26.Size = new System.Drawing.Size(340, 39);
            this.layoutControlItem26.Text = "每张条码数量";
            this.layoutControlItem26.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem28
            // 
            this.layoutControlItem28.Control = this.dataLayoutControl1;
            this.layoutControlItem28.Location = new System.Drawing.Point(680, 72);
            this.layoutControlItem28.Location = new System.Drawing.Point(680, 78);
            this.layoutControlItem28.Name = "layoutControlItem28";
            this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem28.Size = new System.Drawing.Size(340, 36);
            this.layoutControlItem28.Size = new System.Drawing.Size(340, 40);
            this.layoutControlItem28.Text = "打印张数";
            this.layoutControlItem28.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem28.TextVisible = false;
@@ -1739,7 +1767,7 @@
            this.layoutControlItem31.Location = new System.Drawing.Point(1020, 0);
            this.layoutControlItem31.Name = "layoutControlItem31";
            this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem31.Size = new System.Drawing.Size(340, 36);
            this.layoutControlItem31.Size = new System.Drawing.Size(340, 39);
            this.layoutControlItem31.Text = "自动计算";
            this.layoutControlItem31.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem31.TextVisible = false;
@@ -1751,18 +1779,18 @@
            this.layoutControlItem21.CustomizationFormText = "物料编码";
            this.layoutControlItem21.Location = new System.Drawing.Point(0, 0);
            this.layoutControlItem21.Name = "layoutControlItem21";
            this.layoutControlItem21.Size = new System.Drawing.Size(340, 36);
            this.layoutControlItem21.Size = new System.Drawing.Size(340, 39);
            this.layoutControlItem21.Text = "物料编码";
            this.layoutControlItem21.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem32
            // 
            this.layoutControlItem32.Control = this.ucBtnPrint1;
            this.layoutControlItem32.Location = new System.Drawing.Point(1020, 36);
            this.layoutControlItem32.Location = new System.Drawing.Point(1020, 39);
            this.layoutControlItem32.Name = "layoutControlItem32";
            this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem32.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem32.Size = new System.Drawing.Size(340, 36);
            this.layoutControlItem32.Size = new System.Drawing.Size(340, 39);
            this.layoutControlItem32.Text = "打印按钮";
            this.layoutControlItem32.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem32.TextVisible = false;
@@ -1969,10 +1997,10 @@
            // repositoryItemButtonEdit1
            // 
            this.repositoryItemButtonEdit1.AutoHeight = false;
            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "移出", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "移出", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
            this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -2011,9 +2039,9 @@
            // rptBl
            // 
            this.rptBl.AutoHeight = false;
            editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
            editorButtonImageOptions4.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
            this.rptBl.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            this.rptBl.Name = "rptBl";
            this.rptBl.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptBl_ButtonClick);
            // 
@@ -2249,6 +2277,16 @@
            this.picCheckBox.TabStop = false;
            this.picCheckBox.Visible = false;
            // 
            // gridColumn25
            // 
            this.gridColumn25.Caption = "生产线别";
            this.gridColumn25.FieldName = "lineName";
            this.gridColumn25.MinWidth = 25;
            this.gridColumn25.Name = "gridColumn25";
            this.gridColumn25.Visible = true;
            this.gridColumn25.VisibleIndex = 7;
            this.gridColumn25.Width = 94;
            // 
            // Frm_MesItemTbl
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -2300,6 +2338,7 @@
            ((System.ComponentModel.ISupportInitialize)(this.txt_tbl028.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_tbl029.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_tbl027.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_line.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
@@ -2311,7 +2350,6 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
@@ -2324,9 +2362,11 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.lab_daa014)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.lab_daa014)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem39)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
            this.tabMx.ResumeLayout(false);
            this.tabMxPage1.ResumeLayout(false);
@@ -2472,7 +2512,6 @@
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptBl;
@@ -2528,9 +2567,13 @@
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem35;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
        private DevExpress.XtraLayout.LayoutControlItem lab_daa014;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem34;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn24;
        private DevExpress.XtraEditors.TextEdit txt_line;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem34;
        private DevExpress.XtraLayout.LayoutControlItem lab_daa014;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem39;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn25;
    }
}

 DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs

@@ -68,6 +68,7 @@
                txt_workName.Text = txt_tbl002.GetWorkName();
                txt_itemName.Text = txt_tbl002.GetPrdName();
                txt_itemNo.Text = txt_tbl002.GetPrdNo();
                txt_line.Text = txt_tbl002.GetWorkXb();
            };
            //选择需要入库的明细
            btnSelect.Click += (s, e) =>

 DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs

@@ -336,7 +336,7 @@
            // gridColumn2
            // 
            this.gridColumn2.Caption = "完结标识";
            this.gridColumn2.FieldName = "wjStatus";
            this.gridColumn2.FieldName = "txtColor";
            this.gridColumn2.MinWidth = 25;
            this.gridColumn2.Name = "gridColumn2";
            this.gridColumn2.Visible = true;
@@ -632,10 +632,10 @@
            // 
            // txt_chkStatus
            // 
            this.txt_chkStatus.Location = new System.Drawing.Point(671, 74);
            this.txt_chkStatus.Location = new System.Drawing.Point(682, 74);
            this.txt_chkStatus.Name = "txt_chkStatus";
            this.txt_chkStatus.Properties.Caption = "审核状态";
            this.txt_chkStatus.Size = new System.Drawing.Size(326, 24);
            this.txt_chkStatus.Size = new System.Drawing.Size(331, 24);
            this.txt_chkStatus.StyleController = this.layoutMx1;
            this.txt_chkStatus.TabIndex = 376;
            this.txt_chkStatus.Tag = "readonly";
@@ -655,7 +655,7 @@
            this.txt_billNo.Location = new System.Drawing.Point(114, 12);
            this.txt_billNo.Name = "txt_billNo";
            this.txt_billNo.Properties.Appearance.Options.UseFont = true;
            this.txt_billNo.Size = new System.Drawing.Size(223, 24);
            this.txt_billNo.Size = new System.Drawing.Size(229, 24);
            this.txt_billNo.StyleController = this.layoutMx1;
            this.txt_billNo.TabIndex = 211;
            this.txt_billNo.Tag = "readonly";
@@ -670,16 +670,16 @@
            this.txt_fBillTypeID.Properties.Items.AddRange(new object[] {
            "标准销售出库单(XSCKD01_SYS)"});
            this.txt_fBillTypeID.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
            this.txt_fBillTypeID.Size = new System.Drawing.Size(223, 24);
            this.txt_fBillTypeID.Size = new System.Drawing.Size(229, 24);
            this.txt_fBillTypeID.StyleController = this.layoutMx1;
            this.txt_fBillTypeID.TabIndex = 362;
            // 
            // txt_fApproverID
            // 
            this.txt_fApproverID.Location = new System.Drawing.Point(773, 12);
            this.txt_fApproverID.Location = new System.Drawing.Point(784, 12);
            this.txt_fApproverID.Name = "txt_fApproverID";
            this.txt_fApproverID.Properties.Appearance.Options.UseFont = true;
            this.txt_fApproverID.Size = new System.Drawing.Size(224, 24);
            this.txt_fApproverID.Size = new System.Drawing.Size(229, 24);
            this.txt_fApproverID.StyleController = this.layoutMx1;
            this.txt_fApproverID.TabIndex = 222;
            this.txt_fApproverID.Tag = "readonly";
@@ -689,35 +689,35 @@
            this.txt_salesId.IsReadly = false;
            this.txt_salesId.Location = new System.Drawing.Point(114, 74);
            this.txt_salesId.Name = "txt_salesId";
            this.txt_salesId.Size = new System.Drawing.Size(223, 24);
            this.txt_salesId.Size = new System.Drawing.Size(229, 24);
            this.txt_salesId.TabIndex = 367;
            // 
            // txt_fSaleOrgIdTxt
            // 
            this.txt_fSaleOrgIdTxt.Location = new System.Drawing.Point(443, 12);
            this.txt_fSaleOrgIdTxt.Location = new System.Drawing.Point(449, 12);
            this.txt_fSaleOrgIdTxt.Name = "txt_fSaleOrgIdTxt";
            this.txt_fSaleOrgIdTxt.Properties.Appearance.Options.UseFont = true;
            this.txt_fSaleOrgIdTxt.Size = new System.Drawing.Size(224, 24);
            this.txt_fSaleOrgIdTxt.Size = new System.Drawing.Size(229, 24);
            this.txt_fSaleOrgIdTxt.StyleController = this.layoutMx1;
            this.txt_fSaleOrgIdTxt.TabIndex = 365;
            this.txt_fSaleOrgIdTxt.Tag = "readonly";
            // 
            // txt_fCreatorId
            // 
            this.txt_fCreatorId.Location = new System.Drawing.Point(1103, 105);
            this.txt_fCreatorId.Location = new System.Drawing.Point(1119, 105);
            this.txt_fCreatorId.Name = "txt_fCreatorId";
            this.txt_fCreatorId.Properties.Appearance.Options.UseFont = true;
            this.txt_fCreatorId.Size = new System.Drawing.Size(224, 24);
            this.txt_fCreatorId.Size = new System.Drawing.Size(229, 24);
            this.txt_fCreatorId.StyleController = this.layoutMx1;
            this.txt_fCreatorId.TabIndex = 219;
            this.txt_fCreatorId.Tag = "readonly";
            // 
            // txt_fApproveDate
            // 
            this.txt_fApproveDate.Location = new System.Drawing.Point(773, 43);
            this.txt_fApproveDate.Location = new System.Drawing.Point(784, 43);
            this.txt_fApproveDate.Name = "txt_fApproveDate";
            this.txt_fApproveDate.Properties.Appearance.Options.UseFont = true;
            this.txt_fApproveDate.Size = new System.Drawing.Size(224, 24);
            this.txt_fApproveDate.Size = new System.Drawing.Size(229, 24);
            this.txt_fApproveDate.StyleController = this.layoutMx1;
            this.txt_fApproveDate.TabIndex = 228;
            this.txt_fApproveDate.Tag = "readonly";
@@ -727,54 +727,54 @@
            this.txt_fNote.Location = new System.Drawing.Point(114, 105);
            this.txt_fNote.Name = "txt_fNote";
            this.txt_fNote.Properties.Appearance.Options.UseFont = true;
            this.txt_fNote.Size = new System.Drawing.Size(223, 24);
            this.txt_fNote.Size = new System.Drawing.Size(229, 24);
            this.txt_fNote.StyleController = this.layoutMx1;
            this.txt_fNote.TabIndex = 243;
            // 
            // txt_fSalesManIDTxt
            // 
            this.txt_fSalesManIDTxt.Location = new System.Drawing.Point(773, 105);
            this.txt_fSalesManIDTxt.Location = new System.Drawing.Point(784, 105);
            this.txt_fSalesManIDTxt.Name = "txt_fSalesManIDTxt";
            this.txt_fSalesManIDTxt.Properties.Appearance.Options.UseFont = true;
            this.txt_fSalesManIDTxt.Size = new System.Drawing.Size(224, 24);
            this.txt_fSalesManIDTxt.Size = new System.Drawing.Size(229, 24);
            this.txt_fSalesManIDTxt.StyleController = this.layoutMx1;
            this.txt_fSalesManIDTxt.TabIndex = 231;
            this.txt_fSalesManIDTxt.Tag = "readonly";
            // 
            // txt_fCreateDate
            // 
            this.txt_fCreateDate.Location = new System.Drawing.Point(1103, 136);
            this.txt_fCreateDate.Location = new System.Drawing.Point(1119, 136);
            this.txt_fCreateDate.Name = "txt_fCreateDate";
            this.txt_fCreateDate.Properties.Appearance.Options.UseFont = true;
            this.txt_fCreateDate.Size = new System.Drawing.Size(224, 24);
            this.txt_fCreateDate.Size = new System.Drawing.Size(229, 24);
            this.txt_fCreateDate.StyleController = this.layoutMx1;
            this.txt_fCreateDate.TabIndex = 226;
            this.txt_fCreateDate.Tag = "readonly";
            // 
            // txt_fCustomerIDTxt
            // 
            this.txt_fCustomerIDTxt.Location = new System.Drawing.Point(443, 43);
            this.txt_fCustomerIDTxt.Location = new System.Drawing.Point(449, 43);
            this.txt_fCustomerIDTxt.Name = "txt_fCustomerIDTxt";
            this.txt_fCustomerIDTxt.Properties.Appearance.Options.UseFont = true;
            this.txt_fCustomerIDTxt.Size = new System.Drawing.Size(224, 24);
            this.txt_fCustomerIDTxt.Size = new System.Drawing.Size(229, 24);
            this.txt_fCustomerIDTxt.StyleController = this.layoutMx1;
            this.txt_fCustomerIDTxt.TabIndex = 368;
            this.txt_fCustomerIDTxt.Tag = "readonly";
            // 
            // txt_shf
            // 
            this.txt_shf.Location = new System.Drawing.Point(443, 74);
            this.txt_shf.Location = new System.Drawing.Point(449, 74);
            this.txt_shf.Name = "txt_shf";
            this.txt_shf.Size = new System.Drawing.Size(224, 24);
            this.txt_shf.Size = new System.Drawing.Size(229, 24);
            this.txt_shf.StyleController = this.layoutMx1;
            this.txt_shf.TabIndex = 373;
            this.txt_shf.Tag = "readonly";
            // 
            // txt_shName
            // 
            this.txt_shName.Location = new System.Drawing.Point(443, 105);
            this.txt_shName.Location = new System.Drawing.Point(449, 105);
            this.txt_shName.Name = "txt_shName";
            this.txt_shName.Size = new System.Drawing.Size(224, 24);
            this.txt_shName.Size = new System.Drawing.Size(229, 24);
            this.txt_shName.StyleController = this.layoutMx1;
            this.txt_shName.TabIndex = 374;
            this.txt_shName.Tag = "readonly";
@@ -791,31 +791,31 @@
            // 
            // txt_qt031
            // 
            this.txt_qt031.Location = new System.Drawing.Point(1103, 12);
            this.txt_qt031.Location = new System.Drawing.Point(1119, 12);
            this.txt_qt031.Name = "txt_qt031";
            this.txt_qt031.Properties.ReadOnly = true;
            this.txt_qt031.Size = new System.Drawing.Size(224, 24);
            this.txt_qt031.Size = new System.Drawing.Size(229, 24);
            this.txt_qt031.StyleController = this.layoutMx1;
            this.txt_qt031.TabIndex = 378;
            this.txt_qt031.Tag = "readonly";
            // 
            // txt_qt030
            // 
            this.txt_qt030.Location = new System.Drawing.Point(1103, 43);
            this.txt_qt030.Location = new System.Drawing.Point(1119, 43);
            this.txt_qt030.Name = "txt_qt030";
            this.txt_qt030.Properties.ReadOnly = true;
            this.txt_qt030.Size = new System.Drawing.Size(224, 24);
            this.txt_qt030.Size = new System.Drawing.Size(229, 24);
            this.txt_qt030.StyleController = this.layoutMx1;
            this.txt_qt030.TabIndex = 379;
            this.txt_qt030.Tag = "readonly";
            // 
            // txt_qt029
            // 
            this.txt_qt029.Location = new System.Drawing.Point(1001, 74);
            this.txt_qt029.Location = new System.Drawing.Point(1017, 74);
            this.txt_qt029.Name = "txt_qt029";
            this.txt_qt029.Properties.Caption = "财务审核状态";
            this.txt_qt029.Properties.ReadOnly = true;
            this.txt_qt029.Size = new System.Drawing.Size(326, 24);
            this.txt_qt029.Size = new System.Drawing.Size(331, 24);
            this.txt_qt029.StyleController = this.layoutMx1;
            this.txt_qt029.TabIndex = 380;
            this.txt_qt029.Tag = "readonly";
@@ -913,7 +913,7 @@
            rowDefinition3,
            rowDefinition4,
            rowDefinition5});
            this.layoutControlGroup1.Size = new System.Drawing.Size(1339, 175);
            this.layoutControlGroup1.Size = new System.Drawing.Size(1360, 175);
            this.layoutControlGroup1.TextVisible = false;
            // 
            // layoutControlItem13
@@ -921,11 +921,11 @@
            this.layoutControlItem13.Control = this.txt_fCustomerIDTxt;
            this.layoutControlItem13.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
            this.layoutControlItem13.CustomizationFormText = "客户名称";
            this.layoutControlItem13.Location = new System.Drawing.Point(329, 31);
            this.layoutControlItem13.Location = new System.Drawing.Point(335, 31);
            this.layoutControlItem13.Name = "layoutControlItem13";
            this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem13.Size = new System.Drawing.Size(330, 31);
            this.layoutControlItem13.Size = new System.Drawing.Size(335, 31);
            this.layoutControlItem13.Text = "客户名称";
            this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);
            // 
@@ -934,10 +934,10 @@
            this.layoutControlItem5.Control = this.txt_fSaleOrgIdTxt;
            this.layoutControlItem5.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
            this.layoutControlItem5.CustomizationFormText = "销售组织";
            this.layoutControlItem5.Location = new System.Drawing.Point(329, 0);
            this.layoutControlItem5.Location = new System.Drawing.Point(335, 0);
            this.layoutControlItem5.Name = "layoutControlItem5";
            this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem5.Size = new System.Drawing.Size(330, 31);
            this.layoutControlItem5.Size = new System.Drawing.Size(335, 31);
            this.layoutControlItem5.Text = "销售组织";
            this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18);
            // 
@@ -946,11 +946,11 @@
            this.layoutControlItem14.Control = this.txt_shf;
            this.layoutControlItem14.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
            this.layoutControlItem14.CustomizationFormText = "收货方";
            this.layoutControlItem14.Location = new System.Drawing.Point(329, 62);
            this.layoutControlItem14.Location = new System.Drawing.Point(335, 62);
            this.layoutControlItem14.Name = "layoutControlItem14";
            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem14.Size = new System.Drawing.Size(330, 31);
            this.layoutControlItem14.Size = new System.Drawing.Size(335, 31);
            this.layoutControlItem14.Text = "收货方";
            this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18);
            // 
@@ -962,7 +962,7 @@
            this.layoutControlItem8.Location = new System.Drawing.Point(0, 93);
            this.layoutControlItem8.Name = "layoutControlItem8";
            this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem8.Size = new System.Drawing.Size(329, 31);
            this.layoutControlItem8.Size = new System.Drawing.Size(335, 31);
            this.layoutControlItem8.Text = "申请备注";
            this.layoutControlItem8.TextSize = new System.Drawing.Size(90, 18);
            // 
@@ -974,7 +974,7 @@
            this.layoutControlItem4.Location = new System.Drawing.Point(0, 62);
            this.layoutControlItem4.Name = "layoutControlItem4";
            this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem4.Size = new System.Drawing.Size(329, 31);
            this.layoutControlItem4.Size = new System.Drawing.Size(335, 31);
            this.layoutControlItem4.Text = "销售订单";
            this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18);
            // 
@@ -983,10 +983,10 @@
            this.layoutControlItem10.Control = this.txt_fApproverID;
            this.layoutControlItem10.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
            this.layoutControlItem10.CustomizationFormText = "审核人";
            this.layoutControlItem10.Location = new System.Drawing.Point(659, 0);
            this.layoutControlItem10.Location = new System.Drawing.Point(670, 0);
            this.layoutControlItem10.Name = "layoutControlItem10";
            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem10.Size = new System.Drawing.Size(330, 31);
            this.layoutControlItem10.Size = new System.Drawing.Size(335, 31);
            this.layoutControlItem10.Text = "审核人员";
            this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 18);
            // 
@@ -995,22 +995,22 @@
            this.layoutControlItem11.Control = this.txt_fApproveDate;
            this.layoutControlItem11.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
            this.layoutControlItem11.CustomizationFormText = "审核日期";
            this.layoutControlItem11.Location = new System.Drawing.Point(659, 31);
            this.layoutControlItem11.Location = new System.Drawing.Point(670, 31);
            this.layoutControlItem11.Name = "layoutControlItem11";
            this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem11.Size = new System.Drawing.Size(330, 31);
            this.layoutControlItem11.Size = new System.Drawing.Size(335, 31);
            this.layoutControlItem11.Text = "审核日期";
            this.layoutControlItem11.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem15
            // 
            this.layoutControlItem15.Control = this.txt_chkStatus;
            this.layoutControlItem15.Location = new System.Drawing.Point(659, 62);
            this.layoutControlItem15.Location = new System.Drawing.Point(670, 62);
            this.layoutControlItem15.Name = "layoutControlItem15";
            this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem15.Size = new System.Drawing.Size(330, 31);
            this.layoutControlItem15.Size = new System.Drawing.Size(335, 31);
            this.layoutControlItem15.Text = "审核状态";
            this.layoutControlItem15.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem15.TextVisible = false;
@@ -1018,32 +1018,32 @@
            // layoutControlItem18
            // 
            this.layoutControlItem18.Control = this.txt_qt031;
            this.layoutControlItem18.Location = new System.Drawing.Point(989, 0);
            this.layoutControlItem18.Location = new System.Drawing.Point(1005, 0);
            this.layoutControlItem18.Name = "layoutControlItem18";
            this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem18.Size = new System.Drawing.Size(330, 31);
            this.layoutControlItem18.Size = new System.Drawing.Size(335, 31);
            this.layoutControlItem18.Text = "财务审核人员";
            this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem19
            // 
            this.layoutControlItem19.Control = this.txt_qt030;
            this.layoutControlItem19.Location = new System.Drawing.Point(989, 31);
            this.layoutControlItem19.Location = new System.Drawing.Point(1005, 31);
            this.layoutControlItem19.Name = "layoutControlItem19";
            this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem19.Size = new System.Drawing.Size(330, 31);
            this.layoutControlItem19.Size = new System.Drawing.Size(335, 31);
            this.layoutControlItem19.Text = "财务审核日期";
            this.layoutControlItem19.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem20
            // 
            this.layoutControlItem20.Control = this.txt_qt029;
            this.layoutControlItem20.Location = new System.Drawing.Point(989, 62);
            this.layoutControlItem20.Location = new System.Drawing.Point(1005, 62);
            this.layoutControlItem20.Name = "layoutControlItem20";
            this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem20.Size = new System.Drawing.Size(330, 31);
            this.layoutControlItem20.Size = new System.Drawing.Size(335, 31);
            this.layoutControlItem20.Text = "财务审核状态";
            this.layoutControlItem20.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem20.TextVisible = false;
@@ -1053,11 +1053,11 @@
            this.layoutControlItem6.Control = this.txt_fCreatorId;
            this.layoutControlItem6.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
            this.layoutControlItem6.CustomizationFormText = "创建人";
            this.layoutControlItem6.Location = new System.Drawing.Point(989, 93);
            this.layoutControlItem6.Location = new System.Drawing.Point(1005, 93);
            this.layoutControlItem6.Name = "layoutControlItem6";
            this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem6.Size = new System.Drawing.Size(330, 31);
            this.layoutControlItem6.Size = new System.Drawing.Size(335, 31);
            this.layoutControlItem6.Text = "创建人员";
            this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18);
            // 
@@ -1066,11 +1066,11 @@
            this.layoutControlItem7.Control = this.txt_fCreateDate;
            this.layoutControlItem7.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
            this.layoutControlItem7.CustomizationFormText = "创建日期";
            this.layoutControlItem7.Location = new System.Drawing.Point(989, 124);
            this.layoutControlItem7.Location = new System.Drawing.Point(1005, 124);
            this.layoutControlItem7.Name = "layoutControlItem7";
            this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 4;
            this.layoutControlItem7.Size = new System.Drawing.Size(330, 31);
            this.layoutControlItem7.Size = new System.Drawing.Size(335, 31);
            this.layoutControlItem7.Text = "创建日期";
            this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
            // 
@@ -1079,11 +1079,11 @@
            this.layoutControlItem17.Control = this.txt_shName;
            this.layoutControlItem17.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
            this.layoutControlItem17.CustomizationFormText = "收货人姓名";
            this.layoutControlItem17.Location = new System.Drawing.Point(329, 93);
            this.layoutControlItem17.Location = new System.Drawing.Point(335, 93);
            this.layoutControlItem17.Name = "layoutControlItem17";
            this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem17.Size = new System.Drawing.Size(330, 31);
            this.layoutControlItem17.Size = new System.Drawing.Size(335, 31);
            this.layoutControlItem17.Text = "收货人姓名";
            this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18);
            // 
@@ -1092,11 +1092,11 @@
            this.layoutControlItem9.Control = this.txt_fSalesManIDTxt;
            this.layoutControlItem9.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
            this.layoutControlItem9.CustomizationFormText = "销售员";
            this.layoutControlItem9.Location = new System.Drawing.Point(659, 93);
            this.layoutControlItem9.Location = new System.Drawing.Point(670, 93);
            this.layoutControlItem9.Name = "layoutControlItem9";
            this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem9.Size = new System.Drawing.Size(330, 31);
            this.layoutControlItem9.Size = new System.Drawing.Size(335, 31);
            this.layoutControlItem9.Text = "销售人员";
            this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18);
            // 
@@ -1108,7 +1108,7 @@
            this.layoutControlItem3.Location = new System.Drawing.Point(0, 31);
            this.layoutControlItem3.Name = "layoutControlItem3";
            this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem3.Size = new System.Drawing.Size(329, 31);
            this.layoutControlItem3.Size = new System.Drawing.Size(335, 31);
            this.layoutControlItem3.Text = "单据类型";
            this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
            // 
@@ -1119,7 +1119,7 @@
            this.layoutControlItem2.CustomizationFormText = "申请编号";
            this.layoutControlItem2.Location = new System.Drawing.Point(0, 0);
            this.layoutControlItem2.Name = "layoutControlItem2";
            this.layoutControlItem2.Size = new System.Drawing.Size(329, 31);
            this.layoutControlItem2.Size = new System.Drawing.Size(335, 31);
            this.layoutControlItem2.Text = "申请编号";
            this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18);
            // 
@@ -1132,7 +1132,7 @@
            this.layoutControlItem21.MinSize = new System.Drawing.Size(95, 31);
            this.layoutControlItem21.Name = "layoutControlItem21";
            this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 4;
            this.layoutControlItem21.Size = new System.Drawing.Size(329, 31);
            this.layoutControlItem21.Size = new System.Drawing.Size(335, 31);
            this.layoutControlItem21.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
            this.layoutControlItem21.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem21.TextVisible = false;

 DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs

@@ -92,7 +92,6 @@
            this.gv_daa003 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_daa004 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_daa008 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_daa011 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_daa010 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_daa005 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -100,8 +99,6 @@
            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_daa015 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_daa009 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_prepareTime = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_daa028 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_daa016 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_daa017 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_mesStartProd = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -597,7 +594,6 @@
            this.gv_daa003,
            this.gv_daa004,
            this.gv_daa008,
            this.gv_daa011,
            this.gridColumn4,
            this.gv_daa010,
            this.gv_daa005,
@@ -605,8 +601,6 @@
            this.gridColumn1,
            this.gv_daa015,
            this.gv_daa009,
            this.gv_prepareTime,
            this.gv_daa028,
            this.gv_daa016,
            this.gv_daa017,
            this.gv_mesStartProd,
@@ -632,8 +626,6 @@
            this.gridColumn5.MinWidth = 50;
            this.gridColumn5.Name = "gridColumn5";
            this.gridColumn5.Tag = "query_a.jabs";
            this.gridColumn5.Visible = true;
            this.gridColumn5.VisibleIndex = 28;
            this.gridColumn5.Width = 50;
            // 
            // gridColumn7
@@ -668,8 +660,6 @@
            this.gridColumn12.MinWidth = 50;
            this.gridColumn12.Name = "gridColumn12";
            this.gridColumn12.Tag = "query_a.jabs";
            this.gridColumn12.Visible = true;
            this.gridColumn12.VisibleIndex = 2;
            this.gridColumn12.Width = 50;
            // 
            // gridColumn6
@@ -681,7 +671,7 @@
            this.gridColumn6.Name = "gridColumn6";
            this.gridColumn6.Tag = "query_a.jabs";
            this.gridColumn6.Visible = true;
            this.gridColumn6.VisibleIndex = 3;
            this.gridColumn6.VisibleIndex = 2;
            this.gridColumn6.Width = 50;
            // 
            // gridColumn27
@@ -691,7 +681,7 @@
            this.gridColumn27.MinWidth = 25;
            this.gridColumn27.Name = "gridColumn27";
            this.gridColumn27.Visible = true;
            this.gridColumn27.VisibleIndex = 19;
            this.gridColumn27.VisibleIndex = 15;
            this.gridColumn27.Width = 94;
            // 
            // gv_daa018
@@ -704,7 +694,7 @@
            this.gv_daa018.OptionsColumn.AllowEdit = false;
            this.gv_daa018.Tag = "query_a.daa018";
            this.gv_daa018.Visible = true;
            this.gv_daa018.VisibleIndex = 4;
            this.gv_daa018.VisibleIndex = 3;
            this.gv_daa018.Width = 90;
            // 
            // gridColoun100
@@ -715,7 +705,7 @@
            this.gridColoun100.Name = "gridColoun100";
            this.gridColoun100.Tag = "org.fnamber";
            this.gridColoun100.Visible = true;
            this.gridColoun100.VisibleIndex = 29;
            this.gridColoun100.VisibleIndex = 26;
            this.gridColoun100.Width = 250;
            // 
            // gv_daa001
@@ -728,7 +718,7 @@
            this.gv_daa001.OptionsColumn.AllowEdit = false;
            this.gv_daa001.Tag = "query_a.daa001";
            this.gv_daa001.Visible = true;
            this.gv_daa001.VisibleIndex = 5;
            this.gv_daa001.VisibleIndex = 7;
            this.gv_daa001.Width = 120;
            // 
            // gv_daa021
@@ -741,7 +731,7 @@
            this.gv_daa021.OptionsColumn.AllowEdit = false;
            this.gv_daa021.Tag = "query_a.daa021";
            this.gv_daa021.Visible = true;
            this.gv_daa021.VisibleIndex = 6;
            this.gv_daa021.VisibleIndex = 17;
            this.gv_daa021.Width = 100;
            // 
            // gridColumn3
@@ -791,22 +781,8 @@
            this.gv_daa008.OptionsColumn.AllowEdit = false;
            this.gv_daa008.Tag = "query_a.daa008";
            this.gv_daa008.Visible = true;
            this.gv_daa008.VisibleIndex = 13;
            this.gv_daa008.VisibleIndex = 4;
            this.gv_daa008.Width = 50;
            // 
            // gv_daa011
            // 
            this.gv_daa011.AppearanceCell.Options.UseFont = true;
            this.gv_daa011.Caption = "已生产量";
            this.gv_daa011.FieldName = "daa011";
            this.gv_daa011.MaxWidth = 50;
            this.gv_daa011.MinWidth = 50;
            this.gv_daa011.Name = "gv_daa011";
            this.gv_daa011.OptionsColumn.AllowEdit = false;
            this.gv_daa011.Tag = "query_a.daa011";
            this.gv_daa011.Visible = true;
            this.gv_daa011.VisibleIndex = 14;
            this.gv_daa011.Width = 50;
            // 
            // gridColumn4
            // 
@@ -814,19 +790,19 @@
            this.gridColumn4.AppearanceCell.Options.UseForeColor = true;
            this.gridColumn4.AppearanceHeader.ForeColor = System.Drawing.Color.Red;
            this.gridColumn4.AppearanceHeader.Options.UseForeColor = true;
            this.gridColumn4.Caption = "待生产量";
            this.gridColumn4.Caption = "待入库量";
            this.gridColumn4.FieldName = "dscl";
            this.gridColumn4.MaxWidth = 50;
            this.gridColumn4.MinWidth = 50;
            this.gridColumn4.Name = "gridColumn4";
            this.gridColumn4.Visible = true;
            this.gridColumn4.VisibleIndex = 15;
            this.gridColumn4.VisibleIndex = 6;
            this.gridColumn4.Width = 50;
            // 
            // gv_daa010
            // 
            this.gv_daa010.AppearanceCell.Options.UseFont = true;
            this.gv_daa010.Caption = "入库数量";
            this.gv_daa010.Caption = "已入库量";
            this.gv_daa010.FieldName = "daa010";
            this.gv_daa010.MaxWidth = 50;
            this.gv_daa010.MinWidth = 50;
@@ -834,7 +810,7 @@
            this.gv_daa010.OptionsColumn.AllowEdit = false;
            this.gv_daa010.Tag = "query_a.daa010";
            this.gv_daa010.Visible = true;
            this.gv_daa010.VisibleIndex = 17;
            this.gv_daa010.VisibleIndex = 5;
            this.gv_daa010.Width = 50;
            // 
            // gv_daa005
@@ -848,7 +824,7 @@
            this.gv_daa005.OptionsColumn.AllowEdit = false;
            this.gv_daa005.Tag = "query_a.daa005";
            this.gv_daa005.Visible = true;
            this.gv_daa005.VisibleIndex = 18;
            this.gv_daa005.VisibleIndex = 14;
            this.gv_daa005.Width = 50;
            // 
            // gv_cust
@@ -869,7 +845,7 @@
            this.gridColumn1.MinWidth = 50;
            this.gridColumn1.Name = "gridColumn1";
            this.gridColumn1.Visible = true;
            this.gridColumn1.VisibleIndex = 20;
            this.gridColumn1.VisibleIndex = 16;
            this.gridColumn1.Width = 94;
            // 
            // gv_daa015
@@ -895,30 +871,8 @@
            this.gv_daa009.OptionsColumn.AllowEdit = false;
            this.gv_daa009.Tag = "query_a.daa009";
            this.gv_daa009.Visible = true;
            this.gv_daa009.VisibleIndex = 16;
            this.gv_daa009.VisibleIndex = 13;
            this.gv_daa009.Width = 94;
            // 
            // gv_prepareTime
            // 
            this.gv_prepareTime.AppearanceCell.Options.UseFont = true;
            this.gv_prepareTime.Caption = "预计备料时间";
            this.gv_prepareTime.FieldName = "prepareTime";
            this.gv_prepareTime.MinWidth = 50;
            this.gv_prepareTime.Name = "gv_prepareTime";
            this.gv_prepareTime.OptionsColumn.AllowEdit = false;
            this.gv_prepareTime.Tag = "query_a.prepare_time";
            this.gv_prepareTime.Width = 180;
            // 
            // gv_daa028
            // 
            this.gv_daa028.AppearanceCell.Options.UseFont = true;
            this.gv_daa028.Caption = "备料完成时间";
            this.gv_daa028.FieldName = "daa028";
            this.gv_daa028.MinWidth = 50;
            this.gv_daa028.Name = "gv_daa028";
            this.gv_daa028.OptionsColumn.AllowEdit = false;
            this.gv_daa028.Tag = "query_a.daa028";
            this.gv_daa028.Width = 180;
            // 
            // gv_daa016
            // 
@@ -930,7 +884,7 @@
            this.gv_daa016.OptionsColumn.AllowEdit = false;
            this.gv_daa016.Tag = "query_a.daa016";
            this.gv_daa016.Visible = true;
            this.gv_daa016.VisibleIndex = 21;
            this.gv_daa016.VisibleIndex = 19;
            this.gv_daa016.Width = 180;
            // 
            // gv_daa017
@@ -943,7 +897,7 @@
            this.gv_daa017.OptionsColumn.AllowEdit = false;
            this.gv_daa017.Tag = "query_a.daa017";
            this.gv_daa017.Visible = true;
            this.gv_daa017.VisibleIndex = 22;
            this.gv_daa017.VisibleIndex = 20;
            this.gv_daa017.Width = 180;
            // 
            // gv_mesStartProd
@@ -956,7 +910,7 @@
            this.gv_mesStartProd.OptionsColumn.AllowEdit = false;
            this.gv_mesStartProd.Tag = "query_a.mes_start_prod";
            this.gv_mesStartProd.Visible = true;
            this.gv_mesStartProd.VisibleIndex = 23;
            this.gv_mesStartProd.VisibleIndex = 21;
            this.gv_mesStartProd.Width = 180;
            // 
            // gv_mesEndProd
@@ -969,7 +923,7 @@
            this.gv_mesEndProd.OptionsColumn.AllowEdit = false;
            this.gv_mesEndProd.Tag = "query_a.mes_end_prod";
            this.gv_mesEndProd.Visible = true;
            this.gv_mesEndProd.VisibleIndex = 24;
            this.gv_mesEndProd.VisibleIndex = 22;
            this.gv_mesEndProd.Width = 180;
            // 
            // gridColumn21
@@ -979,7 +933,7 @@
            this.gridColumn21.MinWidth = 25;
            this.gridColumn21.Name = "gridColumn21";
            this.gridColumn21.Visible = true;
            this.gridColumn21.VisibleIndex = 25;
            this.gridColumn21.VisibleIndex = 23;
            this.gridColumn21.Width = 94;
            // 
            // gridColumn22
@@ -989,7 +943,7 @@
            this.gridColumn22.MinWidth = 25;
            this.gridColumn22.Name = "gridColumn22";
            this.gridColumn22.Visible = true;
            this.gridColumn22.VisibleIndex = 26;
            this.gridColumn22.VisibleIndex = 24;
            this.gridColumn22.Width = 94;
            // 
            // gridColumn23
@@ -1007,7 +961,7 @@
            this.gridColumn24.MinWidth = 25;
            this.gridColumn24.Name = "gridColumn24";
            this.gridColumn24.Visible = true;
            this.gridColumn24.VisibleIndex = 27;
            this.gridColumn24.VisibleIndex = 25;
            this.gridColumn24.Width = 94;
            // 
            // gridColumn25
@@ -1017,7 +971,7 @@
            this.gridColumn25.MinWidth = 25;
            this.gridColumn25.Name = "gridColumn25";
            this.gridColumn25.Visible = true;
            this.gridColumn25.VisibleIndex = 7;
            this.gridColumn25.VisibleIndex = 18;
            this.gridColumn25.Width = 94;
            // 
            // gridColumn52
@@ -4012,7 +3966,6 @@
        private DevExpress.XtraGrid.Columns.GridColumn gv_daa003;
        private DevExpress.XtraGrid.Columns.GridColumn gv_daa004;
        private DevExpress.XtraGrid.Columns.GridColumn gv_daa008;
        private DevExpress.XtraGrid.Columns.GridColumn gv_daa011;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
        private DevExpress.XtraGrid.Columns.GridColumn gv_daa010;
        private DevExpress.XtraGrid.Columns.GridColumn gv_daa005;
@@ -4020,8 +3973,6 @@
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
        private DevExpress.XtraGrid.Columns.GridColumn gv_daa015;
        private DevExpress.XtraGrid.Columns.GridColumn gv_daa009;
        private DevExpress.XtraGrid.Columns.GridColumn gv_prepareTime;
        private DevExpress.XtraGrid.Columns.GridColumn gv_daa028;
        private DevExpress.XtraGrid.Columns.GridColumn gv_daa016;
        private DevExpress.XtraGrid.Columns.GridColumn gv_daa017;
        private DevExpress.XtraGrid.Columns.GridColumn gv_mesStartProd;

 DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs

@@ -883,7 +883,7 @@
            this.tabMxPage1.Controls.Add(this.gcMx1);
            this.tabMxPage1.Name = "tabMxPage1";
            this.tabMxPage1.Size = new System.Drawing.Size(1365, 346);
            this.tabMxPage1.Text = "良品名称";
            this.tabMxPage1.Text = "良品明细";
            // 
            // gcMx1
            // 
@@ -1227,7 +1227,7 @@
            // 
            // gridColumn20
            // 
            this.gridColumn20.Caption = "结果";
            this.gridColumn20.Caption = "维修结果";
            this.gridColumn20.FieldName = "checkResult";
            this.gridColumn20.MinWidth = 25;
            this.gridColumn20.Name = "gridColumn20";
@@ -1260,7 +1260,7 @@
            // 
            // gridColumn23
            // 
            this.gridColumn23.Caption = "不良项目";
            this.gridColumn23.Caption = "不良原因";
            this.gridColumn23.FieldName = "badReson";
            this.gridColumn23.MinWidth = 25;
            this.gridColumn23.Name = "gridColumn23";
@@ -1274,8 +1274,6 @@
            this.gridColumn25.MinWidth = 25;
            this.gridColumn25.Name = "gridColumn25";
            this.gridColumn25.OptionsColumn.ReadOnly = true;
            this.gridColumn25.Visible = true;
            this.gridColumn25.VisibleIndex = 12;
            this.gridColumn25.Width = 94;
            // 
            // Frm_Work01

 DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs

@@ -36,7 +36,7 @@
        string fGxDianJian = "G002:电检";
        string fGxShouJian = "G003:水检";
        string fGxZhongJian = "G004:终检";
       

        /// <summary>
        /// 
        /// </summary>
@@ -44,7 +44,7 @@
        /// <param name="_fBc">班次</param>
        /// <param name="_strinOther">目前为电检路径</param>
        /// <param name="chkWater">是否水检</param>
        public Frm_Work01(string _fGx, string _fBc, string _strinOther,int chkWater=0)
        public Frm_Work01(string _fGx, string _fBc, string _strinOther, int chkWater = 0)
        {
            InitializeComponent();
            try
@@ -108,7 +108,15 @@
            };
            btnBad.Click += (s, e) =>
            {
                string _collectGuid ="";
                int idx = tabMx.SelectedTabPageIndex;
                if (idx > 0)
                {
                    Toast vm = new Toast(-1, "~已帮你切换到【良品明细】,请重新操作~");
                    vm.Show();
                    tabMx.SelectedTabPageIndex = 0;
                    return;
                }
                string _collectGuid = "";
                string _collCode = "";
                var dr = gvMx1.GetFocusedDataRow();
                if (dr == null || string.IsNullOrEmpty(dr["guid"].ToString()))

 DevApp/Gs.DevApp/Program.cs

@@ -42,7 +42,7 @@
        /// </summary>
        private static void _startLogin()
        {
            //Application.Run(new XtraForm2());
            //Application.Run(new XtraForm1());
            //return;
            CefSettings settings = new CefSettings();
            settings.Locale = "zh-CN";

 DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs

@@ -1868,14 +1868,16 @@
                    if (e.Column.FieldName.EndsWith("Color"))
                    {
                        int rowHandle = e.RowHandle;
                        DataRow row = gridView1.GetDataRow(e.RowHandle);
                        string _bgColor = row[e.Column.FieldName + "Rgb"].ToString();
                        if (!string.IsNullOrEmpty(_bgColor))
                        {
                            Color bgColor = ColorTranslator.FromHtml(_bgColor);
                            e.Appearance.BackColor = bgColor;
                            //   e.Appearance.BackColor2 = Color.LightSkyBlue;
                            //e.Appearance.ForeColor = ColorTranslator.FromHtml("#ffffff") ;
                        if (rowHandle >= 0) {
                            DataRow row = gridView1.GetDataRow(e.RowHandle);
                            string _bgColor = row[e.Column.FieldName + "Rgb"].ToString();
                            if (!string.IsNullOrEmpty(_bgColor))
                            {
                                Color bgColor = ColorTranslator.FromHtml(_bgColor);
                                e.Appearance.BackColor = bgColor;
                                //e.Appearance.BackColor2 = Color.LightSkyBlue;
                                //e.Appearance.ForeColor = ColorTranslator.FromHtml("#ffffff") ;
                            }
                        }
                    }
                }

 DevApp/Gs.DevApp/UserControl/UcDictionarySelect.cs

@@ -19,6 +19,7 @@
        public UcDictionarySelect(string _strTitle, string _strWhere,string _strMsg="")
        {
            InitializeComponent();

            lbMsg.Text = _strMsg;
            this.strTitle = _strTitle;
            this.strWhere = _strWhere;

 DevApp/Gs.DevApp/XtraForm1.Designer.cs

@@ -39,6 +39,7 @@
            this.simpleButton1 = new DevExpress.XtraEditors.SimpleButton();
            this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
            this.txtGWM = new DevExpress.XtraEditors.TextEdit();
            this.button1 = new System.Windows.Forms.Button();
            ((System.ComponentModel.ISupportInitialize)(this.txtGs.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_slaveAddress.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).BeginInit();
@@ -113,6 +114,7 @@
            // 
            // panelControl1
            // 
            this.panelControl1.Controls.Add(this.button1);
            this.panelControl1.Controls.Add(this.btnEdit);
            this.panelControl1.Controls.Add(this.simpleButton1);
            this.panelControl1.Controls.Add(this.labelControl2);
@@ -162,6 +164,16 @@
            this.txtGWM.Size = new System.Drawing.Size(183, 24);
            this.txtGWM.TabIndex = 7;
            // 
            // button1
            // 
            this.button1.Location = new System.Drawing.Point(699, 29);
            this.button1.Name = "button1";
            this.button1.Size = new System.Drawing.Size(75, 23);
            this.button1.TabIndex = 11;
            this.button1.Text = "button1";
            this.button1.UseVisualStyleBackColor = true;
            this.button1.Click += new System.EventHandler(this.button1_Click);
            // 
            // XtraForm1
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -194,5 +206,6 @@
        private DevExpress.XtraEditors.TextEdit txtGWM;
        private DevExpress.XtraEditors.SimpleButton simpleButton1;
        private DevExpress.XtraEditors.ButtonEdit btnEdit;
        private System.Windows.Forms.Button button1;
    }
}

 DevApp/Gs.DevApp/XtraForm1.cs

@@ -1,7 +1,9 @@
using DevExpress.XtraEditors;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using NModbus;
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Data.SqlTypes;
@@ -262,5 +264,65 @@
        {
            MessageBox.Show("d");
        }

        private void button1_Click(object sender, EventArgs e)
        {
            string json = @"{
            ""100℃"": {
                ""temp"": ""94"",
                ""150ml"": ""143"",
                ""250ml"": ""241"",
                ""500ml"": ""482"",
                ""750ml"": ""732""
            },
            ""85℃"": {
                ""temp"": ""86"",
                ""150ml"": ""146"",
                ""250ml"": ""238"",
                ""500ml"": ""495"",
                ""750ml"": ""739""
            },
            ""60℃"": {
                ""temp"": ""62"",
                ""150ml"": ""152"",
                ""250ml"": ""244"",
                ""500ml"": ""499"",
                ""750ml"": ""745""
            },
            ""45℃"": {
                ""temp"": ""48"",
                ""150ml"": ""158"",
                ""250ml"": ""246"",
                ""500ml"": ""506"",
                ""750ml"": ""778""
            },
            ""常温水"": {
                ""temp"": ""29"",
                ""150ml"": ""161"",
                ""250ml"": ""249"",
                ""500ml"": ""504"",
                ""750ml"": ""781""
            }
        }";
            System.Text.StringBuilder sbLine = new StringBuilder();
            var data = JsonConvert.DeserializeObject<Dictionary<string, Dictionary<string, string>>>(json);
            List<string> resultLines = new List<string>();
            foreach (var entry in data)
            {
                string key = entry.Key;
                var values = entry.Value;
                string temp = values["temp"];
                sbLine.Append(key + "/" + temp + "：");
                System.Text.StringBuilder dbdb = new StringBuilder();
                foreach (var dddddd in values)
                {
                    if (dddddd.Key == "temp")
                        continue;
                    dbdb.Append(dddddd.Key+"-"+ dddddd.Value + "、");
                }
                sbLine.Append(dbdb.ToString()+"\n");
            }
            richTextBox1.Text = sbLine.ToString();
        }
    }
}