|
|
@@ -8,7 +8,7 @@
|
|
|
<OutputType>WinExe</OutputType>
|
|
|
<AppDesignerFolder>Properties</AppDesignerFolder>
|
|
|
<RootNamespace>UAS_MES</RootNamespace>
|
|
|
- <AssemblyName>UAS_MES_TEST</AssemblyName>
|
|
|
+ <AssemblyName>UAS_MES</AssemblyName>
|
|
|
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
|
|
|
<FileAlignment>512</FileAlignment>
|
|
|
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
|
|
|
@@ -22,7 +22,7 @@
|
|
|
</SccAuxPath>
|
|
|
<SccProvider>
|
|
|
</SccProvider>
|
|
|
- <PublishUrl>ftp://172.16.11.99/releasetest/</PublishUrl>
|
|
|
+ <PublishUrl>E:\s_user_site\</PublishUrl>
|
|
|
<Install>true</Install>
|
|
|
<InstallFrom>Web</InstallFrom>
|
|
|
<UpdateEnabled>true</UpdateEnabled>
|
|
|
@@ -32,17 +32,17 @@
|
|
|
<UpdatePeriodically>false</UpdatePeriodically>
|
|
|
<UpdateRequired>true</UpdateRequired>
|
|
|
<MapFileExtensions>true</MapFileExtensions>
|
|
|
- <InstallUrl>http://172.16.11.99/releasetest/</InstallUrl>
|
|
|
+ <InstallUrl>http://172.16.11.99/</InstallUrl>
|
|
|
<UpdateUrl>http://172.16.11.99/</UpdateUrl>
|
|
|
<TargetCulture>zh</TargetCulture>
|
|
|
- <ProductName>优软MES系统_TEST</ProductName>
|
|
|
+ <ProductName>优软MES系统</ProductName>
|
|
|
<PublisherName>深圳市优软科技有限公司</PublisherName>
|
|
|
- <SuiteName>优软MES系统_TEST</SuiteName>
|
|
|
- <MinimumRequiredVersion>1.0.0.424</MinimumRequiredVersion>
|
|
|
+ <SuiteName>优软MES系统</SuiteName>
|
|
|
+ <MinimumRequiredVersion>1.0.0.414</MinimumRequiredVersion>
|
|
|
<CreateWebPageOnPublish>true</CreateWebPageOnPublish>
|
|
|
<WebPage>publish.htm</WebPage>
|
|
|
<OpenBrowserOnPublish>false</OpenBrowserOnPublish>
|
|
|
- <ApplicationRevision>460</ApplicationRevision>
|
|
|
+ <ApplicationRevision>415</ApplicationRevision>
|
|
|
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
|
|
|
<UseApplicationTrust>true</UseApplicationTrust>
|
|
|
<CreateDesktopShortcut>true</CreateDesktopShortcut>
|
|
|
@@ -60,7 +60,6 @@
|
|
|
<ErrorReport>prompt</ErrorReport>
|
|
|
<WarningLevel>0</WarningLevel>
|
|
|
<UseVSHostingProcess>true</UseVSHostingProcess>
|
|
|
- <GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
|
|
|
</PropertyGroup>
|
|
|
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
|
|
<PlatformTarget>AnyCPU</PlatformTarget>
|
|
|
@@ -82,7 +81,7 @@
|
|
|
<GenerateManifests>true</GenerateManifests>
|
|
|
</PropertyGroup>
|
|
|
<PropertyGroup>
|
|
|
- <SignManifests>false</SignManifests>
|
|
|
+ <SignManifests>true</SignManifests>
|
|
|
</PropertyGroup>
|
|
|
<PropertyGroup>
|
|
|
<StartupObject>UAS_MES.Program</StartupObject>
|
|
|
@@ -120,6 +119,9 @@
|
|
|
<Reference Include="ExcelHelper">
|
|
|
<HintPath>Tool\ExcelHelper.dll</HintPath>
|
|
|
</Reference>
|
|
|
+ <Reference Include="ICSharpCode.SharpZipLib">
|
|
|
+ <HintPath>Tool\ICSharpCode.SharpZipLib.dll</HintPath>
|
|
|
+ </Reference>
|
|
|
<Reference Include="Interop.SpeechLib">
|
|
|
<HintPath>Tool\Interop.SpeechLib.dll</HintPath>
|
|
|
<EmbedInteropTypes>False</EmbedInteropTypes>
|
|
|
@@ -381,7 +383,7 @@
|
|
|
<DependentUpon>TextBoxNumOnly.cs</DependentUpon>
|
|
|
</Compile>
|
|
|
<Compile Include="CustomControl\TextBoxWithIcon\TextBoxWithPlaceHolder.cs">
|
|
|
- <SubType>Component</SubType>
|
|
|
+ <SubType>UserControl</SubType>
|
|
|
</Compile>
|
|
|
<Compile Include="CustomControl\TextBoxWithIcon\TextBoxWithPlaceHolder.Designer.cs">
|
|
|
<DependentUpon>TextBoxWithPlaceHolder.cs</DependentUpon>
|
|
|
@@ -477,29 +479,53 @@
|
|
|
<Compile Include="FunctionCode\Make\Make_FuselageLabelPrint.Designer.cs">
|
|
|
<DependentUpon>Make_FuselageLabelPrint.cs</DependentUpon>
|
|
|
</Compile>
|
|
|
+ <Compile Include="FunctionCode\Make\Make_GetReMakeSN.cs">
|
|
|
+ <SubType>Form</SubType>
|
|
|
+ </Compile>
|
|
|
+ <Compile Include="FunctionCode\Make\Make_GetReMakeSN.Designer.cs">
|
|
|
+ <DependentUpon>Make_GetReMakeSN.cs</DependentUpon>
|
|
|
+ </Compile>
|
|
|
<Compile Include="FunctionCode\Make\Make_LabelCheck.cs">
|
|
|
<SubType>Form</SubType>
|
|
|
</Compile>
|
|
|
<Compile Include="FunctionCode\Make\Make_LabelCheck.Designer.cs">
|
|
|
<DependentUpon>Make_LabelCheck.cs</DependentUpon>
|
|
|
</Compile>
|
|
|
+ <Compile Include="FunctionCode\Make\Make_MakeCancelDown.cs">
|
|
|
+ <SubType>Form</SubType>
|
|
|
+ </Compile>
|
|
|
+ <Compile Include="FunctionCode\Make\Make_MakeCancelDown.Designer.cs">
|
|
|
+ <DependentUpon>Make_MakeCancelDown.cs</DependentUpon>
|
|
|
+ </Compile>
|
|
|
+ <Compile Include="FunctionCode\Make\Make_MakeDown.cs">
|
|
|
+ <SubType>Form</SubType>
|
|
|
+ </Compile>
|
|
|
+ <Compile Include="FunctionCode\Make\Make_MakeDown.Designer.cs">
|
|
|
+ <DependentUpon>Make_MakeDown.cs</DependentUpon>
|
|
|
+ </Compile>
|
|
|
<Compile Include="FunctionCode\Make\Make_NewBadCode.cs">
|
|
|
<SubType>Form</SubType>
|
|
|
</Compile>
|
|
|
<Compile Include="FunctionCode\Make\Make_NewBadCode.Designer.cs">
|
|
|
<DependentUpon>Make_NewBadCode.cs</DependentUpon>
|
|
|
</Compile>
|
|
|
- <Compile Include="FunctionCode\Make\Make_NewMatainInf.cs">
|
|
|
+ <Compile Include="FunctionCode\Make\Make_NewBadCode_DE.cs">
|
|
|
<SubType>Form</SubType>
|
|
|
</Compile>
|
|
|
- <Compile Include="FunctionCode\Make\Make_NewMatainInf.Designer.cs">
|
|
|
- <DependentUpon>Make_NewMatainInf.cs</DependentUpon>
|
|
|
+ <Compile Include="FunctionCode\Make\Make_NewBadCode_DE.Designer.cs">
|
|
|
+ <DependentUpon>Make_NewBadCode_DE.cs</DependentUpon>
|
|
|
</Compile>
|
|
|
- <Compile Include="FunctionCode\Make\Make_NewPallet.cs">
|
|
|
+ <Compile Include="FunctionCode\Make\Make_NewBigBox.cs">
|
|
|
<SubType>Form</SubType>
|
|
|
</Compile>
|
|
|
- <Compile Include="FunctionCode\Make\Make_NewPallet.Designer.cs">
|
|
|
- <DependentUpon>Make_NewPallet.cs</DependentUpon>
|
|
|
+ <Compile Include="FunctionCode\Make\Make_NewBigBox.Designer.cs">
|
|
|
+ <DependentUpon>Make_NewBigBox.cs</DependentUpon>
|
|
|
+ </Compile>
|
|
|
+ <Compile Include="FunctionCode\Make\Make_NewMatainInf.cs">
|
|
|
+ <SubType>Form</SubType>
|
|
|
+ </Compile>
|
|
|
+ <Compile Include="FunctionCode\Make\Make_NewMatainInf.Designer.cs">
|
|
|
+ <DependentUpon>Make_NewMatainInf.cs</DependentUpon>
|
|
|
</Compile>
|
|
|
<Compile Include="FunctionCode\Make\Make_PackageCollectionWeigh.cs">
|
|
|
<SubType>Form</SubType>
|
|
|
@@ -513,6 +539,12 @@
|
|
|
<Compile Include="FunctionCode\Make\Make_PalletCollection.Designer.cs">
|
|
|
<DependentUpon>Make_PalletCollection.cs</DependentUpon>
|
|
|
</Compile>
|
|
|
+ <Compile Include="FunctionCode\Make\Make_PalletWeightRecord.cs">
|
|
|
+ <SubType>Form</SubType>
|
|
|
+ </Compile>
|
|
|
+ <Compile Include="FunctionCode\Make\Make_PalletWeightRecord.Designer.cs">
|
|
|
+ <DependentUpon>Make_PalletWeightRecord.cs</DependentUpon>
|
|
|
+ </Compile>
|
|
|
<Compile Include="FunctionCode\Make\Make_RePrintLabel.cs">
|
|
|
<SubType>Form</SubType>
|
|
|
</Compile>
|
|
|
@@ -525,12 +557,54 @@
|
|
|
<Compile Include="FunctionCode\Make\Make_SeqProgramTransform.Designer.cs">
|
|
|
<DependentUpon>Make_SeqProgramTransform.cs</DependentUpon>
|
|
|
</Compile>
|
|
|
+ <Compile Include="FunctionCode\Make\Make_SpecialCartonPack.cs">
|
|
|
+ <SubType>Form</SubType>
|
|
|
+ </Compile>
|
|
|
+ <Compile Include="FunctionCode\Make\Make_SpecialCartonPack.Designer.cs">
|
|
|
+ <DependentUpon>Make_SpecialCartonPack.cs</DependentUpon>
|
|
|
+ </Compile>
|
|
|
+ <Compile Include="FunctionCode\Make\Make_UpdateCollectCode.cs">
|
|
|
+ <SubType>Form</SubType>
|
|
|
+ </Compile>
|
|
|
+ <Compile Include="FunctionCode\Make\Make_UpdateCollectCode.Designer.cs">
|
|
|
+ <DependentUpon>Make_UpdateCollectCode.cs</DependentUpon>
|
|
|
+ </Compile>
|
|
|
+ <Compile Include="FunctionCode\OQC\OQC_CheckNoSplit.cs">
|
|
|
+ <SubType>Form</SubType>
|
|
|
+ </Compile>
|
|
|
+ <Compile Include="FunctionCode\OQC\OQC_CheckNoSplit.Designer.cs">
|
|
|
+ <DependentUpon>OQC_CheckNoSplit.cs</DependentUpon>
|
|
|
+ </Compile>
|
|
|
+ <Compile Include="FunctionCode\Packing\Packing_CartonSplit.cs">
|
|
|
+ <SubType>Form</SubType>
|
|
|
+ </Compile>
|
|
|
+ <Compile Include="FunctionCode\Packing\Packing_CartonSplit.Designer.cs">
|
|
|
+ <DependentUpon>Packing_CartonSplit.cs</DependentUpon>
|
|
|
+ </Compile>
|
|
|
+ <Compile Include="FunctionCode\Packing\Packing_CartonTransfer.cs">
|
|
|
+ <SubType>Form</SubType>
|
|
|
+ </Compile>
|
|
|
+ <Compile Include="FunctionCode\Packing\Packing_CartonTransfer.Designer.cs">
|
|
|
+ <DependentUpon>Packing_CartonTransfer.cs</DependentUpon>
|
|
|
+ </Compile>
|
|
|
<Compile Include="FunctionCode\Special\Special_MendLabel.cs">
|
|
|
<SubType>Form</SubType>
|
|
|
</Compile>
|
|
|
<Compile Include="FunctionCode\Special\Special_MendLabel.Designer.cs">
|
|
|
<DependentUpon>Special_MendLabel.cs</DependentUpon>
|
|
|
</Compile>
|
|
|
+ <Compile Include="FunctionCode\Warehouse\Warehouse_NewPiInOut.cs">
|
|
|
+ <SubType>Form</SubType>
|
|
|
+ </Compile>
|
|
|
+ <Compile Include="FunctionCode\Warehouse\Warehouse_NewPiInOut.Designer.cs">
|
|
|
+ <DependentUpon>Warehouse_NewPiInOut.cs</DependentUpon>
|
|
|
+ </Compile>
|
|
|
+ <Compile Include="FunctionCode\Warehouse\Warehouse_ProdDetail.cs">
|
|
|
+ <SubType>Form</SubType>
|
|
|
+ </Compile>
|
|
|
+ <Compile Include="FunctionCode\Warehouse\Warehouse_ProdDetail.Designer.cs">
|
|
|
+ <DependentUpon>Warehouse_ProdDetail.cs</DependentUpon>
|
|
|
+ </Compile>
|
|
|
<Compile Include="Login.cs">
|
|
|
<SubType>Form</SubType>
|
|
|
</Compile>
|
|
|
@@ -690,11 +764,11 @@
|
|
|
<Compile Include="FunctionCode\Make\Make_ColorBoxWeigh.Designer.cs">
|
|
|
<DependentUpon>Make_ColorBoxWeigh.cs</DependentUpon>
|
|
|
</Compile>
|
|
|
- <Compile Include="FunctionCode\Make\Make_NewBigBox.cs">
|
|
|
+ <Compile Include="FunctionCode\Make\Make_NewPallet.cs">
|
|
|
<SubType>Form</SubType>
|
|
|
</Compile>
|
|
|
- <Compile Include="FunctionCode\Make\Make_NewBigBox.Designer.cs">
|
|
|
- <DependentUpon>Make_NewBigBox.cs</DependentUpon>
|
|
|
+ <Compile Include="FunctionCode\Make\Make_NewPallet.Designer.cs">
|
|
|
+ <DependentUpon>Make_NewPallet.cs</DependentUpon>
|
|
|
</Compile>
|
|
|
<Compile Include="FunctionCode\Make\Make_ColorBoxLoadPrint.cs">
|
|
|
<SubType>Form</SubType>
|
|
|
@@ -888,6 +962,7 @@
|
|
|
<Compile Include="FunctionCode\SystemSetting\SystemSetting_ScaleTest.Designer.cs">
|
|
|
<DependentUpon>SystemSetting_ScaleTest.cs</DependentUpon>
|
|
|
</Compile>
|
|
|
+ <Compile Include="PublicMethod\ZipHelper.cs" />
|
|
|
<Compile Include="Settings.cs" />
|
|
|
<EmbeddedResource Include="CustomControl\AccordionMenu\AccordionMenu.resx">
|
|
|
<DependentUpon>AccordionMenu.cs</DependentUpon>
|
|
|
@@ -997,33 +1072,66 @@
|
|
|
<EmbeddedResource Include="FunctionCode\Make\Make_FuselageLabelPrint.resx">
|
|
|
<DependentUpon>Make_FuselageLabelPrint.cs</DependentUpon>
|
|
|
</EmbeddedResource>
|
|
|
+ <EmbeddedResource Include="FunctionCode\Make\Make_GetReMakeSN.resx">
|
|
|
+ <DependentUpon>Make_GetReMakeSN.cs</DependentUpon>
|
|
|
+ </EmbeddedResource>
|
|
|
<EmbeddedResource Include="FunctionCode\Make\Make_LabelCheck.resx">
|
|
|
<DependentUpon>Make_LabelCheck.cs</DependentUpon>
|
|
|
</EmbeddedResource>
|
|
|
+ <EmbeddedResource Include="FunctionCode\Make\Make_MakeCancelDown.resx">
|
|
|
+ <DependentUpon>Make_MakeCancelDown.cs</DependentUpon>
|
|
|
+ </EmbeddedResource>
|
|
|
+ <EmbeddedResource Include="FunctionCode\Make\Make_MakeDown.resx">
|
|
|
+ <DependentUpon>Make_MakeDown.cs</DependentUpon>
|
|
|
+ </EmbeddedResource>
|
|
|
<EmbeddedResource Include="FunctionCode\Make\Make_NewBadCode.resx">
|
|
|
<DependentUpon>Make_NewBadCode.cs</DependentUpon>
|
|
|
</EmbeddedResource>
|
|
|
+ <EmbeddedResource Include="FunctionCode\Make\Make_NewBadCode_DE.resx">
|
|
|
+ <DependentUpon>Make_NewBadCode_DE.cs</DependentUpon>
|
|
|
+ </EmbeddedResource>
|
|
|
+ <EmbeddedResource Include="FunctionCode\Make\Make_NewBigBox.resx">
|
|
|
+ <DependentUpon>Make_NewBigBox.cs</DependentUpon>
|
|
|
+ </EmbeddedResource>
|
|
|
<EmbeddedResource Include="FunctionCode\Make\Make_NewMatainInf.resx">
|
|
|
<DependentUpon>Make_NewMatainInf.cs</DependentUpon>
|
|
|
</EmbeddedResource>
|
|
|
- <EmbeddedResource Include="FunctionCode\Make\Make_NewPallet.resx">
|
|
|
- <DependentUpon>Make_NewPallet.cs</DependentUpon>
|
|
|
- </EmbeddedResource>
|
|
|
<EmbeddedResource Include="FunctionCode\Make\Make_PackageCollectionWeigh.resx">
|
|
|
<DependentUpon>Make_PackageCollectionWeigh.cs</DependentUpon>
|
|
|
</EmbeddedResource>
|
|
|
<EmbeddedResource Include="FunctionCode\Make\Make_PalletCollection.resx">
|
|
|
<DependentUpon>Make_PalletCollection.cs</DependentUpon>
|
|
|
</EmbeddedResource>
|
|
|
+ <EmbeddedResource Include="FunctionCode\Make\Make_PalletWeightRecord.resx">
|
|
|
+ <DependentUpon>Make_PalletWeightRecord.cs</DependentUpon>
|
|
|
+ </EmbeddedResource>
|
|
|
<EmbeddedResource Include="FunctionCode\Make\Make_RePrintLabel.resx">
|
|
|
<DependentUpon>Make_RePrintLabel.cs</DependentUpon>
|
|
|
</EmbeddedResource>
|
|
|
<EmbeddedResource Include="FunctionCode\Make\Make_SeqProgramTransform.resx">
|
|
|
<DependentUpon>Make_SeqProgramTransform.cs</DependentUpon>
|
|
|
</EmbeddedResource>
|
|
|
+ <EmbeddedResource Include="FunctionCode\Make\Make_SpecialCartonPack.resx">
|
|
|
+ <DependentUpon>Make_SpecialCartonPack.cs</DependentUpon>
|
|
|
+ </EmbeddedResource>
|
|
|
+ <EmbeddedResource Include="FunctionCode\Make\Make_UpdateCollectCode.resx">
|
|
|
+ <DependentUpon>Make_UpdateCollectCode.cs</DependentUpon>
|
|
|
+ </EmbeddedResource>
|
|
|
+ <EmbeddedResource Include="FunctionCode\OQC\OQC_CheckNoSplit.resx">
|
|
|
+ <DependentUpon>OQC_CheckNoSplit.cs</DependentUpon>
|
|
|
+ </EmbeddedResource>
|
|
|
+ <EmbeddedResource Include="FunctionCode\Packing\Packing_CartonSplit.resx">
|
|
|
+ <DependentUpon>Packing_CartonSplit.cs</DependentUpon>
|
|
|
+ </EmbeddedResource>
|
|
|
+ <EmbeddedResource Include="FunctionCode\Packing\Packing_CartonTransfer.resx">
|
|
|
+ <DependentUpon>Packing_CartonTransfer.cs</DependentUpon>
|
|
|
+ </EmbeddedResource>
|
|
|
<EmbeddedResource Include="FunctionCode\Special\Special_MendLabel.resx">
|
|
|
<DependentUpon>Special_MendLabel.cs</DependentUpon>
|
|
|
</EmbeddedResource>
|
|
|
+ <EmbeddedResource Include="FunctionCode\Warehouse\Warehouse_NewPiInOut.resx">
|
|
|
+ <DependentUpon>Warehouse_NewPiInOut.cs</DependentUpon>
|
|
|
+ </EmbeddedResource>
|
|
|
<EmbeddedResource Include="Login.resx">
|
|
|
<DependentUpon>Login.cs</DependentUpon>
|
|
|
</EmbeddedResource>
|
|
|
@@ -1098,8 +1206,8 @@
|
|
|
<EmbeddedResource Include="FunctionCode\Make\Make_ColorBoxWeigh.resx">
|
|
|
<DependentUpon>Make_ColorBoxWeigh.cs</DependentUpon>
|
|
|
</EmbeddedResource>
|
|
|
- <EmbeddedResource Include="FunctionCode\Make\Make_NewBigBox.resx">
|
|
|
- <DependentUpon>Make_NewBigBox.cs</DependentUpon>
|
|
|
+ <EmbeddedResource Include="FunctionCode\Make\Make_NewPallet.resx">
|
|
|
+ <DependentUpon>Make_NewPallet.cs</DependentUpon>
|
|
|
</EmbeddedResource>
|
|
|
<EmbeddedResource Include="FunctionCode\Make\Make_ColorBoxLoadPrint.resx">
|
|
|
<DependentUpon>Make_ColorBoxLoadPrint.cs</DependentUpon>
|
|
|
@@ -1189,7 +1297,6 @@
|
|
|
<DependentUpon>SystemSetting_ScaleTest.cs</DependentUpon>
|
|
|
</EmbeddedResource>
|
|
|
<None Include="Cert\深圳市优软科技有限公司.pfx" />
|
|
|
- <None Include="ClassDiagram1.cd" />
|
|
|
<None Include="Properties\app.manifest" />
|
|
|
<None Include="Properties\Settings.settings">
|
|
|
<Generator>SettingsSingleFileGenerator</Generator>
|
|
|
@@ -1221,7 +1328,6 @@
|
|
|
<Content Include="Resources\Sound\3291.wav" />
|
|
|
<Content Include="Resources\Sound\5185.wav" />
|
|
|
<Content Include="Resources\Sound\8378.wav" />
|
|
|
- <None Include="Resources\WhiteImage.png" />
|
|
|
<Content Include="U_Icon.ico" />
|
|
|
<None Include="Resources\timg.jpg" />
|
|
|
<None Include="Resources\matte_white_square_icon_business_tool_hammer_128px_571061_easyicon.net.ico" />
|