Merge branch 'master' of http://43.142.96.171:8080/r/~kyy/LW_MesClient

cnf

18 小时以前 86e875b896d74dce8757ad693eb5dd336a7645cf

 DevApp/Gs.DevApp/Gs.DevApp.csproj

@@ -74,6 +74,8 @@
    </Reference>
    <Reference Include="DevExpress.BonusSkins.v22.2" />
    <Reference Include="DevExpress.Charts.v22.2.Core, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
    <Reference Include="DevExpress.DataAccess.v22.2.UI, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
    <Reference Include="DevExpress.DataVisualization.v22.2.Core, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
    <Reference Include="DevExpress.Drawing.v22.2" />
    <Reference Include="DevExpress.Data.v22.2" />
    <Reference Include="DevExpress.DataAccess.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
@@ -84,9 +86,11 @@
    <Reference Include="DevExpress.RichEdit.v22.2.Core, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
    <Reference Include="DevExpress.RichEdit.v22.2.Export, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
    <Reference Include="DevExpress.Data.Desktop.v22.2" />
    <Reference Include="DevExpress.Spreadsheet.v22.2.Core, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
    <Reference Include="DevExpress.Utils.v22.2" />
    <Reference Include="DevExpress.Sparkline.v22.2.Core" />
    <Reference Include="DevExpress.Utils.v22.2.UI, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
    <Reference Include="DevExpress.Xpo.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
    <Reference Include="DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
    <Reference Include="DevExpress.XtraCharts.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
    <Reference Include="DevExpress.XtraEditors.v22.2" />
@@ -98,7 +102,10 @@
    <Reference Include="DevExpress.XtraPrinting.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
    <Reference Include="DevExpress.XtraReports.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
    <Reference Include="DevExpress.XtraReports.v22.2.Extensions, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
    <Reference Include="DevExpress.XtraRichEdit.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
    <Reference Include="DevExpress.XtraSpreadsheet.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
    <Reference Include="DevExpress.XtraTreeList.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
    <Reference Include="DevExpress.XtraTreeMap.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
    <Reference Include="DevExpress.XtraWizard.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
    <Reference Include="FastReport">
      <HintPath>D:\GsMesV2\DevApp\Gs.DevApp\bin\Debug\FastReport.dll</HintPath>
@@ -166,6 +173,7 @@
    <Reference Include="System.Runtime.Serialization" />
    <Reference Include="System.Runtime.Serialization.Formatters.Soap" />
    <Reference Include="System.Security" />
    <Reference Include="System.ServiceModel" />
    <Reference Include="System.Text.Encodings.Web, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
      <HintPath>..\packages\System.Text.Encodings.Web.8.0.0\lib\net462\System.Text.Encodings.Web.dll</HintPath>
    </Reference>
@@ -181,6 +189,7 @@
    </Reference>
    <Reference Include="System.Web" />
    <Reference Include="System.Web.Extensions" />
    <Reference Include="System.Web.Services" />
    <Reference Include="System.Xaml" />
    <Reference Include="System.Xml.Linq" />
    <Reference Include="System.Data.DataSetExtensions" />
@@ -337,6 +346,12 @@
    <Compile Include="DevFrm\FQC\Frm_FqcDetect01.Designer.cs">
      <DependentUpon>Frm_FqcDetect01.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\FQC\Frm_FQCItem.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\FQC\Frm_FQCItem.Designer.cs">
      <DependentUpon>Frm_FQCItem.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\FQC\MesFqcExceptional.cs">
      <SubType>Form</SubType>
    </Compile>
@@ -366,6 +381,12 @@
    </Compile>
    <Compile Include="DevFrm\FrmMain.Designer.cs">
      <DependentUpon>FrmMain.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\IPQC\Frm_ShouJianDetect01H5.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\IPQC\Frm_ShouJianDetect01H5.Designer.cs">
      <DependentUpon>Frm_ShouJianDetect01H5.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\IPQC\Frm_XunJianDetect01Show.cs">
      <SubType>Form</SubType>
@@ -574,6 +595,12 @@
    <Compile Include="DevFrm\QC\Models\MesQmCheckitemDt.cs" />
    <Compile Include="DevFrm\QC\Models\MesSysLookups.cs" />
    <Compile Include="DevFrm\QC\Models\MesSysLookupTypes.cs" />
    <Compile Include="DevFrm\QC\Xls.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\QC\Xls.Designer.cs">
      <DependentUpon>Xls.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\RkQC\Frm_RkDetect01.cs">
      <SubType>Form</SubType>
    </Compile>
@@ -597,6 +624,42 @@
    </Compile>
    <Compile Include="DevFrm\Rk\Frm_MesItemTblShow.Designer.cs">
      <DependentUpon>Frm_MesItemTblShow.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\Sales\Frm_SalesDeliverSelect.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\Sales\Frm_SalesDeliverSelect.Designer.cs">
      <DependentUpon>Frm_SalesDeliverSelect.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\Sales\Frm_SalesReturnNoticeSelect.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\Sales\Frm_SalesReturnNoticeSelect.Designer.cs">
      <DependentUpon>Frm_SalesReturnNoticeSelect.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\Sales\Frm_SalesReturnNoticeSelect2.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\Sales\Frm_SalesReturnNoticeSelect2.Designer.cs">
      <DependentUpon>Frm_SalesReturnNoticeSelect2.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\Sales\Frm_SalesReturnNoticeSelectLink.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\Sales\Frm_SalesReturnNoticeSelectLink.Designer.cs">
      <DependentUpon>Frm_SalesReturnNoticeSelectLink.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\WOM\FrmAutoRk.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\WOM\FrmAutoRk.Designer.cs">
      <DependentUpon>FrmAutoRk.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\WOM\FrmBackFlash.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\WOM\FrmBackFlash.Designer.cs">
      <DependentUpon>FrmBackFlash.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\WOM\Frm_MesScrksqDj.cs">
      <SubType>Form</SubType>
@@ -887,6 +950,12 @@
    <Compile Include="DevFrm\WOM\Frm_MesWorkProd.Designer.cs">
      <DependentUpon>Frm_MesWorkProd.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\WOM\Frm_Womdaahb.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\WOM\Frm_Womdaahb.Designer.cs">
      <DependentUpon>Frm_Womdaahb.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\WOM\Frm_WompbaGx.cs">
      <SubType>Form</SubType>
    </Compile>
@@ -898,6 +967,12 @@
    </Compile>
    <Compile Include="DevFrm\WOM\MesProcInfo.Designer.cs">
      <DependentUpon>MesProcInfo.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\WOM\SelectWomdaa.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\WOM\SelectWomdaa.Designer.cs">
      <DependentUpon>SelectWomdaa.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\WOM\ShowJieAn.cs">
      <SubType>Form</SubType>
@@ -958,17 +1033,35 @@
      <DesignTime>True</DesignTime>
      <DependentUpon>Resources.resx</DependentUpon>
    </Compile>
    <Compile Include="UserControl\CopyXls.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="UserControl\CopyXls.Designer.cs">
      <DependentUpon>CopyXls.cs</DependentUpon>
    </Compile>
    <Compile Include="UserControl\SelectCk.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="UserControl\SelectCk.Designer.cs">
      <DependentUpon>SelectCk.cs</DependentUpon>
    </Compile>
    <Compile Include="UserControl\SelectDaa.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="UserControl\SelectDaa.Designer.cs">
      <DependentUpon>SelectDaa.cs</DependentUpon>
    </Compile>
    <Compile Include="UserControl\SelectDeleteBar.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="UserControl\SelectDeleteBar.Designer.cs">
      <DependentUpon>SelectDeleteBar.cs</DependentUpon>
    </Compile>
    <Compile Include="UserControl\UcBtnPrintOne.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Include="UserControl\UcBtnPrintOne.Designer.cs">
      <DependentUpon>UcBtnPrintOne.cs</DependentUpon>
    </Compile>
    <Compile Include="UserControl\UcDictionaryComBox.cs">
      <SubType>UserControl</SubType>
@@ -1244,6 +1337,12 @@
    <Compile Include="UserControl\UcLookItems.Designer.cs">
      <DependentUpon>UcLookItems.cs</DependentUpon>
    </Compile>
    <Compile Include="UserControl\UcLookKw.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Include="UserControl\UcLookKw.Designer.cs">
      <DependentUpon>UcLookKw.cs</DependentUpon>
    </Compile>
    <Compile Include="UserControl\UcLookOrg.cs">
      <SubType>UserControl</SubType>
    </Compile>
@@ -1418,6 +1517,9 @@
    <EmbeddedResource Include="DevFrm\FQC\Frm_FqcDetect01.resx">
      <DependentUpon>Frm_FqcDetect01.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\FQC\Frm_FQCItem.resx">
      <DependentUpon>Frm_FQCItem.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\FQC\MesFqcExceptional.resx">
      <DependentUpon>MesFqcExceptional.cs</DependentUpon>
    </EmbeddedResource>
@@ -1442,6 +1544,9 @@
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\IPQC\Frm_ShouJianDetect01.resx">
      <DependentUpon>Frm_ShouJianDetect01.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\IPQC\Frm_ShouJianDetect01H5.resx">
      <DependentUpon>Frm_ShouJianDetect01H5.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\IPQC\Frm_XunJianDetect01.resx">
      <DependentUpon>Frm_XunJianDetect01.cs</DependentUpon>
@@ -1515,6 +1620,9 @@
    <EmbeddedResource Include="DevFrm\QC\MesQcExceptional.resx">
      <DependentUpon>MesQcExceptional.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\QC\Xls.resx">
      <DependentUpon>Xls.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\RkQC\Frm_RkDetect01.resx">
      <DependentUpon>Frm_RkDetect01.cs</DependentUpon>
    </EmbeddedResource>
@@ -1526,6 +1634,24 @@
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\Rk\Frm_MesItemTblShow.resx">
      <DependentUpon>Frm_MesItemTblShow.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\Sales\Frm_SalesDeliverSelect.resx">
      <DependentUpon>Frm_SalesDeliverSelect.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\Sales\Frm_SalesReturnNoticeSelect.resx">
      <DependentUpon>Frm_SalesReturnNoticeSelect.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\Sales\Frm_SalesReturnNoticeSelect2.resx">
      <DependentUpon>Frm_SalesReturnNoticeSelect2.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\Sales\Frm_SalesReturnNoticeSelectLink.resx">
      <DependentUpon>Frm_SalesReturnNoticeSelectLink.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\WOM\FrmAutoRk.resx">
      <DependentUpon>FrmAutoRk.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\WOM\FrmBackFlash.resx">
      <DependentUpon>FrmBackFlash.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\WOM\Frm_MesScrksqDj.resx">
      <DependentUpon>Frm_MesScrksqDj.cs</DependentUpon>
@@ -1666,11 +1792,17 @@
    <EmbeddedResource Include="DevFrm\WOM\Frm_MesWorkProd.resx">
      <DependentUpon>Frm_MesWorkProd.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\WOM\Frm_Womdaahb.resx">
      <DependentUpon>Frm_Womdaahb.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\WOM\Frm_WompbaGx.resx">
      <DependentUpon>Frm_WompbaGx.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\WOM\MesProcInfo.resx">
      <DependentUpon>MesProcInfo.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\WOM\SelectWomdaa.resx">
      <DependentUpon>SelectWomdaa.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\WOM\ShowJieAn.resx">
      <DependentUpon>ShowJieAn.cs</DependentUpon>
@@ -1699,11 +1831,20 @@
    <EmbeddedResource Include="DevFrm\WW\showWwZhongTai.resx">
      <DependentUpon>showWwZhongTai.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="UserControl\CopyXls.resx">
      <DependentUpon>CopyXls.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="UserControl\SelectCk.resx">
      <DependentUpon>SelectCk.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="UserControl\SelectDaa.resx">
      <DependentUpon>SelectDaa.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="UserControl\SelectDeleteBar.resx">
      <DependentUpon>SelectDeleteBar.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="UserControl\UcBtnPrintOne.resx">
      <DependentUpon>UcBtnPrintOne.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="UserControl\UcDictionaryComBox.resx">
      <DependentUpon>UcDictionaryComBox.cs</DependentUpon>
@@ -1840,6 +1981,9 @@
    <EmbeddedResource Include="UserControl\UcLookItems.resx">
      <DependentUpon>UcLookItems.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="UserControl\UcLookKw.resx">
      <DependentUpon>UcLookKw.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="UserControl\UcLookOrg.resx">
      <DependentUpon>UcLookOrg.cs</DependentUpon>
    </EmbeddedResource>