版本-v1.2.0 未调试

This commit is contained in:
CPL 2023-11-01 15:13:54 +08:00
parent 0774acbc17
commit 2a841bbfa9
39 changed files with 77714 additions and 90494 deletions

View File

@ -1,420 +1,429 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{3988AF04-DF89-4BBB-BEC9-92CDAF3BCC9D}</ProjectGuid> <ProjectGuid>{3988AF04-DF89-4BBB-BEC9-92CDAF3BCC9D}</ProjectGuid>
<OutputType>WinExe</OutputType> <OutputType>WinExe</OutputType>
<RootNamespace>AssistClient</RootNamespace> <RootNamespace>AssistClient</RootNamespace>
<AssemblyName>AssistClient</AssemblyName> <AssemblyName>AssistClient</AssemblyName>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects> <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<Deterministic>true</Deterministic> <Deterministic>true</Deterministic>
<PublishUrl>publish\</PublishUrl> <PublishUrl>publish\</PublishUrl>
<Install>true</Install> <Install>true</Install>
<InstallFrom>Disk</InstallFrom> <InstallFrom>Disk</InstallFrom>
<UpdateEnabled>false</UpdateEnabled> <UpdateEnabled>false</UpdateEnabled>
<UpdateMode>Foreground</UpdateMode> <UpdateMode>Foreground</UpdateMode>
<UpdateInterval>7</UpdateInterval> <UpdateInterval>7</UpdateInterval>
<UpdateIntervalUnits>Days</UpdateIntervalUnits> <UpdateIntervalUnits>Days</UpdateIntervalUnits>
<UpdatePeriodically>false</UpdatePeriodically> <UpdatePeriodically>false</UpdatePeriodically>
<UpdateRequired>false</UpdateRequired> <UpdateRequired>false</UpdateRequired>
<MapFileExtensions>true</MapFileExtensions> <MapFileExtensions>true</MapFileExtensions>
<ApplicationRevision>0</ApplicationRevision> <ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion> <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<IsWebBootstrapper>false</IsWebBootstrapper> <IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust> <UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled> <BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>x64</PlatformTarget> <PlatformTarget>x64</PlatformTarget>
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType> <DebugType>full</DebugType>
<Optimize>false</Optimize> <Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath> <OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants> <DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget> <PlatformTarget>AnyCPU</PlatformTarget>
<DebugType>pdbonly</DebugType> <DebugType>pdbonly</DebugType>
<Optimize>true</Optimize> <Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath> <OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants> <DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<ApplicationIcon>ComputerDisplayMode.ico</ApplicationIcon> <ApplicationIcon>ComputerDisplayMode.ico</ApplicationIcon>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<SignManifests>false</SignManifests> <SignManifests>false</SignManifests>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<TargetZone>LocalIntranet</TargetZone> <TargetZone>LocalIntranet</TargetZone>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<GenerateManifests>false</GenerateManifests> <GenerateManifests>false</GenerateManifests>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<ApplicationManifest>Properties\app.manifest</ApplicationManifest> <ApplicationManifest>Properties\app.manifest</ApplicationManifest>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="AdvMotAPI, Version=2.0.8.5, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="AdvMotAPI, Version=2.0.8.5, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>bin\Debug\AdvMotAPI.dll</HintPath> <HintPath>bin\Debug\AdvMotAPI.dll</HintPath>
</Reference> </Reference>
<Reference Include="Automation.BDaq4, Version=4.0.0.0, Culture=neutral, PublicKeyToken=463f5928d60183a0, processorArchitecture=MSIL"> <Reference Include="Automation.BDaq4, Version=4.0.0.0, Culture=neutral, PublicKeyToken=463f5928d60183a0, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>bin\Debug\Automation.BDaq4.dll</HintPath> <HintPath>bin\Debug\Automation.BDaq4.dll</HintPath>
</Reference> </Reference>
<Reference Include="ControllerDllCSharp, Version=3.0.0.1, Culture=neutral, processorArchitecture=AMD64"> <Reference Include="ControllerDllCSharp, Version=3.0.0.1, Culture=neutral, processorArchitecture=AMD64">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>bin\Debug\ControllerDllCSharp.dll</HintPath> <HintPath>bin\Debug\ControllerDllCSharp.dll</HintPath>
</Reference> </Reference>
<Reference Include="halcondotnet, Version=21.5.0.0, Culture=neutral, PublicKeyToken=4973bed59ddbf2b8, processorArchitecture=MSIL"> <Reference Include="halcondotnet, Version=21.5.0.0, Culture=neutral, PublicKeyToken=4973bed59ddbf2b8, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>bin\Debug\halcondotnet.dll</HintPath> <HintPath>bin\Debug\halcondotnet.dll</HintPath>
</Reference> </Reference>
<Reference Include="hdevenginedotnet, Version=21.5.0.0, Culture=neutral, PublicKeyToken=4973bed59ddbf2b8, processorArchitecture=MSIL"> <Reference Include="hdevenginedotnet, Version=21.5.0.0, Culture=neutral, PublicKeyToken=4973bed59ddbf2b8, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>bin\Debug\hdevenginedotnet.dll</HintPath> <HintPath>bin\Debug\hdevenginedotnet.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.ML.OnnxRuntime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=f27f157f0a5b7bb6, processorArchitecture=MSIL"> <Reference Include="Microsoft.ML.OnnxRuntime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=f27f157f0a5b7bb6, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>bin\Debug\Microsoft.ML.OnnxRuntime.dll</HintPath> <HintPath>bin\Debug\Microsoft.ML.OnnxRuntime.dll</HintPath>
</Reference> </Reference>
<Reference Include="MvCameraControl.Net, Version=3.4.0.1, Culture=neutral, PublicKeyToken=52fddfb3f94be800, processorArchitecture=MSIL"> <Reference Include="MvCameraControl.Net, Version=3.4.0.1, Culture=neutral, PublicKeyToken=52fddfb3f94be800, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>bin\Debug\MvCameraControl.Net.dll</HintPath> <HintPath>bin\Debug\MvCameraControl.Net.dll</HintPath>
</Reference> </Reference>
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL"> <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\Code\packages\Newtonsoft.Json.13.0.2\lib\net45\Newtonsoft.Json.dll</HintPath> <HintPath>..\Code\packages\Newtonsoft.Json.13.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference> </Reference>
<Reference Include="OpenCvSharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6adad1e807fea099, processorArchitecture=MSIL"> <Reference Include="OpenCvSharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6adad1e807fea099, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>bin\Debug\OpenCvSharp.dll</HintPath> <HintPath>bin\Debug\OpenCvSharp.dll</HintPath>
</Reference> </Reference>
<Reference Include="OpenCvSharp.Extensions, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6adad1e807fea099, processorArchitecture=MSIL"> <Reference Include="OpenCvSharp.Extensions, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6adad1e807fea099, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>bin\Debug\OpenCvSharp.Extensions.dll</HintPath> <HintPath>bin\Debug\OpenCvSharp.Extensions.dll</HintPath>
</Reference> </Reference>
<Reference Include="SqlSugar, Version=5.1.4.73, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="SqlSugar, Version=5.1.4.73, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\Code\packages\SqlSugar.5.1.4.73\lib\SqlSugar.dll</HintPath> <HintPath>..\Code\packages\SqlSugar.5.1.4.73\lib\SqlSugar.dll</HintPath>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />
<Reference Include="System.Management" /> <Reference Include="System.Management" />
<Reference Include="System.Xml.Linq" /> <Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" /> <Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" /> <Reference Include="System.Data" />
<Reference Include="System.Deployment" /> <Reference Include="System.Deployment" />
<Reference Include="System.Drawing" /> <Reference Include="System.Drawing" />
<Reference Include="System.Net.Http" /> <Reference Include="System.Net.Http" />
<Reference Include="System.Windows.Forms" /> <Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
<Reference Include="Yolo5, Version=1.0.0.0, Culture=neutral, processorArchitecture=AMD64"> <Reference Include="Yolo5, Version=1.0.0.0, Culture=neutral, processorArchitecture=AMD64">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>bin\Debug\Yolo5.dll</HintPath> <HintPath>bin\Debug\Yolo5.dll</HintPath>
</Reference> </Reference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="API.cs" /> <Compile Include="API.cs" />
<Compile Include="Config.cs" /> <Compile Include="Config.cs" />
<Compile Include="DevContainer.cs" /> <Compile Include="DevContainer.cs" />
<Compile Include="Device\AxisDev.cs" /> <Compile Include="Device\AxisDev.cs" />
<Compile Include="Device\CodeScannerDev.cs" /> <Compile Include="Device\CodeScannerDev.cs" />
<Compile Include="Device\ForLib.cs" /> <Compile Include="Device\ForLib.cs" />
<Compile Include="Device\IFLib.cs" /> <Compile Include="Device\IFLib.cs" />
<Compile Include="Device\IOCardDev.cs" /> <Compile Include="Device\IOCardDev.cs" />
<Compile Include="Device\LightDev.cs" /> <Compile Include="Device\LightDev.cs" />
<Compile Include="Device\ScannerDev.cs" /> <Compile Include="Device\ScannerDev.cs" />
<Compile Include="Device\SizeLib.cs" /> <Compile Include="Device\SizeLib.cs" />
<Compile Include="Enums.cs" /> <Compile Include="Enums.cs" />
<Compile Include="Form1.cs"> <Compile Include="Form1.cs">
<SubType>Form</SubType> <SubType>Form</SubType>
</Compile> </Compile>
<Compile Include="Form1.Designer.cs"> <Compile Include="Form1.Designer.cs">
<DependentUpon>Form1.cs</DependentUpon> <DependentUpon>Form1.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="FrmCMDProcess.cs"> <Compile Include="FrmCMDProcess.cs">
<SubType>Form</SubType> <SubType>Form</SubType>
</Compile> </Compile>
<Compile Include="FrmCMDProcess.Designer.cs"> <Compile Include="FrmCMDProcess.Designer.cs">
<DependentUpon>FrmCMDProcess.cs</DependentUpon> <DependentUpon>FrmCMDProcess.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="FrmDebug3.cs"> <Compile Include="FrmDebug3.cs">
<SubType>Form</SubType> <SubType>Form</SubType>
</Compile> </Compile>
<Compile Include="FrmDebug3.Designer.cs"> <Compile Include="FrmDebug3.Designer.cs">
<DependentUpon>FrmDebug3.cs</DependentUpon> <DependentUpon>FrmDebug3.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="FrmLoading.cs"> <Compile Include="FrmLoading.cs">
<SubType>Form</SubType> <SubType>Form</SubType>
</Compile> </Compile>
<Compile Include="FrmLoading.designer.cs"> <Compile Include="FrmLoading.designer.cs">
<DependentUpon>FrmLoading.cs</DependentUpon> <DependentUpon>FrmLoading.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="FrmLogin.cs"> <Compile Include="FrmLogin.cs">
<SubType>Form</SubType> <SubType>Form</SubType>
</Compile> </Compile>
<Compile Include="FrmLogin.Designer.cs"> <Compile Include="FrmLogin.Designer.cs">
<DependentUpon>FrmLogin.cs</DependentUpon> <DependentUpon>FrmLogin.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="FrmMain.cs"> <Compile Include="FrmMain.cs">
<SubType>Form</SubType> <SubType>Form</SubType>
</Compile> </Compile>
<Compile Include="FrmMain.Designer.cs"> <Compile Include="FrmMain.Designer.cs">
<DependentUpon>FrmMain.cs</DependentUpon> <DependentUpon>FrmMain.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="FrmProductList.cs"> <Compile Include="FrmProductList.cs">
<SubType>Form</SubType> <SubType>Form</SubType>
</Compile> </Compile>
<Compile Include="FrmProductList.Designer.cs"> <Compile Include="FrmProductList.Designer.cs">
<DependentUpon>FrmProductList.cs</DependentUpon> <DependentUpon>FrmProductList.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="FrmProductStep.cs"> <Compile Include="FrmProductStep.cs">
<SubType>Form</SubType> <SubType>Form</SubType>
</Compile> </Compile>
<Compile Include="FrmProductStep.Designer.cs"> <Compile Include="FrmProductStep.Designer.cs">
<DependentUpon>FrmProductStep.cs</DependentUpon> <DependentUpon>FrmProductStep.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="FrmPTSetting.cs"> <Compile Include="FrmPTSetting.cs">
<SubType>Form</SubType> <SubType>Form</SubType>
</Compile> </Compile>
<Compile Include="FrmPTSetting.Designer.cs"> <Compile Include="FrmPTSetting.Designer.cs">
<DependentUpon>FrmPTSetting.cs</DependentUpon> <DependentUpon>FrmPTSetting.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="FrmSetParams.cs"> <Compile Include="FrmRepairInfo.cs">
<SubType>Form</SubType> <SubType>Form</SubType>
</Compile> </Compile>
<Compile Include="FrmSetParams.Designer.cs"> <Compile Include="FrmRepairInfo.Designer.cs">
<DependentUpon>FrmSetParams.cs</DependentUpon> <DependentUpon>FrmRepairInfo.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="FrmStepInfo.cs"> <Compile Include="FrmSetParams.cs">
<SubType>Form</SubType> <SubType>Form</SubType>
</Compile> </Compile>
<Compile Include="FrmStepInfo.Designer.cs"> <Compile Include="FrmSetParams.Designer.cs">
<DependentUpon>FrmStepInfo.cs</DependentUpon> <DependentUpon>FrmSetParams.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="FrmStepList.cs"> <Compile Include="FrmStepInfo.cs">
<SubType>Form</SubType> <SubType>Form</SubType>
</Compile> </Compile>
<Compile Include="FrmStepList.Designer.cs"> <Compile Include="FrmStepInfo.Designer.cs">
<DependentUpon>FrmStepList.cs</DependentUpon> <DependentUpon>FrmStepInfo.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="FrmSysSetting.cs"> <Compile Include="FrmStepList.cs">
<SubType>Form</SubType> <SubType>Form</SubType>
</Compile> </Compile>
<Compile Include="FrmSysSetting.Designer.cs"> <Compile Include="FrmStepList.Designer.cs">
<DependentUpon>FrmSysSetting.cs</DependentUpon> <DependentUpon>FrmStepList.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="Program.cs" /> <Compile Include="FrmSysSetting.cs">
<Compile Include="Properties\AssemblyInfo.cs" /> <SubType>Form</SubType>
<Compile Include="UI\AxisDevProp.cs" /> </Compile>
<Compile Include="UI\ForProp.cs" /> <Compile Include="FrmSysSetting.Designer.cs">
<Compile Include="UI\FrmScannerShow.cs"> <DependentUpon>FrmSysSetting.cs</DependentUpon>
<SubType>Form</SubType> </Compile>
</Compile> <Compile Include="Program.cs" />
<Compile Include="UI\FrmScannerShow.Designer.cs"> <Compile Include="Properties\AssemblyInfo.cs" />
<DependentUpon>FrmScannerShow.cs</DependentUpon> <Compile Include="UI\AxisDevProp.cs" />
</Compile> <Compile Include="UI\ForProp.cs" />
<Compile Include="UI\IFProp.cs" /> <Compile Include="UI\FrmScannerShow.cs">
<Compile Include="UI\IOCardDevProp.cs" /> <SubType>Form</SubType>
<Compile Include="UI\LightDevProp.cs" /> </Compile>
<Compile Include="UI\PropExtend\PropertyOrderAttribute.cs" /> <Compile Include="UI\FrmScannerShow.Designer.cs">
<Compile Include="UI\PropExtend\PropertySorter.cs" /> <DependentUpon>FrmScannerShow.cs</DependentUpon>
<Compile Include="UI\ScannerDevProp.cs" /> </Compile>
<Compile Include="UI\SizeLibProp.cs" /> <Compile Include="UI\IFProp.cs" />
<Compile Include="UI\UIAxisDev.cs"> <Compile Include="UI\IOCardDevProp.cs" />
<SubType>UserControl</SubType> <Compile Include="UI\LightDevProp.cs" />
</Compile> <Compile Include="UI\PropExtend\PropertyOrderAttribute.cs" />
<Compile Include="UI\UIAxisDev.Designer.cs"> <Compile Include="UI\PropExtend\PropertySorter.cs" />
<DependentUpon>UIAxisDev.cs</DependentUpon> <Compile Include="UI\ScannerDevProp.cs" />
</Compile> <Compile Include="UI\SizeLibProp.cs" />
<Compile Include="UI\UICodeScannerDev.cs"> <Compile Include="UI\UIAxisDev.cs">
<SubType>UserControl</SubType> <SubType>UserControl</SubType>
</Compile> </Compile>
<Compile Include="UI\UICodeScannerDev.Designer.cs"> <Compile Include="UI\UIAxisDev.Designer.cs">
<DependentUpon>UICodeScannerDev.cs</DependentUpon> <DependentUpon>UIAxisDev.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="UI\UIForLib.cs"> <Compile Include="UI\UICodeScannerDev.cs">
<SubType>UserControl</SubType> <SubType>UserControl</SubType>
</Compile> </Compile>
<Compile Include="UI\UIForLib.Designer.cs"> <Compile Include="UI\UICodeScannerDev.Designer.cs">
<DependentUpon>UIForLib.cs</DependentUpon> <DependentUpon>UICodeScannerDev.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="UI\UIIFLib.cs"> <Compile Include="UI\UIForLib.cs">
<SubType>UserControl</SubType> <SubType>UserControl</SubType>
</Compile> </Compile>
<Compile Include="UI\UIIFLib.Designer.cs"> <Compile Include="UI\UIForLib.Designer.cs">
<DependentUpon>UIIFLib.cs</DependentUpon> <DependentUpon>UIForLib.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="UI\UIIOCardDev.cs"> <Compile Include="UI\UIIFLib.cs">
<SubType>UserControl</SubType> <SubType>UserControl</SubType>
</Compile> </Compile>
<Compile Include="UI\UIIOCardDev.Designer.cs"> <Compile Include="UI\UIIFLib.Designer.cs">
<DependentUpon>UIIOCardDev.cs</DependentUpon> <DependentUpon>UIIFLib.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="UI\UILightDev.cs"> <Compile Include="UI\UIIOCardDev.cs">
<SubType>UserControl</SubType> <SubType>UserControl</SubType>
</Compile> </Compile>
<Compile Include="UI\UILightDev.Designer.cs"> <Compile Include="UI\UIIOCardDev.Designer.cs">
<DependentUpon>UILightDev.cs</DependentUpon> <DependentUpon>UIIOCardDev.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="UI\UIScannerDev.cs"> <Compile Include="UI\UILightDev.cs">
<SubType>UserControl</SubType> <SubType>UserControl</SubType>
</Compile> </Compile>
<Compile Include="UI\UIScannerDev.Designer.cs"> <Compile Include="UI\UILightDev.Designer.cs">
<DependentUpon>UIScannerDev.cs</DependentUpon> <DependentUpon>UILightDev.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="UI\UISizeLib.cs"> <Compile Include="UI\UIScannerDev.cs">
<SubType>UserControl</SubType> <SubType>UserControl</SubType>
</Compile> </Compile>
<Compile Include="UI\UISizeLib.Designer.cs"> <Compile Include="UI\UIScannerDev.Designer.cs">
<DependentUpon>UISizeLib.cs</DependentUpon> <DependentUpon>UIScannerDev.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="Utils\DBUtils.cs" /> <Compile Include="UI\UISizeLib.cs">
<Compile Include="Utils\EnumData.cs" /> <SubType>UserControl</SubType>
<Compile Include="Utils\EnumUtil.cs" /> </Compile>
<Compile Include="Utils\FileUtil.cs" /> <Compile Include="UI\UISizeLib.Designer.cs">
<Compile Include="Utils\HttpUtil.CS" /> <DependentUpon>UISizeLib.cs</DependentUpon>
<Compile Include="Utils\SSerialPort.cs" /> </Compile>
<Compile Include="Utils\Util.cs" /> <Compile Include="Utils\DBUtils.cs" />
<Compile Include="Utils\WINAPI.cs" /> <Compile Include="Utils\EnumData.cs" />
<Compile Include="WebApi.cs" /> <Compile Include="Utils\EnumUtil.cs" />
<EmbeddedResource Include="Form1.resx"> <Compile Include="Utils\FileUtil.cs" />
<DependentUpon>Form1.cs</DependentUpon> <Compile Include="Utils\HttpUtil.CS" />
</EmbeddedResource> <Compile Include="Utils\SSerialPort.cs" />
<EmbeddedResource Include="FrmCMDProcess.resx"> <Compile Include="Utils\Util.cs" />
<DependentUpon>FrmCMDProcess.cs</DependentUpon> <Compile Include="Utils\WINAPI.cs" />
</EmbeddedResource> <Compile Include="WebApi.cs" />
<EmbeddedResource Include="FrmDebug3.resx"> <EmbeddedResource Include="Form1.resx">
<DependentUpon>FrmDebug3.cs</DependentUpon> <DependentUpon>Form1.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="FrmLoading.resx"> <EmbeddedResource Include="FrmCMDProcess.resx">
<DependentUpon>FrmLoading.cs</DependentUpon> <DependentUpon>FrmCMDProcess.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="FrmLogin.resx"> <EmbeddedResource Include="FrmDebug3.resx">
<DependentUpon>FrmLogin.cs</DependentUpon> <DependentUpon>FrmDebug3.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="FrmMain.resx"> <EmbeddedResource Include="FrmLoading.resx">
<DependentUpon>FrmMain.cs</DependentUpon> <DependentUpon>FrmLoading.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="FrmProductList.resx"> <EmbeddedResource Include="FrmLogin.resx">
<DependentUpon>FrmProductList.cs</DependentUpon> <DependentUpon>FrmLogin.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="FrmProductStep.resx"> <EmbeddedResource Include="FrmMain.resx">
<DependentUpon>FrmProductStep.cs</DependentUpon> <DependentUpon>FrmMain.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="FrmPTSetting.resx"> <EmbeddedResource Include="FrmProductList.resx">
<DependentUpon>FrmPTSetting.cs</DependentUpon> <DependentUpon>FrmProductList.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="FrmSetParams.resx"> <EmbeddedResource Include="FrmProductStep.resx">
<DependentUpon>FrmSetParams.cs</DependentUpon> <DependentUpon>FrmProductStep.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="FrmStepInfo.resx"> <EmbeddedResource Include="FrmPTSetting.resx">
<DependentUpon>FrmStepInfo.cs</DependentUpon> <DependentUpon>FrmPTSetting.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="FrmStepList.resx"> <EmbeddedResource Include="FrmRepairInfo.resx">
<DependentUpon>FrmStepList.cs</DependentUpon> <DependentUpon>FrmRepairInfo.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="FrmSysSetting.resx"> <EmbeddedResource Include="FrmSetParams.resx">
<DependentUpon>FrmSysSetting.cs</DependentUpon> <DependentUpon>FrmSetParams.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.resx"> <EmbeddedResource Include="FrmStepInfo.resx">
<Generator>ResXFileCodeGenerator</Generator> <DependentUpon>FrmStepInfo.cs</DependentUpon>
<LastGenOutput>Resources.Designer.cs</LastGenOutput> </EmbeddedResource>
<SubType>Designer</SubType> <EmbeddedResource Include="FrmStepList.resx">
</EmbeddedResource> <DependentUpon>FrmStepList.cs</DependentUpon>
<Compile Include="Properties\Resources.Designer.cs"> </EmbeddedResource>
<AutoGen>True</AutoGen> <EmbeddedResource Include="FrmSysSetting.resx">
<DependentUpon>Resources.resx</DependentUpon> <DependentUpon>FrmSysSetting.cs</DependentUpon>
<DesignTime>True</DesignTime> </EmbeddedResource>
</Compile> <EmbeddedResource Include="Properties\Resources.resx">
<EmbeddedResource Include="UI\FrmScannerShow.resx"> <Generator>ResXFileCodeGenerator</Generator>
<DependentUpon>FrmScannerShow.cs</DependentUpon> <LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource> <SubType>Designer</SubType>
<EmbeddedResource Include="UI\UIAxisDev.resx"> </EmbeddedResource>
<DependentUpon>UIAxisDev.cs</DependentUpon> <Compile Include="Properties\Resources.Designer.cs">
</EmbeddedResource> <AutoGen>True</AutoGen>
<EmbeddedResource Include="UI\UICodeScannerDev.resx"> <DependentUpon>Resources.resx</DependentUpon>
<DependentUpon>UICodeScannerDev.cs</DependentUpon> <DesignTime>True</DesignTime>
</EmbeddedResource> </Compile>
<EmbeddedResource Include="UI\UIForLib.resx"> <EmbeddedResource Include="UI\FrmScannerShow.resx">
<DependentUpon>UIForLib.cs</DependentUpon> <DependentUpon>FrmScannerShow.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="UI\UIIFLib.resx"> <EmbeddedResource Include="UI\UIAxisDev.resx">
<DependentUpon>UIIFLib.cs</DependentUpon> <DependentUpon>UIAxisDev.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="UI\UIIOCardDev.resx"> <EmbeddedResource Include="UI\UICodeScannerDev.resx">
<DependentUpon>UIIOCardDev.cs</DependentUpon> <DependentUpon>UICodeScannerDev.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="UI\UILightDev.resx"> <EmbeddedResource Include="UI\UIForLib.resx">
<DependentUpon>UILightDev.cs</DependentUpon> <DependentUpon>UIForLib.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="UI\UIScannerDev.resx"> <EmbeddedResource Include="UI\UIIFLib.resx">
<DependentUpon>UIScannerDev.cs</DependentUpon> <DependentUpon>UIIFLib.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="UI\UISizeLib.resx"> <EmbeddedResource Include="UI\UIIOCardDev.resx">
<DependentUpon>UISizeLib.cs</DependentUpon> <DependentUpon>UIIOCardDev.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
<None Include="packages.config" /> <EmbeddedResource Include="UI\UILightDev.resx">
<None Include="Properties\app.manifest" /> <DependentUpon>UILightDev.cs</DependentUpon>
<None Include="Properties\Settings.settings"> </EmbeddedResource>
<Generator>SettingsSingleFileGenerator</Generator> <EmbeddedResource Include="UI\UIScannerDev.resx">
<LastGenOutput>Settings.Designer.cs</LastGenOutput> <DependentUpon>UIScannerDev.cs</DependentUpon>
</None> </EmbeddedResource>
<Compile Include="Properties\Settings.Designer.cs"> <EmbeddedResource Include="UI\UISizeLib.resx">
<AutoGen>True</AutoGen> <DependentUpon>UISizeLib.cs</DependentUpon>
<DependentUpon>Settings.settings</DependentUpon> </EmbeddedResource>
<DesignTimeSharedInput>True</DesignTimeSharedInput> <None Include="packages.config" />
</Compile> <None Include="Properties\app.manifest" />
</ItemGroup> <None Include="Properties\Settings.settings">
<ItemGroup> <Generator>SettingsSingleFileGenerator</Generator>
<None Include="App.config" /> <LastGenOutput>Settings.Designer.cs</LastGenOutput>
</ItemGroup> </None>
<ItemGroup> <Compile Include="Properties\Settings.Designer.cs">
<None Include="Resources\down.png" /> <AutoGen>True</AutoGen>
</ItemGroup> <DependentUpon>Settings.settings</DependentUpon>
<ItemGroup> <DesignTimeSharedInput>True</DesignTimeSharedInput>
<None Include="Resources\left.png" /> </Compile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="Resources\right.png" /> <None Include="App.config" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="Resources\up.png" /> <None Include="Resources\down.png" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Content Include="ComputerDisplayMode.ico" /> <None Include="Resources\left.png" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Models\Models.csproj"> <None Include="Resources\right.png" />
<Project>{47694c39-2448-4be5-80a4-70d78b59272b}</Project> </ItemGroup>
<Name>Models</Name> <ItemGroup>
</ProjectReference> <None Include="Resources\up.png" />
<ProjectReference Include="..\Service\Service.csproj"> </ItemGroup>
<Project>{1cced98a-7af6-47f3-b9f9-a9e7dad461b4}</Project> <ItemGroup>
<Name>Service</Name> <Content Include="ComputerDisplayMode.ico" />
</ProjectReference> </ItemGroup>
</ItemGroup> <ItemGroup>
<ItemGroup> <ProjectReference Include="..\Models\Models.csproj">
<BootstrapperPackage Include=".NETFramework,Version=v4.8"> <Project>{47694c39-2448-4be5-80a4-70d78b59272b}</Project>
<Visible>False</Visible> <Name>Models</Name>
<ProductName>Microsoft .NET Framework 4.8 %28x86 和 x64%29</ProductName> </ProjectReference>
<Install>true</Install> <ProjectReference Include="..\Service\Service.csproj">
</BootstrapperPackage> <Project>{1cced98a-7af6-47f3-b9f9-a9e7dad461b4}</Project>
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1"> <Name>Service</Name>
<Visible>False</Visible> </ProjectReference>
<ProductName>.NET Framework 3.5 SP1</ProductName> </ItemGroup>
<Install>false</Install> <ItemGroup>
</BootstrapperPackage> <BootstrapperPackage Include=".NETFramework,Version=v4.8">
</ItemGroup> <Visible>False</Visible>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <ProductName>Microsoft .NET Framework 4.8 %28x86 和 x64%29</ProductName>
<Install>true</Install>
</BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
<Visible>False</Visible>
<ProductName>.NET Framework 3.5 SP1</ProductName>
<Install>false</Install>
</BootstrapperPackage>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project> </Project>

View File

@ -28,148 +28,147 @@
/// </summary> /// </summary>
private void InitializeComponent() private void InitializeComponent()
{ {
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmLogin)); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmLogin));
this.btnLogin = new System.Windows.Forms.Button(); this.btnLogin = new System.Windows.Forms.Button();
this.chkRememberPw = new System.Windows.Forms.CheckBox(); this.chkRememberPw = new System.Windows.Forms.CheckBox();
this.chkRememberUserCode = new System.Windows.Forms.CheckBox(); this.chkRememberUserCode = new System.Windows.Forms.CheckBox();
this.pictureBox1 = new System.Windows.Forms.PictureBox(); this.pictureBox1 = new System.Windows.Forms.PictureBox();
this.txtUserPw = new System.Windows.Forms.TextBox(); this.txtUserPw = new System.Windows.Forms.TextBox();
this.label2 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label();
this.txtUserCode = new System.Windows.Forms.TextBox(); this.txtUserCode = new System.Windows.Forms.TextBox();
this.label1 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label();
this.button2 = new System.Windows.Forms.Button(); this.button2 = new System.Windows.Forms.Button();
this.label3 = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.SuspendLayout();
this.SuspendLayout(); //
// // btnLogin
// btnLogin //
// this.btnLogin.Location = new System.Drawing.Point(133, 182);
this.btnLogin.Location = new System.Drawing.Point(495, 707); this.btnLogin.Margin = new System.Windows.Forms.Padding(2);
this.btnLogin.Name = "btnLogin"; this.btnLogin.Name = "btnLogin";
this.btnLogin.Size = new System.Drawing.Size(112, 35); this.btnLogin.Size = new System.Drawing.Size(75, 23);
this.btnLogin.TabIndex = 5; this.btnLogin.TabIndex = 5;
this.btnLogin.Text = "登录"; this.btnLogin.Text = "登录";
this.btnLogin.UseVisualStyleBackColor = true; this.btnLogin.UseVisualStyleBackColor = true;
this.btnLogin.Click += new System.EventHandler(this.btnLogin_Click); this.btnLogin.Click += new System.EventHandler(this.btnLogin_Click);
// //
// chkRememberPw // chkRememberPw
// //
this.chkRememberPw.AutoSize = true; this.chkRememberPw.AutoSize = true;
this.chkRememberPw.Location = new System.Drawing.Point(602, 668); this.chkRememberPw.Location = new System.Drawing.Point(204, 156);
this.chkRememberPw.Name = "chkRememberPw"; this.chkRememberPw.Margin = new System.Windows.Forms.Padding(2);
this.chkRememberPw.Size = new System.Drawing.Size(106, 22); this.chkRememberPw.Name = "chkRememberPw";
this.chkRememberPw.TabIndex = 3; this.chkRememberPw.Size = new System.Drawing.Size(72, 16);
this.chkRememberPw.Text = "记住密码"; this.chkRememberPw.TabIndex = 3;
this.chkRememberPw.UseVisualStyleBackColor = true; this.chkRememberPw.Text = "记住密码";
this.chkRememberPw.CheckedChanged += new System.EventHandler(this.chkRememberPw_CheckedChanged); this.chkRememberPw.UseVisualStyleBackColor = true;
// this.chkRememberPw.CheckedChanged += new System.EventHandler(this.chkRememberPw_CheckedChanged);
// chkRememberUserCode //
// // chkRememberUserCode
this.chkRememberUserCode.AutoSize = true; //
this.chkRememberUserCode.Location = new System.Drawing.Point(433, 668); this.chkRememberUserCode.AutoSize = true;
this.chkRememberUserCode.Name = "chkRememberUserCode"; this.chkRememberUserCode.Location = new System.Drawing.Point(92, 156);
this.chkRememberUserCode.Size = new System.Drawing.Size(124, 22); this.chkRememberUserCode.Margin = new System.Windows.Forms.Padding(2);
this.chkRememberUserCode.TabIndex = 4; this.chkRememberUserCode.Name = "chkRememberUserCode";
this.chkRememberUserCode.Text = "记住用户名"; this.chkRememberUserCode.Size = new System.Drawing.Size(84, 16);
this.chkRememberUserCode.UseVisualStyleBackColor = true; this.chkRememberUserCode.TabIndex = 4;
this.chkRememberUserCode.CheckedChanged += new System.EventHandler(this.chkRememberUserCode_CheckedChanged); this.chkRememberUserCode.Text = "记住用户名";
// this.chkRememberUserCode.UseVisualStyleBackColor = true;
// pictureBox1 this.chkRememberUserCode.CheckedChanged += new System.EventHandler(this.chkRememberUserCode_CheckedChanged);
// //
this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); // pictureBox1
this.pictureBox1.Location = new System.Drawing.Point(298, 437); //
this.pictureBox1.Name = "pictureBox1"; this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image")));
this.pictureBox1.Size = new System.Drawing.Size(539, 142); this.pictureBox1.Location = new System.Drawing.Point(2, 2);
this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox1.Margin = new System.Windows.Forms.Padding(2);
this.pictureBox1.TabIndex = 24; this.pictureBox1.Name = "pictureBox1";
this.pictureBox1.TabStop = false; this.pictureBox1.Size = new System.Drawing.Size(359, 95);
// this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
// txtUserPw this.pictureBox1.TabIndex = 24;
// this.pictureBox1.TabStop = false;
this.txtUserPw.Location = new System.Drawing.Point(433, 634); //
this.txtUserPw.MaxLength = 16; // txtUserPw
this.txtUserPw.Name = "txtUserPw"; //
this.txtUserPw.PasswordChar = '*'; this.txtUserPw.Location = new System.Drawing.Point(92, 134);
this.txtUserPw.Size = new System.Drawing.Size(275, 28); this.txtUserPw.Margin = new System.Windows.Forms.Padding(2);
this.txtUserPw.TabIndex = 2; this.txtUserPw.MaxLength = 16;
// this.txtUserPw.Name = "txtUserPw";
// label2 this.txtUserPw.PasswordChar = '*';
// this.txtUserPw.Size = new System.Drawing.Size(185, 21);
this.label2.AutoSize = true; this.txtUserPw.TabIndex = 2;
this.label2.Location = new System.Drawing.Point(366, 644); //
this.label2.Name = "label2"; // label2
this.label2.Size = new System.Drawing.Size(44, 18); //
this.label2.TabIndex = 27; this.label2.AutoSize = true;
this.label2.Text = "密码"; this.label2.Location = new System.Drawing.Point(47, 140);
// this.label2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
// txtUserCode this.label2.Name = "label2";
// this.label2.Size = new System.Drawing.Size(29, 12);
this.txtUserCode.Location = new System.Drawing.Point(433, 593); this.label2.TabIndex = 27;
this.txtUserCode.Name = "txtUserCode"; this.label2.Text = "密码";
this.txtUserCode.Size = new System.Drawing.Size(275, 28); //
this.txtUserCode.TabIndex = 1; // txtUserCode
// //
// label1 this.txtUserCode.Location = new System.Drawing.Point(92, 106);
// this.txtUserCode.Margin = new System.Windows.Forms.Padding(2);
this.label1.AutoSize = true; this.txtUserCode.Name = "txtUserCode";
this.label1.Location = new System.Drawing.Point(366, 603); this.txtUserCode.Size = new System.Drawing.Size(185, 21);
this.label1.Name = "label1"; this.txtUserCode.TabIndex = 1;
this.label1.Size = new System.Drawing.Size(44, 18); //
this.label1.TabIndex = 25; // label1
this.label1.Text = "帐号"; //
// this.label1.AutoSize = true;
// button2 this.label1.Location = new System.Drawing.Point(47, 113);
// this.label1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.button2.Location = new System.Drawing.Point(720, 707); this.label1.Name = "label1";
this.button2.Name = "button2"; this.label1.Size = new System.Drawing.Size(29, 12);
this.button2.Size = new System.Drawing.Size(84, 35); this.label1.TabIndex = 25;
this.button2.TabIndex = 9; this.label1.Text = "帐号";
this.button2.Text = "初始DB"; //
this.button2.UseVisualStyleBackColor = true; // button2
this.button2.Click += new System.EventHandler(this.button2_Click); //
// this.button2.Location = new System.Drawing.Point(283, 182);
// label3 this.button2.Margin = new System.Windows.Forms.Padding(2);
// this.button2.Name = "button2";
this.label3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(41)))), ((int)(((byte)(41)))), ((int)(((byte)(41))))); this.button2.Size = new System.Drawing.Size(56, 23);
this.label3.Dock = System.Windows.Forms.DockStyle.Fill; this.button2.TabIndex = 9;
this.label3.Image = ((System.Drawing.Image)(resources.GetObject("label3.Image"))); this.button2.Text = "初始DB";
this.label3.Location = new System.Drawing.Point(0, 0); this.button2.UseVisualStyleBackColor = true;
this.label3.Name = "label3"; this.button2.Visible = false;
this.label3.Size = new System.Drawing.Size(510, 275); this.button2.Click += new System.EventHandler(this.button2_Click);
this.label3.TabIndex = 28; //
// // FrmLogin
// FrmLogin //
// this.AcceptButton = this.btnLogin;
this.AcceptButton = this.btnLogin; this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.SystemColors.GradientInactiveCaption;
this.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; this.ClientSize = new System.Drawing.Size(363, 216);
this.ClientSize = new System.Drawing.Size(510, 275); this.Controls.Add(this.txtUserPw);
this.Controls.Add(this.label3); this.Controls.Add(this.label2);
this.Controls.Add(this.txtUserPw); this.Controls.Add(this.txtUserCode);
this.Controls.Add(this.label2); this.Controls.Add(this.label1);
this.Controls.Add(this.txtUserCode); this.Controls.Add(this.pictureBox1);
this.Controls.Add(this.label1); this.Controls.Add(this.chkRememberUserCode);
this.Controls.Add(this.pictureBox1); this.Controls.Add(this.chkRememberPw);
this.Controls.Add(this.chkRememberUserCode); this.Controls.Add(this.button2);
this.Controls.Add(this.chkRememberPw); this.Controls.Add(this.btnLogin);
this.Controls.Add(this.button2); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
this.Controls.Add(this.btnLogin); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; this.Margin = new System.Windows.Forms.Padding(2);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MaximizeBox = false;
this.MaximizeBox = false; this.MinimizeBox = false;
this.MinimizeBox = false; this.Name = "FrmLogin";
this.Name = "FrmLogin"; this.ShowIcon = false;
this.ShowIcon = false; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "修复控制台 - v1.2";
this.Text = "修复控制台 - v1.0"; this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.FrmLogin_FormClosed);
this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.FrmLogin_FormClosed); this.Load += new System.EventHandler(this.FrmLogin_Load);
this.Load += new System.EventHandler(this.FrmLogin_Load); this.Shown += new System.EventHandler(this.FrmLogin_Shown);
this.Shown += new System.EventHandler(this.FrmLogin_Shown); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.ResumeLayout(false);
this.ResumeLayout(false); this.PerformLayout();
this.PerformLayout();
} }
#endregion #endregion
@ -182,6 +181,5 @@
private System.Windows.Forms.TextBox txtUserCode; private System.Windows.Forms.TextBox txtUserCode;
private System.Windows.Forms.Label label1; private System.Windows.Forms.Label label1;
private System.Windows.Forms.Button button2; private System.Windows.Forms.Button button2;
private System.Windows.Forms.Label label3;
} }
} }

View File

@ -26,35 +26,28 @@ namespace AssistClient
} }
private void FrmLogin_Load(object sender, EventArgs e) private void FrmLogin_Load(object sender, EventArgs e)
{ {
//this.txtUserCode.SelectAll(); this.txtUserCode.SelectAll();
//string configPath = Application.StartupPath + "\\Login.ini"; string configPath = Application.StartupPath + "\\Login.ini";
////DEV //DEV
//if (Util.ReadIniValue(configPath, "LOGIN", "RememberUserCode") == "1") if (Util.ReadIniValue(configPath, "LOGIN", "RememberUserCode") == "1")
//{ {
// this.txtUserCode.Text = Util.ReadIniValue(configPath, "LOGIN", "UserCode"); this.txtUserCode.Text = Util.ReadIniValue(configPath, "LOGIN", "UserCode");
// this.chkRememberUserCode.Checked = true; this.chkRememberUserCode.Checked = true;
// this.txtUserPw.SelectAll(); this.txtUserPw.SelectAll();
// if (Util.ReadIniValue(configPath, "LOGIN", "RememberPw") == "1") if (Util.ReadIniValue(configPath, "LOGIN", "RememberPw") == "1")
// { {
// this.txtUserPw.Text = Util.ReadIniValue(configPath, "LOGIN", "PassWord"); this.txtUserPw.Text = Util.ReadIniValue(configPath, "LOGIN", "PassWord");
// this.chkRememberPw.Checked = true; this.chkRememberPw.Checked = true;
// this.btnLogin.Focus(); this.btnLogin.Focus();
// } }
//} }
//FrmLoading2 loading = new FrmLoading2();
//loading.ShowDialog(this);
//Thread workThread = new Thread(waiting);
//workThread.IsBackground = true;
//workThread.Start(loading);
} }
private void FrmLogin_Shown(object sender, EventArgs e) private void FrmLogin_Shown(object sender, EventArgs e)
{ {
this.txtUserCode.Text = "admin"; //this.txtUserCode.Text = "admin";
this.txtUserPw.Text = ""; //this.txtUserPw.Text = "";
btnLogin_Click(null, null); //btnLogin_Click(null, null);
} }
private void waiting(Object form) private void waiting(Object form)
{ {

File diff suppressed because it is too large Load Diff

View File

@ -29,11 +29,11 @@
private void InitializeComponent() private void InitializeComponent()
{ {
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmMain)); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmMain));
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
this.chkSyncMove = new System.Windows.Forms.CheckBox(); this.chkSyncMove = new System.Windows.Forms.CheckBox();
this.menuStrip1 = new System.Windows.Forms.MenuStrip(); this.menuStrip1 = new System.Windows.Forms.MenuStrip();
this.ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@ -136,7 +136,7 @@
this.chkSyncMove.CheckState = System.Windows.Forms.CheckState.Checked; this.chkSyncMove.CheckState = System.Windows.Forms.CheckState.Checked;
this.chkSyncMove.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.chkSyncMove.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chkSyncMove.Location = new System.Drawing.Point(507, 15); this.chkSyncMove.Location = new System.Drawing.Point(507, 15);
this.chkSyncMove.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.chkSyncMove.Margin = new System.Windows.Forms.Padding(2);
this.chkSyncMove.Name = "chkSyncMove"; this.chkSyncMove.Name = "chkSyncMove";
this.chkSyncMove.Size = new System.Drawing.Size(179, 20); this.chkSyncMove.Size = new System.Drawing.Size(179, 20);
this.chkSyncMove.TabIndex = 23; this.chkSyncMove.TabIndex = 23;
@ -418,10 +418,10 @@
this.gpbDefectList.BackColor = System.Drawing.SystemColors.ActiveCaption; this.gpbDefectList.BackColor = System.Drawing.SystemColors.ActiveCaption;
this.gpbDefectList.Controls.Add(this.dgvProcess); this.gpbDefectList.Controls.Add(this.dgvProcess);
this.gpbDefectList.Location = new System.Drawing.Point(5, 2); this.gpbDefectList.Location = new System.Drawing.Point(5, 2);
this.gpbDefectList.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.gpbDefectList.Margin = new System.Windows.Forms.Padding(2);
this.gpbDefectList.Name = "gpbDefectList"; this.gpbDefectList.Name = "gpbDefectList";
this.gpbDefectList.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2); this.gpbDefectList.Padding = new System.Windows.Forms.Padding(2);
this.gpbDefectList.Size = new System.Drawing.Size(425, 377); this.gpbDefectList.Size = new System.Drawing.Size(428, 377);
this.gpbDefectList.TabIndex = 4; this.gpbDefectList.TabIndex = 4;
this.gpbDefectList.TabStop = false; this.gpbDefectList.TabStop = false;
this.gpbDefectList.Text = "缺陷明细"; this.gpbDefectList.Text = "缺陷明细";
@ -431,14 +431,14 @@
this.dgvProcess.AllowUserToAddRows = false; this.dgvProcess.AllowUserToAddRows = false;
this.dgvProcess.AllowUserToDeleteRows = false; this.dgvProcess.AllowUserToDeleteRows = false;
this.dgvProcess.AllowUserToResizeRows = false; this.dgvProcess.AllowUserToResizeRows = false;
dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control; dataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Control;
dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); dataGridViewCellStyle11.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText; dataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.WindowText;
dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; dataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText; dataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True; dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.dgvProcess.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1; this.dgvProcess.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle11;
this.dgvProcess.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvProcess.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dgvProcess.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.dgvProcess.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.colKey, this.colKey,
@ -449,27 +449,27 @@
this.colDefectName, this.colDefectName,
this.colDefectCC, this.colDefectCC,
this.colResult}); this.colResult});
dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Window; dataGridViewCellStyle14.BackColor = System.Drawing.SystemColors.Window;
dataGridViewCellStyle4.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); dataGridViewCellStyle14.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.ControlText; dataGridViewCellStyle14.ForeColor = System.Drawing.SystemColors.ControlText;
dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight; dataGridViewCellStyle14.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText; dataGridViewCellStyle14.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False; dataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
this.dgvProcess.DefaultCellStyle = dataGridViewCellStyle4; this.dgvProcess.DefaultCellStyle = dataGridViewCellStyle14;
this.dgvProcess.Dock = System.Windows.Forms.DockStyle.Fill; this.dgvProcess.Dock = System.Windows.Forms.DockStyle.Fill;
this.dgvProcess.Location = new System.Drawing.Point(2, 16); this.dgvProcess.Location = new System.Drawing.Point(2, 16);
this.dgvProcess.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.dgvProcess.Margin = new System.Windows.Forms.Padding(2);
this.dgvProcess.MultiSelect = false; this.dgvProcess.MultiSelect = false;
this.dgvProcess.Name = "dgvProcess"; this.dgvProcess.Name = "dgvProcess";
this.dgvProcess.ReadOnly = true; this.dgvProcess.ReadOnly = true;
this.dgvProcess.RowHeadersVisible = false; this.dgvProcess.RowHeadersVisible = false;
this.dgvProcess.RowHeadersWidth = 62; this.dgvProcess.RowHeadersWidth = 62;
dataGridViewCellStyle5.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); dataGridViewCellStyle15.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.dgvProcess.RowsDefaultCellStyle = dataGridViewCellStyle5; this.dgvProcess.RowsDefaultCellStyle = dataGridViewCellStyle15;
this.dgvProcess.RowTemplate.Height = 30; this.dgvProcess.RowTemplate.Height = 30;
this.dgvProcess.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect; this.dgvProcess.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect;
this.dgvProcess.Size = new System.Drawing.Size(421, 359); this.dgvProcess.Size = new System.Drawing.Size(424, 359);
this.dgvProcess.TabIndex = 3; this.dgvProcess.TabIndex = 3;
this.dgvProcess.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvProcess_CellDoubleClick); this.dgvProcess.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvProcess_CellDoubleClick);
// //
@ -496,9 +496,9 @@
// colIndex // colIndex
// //
this.colIndex.DataPropertyName = "Index"; this.colIndex.DataPropertyName = "Index";
dataGridViewCellStyle2.BackColor = System.Drawing.Color.White; dataGridViewCellStyle12.BackColor = System.Drawing.Color.White;
dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); dataGridViewCellStyle12.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.colIndex.DefaultCellStyle = dataGridViewCellStyle2; this.colIndex.DefaultCellStyle = dataGridViewCellStyle12;
this.colIndex.HeaderText = "索引"; this.colIndex.HeaderText = "索引";
this.colIndex.MinimumWidth = 50; this.colIndex.MinimumWidth = 50;
this.colIndex.Name = "colIndex"; this.colIndex.Name = "colIndex";
@ -509,8 +509,8 @@
// colX // colX
// //
this.colX.DataPropertyName = "X"; this.colX.DataPropertyName = "X";
dataGridViewCellStyle3.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Bold); dataGridViewCellStyle13.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Bold);
this.colX.DefaultCellStyle = dataGridViewCellStyle3; this.colX.DefaultCellStyle = dataGridViewCellStyle13;
this.colX.HeaderText = "X轴"; this.colX.HeaderText = "X轴";
this.colX.MinimumWidth = 50; this.colX.MinimumWidth = 50;
this.colX.Name = "colX"; this.colX.Name = "colX";
@ -572,9 +572,9 @@
this.gpbProductInfo.Controls.Add(this.label4); this.gpbProductInfo.Controls.Add(this.label4);
this.gpbProductInfo.Controls.Add(this.label1); this.gpbProductInfo.Controls.Add(this.label1);
this.gpbProductInfo.Location = new System.Drawing.Point(5, 367); this.gpbProductInfo.Location = new System.Drawing.Point(5, 367);
this.gpbProductInfo.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.gpbProductInfo.Margin = new System.Windows.Forms.Padding(2);
this.gpbProductInfo.Name = "gpbProductInfo"; this.gpbProductInfo.Name = "gpbProductInfo";
this.gpbProductInfo.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2); this.gpbProductInfo.Padding = new System.Windows.Forms.Padding(2);
this.gpbProductInfo.Size = new System.Drawing.Size(452, 151); this.gpbProductInfo.Size = new System.Drawing.Size(452, 151);
this.gpbProductInfo.TabIndex = 8; this.gpbProductInfo.TabIndex = 8;
this.gpbProductInfo.TabStop = false; this.gpbProductInfo.TabStop = false;
@ -588,7 +588,7 @@
this.cbxSN.FormattingEnabled = true; this.cbxSN.FormattingEnabled = true;
this.cbxSN.ImeMode = System.Windows.Forms.ImeMode.Disable; this.cbxSN.ImeMode = System.Windows.Forms.ImeMode.Disable;
this.cbxSN.Location = new System.Drawing.Point(69, 18); this.cbxSN.Location = new System.Drawing.Point(69, 18);
this.cbxSN.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.cbxSN.Margin = new System.Windows.Forms.Padding(2);
this.cbxSN.Name = "cbxSN"; this.cbxSN.Name = "cbxSN";
this.cbxSN.Size = new System.Drawing.Size(379, 29); this.cbxSN.Size = new System.Drawing.Size(379, 29);
this.cbxSN.TabIndex = 18; this.cbxSN.TabIndex = 18;
@ -598,7 +598,7 @@
// txtCreateTime // txtCreateTime
// //
this.txtCreateTime.Location = new System.Drawing.Point(69, 125); this.txtCreateTime.Location = new System.Drawing.Point(69, 125);
this.txtCreateTime.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.txtCreateTime.Margin = new System.Windows.Forms.Padding(2);
this.txtCreateTime.Name = "txtCreateTime"; this.txtCreateTime.Name = "txtCreateTime";
this.txtCreateTime.ReadOnly = true; this.txtCreateTime.ReadOnly = true;
this.txtCreateTime.Size = new System.Drawing.Size(380, 21); this.txtCreateTime.Size = new System.Drawing.Size(380, 21);
@ -617,7 +617,7 @@
// txtProductCode // txtProductCode
// //
this.txtProductCode.Location = new System.Drawing.Point(69, 75); this.txtProductCode.Location = new System.Drawing.Point(69, 75);
this.txtProductCode.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.txtProductCode.Margin = new System.Windows.Forms.Padding(2);
this.txtProductCode.Name = "txtProductCode"; this.txtProductCode.Name = "txtProductCode";
this.txtProductCode.ReadOnly = true; this.txtProductCode.ReadOnly = true;
this.txtProductCode.Size = new System.Drawing.Size(380, 21); this.txtProductCode.Size = new System.Drawing.Size(380, 21);
@ -636,7 +636,7 @@
// txtBatchId // txtBatchId
// //
this.txtBatchId.Location = new System.Drawing.Point(69, 100); this.txtBatchId.Location = new System.Drawing.Point(69, 100);
this.txtBatchId.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.txtBatchId.Margin = new System.Windows.Forms.Padding(2);
this.txtBatchId.Name = "txtBatchId"; this.txtBatchId.Name = "txtBatchId";
this.txtBatchId.ReadOnly = true; this.txtBatchId.ReadOnly = true;
this.txtBatchId.Size = new System.Drawing.Size(380, 21); this.txtBatchId.Size = new System.Drawing.Size(380, 21);
@ -655,7 +655,7 @@
// txtProductName // txtProductName
// //
this.txtProductName.Location = new System.Drawing.Point(69, 51); this.txtProductName.Location = new System.Drawing.Point(69, 51);
this.txtProductName.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.txtProductName.Margin = new System.Windows.Forms.Padding(2);
this.txtProductName.Name = "txtProductName"; this.txtProductName.Name = "txtProductName";
this.txtProductName.ReadOnly = true; this.txtProductName.ReadOnly = true;
this.txtProductName.Size = new System.Drawing.Size(380, 21); this.txtProductName.Size = new System.Drawing.Size(380, 21);
@ -685,7 +685,7 @@
// //
this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill; this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitContainer2.Location = new System.Drawing.Point(0, 0); this.splitContainer2.Location = new System.Drawing.Point(0, 0);
this.splitContainer2.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.splitContainer2.Margin = new System.Windows.Forms.Padding(2);
this.splitContainer2.Name = "splitContainer2"; this.splitContainer2.Name = "splitContainer2";
this.splitContainer2.Orientation = System.Windows.Forms.Orientation.Horizontal; this.splitContainer2.Orientation = System.Windows.Forms.Orientation.Horizontal;
// //
@ -714,7 +714,7 @@
this.pnlPic.BackColor = System.Drawing.SystemColors.ActiveCaption; this.pnlPic.BackColor = System.Drawing.SystemColors.ActiveCaption;
this.pnlPic.Controls.Add(this.pictureBox1); this.pnlPic.Controls.Add(this.pictureBox1);
this.pnlPic.Location = new System.Drawing.Point(2, 2); this.pnlPic.Location = new System.Drawing.Point(2, 2);
this.pnlPic.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.pnlPic.Margin = new System.Windows.Forms.Padding(2);
this.pnlPic.Name = "pnlPic"; this.pnlPic.Name = "pnlPic";
this.pnlPic.Size = new System.Drawing.Size(554, 250); this.pnlPic.Size = new System.Drawing.Size(554, 250);
this.pnlPic.TabIndex = 22; this.pnlPic.TabIndex = 22;
@ -722,7 +722,7 @@
// pictureBox1 // pictureBox1
// //
this.pictureBox1.Location = new System.Drawing.Point(37, 31); this.pictureBox1.Location = new System.Drawing.Point(37, 31);
this.pictureBox1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.pictureBox1.Margin = new System.Windows.Forms.Padding(2);
this.pictureBox1.Name = "pictureBox1"; this.pictureBox1.Name = "pictureBox1";
this.pictureBox1.Size = new System.Drawing.Size(386, 161); this.pictureBox1.Size = new System.Drawing.Size(386, 161);
this.pictureBox1.TabIndex = 14; this.pictureBox1.TabIndex = 14;
@ -735,7 +735,7 @@
this.tsbtnGoDownPT.Enabled = false; this.tsbtnGoDownPT.Enabled = false;
this.tsbtnGoDownPT.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.tsbtnGoDownPT.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.tsbtnGoDownPT.Location = new System.Drawing.Point(763, 75); this.tsbtnGoDownPT.Location = new System.Drawing.Point(763, 75);
this.tsbtnGoDownPT.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.tsbtnGoDownPT.Margin = new System.Windows.Forms.Padding(2);
this.tsbtnGoDownPT.Name = "tsbtnGoDownPT"; this.tsbtnGoDownPT.Name = "tsbtnGoDownPT";
this.tsbtnGoDownPT.Size = new System.Drawing.Size(90, 46); this.tsbtnGoDownPT.Size = new System.Drawing.Size(90, 46);
this.tsbtnGoDownPT.TabIndex = 9; this.tsbtnGoDownPT.TabIndex = 9;
@ -750,7 +750,7 @@
this.tsbtnPause.Enabled = false; this.tsbtnPause.Enabled = false;
this.tsbtnPause.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.tsbtnPause.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.tsbtnPause.Location = new System.Drawing.Point(763, 21); this.tsbtnPause.Location = new System.Drawing.Point(763, 21);
this.tsbtnPause.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.tsbtnPause.Margin = new System.Windows.Forms.Padding(2);
this.tsbtnPause.Name = "tsbtnPause"; this.tsbtnPause.Name = "tsbtnPause";
this.tsbtnPause.Size = new System.Drawing.Size(90, 46); this.tsbtnPause.Size = new System.Drawing.Size(90, 46);
this.tsbtnPause.TabIndex = 9; this.tsbtnPause.TabIndex = 9;
@ -763,9 +763,9 @@
this.gpbLog.BackColor = System.Drawing.SystemColors.ActiveCaption; this.gpbLog.BackColor = System.Drawing.SystemColors.ActiveCaption;
this.gpbLog.Controls.Add(this.lstLog); this.gpbLog.Controls.Add(this.lstLog);
this.gpbLog.Location = new System.Drawing.Point(2, 7); this.gpbLog.Location = new System.Drawing.Point(2, 7);
this.gpbLog.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.gpbLog.Margin = new System.Windows.Forms.Padding(2);
this.gpbLog.Name = "gpbLog"; this.gpbLog.Name = "gpbLog";
this.gpbLog.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2); this.gpbLog.Padding = new System.Windows.Forms.Padding(2);
this.gpbLog.Size = new System.Drawing.Size(555, 125); this.gpbLog.Size = new System.Drawing.Size(555, 125);
this.gpbLog.TabIndex = 8; this.gpbLog.TabIndex = 8;
this.gpbLog.TabStop = false; this.gpbLog.TabStop = false;
@ -793,9 +793,9 @@
this.gpbXYAxis.Controls.Add(this.btnFront); this.gpbXYAxis.Controls.Add(this.btnFront);
this.gpbXYAxis.Enabled = false; this.gpbXYAxis.Enabled = false;
this.gpbXYAxis.Location = new System.Drawing.Point(567, 7); this.gpbXYAxis.Location = new System.Drawing.Point(567, 7);
this.gpbXYAxis.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.gpbXYAxis.Margin = new System.Windows.Forms.Padding(2);
this.gpbXYAxis.Name = "gpbXYAxis"; this.gpbXYAxis.Name = "gpbXYAxis";
this.gpbXYAxis.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2); this.gpbXYAxis.Padding = new System.Windows.Forms.Padding(2);
this.gpbXYAxis.Size = new System.Drawing.Size(124, 125); this.gpbXYAxis.Size = new System.Drawing.Size(124, 125);
this.gpbXYAxis.TabIndex = 7; this.gpbXYAxis.TabIndex = 7;
this.gpbXYAxis.TabStop = false; this.gpbXYAxis.TabStop = false;
@ -806,7 +806,7 @@
this.btnRight.Cursor = System.Windows.Forms.Cursors.Hand; this.btnRight.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnRight.Image = ((System.Drawing.Image)(resources.GetObject("btnRight.Image"))); this.btnRight.Image = ((System.Drawing.Image)(resources.GetObject("btnRight.Image")));
this.btnRight.Location = new System.Drawing.Point(81, 51); this.btnRight.Location = new System.Drawing.Point(81, 51);
this.btnRight.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.btnRight.Margin = new System.Windows.Forms.Padding(2);
this.btnRight.Name = "btnRight"; this.btnRight.Name = "btnRight";
this.btnRight.Size = new System.Drawing.Size(33, 33); this.btnRight.Size = new System.Drawing.Size(33, 33);
this.btnRight.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; this.btnRight.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
@ -820,7 +820,7 @@
this.btnLeft.Cursor = System.Windows.Forms.Cursors.Hand; this.btnLeft.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnLeft.Image = ((System.Drawing.Image)(resources.GetObject("btnLeft.Image"))); this.btnLeft.Image = ((System.Drawing.Image)(resources.GetObject("btnLeft.Image")));
this.btnLeft.Location = new System.Drawing.Point(9, 51); this.btnLeft.Location = new System.Drawing.Point(9, 51);
this.btnLeft.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.btnLeft.Margin = new System.Windows.Forms.Padding(2);
this.btnLeft.Name = "btnLeft"; this.btnLeft.Name = "btnLeft";
this.btnLeft.Size = new System.Drawing.Size(33, 33); this.btnLeft.Size = new System.Drawing.Size(33, 33);
this.btnLeft.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; this.btnLeft.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
@ -834,7 +834,7 @@
this.btnBack.Cursor = System.Windows.Forms.Cursors.Hand; this.btnBack.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnBack.Image = ((System.Drawing.Image)(resources.GetObject("btnBack.Image"))); this.btnBack.Image = ((System.Drawing.Image)(resources.GetObject("btnBack.Image")));
this.btnBack.Location = new System.Drawing.Point(45, 81); this.btnBack.Location = new System.Drawing.Point(45, 81);
this.btnBack.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.btnBack.Margin = new System.Windows.Forms.Padding(2);
this.btnBack.Name = "btnBack"; this.btnBack.Name = "btnBack";
this.btnBack.Size = new System.Drawing.Size(33, 33); this.btnBack.Size = new System.Drawing.Size(33, 33);
this.btnBack.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; this.btnBack.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
@ -848,7 +848,7 @@
this.btnFront.Cursor = System.Windows.Forms.Cursors.Hand; this.btnFront.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnFront.Image = global::AssistClient.Properties.Resources.up; this.btnFront.Image = global::AssistClient.Properties.Resources.up;
this.btnFront.Location = new System.Drawing.Point(45, 20); this.btnFront.Location = new System.Drawing.Point(45, 20);
this.btnFront.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.btnFront.Margin = new System.Windows.Forms.Padding(2);
this.btnFront.Name = "btnFront"; this.btnFront.Name = "btnFront";
this.btnFront.Size = new System.Drawing.Size(33, 33); this.btnFront.Size = new System.Drawing.Size(33, 33);
this.btnFront.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; this.btnFront.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
@ -864,9 +864,9 @@
this.gpbZAxis.Controls.Add(this.btnZUp); this.gpbZAxis.Controls.Add(this.btnZUp);
this.gpbZAxis.Enabled = false; this.gpbZAxis.Enabled = false;
this.gpbZAxis.Location = new System.Drawing.Point(704, 7); this.gpbZAxis.Location = new System.Drawing.Point(704, 7);
this.gpbZAxis.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.gpbZAxis.Margin = new System.Windows.Forms.Padding(2);
this.gpbZAxis.Name = "gpbZAxis"; this.gpbZAxis.Name = "gpbZAxis";
this.gpbZAxis.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2); this.gpbZAxis.Padding = new System.Windows.Forms.Padding(2);
this.gpbZAxis.Size = new System.Drawing.Size(55, 125); this.gpbZAxis.Size = new System.Drawing.Size(55, 125);
this.gpbZAxis.TabIndex = 6; this.gpbZAxis.TabIndex = 6;
this.gpbZAxis.TabStop = false; this.gpbZAxis.TabStop = false;
@ -877,7 +877,7 @@
this.btnZDown.Cursor = System.Windows.Forms.Cursors.Hand; this.btnZDown.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnZDown.Image = ((System.Drawing.Image)(resources.GetObject("btnZDown.Image"))); this.btnZDown.Image = ((System.Drawing.Image)(resources.GetObject("btnZDown.Image")));
this.btnZDown.Location = new System.Drawing.Point(11, 81); this.btnZDown.Location = new System.Drawing.Point(11, 81);
this.btnZDown.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.btnZDown.Margin = new System.Windows.Forms.Padding(2);
this.btnZDown.Name = "btnZDown"; this.btnZDown.Name = "btnZDown";
this.btnZDown.Size = new System.Drawing.Size(33, 33); this.btnZDown.Size = new System.Drawing.Size(33, 33);
this.btnZDown.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; this.btnZDown.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
@ -891,7 +891,7 @@
this.btnZUp.Cursor = System.Windows.Forms.Cursors.Hand; this.btnZUp.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnZUp.Image = global::AssistClient.Properties.Resources.up; this.btnZUp.Image = global::AssistClient.Properties.Resources.up;
this.btnZUp.Location = new System.Drawing.Point(11, 20); this.btnZUp.Location = new System.Drawing.Point(11, 20);
this.btnZUp.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.btnZUp.Margin = new System.Windows.Forms.Padding(2);
this.btnZUp.Name = "btnZUp"; this.btnZUp.Name = "btnZUp";
this.btnZUp.Size = new System.Drawing.Size(33, 33); this.btnZUp.Size = new System.Drawing.Size(33, 33);
this.btnZUp.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; this.btnZUp.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
@ -904,7 +904,7 @@
// //
this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill; this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitContainer1.Location = new System.Drawing.Point(0, 80); this.splitContainer1.Location = new System.Drawing.Point(0, 80);
this.splitContainer1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.splitContainer1.Margin = new System.Windows.Forms.Padding(2);
this.splitContainer1.Name = "splitContainer1"; this.splitContainer1.Name = "splitContainer1";
// //
// splitContainer1.Panel1 // splitContainer1.Panel1
@ -950,7 +950,7 @@
this.chkLaser.Enabled = false; this.chkLaser.Enabled = false;
this.chkLaser.Font = new System.Drawing.Font("宋体", 11F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.chkLaser.Font = new System.Drawing.Font("宋体", 11F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chkLaser.Location = new System.Drawing.Point(346, 39); this.chkLaser.Location = new System.Drawing.Point(346, 39);
this.chkLaser.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.chkLaser.Margin = new System.Windows.Forms.Padding(2);
this.chkLaser.Name = "chkLaser"; this.chkLaser.Name = "chkLaser";
this.chkLaser.Size = new System.Drawing.Size(74, 19); this.chkLaser.Size = new System.Drawing.Size(74, 19);
this.chkLaser.TabIndex = 27; this.chkLaser.TabIndex = 27;
@ -971,11 +971,11 @@
this.Controls.Add(this.statusStrip1); this.Controls.Add(this.statusStrip1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
this.KeyPreview = true; this.KeyPreview = true;
this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.Margin = new System.Windows.Forms.Padding(2);
this.Name = "FrmMain"; this.Name = "FrmMain";
this.ShowIcon = false; this.ShowIcon = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "修复控制台 - v1.0"; this.Text = "修复控制台 - v1.2";
this.WindowState = System.Windows.Forms.FormWindowState.Maximized; this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmMain_FormClosing); this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmMain_FormClosing);
this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.FrmMain_FormClosed); this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.FrmMain_FormClosed);

View File

@ -648,7 +648,15 @@ namespace AssistClient
AddTextEvent($"下料", "下料完成!"); AddTextEvent($"下料", "下料完成!");
//更新指定列 //更新指定列
if (svcOrder.Update(it => new Order() { State = 5 }, it => it.Id == OrderId)) //2023-10-31 加入异常情况
FrmRepairInfo frmInfo = new FrmRepairInfo();
DialogResult dr = frmInfo.ShowDialog();
if (svcOrder.Update(it => new Order() {
State = dr == DialogResult.OK? 10 :5 ,
Abnormalities = frmInfo.RepairInfo,
RepairCode = Config.loginUser.Code
}, it => it.Id == OrderId))
AddTextEvent($"检测结束", $"保存检测结果成功。"); AddTextEvent($"检测结束", $"保存检测结果成功。");
else else
AddTextEvent($"检测结束", $"保存检测结果失败!",WarningEnum.High); AddTextEvent($"检测结束", $"保存检测结果失败!",WarningEnum.High);
@ -697,7 +705,7 @@ namespace AssistClient
return warningLevel != WarningEnum.Normal || currentState != CurrentStateEnum.; return warningLevel != WarningEnum.Normal || currentState != CurrentStateEnum.;
} }
private void runStep() private void runStep()
{ {
sizeBmpNum = sizeBmpNumResult = 0; sizeBmpNum = sizeBmpNumResult = 0;
AddTextEvent("启动", "等待网版编码扫码..."); AddTextEvent("启动", "等待网版编码扫码...");
if (devContainer.devCodeScanner != null) if (devContainer.devCodeScanner != null)
@ -730,14 +738,31 @@ namespace AssistClient
AddTextEvent("扫码枪", $"开始读取网版编码:{code} 数据..."); AddTextEvent("扫码枪", $"开始读取网版编码:{code} 数据...");
var modOrder = svcOrder.GetModelNav(code);//from sn var modOrder = svcOrder.GetModelNav(code);//from sn
//AddTextEvent("扫码枪", $"读取网版编码:{code}DB数据完成"); //AddTextEvent("扫码枪", $"读取网版编码:{code}DB数据完成");
string modeState = "";
if (modOrder == null) if (modOrder == null)
AddTextEvent("扫码枪", $"网版编码{code}不存在!"); AddTextEvent("扫码枪", $"网版编码{code}不存在!");
if (modOrder.State == 5) if (modOrder.State == 5)
{ {
modeState = $"网版编码{code}已被检测!";
AddTextEvent("扫码枪", $"网版编码{code}已被检测!"); AddTextEvent("扫码枪", $"网版编码{code}已被检测!");
loadOrderSNList(); loadOrderSNList();
} }
else if (modOrder.ProductInfo == null) else if (modOrder.State == 10)
{
modeState = $"网版编码{code}已被检测, 并且异常!";
AddTextEvent("扫码枪", $"网版编码{code}已被检测, 并且异常!");
loadOrderSNList();
}
if(!string.IsNullOrEmpty(modeState))
{
if(DialogResult.No == MessageBox.Show(modeState + "是否重新检测!", "网版已被检测", MessageBoxButtons.YesNo, MessageBoxIcon.Information))
{
return;
}
}
//2023-10-20
//else if (modOrder.ProductInfo == null)
if (modOrder.ProductInfo == null)
AddTextEvent("扫码枪", $"网版编码:{code}对应产品信息已不存在!"); AddTextEvent("扫码枪", $"网版编码:{code}对应产品信息已不存在!");
else if (modOrder.DefectCount < 1) else if (modOrder.DefectCount < 1)
AddTextEvent("扫码枪", $"网版编码:{code}没有缺陷!"); AddTextEvent("扫码枪", $"网版编码:{code}没有缺陷!");
@ -883,6 +908,13 @@ namespace AssistClient
this.dgvProcess.DataSource = new BindingSource(defectList, null); this.dgvProcess.DataSource = new BindingSource(defectList, null);
AddTextEvent("主机台", $"显示缺陷列表完成."); AddTextEvent("主机台", $"显示缺陷列表完成.");
this.gpbDefectList.Text = $"缺陷明细({defectList.Count}条)"; this.gpbDefectList.Text = $"缺陷明细({defectList.Count}条)";
//2023-11-1 图纸对比缺陷标红
for (int i = 0; i < defectList.Count; i++)
{
string defName = (string)this.dgvProcess.Rows[i].Cells["colDefectName"].Value;
if ((defName == Config.getDefectName("ds"))||((defName == Config.getDefectName("yx"))))
this.dgvProcess.Rows[i].DefaultCellStyle.BackColor = Color.Red;
}
})); }));
#endregion #endregion
@ -1069,6 +1101,9 @@ namespace AssistClient
public double Y { get; set; } public double Y { get; set; }
public string DefectName { get; set; }//缺陷类型 public string DefectName { get; set; }//缺陷类型
public double DefectCC { get; set; }//缺陷的置信度 public double DefectCC { get; set; }//缺陷的置信度
//2023-10-30 修复情况
public string Restoratory { get; set; }
} }
private double[] convert(JArray data) private double[] convert(JArray data)
{ {

View File

@ -459,30 +459,30 @@
<value> <value>
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
AElFTkSuQmCC AElFTkSuQmCC
</value> </value>
</data> </data>

View File

@ -0,0 +1,115 @@
namespace AssistClient
{
partial class FrmRepairInfo
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.label1 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
this.tbInfo = new System.Windows.Forms.TextBox();
this.btnSave = new System.Windows.Forms.Button();
this.btnCancel = new System.Windows.Forms.Button();
this.SuspendLayout();
//
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(51, 86);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(77, 12);
this.label1.TabIndex = 0;
this.label1.Text = "异常情况描述";
//
// label2
//
this.label2.AutoSize = true;
this.label2.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label2.Location = new System.Drawing.Point(159, 9);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(201, 28);
this.label2.TabIndex = 1;
this.label2.Text = "修复台修复情况汇总";
//
// tbInfo
//
this.tbInfo.Location = new System.Drawing.Point(164, 66);
this.tbInfo.Multiline = true;
this.tbInfo.Name = "tbInfo";
this.tbInfo.Size = new System.Drawing.Size(398, 60);
this.tbInfo.TabIndex = 2;
this.tbInfo.Text = "断线,破洞";
//
// btnSave
//
this.btnSave.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSave.Location = new System.Drawing.Point(165, 155);
this.btnSave.Name = "btnSave";
this.btnSave.Size = new System.Drawing.Size(110, 40);
this.btnSave.TabIndex = 7;
this.btnSave.Text = "异常确认";
this.btnSave.UseVisualStyleBackColor = true;
this.btnSave.Click += new System.EventHandler(this.btnSave_Click);
//
// btnCancel
//
this.btnCancel.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCancel.Location = new System.Drawing.Point(342, 155);
this.btnCancel.Name = "btnCancel";
this.btnCancel.Size = new System.Drawing.Size(110, 40);
this.btnCancel.TabIndex = 8;
this.btnCancel.Text = "无异常";
this.btnCancel.UseVisualStyleBackColor = true;
this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
//
// FrmRepairInfo
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.SystemColors.ActiveCaption;
this.ClientSize = new System.Drawing.Size(613, 228);
this.Controls.Add(this.btnCancel);
this.Controls.Add(this.btnSave);
this.Controls.Add(this.tbInfo);
this.Controls.Add(this.label2);
this.Controls.Add(this.label1);
this.Name = "FrmRepairInfo";
this.Text = "情况汇总";
this.Load += new System.EventHandler(this.FrmRepairInfo_Load);
this.ResumeLayout(false);
this.PerformLayout();
}
#endregion
private System.Windows.Forms.Label label1;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.TextBox tbInfo;
private System.Windows.Forms.Button btnSave;
private System.Windows.Forms.Button btnCancel;
}
}

View File

@ -0,0 +1,41 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace AssistClient
{
public partial class FrmRepairInfo : Form
{
public string RepairInfo;
public FrmRepairInfo()
{
InitializeComponent();
}
private void FrmRepairInfo_Load(object sender, EventArgs e)
{
this.RepairInfo = this.tbInfo.Text = "";
this.btnCancel.Select();
}
private void btnSave_Click(object sender, EventArgs e)
{
this.RepairInfo = this.tbInfo.Text;
this.DialogResult = DialogResult.OK;
}
private void btnCancel_Click(object sender, EventArgs e)
{
this.DialogResult= DialogResult.Cancel;
}
}
}

View File

@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>

View File

@ -27,153 +27,149 @@
/// </summary> /// </summary>
private void InitializeComponent() private void InitializeComponent()
{ {
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AboutBox1)); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AboutBox1));
this.tableLayoutPanel = new System.Windows.Forms.TableLayoutPanel(); this.tableLayoutPanel = new System.Windows.Forms.TableLayoutPanel();
this.logoPictureBox = new System.Windows.Forms.PictureBox(); this.logoPictureBox = new System.Windows.Forms.PictureBox();
this.labelProductName = new System.Windows.Forms.Label(); this.labelProductName = new System.Windows.Forms.Label();
this.labelVersion = new System.Windows.Forms.Label(); this.labelVersion = new System.Windows.Forms.Label();
this.labelCopyright = new System.Windows.Forms.Label(); this.labelCopyright = new System.Windows.Forms.Label();
this.labelCompanyName = new System.Windows.Forms.Label(); this.labelCompanyName = new System.Windows.Forms.Label();
this.textBoxDescription = new System.Windows.Forms.TextBox(); this.textBoxDescription = new System.Windows.Forms.TextBox();
this.okButton = new System.Windows.Forms.Button(); this.okButton = new System.Windows.Forms.Button();
this.tableLayoutPanel.SuspendLayout(); this.tableLayoutPanel.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.logoPictureBox)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.logoPictureBox)).BeginInit();
this.SuspendLayout(); this.SuspendLayout();
// //
// tableLayoutPanel // tableLayoutPanel
// //
this.tableLayoutPanel.ColumnCount = 2; this.tableLayoutPanel.ColumnCount = 2;
this.tableLayoutPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33F)); this.tableLayoutPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33F));
this.tableLayoutPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 67F)); this.tableLayoutPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 67F));
this.tableLayoutPanel.Controls.Add(this.logoPictureBox, 0, 0); this.tableLayoutPanel.Controls.Add(this.logoPictureBox, 0, 0);
this.tableLayoutPanel.Controls.Add(this.labelProductName, 1, 0); this.tableLayoutPanel.Controls.Add(this.labelProductName, 1, 0);
this.tableLayoutPanel.Controls.Add(this.labelVersion, 1, 1); this.tableLayoutPanel.Controls.Add(this.labelVersion, 1, 1);
this.tableLayoutPanel.Controls.Add(this.labelCopyright, 1, 2); this.tableLayoutPanel.Controls.Add(this.labelCopyright, 1, 2);
this.tableLayoutPanel.Controls.Add(this.labelCompanyName, 1, 3); this.tableLayoutPanel.Controls.Add(this.labelCompanyName, 1, 3);
this.tableLayoutPanel.Controls.Add(this.textBoxDescription, 1, 4); this.tableLayoutPanel.Controls.Add(this.textBoxDescription, 1, 4);
this.tableLayoutPanel.Controls.Add(this.okButton, 1, 5); this.tableLayoutPanel.Controls.Add(this.okButton, 1, 5);
this.tableLayoutPanel.Dock = System.Windows.Forms.DockStyle.Fill; this.tableLayoutPanel.Dock = System.Windows.Forms.DockStyle.Fill;
this.tableLayoutPanel.Location = new System.Drawing.Point(14, 12); this.tableLayoutPanel.Location = new System.Drawing.Point(9, 8);
this.tableLayoutPanel.Margin = new System.Windows.Forms.Padding(4); this.tableLayoutPanel.Name = "tableLayoutPanel";
this.tableLayoutPanel.Name = "tableLayoutPanel"; this.tableLayoutPanel.RowCount = 6;
this.tableLayoutPanel.RowCount = 6; this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 10F));
this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 10F)); this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 10F));
this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 10F)); this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 10F));
this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 10F)); this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 10F));
this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 10F)); this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 10F));
this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 10F)); this.tableLayoutPanel.Size = new System.Drawing.Size(417, 245);
this.tableLayoutPanel.Size = new System.Drawing.Size(624, 368); this.tableLayoutPanel.TabIndex = 0;
this.tableLayoutPanel.TabIndex = 0; //
// // logoPictureBox
// logoPictureBox //
// this.logoPictureBox.Dock = System.Windows.Forms.DockStyle.Fill;
this.logoPictureBox.Dock = System.Windows.Forms.DockStyle.Fill; this.logoPictureBox.Image = ((System.Drawing.Image)(resources.GetObject("logoPictureBox.Image")));
this.logoPictureBox.Image = ((System.Drawing.Image)(resources.GetObject("logoPictureBox.Image"))); this.logoPictureBox.Location = new System.Drawing.Point(3, 3);
this.logoPictureBox.Location = new System.Drawing.Point(4, 4); this.logoPictureBox.Name = "logoPictureBox";
this.logoPictureBox.Margin = new System.Windows.Forms.Padding(4); this.tableLayoutPanel.SetRowSpan(this.logoPictureBox, 6);
this.logoPictureBox.Name = "logoPictureBox"; this.logoPictureBox.Size = new System.Drawing.Size(131, 239);
this.tableLayoutPanel.SetRowSpan(this.logoPictureBox, 6); this.logoPictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.logoPictureBox.Size = new System.Drawing.Size(197, 360); this.logoPictureBox.TabIndex = 12;
this.logoPictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.logoPictureBox.TabStop = false;
this.logoPictureBox.TabIndex = 12; //
this.logoPictureBox.TabStop = false; // labelProductName
// //
// labelProductName this.labelProductName.Dock = System.Windows.Forms.DockStyle.Fill;
// this.labelProductName.Location = new System.Drawing.Point(143, 0);
this.labelProductName.Dock = System.Windows.Forms.DockStyle.Fill; this.labelProductName.Margin = new System.Windows.Forms.Padding(6, 0, 3, 0);
this.labelProductName.Location = new System.Drawing.Point(214, 0); this.labelProductName.MaximumSize = new System.Drawing.Size(0, 16);
this.labelProductName.Margin = new System.Windows.Forms.Padding(9, 0, 4, 0); this.labelProductName.Name = "labelProductName";
this.labelProductName.MaximumSize = new System.Drawing.Size(0, 24); this.labelProductName.Size = new System.Drawing.Size(271, 16);
this.labelProductName.Name = "labelProductName"; this.labelProductName.TabIndex = 19;
this.labelProductName.Size = new System.Drawing.Size(406, 24); this.labelProductName.Text = "产品名称";
this.labelProductName.TabIndex = 19; this.labelProductName.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.labelProductName.Text = "产品名称"; //
this.labelProductName.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // labelVersion
// //
// labelVersion this.labelVersion.Dock = System.Windows.Forms.DockStyle.Fill;
// this.labelVersion.Location = new System.Drawing.Point(143, 24);
this.labelVersion.Dock = System.Windows.Forms.DockStyle.Fill; this.labelVersion.Margin = new System.Windows.Forms.Padding(6, 0, 3, 0);
this.labelVersion.Location = new System.Drawing.Point(214, 36); this.labelVersion.MaximumSize = new System.Drawing.Size(0, 16);
this.labelVersion.Margin = new System.Windows.Forms.Padding(9, 0, 4, 0); this.labelVersion.Name = "labelVersion";
this.labelVersion.MaximumSize = new System.Drawing.Size(0, 24); this.labelVersion.Size = new System.Drawing.Size(271, 16);
this.labelVersion.Name = "labelVersion"; this.labelVersion.TabIndex = 0;
this.labelVersion.Size = new System.Drawing.Size(406, 24); this.labelVersion.Text = "版本";
this.labelVersion.TabIndex = 0; this.labelVersion.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.labelVersion.Text = "版本"; //
this.labelVersion.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // labelCopyright
// //
// labelCopyright this.labelCopyright.Dock = System.Windows.Forms.DockStyle.Fill;
// this.labelCopyright.Location = new System.Drawing.Point(143, 48);
this.labelCopyright.Dock = System.Windows.Forms.DockStyle.Fill; this.labelCopyright.Margin = new System.Windows.Forms.Padding(6, 0, 3, 0);
this.labelCopyright.Location = new System.Drawing.Point(214, 72); this.labelCopyright.MaximumSize = new System.Drawing.Size(0, 16);
this.labelCopyright.Margin = new System.Windows.Forms.Padding(9, 0, 4, 0); this.labelCopyright.Name = "labelCopyright";
this.labelCopyright.MaximumSize = new System.Drawing.Size(0, 24); this.labelCopyright.Size = new System.Drawing.Size(271, 16);
this.labelCopyright.Name = "labelCopyright"; this.labelCopyright.TabIndex = 21;
this.labelCopyright.Size = new System.Drawing.Size(406, 24); this.labelCopyright.Text = "版权";
this.labelCopyright.TabIndex = 21; this.labelCopyright.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.labelCopyright.Text = "版权"; //
this.labelCopyright.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // labelCompanyName
// //
// labelCompanyName this.labelCompanyName.Dock = System.Windows.Forms.DockStyle.Fill;
// this.labelCompanyName.Location = new System.Drawing.Point(143, 72);
this.labelCompanyName.Dock = System.Windows.Forms.DockStyle.Fill; this.labelCompanyName.Margin = new System.Windows.Forms.Padding(6, 0, 3, 0);
this.labelCompanyName.Location = new System.Drawing.Point(214, 108); this.labelCompanyName.MaximumSize = new System.Drawing.Size(0, 16);
this.labelCompanyName.Margin = new System.Windows.Forms.Padding(9, 0, 4, 0); this.labelCompanyName.Name = "labelCompanyName";
this.labelCompanyName.MaximumSize = new System.Drawing.Size(0, 24); this.labelCompanyName.Size = new System.Drawing.Size(271, 16);
this.labelCompanyName.Name = "labelCompanyName"; this.labelCompanyName.TabIndex = 22;
this.labelCompanyName.Size = new System.Drawing.Size(406, 24); this.labelCompanyName.Text = "公司名称";
this.labelCompanyName.TabIndex = 22; this.labelCompanyName.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.labelCompanyName.Text = "公司名称"; //
this.labelCompanyName.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // textBoxDescription
// //
// textBoxDescription this.textBoxDescription.Dock = System.Windows.Forms.DockStyle.Fill;
// this.textBoxDescription.Location = new System.Drawing.Point(143, 99);
this.textBoxDescription.Dock = System.Windows.Forms.DockStyle.Fill; this.textBoxDescription.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3);
this.textBoxDescription.Location = new System.Drawing.Point(214, 148); this.textBoxDescription.Multiline = true;
this.textBoxDescription.Margin = new System.Windows.Forms.Padding(9, 4, 4, 4); this.textBoxDescription.Name = "textBoxDescription";
this.textBoxDescription.Multiline = true; this.textBoxDescription.ReadOnly = true;
this.textBoxDescription.Name = "textBoxDescription"; this.textBoxDescription.ScrollBars = System.Windows.Forms.ScrollBars.Both;
this.textBoxDescription.ReadOnly = true; this.textBoxDescription.Size = new System.Drawing.Size(271, 116);
this.textBoxDescription.ScrollBars = System.Windows.Forms.ScrollBars.Both; this.textBoxDescription.TabIndex = 23;
this.textBoxDescription.Size = new System.Drawing.Size(406, 176); this.textBoxDescription.TabStop = false;
this.textBoxDescription.TabIndex = 23; this.textBoxDescription.Text = "说明";
this.textBoxDescription.TabStop = false; //
this.textBoxDescription.Text = "说明"; // okButton
// //
// okButton this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
// this.okButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.okButton.Location = new System.Drawing.Point(339, 221);
this.okButton.DialogResult = System.Windows.Forms.DialogResult.Cancel; this.okButton.Name = "okButton";
this.okButton.Location = new System.Drawing.Point(508, 332); this.okButton.Size = new System.Drawing.Size(75, 21);
this.okButton.Margin = new System.Windows.Forms.Padding(4); this.okButton.TabIndex = 24;
this.okButton.Name = "okButton"; this.okButton.Text = "确定(&O)";
this.okButton.Size = new System.Drawing.Size(112, 32); //
this.okButton.TabIndex = 24; // AboutBox1
this.okButton.Text = "确定(&O)"; //
// this.AcceptButton = this.okButton;
// AboutBox1 this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
// this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.AcceptButton = this.okButton; this.ClientSize = new System.Drawing.Size(435, 261);
this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F); this.Controls.Add(this.tableLayoutPanel);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
this.ClientSize = new System.Drawing.Size(652, 392); this.MaximizeBox = false;
this.Controls.Add(this.tableLayoutPanel); this.MinimizeBox = false;
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; this.Name = "AboutBox1";
this.Margin = new System.Windows.Forms.Padding(4); this.Padding = new System.Windows.Forms.Padding(9, 8, 9, 8);
this.MaximizeBox = false; this.ShowIcon = false;
this.MinimizeBox = false; this.ShowInTaskbar = false;
this.Name = "AboutBox1"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Padding = new System.Windows.Forms.Padding(14, 12, 14, 12); this.Text = "AboutBox1";
this.ShowIcon = false; this.tableLayoutPanel.ResumeLayout(false);
this.ShowInTaskbar = false; this.tableLayoutPanel.PerformLayout();
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; ((System.ComponentModel.ISupportInitialize)(this.logoPictureBox)).EndInit();
this.Text = "AboutBox1"; this.ResumeLayout(false);
this.tableLayoutPanel.ResumeLayout(false);
this.tableLayoutPanel.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.logoPictureBox)).EndInit();
this.ResumeLayout(false);
} }
#endregion #endregion

File diff suppressed because it is too large Load Diff

View File

@ -23,6 +23,8 @@ namespace ProductionControl
//跳过检测设备 //跳过检测设备
public static bool SkipAxis0, SkipAxis1, SkipAxis2, SkipAxis3; public static bool SkipAxis0, SkipAxis1, SkipAxis2, SkipAxis3;
public static bool SkipTension, SkipHeight, SkipLight, SkipScannerGL, SkipScannerCC, SkipSmallAxis; public static bool SkipTension, SkipHeight, SkipLight, SkipScannerGL, SkipScannerCC, SkipSmallAxis;
//启用功能 2023-1023
public static bool OpenMarkErrorStop;
//DEV //DEV
public static int[] Axis_PulseOutMode=new int[4]; public static int[] Axis_PulseOutMode=new int[4];
@ -48,12 +50,12 @@ namespace ProductionControl
//public static string Scanner_GENTL_CTI = "ScannerRuntime\\Win64_x64\\MvFGProducerCML.cti";//GE相机 //public static string Scanner_GENTL_CTI = "ScannerRuntime\\Win64_x64\\MvFGProducerCML.cti";//GE相机
public static string SizeEnginePath; public static string SizeEnginePath;
public static string SizeBmp_SavePath, SizeBmp_Compare_SavePath, SizeBmp_Zoom_Image_SavePath; public static string SizeBmp_SavePath, SizeBmp_Compare_SavePath, SizeBmp_Zoom_Image_SavePath;
public static int SizeBmp_SavePath_AutoClear = -1, SizeBmp_Compare_SavePath_AutoClear = -1, SizeBmp_Zoom_Image_SavePath_AutoClear = -1; public static double SizeBmp_SavePath_AutoClear = -1, SizeBmp_Compare_SavePath_AutoClear = -1, SizeBmp_Zoom_Image_SavePath_AutoClear = -1;
//缺陷配置 //缺陷配置
public static Size Defect_CutSize, Defect_ReSize; public static Size Defect_CutSize, Defect_ReSize;
public static float Defect_Thresholds; public static float Defect_Thresholds;
public static string Defect_SavePath, Defect_Compress_SavePath, Defect_Small_SavePath; public static string Defect_SavePath, Defect_Compress_SavePath, Defect_Small_SavePath;
public static int Defect_SavePath_AutoClear=-1,Defect_Compress_SavePath_AutoClear=-1,Defect_Small_SavePath_AutoClear=-1; public static double Defect_SavePath_AutoClear =-1,Defect_Compress_SavePath_AutoClear=-1,Defect_Small_SavePath_AutoClear=-1;
public static bool SaveAllDefectImg, MakeTag; public static bool SaveAllDefectImg, MakeTag;
//尺寸配置 //尺寸配置
//public static string Size_LoadPath, Size_FileName; //public static string Size_LoadPath, Size_FileName;
@ -90,6 +92,33 @@ namespace ProductionControl
// { "warning", null}, // { "warning", null},
// { "iodefault", null} // { "iodefault", null}
//}; //};
public static void DelectPictureFile()
{
//删除文件
Task.Factory.StartNew(() =>
{
// CreateSysFolder();
//
//DeleteFiles(appBasePath + "\\temp\\");
//
if (Defect_SavePath_AutoClear >= 0)
DeleteFiles(Config.Defect_SavePath, Defect_SavePath_AutoClear, false);
if (Defect_Compress_SavePath_AutoClear >= 0)
DeleteFiles(Config.Defect_Compress_SavePath, Defect_Compress_SavePath_AutoClear, false);
if (Defect_Small_SavePath_AutoClear >= 0)
DeleteFiles(Config.Defect_Small_SavePath, Defect_Small_SavePath_AutoClear, false);
//
if (SizeBmp_SavePath_AutoClear >= 0)
DeleteFiles(Config.SizeBmp_SavePath, SizeBmp_SavePath_AutoClear, false);
if (SizeBmp_Compare_SavePath_AutoClear >= 0)
DeleteFiles(Config.SizeBmp_Compare_SavePath, SizeBmp_Compare_SavePath_AutoClear, false);
if (SizeBmp_Zoom_Image_SavePath_AutoClear >= 0)
DeleteFiles(Config.SizeBmp_Zoom_Image_SavePath, SizeBmp_Zoom_Image_SavePath_AutoClear, false);
});
}
public static void LoadAllConfig() public static void LoadAllConfig()
{ {
@ -165,7 +194,7 @@ namespace ProductionControl
SkipScannerCC = Util.ReadIniValue(configPath, "SKIP", "SkipScannerCC") == "1"; SkipScannerCC = Util.ReadIniValue(configPath, "SKIP", "SkipScannerCC") == "1";
SkipSmallAxis = Util.ReadIniValue(configPath, "SKIP", "SkipSmallAxis") == "1"; SkipSmallAxis = Util.ReadIniValue(configPath, "SKIP", "SkipSmallAxis") == "1";
OpenMarkErrorStop = Util.ReadIniValue(configPath, "SKIP", "MarkErrorStop") == "1";
//DEV //DEV
lsTmp = Util.ReadIniValue(configPath, "DEV", "Axis0_PulseOutMode"); lsTmp = Util.ReadIniValue(configPath, "DEV", "Axis0_PulseOutMode");
if (Util.IsNumber(lsTmp)) Config.Axis_PulseOutMode[0] = Convert.ToInt32(lsTmp); if (Util.IsNumber(lsTmp)) Config.Axis_PulseOutMode[0] = Convert.ToInt32(lsTmp);
@ -222,14 +251,14 @@ namespace ProductionControl
Defect_SavePath = Util.ReadIniValue(configPath, "DEV", "Defect_SavePath"); Defect_SavePath = Util.ReadIniValue(configPath, "DEV", "Defect_SavePath");
lsTmp = Util.ReadIniValue(configPath, "DEV", "Defect_SavePath_AutoClear"); lsTmp = Util.ReadIniValue(configPath, "DEV", "Defect_SavePath_AutoClear");
if (Util.IsNumber(lsTmp)) Defect_SavePath_AutoClear = Convert.ToInt32(lsTmp); if (Util.IsNumber(lsTmp)) Defect_SavePath_AutoClear = Convert.ToDouble(lsTmp);
Defect_Compress_SavePath = Util.ReadIniValue(configPath, "DEV", "Defect_Compress_SavePath"); Defect_Compress_SavePath = Util.ReadIniValue(configPath, "DEV", "Defect_Compress_SavePath");
lsTmp = Util.ReadIniValue(configPath, "DEV", "Defect_Compress_SavePath_AutoClear"); lsTmp = Util.ReadIniValue(configPath, "DEV", "Defect_Compress_SavePath_AutoClear");
if (Util.IsNumber(lsTmp)) Defect_Compress_SavePath_AutoClear = Convert.ToInt32(lsTmp); if (Util.IsNumber(lsTmp)) Defect_Compress_SavePath_AutoClear = Convert.ToDouble(lsTmp);
Defect_Small_SavePath = Util.ReadIniValue(configPath, "DEV", "Defect_Small_SavePath"); Defect_Small_SavePath = Util.ReadIniValue(configPath, "DEV", "Defect_Small_SavePath");
lsTmp = Util.ReadIniValue(configPath, "DEV", "Defect_Small_SavePath_AutoClear"); lsTmp = Util.ReadIniValue(configPath, "DEV", "Defect_Small_SavePath_AutoClear");
if (Util.IsNumber(lsTmp)) Defect_Small_SavePath_AutoClear = Convert.ToInt32(lsTmp); if (Util.IsNumber(lsTmp)) Defect_Small_SavePath_AutoClear = Convert.ToDouble(lsTmp);
lsTmp = Util.ReadIniValue(configPath, "DEV", "SaveAllDefectImg"); lsTmp = Util.ReadIniValue(configPath, "DEV", "SaveAllDefectImg");
SaveAllDefectImg = (lsTmp == "1"); SaveAllDefectImg = (lsTmp == "1");
@ -238,15 +267,15 @@ namespace ProductionControl
SizeBmp_SavePath = Util.ReadIniValue(configPath, "DEV", "SizeBmp_SavePath"); SizeBmp_SavePath = Util.ReadIniValue(configPath, "DEV", "SizeBmp_SavePath");
lsTmp = Util.ReadIniValue(configPath, "DEV", "SizeBmp_SavePath_AutoClear"); lsTmp = Util.ReadIniValue(configPath, "DEV", "SizeBmp_SavePath_AutoClear");
if (Util.IsNumber(lsTmp)) SizeBmp_SavePath_AutoClear = Convert.ToInt32(lsTmp); if (Util.IsNumber(lsTmp)) SizeBmp_SavePath_AutoClear = Convert.ToDouble(lsTmp);
SizeBmp_Compare_SavePath = Util.ReadIniValue(configPath, "DEV", "SizeBmp_Compare_SavePath"); SizeBmp_Compare_SavePath = Util.ReadIniValue(configPath, "DEV", "SizeBmp_Compare_SavePath");
lsTmp = Util.ReadIniValue(configPath, "DEV", "SizeBmp_Compare_SavePath_AutoClear"); lsTmp = Util.ReadIniValue(configPath, "DEV", "SizeBmp_Compare_SavePath_AutoClear");
if (Util.IsNumber(lsTmp)) SizeBmp_Compare_SavePath_AutoClear = Convert.ToInt32(lsTmp); if (Util.IsNumber(lsTmp)) SizeBmp_Compare_SavePath_AutoClear = Convert.ToDouble(lsTmp);
SizeBmp_Zoom_Image_SavePath = Util.ReadIniValue(configPath, "DEV", "SizeBmp_Zoom_Image_SavePath"); SizeBmp_Zoom_Image_SavePath = Util.ReadIniValue(configPath, "DEV", "SizeBmp_Zoom_Image_SavePath");
lsTmp = Util.ReadIniValue(configPath, "DEV", "SizeBmp_Zoom_Image_SavePath_AutoClear"); lsTmp = Util.ReadIniValue(configPath, "DEV", "SizeBmp_Zoom_Image_SavePath_AutoClear");
if (Util.IsNumber(lsTmp)) SizeBmp_Zoom_Image_SavePath_AutoClear = Convert.ToInt32(lsTmp); if (Util.IsNumber(lsTmp)) SizeBmp_Zoom_Image_SavePath_AutoClear = Convert.ToDouble(lsTmp);
//DB //DB
DBConStr = Util.ReadIniValue(configPath, "DB", "DBConStr"); DBConStr = Util.ReadIniValue(configPath, "DB", "DBConStr");
//HTTP //HTTP
@ -305,7 +334,7 @@ namespace ProductionControl
/// <param name="dirPath"></param> /// <param name="dirPath"></param>
/// <param name="days"></param> /// <param name="days"></param>
/// <param name="delDir">把日期文件夹也按days进行删除格式:yyyyMMdd</param> /// <param name="delDir">把日期文件夹也按days进行删除格式:yyyyMMdd</param>
private static void DeleteFiles(string dirPath,int days=0,bool delDir=false) private static void DeleteFiles(string dirPath,double days=0,bool delDir=false)
{ {
if (!Directory.Exists(dirPath)) return; if (!Directory.Exists(dirPath)) return;
DateTime delDate = DateTime.Now.AddDays(-days); DateTime delDate = DateTime.Now.AddDays(-days);

View File

@ -130,6 +130,35 @@ namespace ProductionControl.Device
ProcCall1_PI_PT.SetInputCtrlParamTuple("posX", task.posX); ProcCall1_PI_PT.SetInputCtrlParamTuple("posX", task.posX);
ProcCall1_PI_PT.SetInputCtrlParamTuple("posY", task.posY); ProcCall1_PI_PT.SetInputCtrlParamTuple("posY", task.posY);
ProcCall1_PI_PT.SetInputCtrlParamTuple("GerberPath",new HTuple( task.drawingPagePath));//美尚没有 ProcCall1_PI_PT.SetInputCtrlParamTuple("GerberPath",new HTuple( task.drawingPagePath));//美尚没有
//设置外部函数输入
if ((task.PTandLinePos != null) && (task.PTandLinePos[0] != 0))
{
double[] posarray = new double[23];
posarray[0] = task.PTandLinePos[0];
posarray[1] = task.PTandLinePos[2];
posarray[2] = task.PTandLinePos[4];
posarray[3] = task.PTandLinePos[6];
posarray[4] = task.PTandLinePos[8];
for (int i = 0; i < 18; i++)
{
posarray[5 + i] = task.PTandLinePos[10 + i];
}
ProcCall1_PI_PT.SetInputCtrlParamTuple("UserPose", posarray);
/////
///
//string directory = Config.LogPath + "\\" + DateTime.Now.ToString("yyyyMM") + "\\";
//if (!System.IO.Directory.Exists(directory))
// System.IO.Directory.CreateDirectory(directory);
//File.AppendAllText(directory + "sizeData.log", "data:" + string.Join(",", posarray) + "\r\n");
}
else
{
double[] posarray = new double[23];
ProcCall1_PI_PT.SetInputCtrlParamTuple("UserPose", posarray);
}
} }
if (task.index == 777) if (task.index == 777)
{ {
@ -267,7 +296,10 @@ namespace ProductionControl.Device
public string file_path; public string file_path;
public double posX,posY; public double posX,posY;
public Bitmap bmp; public Bitmap bmp;
public string drawingPagePath = "";//.gbx图纸路径 public string drawingPagePath = "";//.gbx图纸路径
//2023-10-27 新增图纸选择pt点位与线宽点位
public double[] PTandLinePos;
/// <summary> /// <summary>
/// 比对(index=777); 计算Mark(111/222/333/444); 尺寸(1-9); 轴偏移调整(10,20,30...) /// 比对(index=777); 计算Mark(111/222/333/444); 尺寸(1-9); 轴偏移调整(10,20,30...)
/// </summary> /// </summary>

View File

@ -28,134 +28,144 @@
/// </summary> /// </summary>
private void InitializeComponent() private void InitializeComponent()
{ {
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmLogin)); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmLogin));
this.btnLogin = new System.Windows.Forms.Button(); this.btnLogin = new System.Windows.Forms.Button();
this.chkRememberPw = new System.Windows.Forms.CheckBox(); this.chkRememberPw = new System.Windows.Forms.CheckBox();
this.chkRememberUserCode = new System.Windows.Forms.CheckBox(); this.chkRememberUserCode = new System.Windows.Forms.CheckBox();
this.pictureBox1 = new System.Windows.Forms.PictureBox(); this.pictureBox1 = new System.Windows.Forms.PictureBox();
this.txtUserPw = new System.Windows.Forms.TextBox(); this.txtUserPw = new System.Windows.Forms.TextBox();
this.label2 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label();
this.txtUserCode = new System.Windows.Forms.TextBox(); this.txtUserCode = new System.Windows.Forms.TextBox();
this.label1 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label();
this.button2 = new System.Windows.Forms.Button(); this.button2 = new System.Windows.Forms.Button();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
this.SuspendLayout(); this.SuspendLayout();
// //
// btnLogin // btnLogin
// //
this.btnLogin.Location = new System.Drawing.Point(197, 272); this.btnLogin.Location = new System.Drawing.Point(131, 181);
this.btnLogin.Name = "btnLogin"; this.btnLogin.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.btnLogin.Size = new System.Drawing.Size(112, 35); this.btnLogin.Name = "btnLogin";
this.btnLogin.TabIndex = 5; this.btnLogin.Size = new System.Drawing.Size(75, 23);
this.btnLogin.Text = "登录"; this.btnLogin.TabIndex = 5;
this.btnLogin.UseVisualStyleBackColor = true; this.btnLogin.Text = "登录";
this.btnLogin.Click += new System.EventHandler(this.btnLogin_Click); this.btnLogin.UseVisualStyleBackColor = true;
// this.btnLogin.Click += new System.EventHandler(this.btnLogin_Click);
// chkRememberPw //
// // chkRememberPw
this.chkRememberPw.AutoSize = true; //
this.chkRememberPw.Location = new System.Drawing.Point(304, 233); this.chkRememberPw.AutoSize = true;
this.chkRememberPw.Name = "chkRememberPw"; this.chkRememberPw.Location = new System.Drawing.Point(203, 155);
this.chkRememberPw.Size = new System.Drawing.Size(106, 22); this.chkRememberPw.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.chkRememberPw.TabIndex = 3; this.chkRememberPw.Name = "chkRememberPw";
this.chkRememberPw.Text = "记住密码"; this.chkRememberPw.Size = new System.Drawing.Size(72, 16);
this.chkRememberPw.UseVisualStyleBackColor = true; this.chkRememberPw.TabIndex = 3;
this.chkRememberPw.CheckedChanged += new System.EventHandler(this.chkRememberPw_CheckedChanged); this.chkRememberPw.Text = "记住密码";
// this.chkRememberPw.UseVisualStyleBackColor = true;
// chkRememberUserCode this.chkRememberPw.CheckedChanged += new System.EventHandler(this.chkRememberPw_CheckedChanged);
// //
this.chkRememberUserCode.AutoSize = true; // chkRememberUserCode
this.chkRememberUserCode.Location = new System.Drawing.Point(135, 233); //
this.chkRememberUserCode.Name = "chkRememberUserCode"; this.chkRememberUserCode.AutoSize = true;
this.chkRememberUserCode.Size = new System.Drawing.Size(124, 22); this.chkRememberUserCode.Location = new System.Drawing.Point(90, 155);
this.chkRememberUserCode.TabIndex = 4; this.chkRememberUserCode.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.chkRememberUserCode.Text = "记住用户名"; this.chkRememberUserCode.Name = "chkRememberUserCode";
this.chkRememberUserCode.UseVisualStyleBackColor = true; this.chkRememberUserCode.Size = new System.Drawing.Size(84, 16);
this.chkRememberUserCode.CheckedChanged += new System.EventHandler(this.chkRememberUserCode_CheckedChanged); this.chkRememberUserCode.TabIndex = 4;
// this.chkRememberUserCode.Text = "记住用户名";
// pictureBox1 this.chkRememberUserCode.UseVisualStyleBackColor = true;
// this.chkRememberUserCode.CheckedChanged += new System.EventHandler(this.chkRememberUserCode_CheckedChanged);
this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); //
this.pictureBox1.Location = new System.Drawing.Point(0, 2); // pictureBox1
this.pictureBox1.Name = "pictureBox1"; //
this.pictureBox1.Size = new System.Drawing.Size(539, 142); this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image")));
this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox1.Location = new System.Drawing.Point(0, 1);
this.pictureBox1.TabIndex = 24; this.pictureBox1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.pictureBox1.TabStop = false; this.pictureBox1.Name = "pictureBox1";
// this.pictureBox1.Size = new System.Drawing.Size(359, 95);
// txtUserPw this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
// this.pictureBox1.TabIndex = 24;
this.txtUserPw.Location = new System.Drawing.Point(135, 199); this.pictureBox1.TabStop = false;
this.txtUserPw.MaxLength = 16; //
this.txtUserPw.Name = "txtUserPw"; // txtUserPw
this.txtUserPw.PasswordChar = '*'; //
this.txtUserPw.Size = new System.Drawing.Size(275, 28); this.txtUserPw.Location = new System.Drawing.Point(90, 133);
this.txtUserPw.TabIndex = 2; this.txtUserPw.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
// this.txtUserPw.MaxLength = 16;
// label2 this.txtUserPw.Name = "txtUserPw";
// this.txtUserPw.PasswordChar = '*';
this.label2.AutoSize = true; this.txtUserPw.Size = new System.Drawing.Size(185, 21);
this.label2.Location = new System.Drawing.Point(68, 209); this.txtUserPw.TabIndex = 2;
this.label2.Name = "label2"; //
this.label2.Size = new System.Drawing.Size(44, 18); // label2
this.label2.TabIndex = 27; //
this.label2.Text = "密码"; this.label2.AutoSize = true;
// this.label2.Location = new System.Drawing.Point(45, 139);
// txtUserCode this.label2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
// this.label2.Name = "label2";
this.txtUserCode.Location = new System.Drawing.Point(135, 158); this.label2.Size = new System.Drawing.Size(29, 12);
this.txtUserCode.Name = "txtUserCode"; this.label2.TabIndex = 27;
this.txtUserCode.Size = new System.Drawing.Size(275, 28); this.label2.Text = "密码";
this.txtUserCode.TabIndex = 1; //
// // txtUserCode
// label1 //
// this.txtUserCode.Location = new System.Drawing.Point(90, 105);
this.label1.AutoSize = true; this.txtUserCode.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.label1.Location = new System.Drawing.Point(68, 168); this.txtUserCode.Name = "txtUserCode";
this.label1.Name = "label1"; this.txtUserCode.Size = new System.Drawing.Size(185, 21);
this.label1.Size = new System.Drawing.Size(44, 18); this.txtUserCode.TabIndex = 1;
this.label1.TabIndex = 25; //
this.label1.Text = "帐号"; // label1
// //
// button2 this.label1.AutoSize = true;
// this.label1.Location = new System.Drawing.Point(45, 112);
this.button2.Location = new System.Drawing.Point(422, 272); this.label1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.button2.Name = "button2"; this.label1.Name = "label1";
this.button2.Size = new System.Drawing.Size(84, 35); this.label1.Size = new System.Drawing.Size(29, 12);
this.button2.TabIndex = 9; this.label1.TabIndex = 25;
this.button2.Text = "初始DB"; this.label1.Text = "帐号";
this.button2.UseVisualStyleBackColor = true; //
this.button2.Click += new System.EventHandler(this.button2_Click); // button2
// //
// FrmLogin this.button2.Location = new System.Drawing.Point(281, 181);
// this.button2.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.AcceptButton = this.btnLogin; this.button2.Name = "button2";
this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F); this.button2.Size = new System.Drawing.Size(56, 23);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.button2.TabIndex = 9;
this.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; this.button2.Text = "初始DB";
this.ClientSize = new System.Drawing.Size(518, 311); this.button2.UseVisualStyleBackColor = true;
this.Controls.Add(this.txtUserPw); this.button2.Click += new System.EventHandler(this.button2_Click);
this.Controls.Add(this.label2); //
this.Controls.Add(this.txtUserCode); // FrmLogin
this.Controls.Add(this.label1); //
this.Controls.Add(this.pictureBox1); this.AcceptButton = this.btnLogin;
this.Controls.Add(this.chkRememberUserCode); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.Controls.Add(this.chkRememberPw); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.button2); this.BackColor = System.Drawing.SystemColors.GradientInactiveCaption;
this.Controls.Add(this.btnLogin); this.ClientSize = new System.Drawing.Size(345, 207);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; this.Controls.Add(this.txtUserPw);
this.MaximizeBox = false; this.Controls.Add(this.label2);
this.MinimizeBox = false; this.Controls.Add(this.txtUserCode);
this.Name = "FrmLogin"; this.Controls.Add(this.label1);
this.ShowIcon = false; this.Controls.Add(this.pictureBox1);
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Controls.Add(this.chkRememberUserCode);
this.Text = "自动化视觉检测系统 - v1.0"; this.Controls.Add(this.chkRememberPw);
this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.FrmLogin_FormClosed); this.Controls.Add(this.button2);
this.Load += new System.EventHandler(this.FrmLogin_Load); this.Controls.Add(this.btnLogin);
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
this.ResumeLayout(false); this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.PerformLayout(); this.MaximizeBox = false;
this.MinimizeBox = false;
this.Name = "FrmLogin";
this.ShowIcon = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "自动化视觉检测系统 - v1.2";
this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.FrmLogin_FormClosed);
this.Load += new System.EventHandler(this.FrmLogin_Load);
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
} }
#endregion #endregion

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -210,8 +210,10 @@ namespace ProductionControl
{ {
AddTextEvent("扫码枪", "扫码枪初始化失败!"); AddTextEvent("扫码枪", "扫码枪初始化失败!");
return; return;
} }
devContainer.devCodeScanner.ScanerEvent = (code) => //2023-10-20 不使用扫码枪事件处理
//devContainer.devCodeScanner.ScanerEvent = (code) =>
string code = this.txtProductCode.Text;
{ {
if (!devContainer.state || currentState != CurrentStateEnum. || string.IsNullOrWhiteSpace(code)) if (!devContainer.state || currentState != CurrentStateEnum. || string.IsNullOrWhiteSpace(code))
return; return;
@ -403,6 +405,7 @@ namespace ProductionControl
//======Switch 工序类型 //======Switch 工序类型
bool asynRun; bool asynRun;
string gbxBmpPath = ""; string gbxBmpPath = "";
Models.Attachment attachmentFile; Models.Attachment attachmentFile;
int liStatocStepIndex = stepIndex; int liStatocStepIndex = stepIndex;
switch (processInfo.ProcessCode) switch (processInfo.ProcessCode)
@ -861,7 +864,7 @@ namespace ProductionControl
scannerCBmpQueue.Enqueue(new scannerCBmpLoc(path2, scannerCBmpQueue.Enqueue(new scannerCBmpLoc(path2,
devContainer.devAxis.getActualPos_mm(0), devContainer.devAxis.getActualPos_mm(0),
devContainer.devAxis.getActualPos_mm(2)));//Dequeue devContainer.devAxis.getActualPos_mm(2)));//Dequeue
AddTextEvent($"{stepIndex + 1}-{processName}", $"添加尺寸图像队列X:{ devContainer.devAxis.getActualPos_mm(1)},y: { devContainer.devAxis.getActualPos_mm(2)},数量: { scannerCBmpQueue.Count}"); AddTextEvent($"{stepIndex + 1}-{processName}", $"添加尺寸图像队列X:{ devContainer.devAxis.getActualPos_mm(0)},y: { devContainer.devAxis.getActualPos_mm(2)},数量: { scannerCBmpQueue.Count}");
endEventCC.Set();//线程返回 endEventCC.Set();//线程返回
}); });
if (!devContainer.devScannerCC.scan(1))//软触发拍照 if (!devContainer.devScannerCC.scan(1))//软触发拍照
@ -902,7 +905,23 @@ namespace ProductionControl
limitThresholdVal = processParam.Value<double>("LimitThresholdVal"); limitThresholdVal = processParam.Value<double>("LimitThresholdVal");
lowerThresholdVal = processParam.Value<double>("LowerThresholdVal"); lowerThresholdVal = processParam.Value<double>("LowerThresholdVal");
int sizeIndex = processParam.Value<int>("Index"); int sizeIndex = processParam.Value<int>("Index");
string sizeTag = processParam.ContainsKey("SizeTag") ? processParam.Value<string>("SizeTag") : ""; string sizeTag = processParam.ContainsKey("SizeTag") ? processParam.Value<string>("SizeTag") : "";
//2023-10-27
List<double> getPosList = new List<double>();
try
{
getPosList = processParam.Value<JArray>("GetPointList").ToObject<List<double>>();
}
catch
{
for (int i = 0; i < 28; i++)
getPosList.Add(0);
}
double[] getPosArray = getPosList.ToArray();
if (scannerCBmpQueue.Count < 1) if (scannerCBmpQueue.Count < 1)
{ {
AddTextEvent($"{stepIndex + 1}-{processName}", $"尺寸检测异常,无源图像!!", WarningEnum.Low); AddTextEvent($"{stepIndex + 1}-{processName}", $"尺寸检测异常,无源图像!!", WarningEnum.Low);
@ -921,6 +940,10 @@ namespace ProductionControl
} }
if ((sizeIndex == 333 || sizeIndex == 777) && gbxBmpPath == "") if ((sizeIndex == 333 || sizeIndex == 777) && gbxBmpPath == "")
AddTextEvent($"{stepIndex + 1}-{processName}", $"尺寸检测index:{sizeIndex},图纸不存在!", WarningEnum.Low); AddTextEvent($"{stepIndex + 1}-{processName}", $"尺寸检测index:{sizeIndex},图纸不存在!", WarningEnum.Low);
//2023-10-27
if ((getPosList != null) && (getPosList.Count() != 28))
AddTextEvent($"{stepIndex + 1}-{processName}", $"尺寸检测index:{sizeIndex},图纸读点不存在!", WarningEnum.Low);
AddTextEvent($"{stepIndex + 1}-{processName}", $"开始图纸读点index:{sizeIndex},PT1:{getPosArray[0]},PPT2:{getPosArray[2]},PPT3:{getPosArray[4]},PPT4:{getPosArray[6]},PPT5:{getPosArray[8]}...");
//需要偏移校正index=0时不能异步 //10,20,30...  //需要偏移校正index=0时不能异步 //10,20,30... 
endEvent = new AutoResetEvent(false); endEvent = new AutoResetEvent(false);
devContainer.libSize.add(new SizeTask() devContainer.libSize.add(new SizeTask()
@ -934,6 +957,8 @@ namespace ProductionControl
drawingPagePath = gbxBmpPath, drawingPagePath = gbxBmpPath,
posX= bmpCBmpQueue.PosX, posX= bmpCBmpQueue.PosX,
posY= bmpCBmpQueue.PosY, posY= bmpCBmpQueue.PosY,
//2023-10-27
PTandLinePos = getPosArray,
index = sizeIndex,// scannerCBmpIndex++, index = sizeIndex,// scannerCBmpIndex++,
ContoursAffineTrans1_Out=this.contoursAffineTrans1_Out,//只有777时才使用最近333输出的结果 ContoursAffineTrans1_Out=this.contoursAffineTrans1_Out,//只有777时才使用最近333输出的结果
finishEvent = (res) => finishEvent = (res) =>
@ -1031,7 +1056,10 @@ namespace ProductionControl
{ {
//warning(WarningEnum.Low);//暂停 //warning(WarningEnum.Low);//暂停
setDgvContentCol(liStatocStepIndex, $"index:{res.index}Mark点计算失败"); setDgvContentCol(liStatocStepIndex, $"index:{res.index}Mark点计算失败");
AddTextEvent($"{res.stepIndex + 1}-{processName}", $"Mark点计算失败index:{res.index}.", WarningEnum.Low); AddTextEvent($"{res.stepIndex + 1}-{processName}", $"Mark点计算失败index:{res.index}.", WarningEnum.Low);
//2023-10-20 make暂停
if (Config.OpenMarkErrorStop)
warning(WarningEnum.Low);//暂停
} }
//保存 //保存
@ -1060,6 +1088,8 @@ namespace ProductionControl
warning(WarningEnum.High);//急停 warning(WarningEnum.High);//急停
return; return;
} }
//2023-10-27
AddTextEvent($"{res.stepIndex + 1}-{res.processName}", $"Tag对应posePT: {tagOutData}", WarningEnum.Normal);
if (order.SizeTagDataList == null) if (order.SizeTagDataList == null)
order.SizeTagDataList = new List<SizeTagData>(); order.SizeTagDataList = new List<SizeTagData>();
@ -1931,9 +1961,11 @@ namespace ProductionControl
private void resetUIValue() private void resetUIValue()
{ {
this.Invoke(new System.Action(() => this.Invoke(new System.Action(() =>
{ {
txtProductName.Text = txtProductCode.Text = txtProductSN.Text = ""; //保持产品名称和料号
//txtProductName.Text = txtProductCode.Text = txtProductSN.Text = "";
txtProductSN.Text = "";
lstHeight.Clear(); lstHeight.Clear();
lstLineWidth.Clear(); lstLineWidth.Clear();
lstTension.Clear(); lstTension.Clear();
@ -2410,6 +2442,8 @@ namespace ProductionControl
private void startCommand() private void startCommand()
{ {
this.setButtonEnabled(this.tsbtnProductRevise, false); this.setButtonEnabled(this.tsbtnProductRevise, false);
//2023-10-23 运行前清除过期图片文件
Config.DelectPictureFile();
if (!devContainer.state || warningLevel != WarningEnum.Normal || currentState != CurrentStateEnum.) if (!devContainer.state || warningLevel != WarningEnum.Normal || currentState != CurrentStateEnum.)
return; return;
if (currentPT == CurrentPTEnum.MakeTag) if (currentPT == CurrentPTEnum.MakeTag)
@ -2935,7 +2969,11 @@ namespace ProductionControl
// //
int spliceWidth = 5; int spliceWidth = 5;
kanban1.Width = kanban2.Width = kanban3.Width = kanban4.Width = kanban5.Width = kanban6.Width = (flpnlResultData.Width-20) / 6; kanban1.Width = kanban2.Width = kanban3.Width = kanban4.Width = kanban5.Width = kanban6.Width = (flpnlResultData.Width-20) / 6;
//2023-10-17 更新log和步骤列表显示
this.gpbProcessList.Height = this.splitContainer1.Panel1.Height - this.gpbProcessList.Top - this.gpbLog.Height;
this.gpbLog.Top = this.splitContainer1.Panel1.Height - this.gpbLog.Height;
} }
@ -3313,15 +3351,26 @@ namespace ProductionControl
} }
private void txtProductCode_DoubleClick(object sender, EventArgs e) private void txtProductCode_DoubleClick(object sender, EventArgs e)
{ {
if (currentState != CurrentStateEnum.) return; //不需要等待扫码才能选择
//if (currentState != CurrentStateEnum.等待扫码) return;
FrmInput frm = new FrmInput(productCodeList, "请选择产品料号:"); FrmInput frm = new FrmInput(productCodeList, "请选择产品料号:");
if (frm.ShowDialog() != DialogResult.OK && string.IsNullOrWhiteSpace(frm.inputData)) if (frm.ShowDialog() != DialogResult.OK && string.IsNullOrWhiteSpace(frm.inputData))
return; return;
//显示料号
//this.txtProductCode.Text = frm.inputData;
var model = svcProduct.GetModelNav(frm.inputData);
if (model != null && model.StepInfo.ProcessList.Count > 0)
{
this.txtProductCode.Text = model.Code;
this.txtProductName.Text = model.Name;
}
/*//屏蔽扫码枪事件
Task.Factory.StartNew(() => Task.Factory.StartNew(() =>
{ {
devContainer.devCodeScanner.ScanerEvent?.Invoke(frm.inputData); devContainer.devCodeScanner.ScanerEvent?.Invoke(frm.inputData);
}); });
*/
//string code = Interaction.InputBox("请输入产品编码", "输入框", "", -1, -1).Trim(); //string code = Interaction.InputBox("请输入产品编码", "输入框", "", -1, -1).Trim();
//if(code != "") //if(code != "")

File diff suppressed because it is too large Load Diff

View File

@ -28,402 +28,426 @@
/// </summary> /// </summary>
private void InitializeComponent() private void InitializeComponent()
{ {
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmProductList)); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmProductList));
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
this.toolStrip1 = new System.Windows.Forms.ToolStrip(); this.toolStrip1 = new System.Windows.Forms.ToolStrip();
this.tsbtnRefresh = new System.Windows.Forms.ToolStripButton(); this.tsbtnRefresh = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
this.tsbtnAdd = new System.Windows.Forms.ToolStripButton(); this.tsbtnAdd = new System.Windows.Forms.ToolStripButton();
this.tsbtnDel = new System.Windows.Forms.ToolStripButton(); this.tsbtnDel = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
this.tsbtnSetting = new System.Windows.Forms.ToolStripButton(); this.tsbtnSetting = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
this.tsbtnClasses = new System.Windows.Forms.ToolStripButton(); this.tsbtnClasses = new System.Windows.Forms.ToolStripButton();
this.tsbtnDefectClasses = new System.Windows.Forms.ToolStripButton(); this.tsbtnDefectClasses = new System.Windows.Forms.ToolStripButton();
this.tsbtnRevise = new System.Windows.Forms.ToolStripButton(); this.tsbtnRevise = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
this.tsbtnClose = new System.Windows.Forms.ToolStripButton(); this.tsbtnClose = new System.Windows.Forms.ToolStripButton();
this.statusStrip1 = new System.Windows.Forms.StatusStrip(); this.statusStrip1 = new System.Windows.Forms.StatusStrip();
this.tsslCount = new System.Windows.Forms.ToolStripStatusLabel(); this.tsslCount = new System.Windows.Forms.ToolStripStatusLabel();
this.dataGridView1 = new System.Windows.Forms.DataGridView(); this.dataGridView1 = new System.Windows.Forms.DataGridView();
this.colId = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colId = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colClasses = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colClasses = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colCode = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colName = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colName = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colSpec = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colSpec = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colHoleCount = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colHoleCount = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colTag = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colTag = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colTargetCount = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colTargetCount = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colCompleteCount = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colCompleteCount = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colStepName = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colStepName = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colReviseStepName = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colReviseStepName = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colModifyCode = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colModifyCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colModifyTime = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colModifyTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.toolStrip1.SuspendLayout(); this.tsbtnClone = new System.Windows.Forms.ToolStripButton();
this.statusStrip1.SuspendLayout(); this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();
((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); this.toolStrip1.SuspendLayout();
this.SuspendLayout(); this.statusStrip1.SuspendLayout();
// ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
// toolStrip1 this.SuspendLayout();
// //
this.toolStrip1.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; // toolStrip1
this.toolStrip1.ImageScalingSize = new System.Drawing.Size(32, 32); //
this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.toolStrip1.BackColor = System.Drawing.SystemColors.GradientInactiveCaption;
this.tsbtnRefresh, this.toolStrip1.ImageScalingSize = new System.Drawing.Size(32, 32);
this.toolStripSeparator4, this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.tsbtnAdd, this.tsbtnRefresh,
this.tsbtnDel, this.toolStripSeparator4,
this.toolStripSeparator1, this.tsbtnAdd,
this.tsbtnSetting, this.tsbtnDel,
this.toolStripSeparator2, this.toolStripSeparator1,
this.tsbtnClasses, this.tsbtnClone,
this.tsbtnDefectClasses, this.toolStripSeparator5,
this.tsbtnRevise, this.tsbtnSetting,
this.toolStripSeparator3, this.toolStripSeparator2,
this.tsbtnClose}); this.tsbtnClasses,
this.toolStrip1.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.HorizontalStackWithOverflow; this.tsbtnDefectClasses,
this.toolStrip1.Location = new System.Drawing.Point(0, 0); this.tsbtnRevise,
this.toolStrip1.Name = "toolStrip1"; this.toolStripSeparator3,
this.toolStrip1.Size = new System.Drawing.Size(1311, 65); this.tsbtnClose});
this.toolStrip1.TabIndex = 12; this.toolStrip1.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.HorizontalStackWithOverflow;
this.toolStrip1.Text = "toolStrip1"; this.toolStrip1.Location = new System.Drawing.Point(0, 0);
// this.toolStrip1.Name = "toolStrip1";
// tsbtnRefresh this.toolStrip1.Size = new System.Drawing.Size(874, 56);
// this.toolStrip1.TabIndex = 12;
this.tsbtnRefresh.Image = ((System.Drawing.Image)(resources.GetObject("tsbtnRefresh.Image"))); this.toolStrip1.Text = "toolStrip1";
this.tsbtnRefresh.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; //
this.tsbtnRefresh.ImageTransparentColor = System.Drawing.Color.Magenta; // tsbtnRefresh
this.tsbtnRefresh.Name = "tsbtnRefresh"; //
this.tsbtnRefresh.Size = new System.Drawing.Size(70, 60); this.tsbtnRefresh.Image = ((System.Drawing.Image)(resources.GetObject("tsbtnRefresh.Image")));
this.tsbtnRefresh.Text = " 刷新 "; this.tsbtnRefresh.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.tsbtnRefresh.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; this.tsbtnRefresh.ImageTransparentColor = System.Drawing.Color.Magenta;
this.tsbtnRefresh.Click += new System.EventHandler(this.tsbtnRefresh_Click); this.tsbtnRefresh.Name = "tsbtnRefresh";
// this.tsbtnRefresh.Size = new System.Drawing.Size(52, 53);
// toolStripSeparator4 this.tsbtnRefresh.Text = " 刷新 ";
// this.tsbtnRefresh.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
this.toolStripSeparator4.Name = "toolStripSeparator4"; this.tsbtnRefresh.Click += new System.EventHandler(this.tsbtnRefresh_Click);
this.toolStripSeparator4.Size = new System.Drawing.Size(6, 65); //
// // toolStripSeparator4
// tsbtnAdd //
// this.toolStripSeparator4.Name = "toolStripSeparator4";
this.tsbtnAdd.Image = ((System.Drawing.Image)(resources.GetObject("tsbtnAdd.Image"))); this.toolStripSeparator4.Size = new System.Drawing.Size(6, 56);
this.tsbtnAdd.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; //
this.tsbtnAdd.ImageTransparentColor = System.Drawing.Color.Magenta; // tsbtnAdd
this.tsbtnAdd.Name = "tsbtnAdd"; //
this.tsbtnAdd.Size = new System.Drawing.Size(70, 60); this.tsbtnAdd.Image = ((System.Drawing.Image)(resources.GetObject("tsbtnAdd.Image")));
this.tsbtnAdd.Text = " 添加 "; this.tsbtnAdd.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.tsbtnAdd.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; this.tsbtnAdd.ImageTransparentColor = System.Drawing.Color.Magenta;
this.tsbtnAdd.Click += new System.EventHandler(this.tsbtnAdd_Click); this.tsbtnAdd.Name = "tsbtnAdd";
// this.tsbtnAdd.Size = new System.Drawing.Size(52, 53);
// tsbtnDel this.tsbtnAdd.Text = " 添加 ";
// this.tsbtnAdd.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
this.tsbtnDel.Image = ((System.Drawing.Image)(resources.GetObject("tsbtnDel.Image"))); this.tsbtnAdd.Click += new System.EventHandler(this.tsbtnAdd_Click);
this.tsbtnDel.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; //
this.tsbtnDel.ImageTransparentColor = System.Drawing.Color.Magenta; // tsbtnDel
this.tsbtnDel.Name = "tsbtnDel"; //
this.tsbtnDel.Size = new System.Drawing.Size(70, 60); this.tsbtnDel.Image = ((System.Drawing.Image)(resources.GetObject("tsbtnDel.Image")));
this.tsbtnDel.Text = " 删除 "; this.tsbtnDel.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.tsbtnDel.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; this.tsbtnDel.ImageTransparentColor = System.Drawing.Color.Magenta;
this.tsbtnDel.Click += new System.EventHandler(this.tsbtnDel_Click); this.tsbtnDel.Name = "tsbtnDel";
// this.tsbtnDel.Size = new System.Drawing.Size(52, 53);
// toolStripSeparator1 this.tsbtnDel.Text = " 删除 ";
// this.tsbtnDel.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
this.toolStripSeparator1.Name = "toolStripSeparator1"; this.tsbtnDel.Click += new System.EventHandler(this.tsbtnDel_Click);
this.toolStripSeparator1.Size = new System.Drawing.Size(6, 65); //
// // toolStripSeparator1
// tsbtnSetting //
// this.toolStripSeparator1.Name = "toolStripSeparator1";
this.tsbtnSetting.Image = ((System.Drawing.Image)(resources.GetObject("tsbtnSetting.Image"))); this.toolStripSeparator1.Size = new System.Drawing.Size(6, 56);
this.tsbtnSetting.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; //
this.tsbtnSetting.ImageTransparentColor = System.Drawing.Color.Magenta; // tsbtnSetting
this.tsbtnSetting.Name = "tsbtnSetting"; //
this.tsbtnSetting.Size = new System.Drawing.Size(140, 60); this.tsbtnSetting.Image = ((System.Drawing.Image)(resources.GetObject("tsbtnSetting.Image")));
this.tsbtnSetting.Text = "流程与配方设置"; this.tsbtnSetting.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.tsbtnSetting.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; this.tsbtnSetting.ImageTransparentColor = System.Drawing.Color.Magenta;
this.tsbtnSetting.Click += new System.EventHandler(this.tsbtnSetting_Click); this.tsbtnSetting.Name = "tsbtnSetting";
// this.tsbtnSetting.Size = new System.Drawing.Size(96, 53);
// toolStripSeparator2 this.tsbtnSetting.Text = "流程与配方设置";
// this.tsbtnSetting.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
this.toolStripSeparator2.Name = "toolStripSeparator2"; this.tsbtnSetting.Click += new System.EventHandler(this.tsbtnSetting_Click);
this.toolStripSeparator2.Size = new System.Drawing.Size(6, 65); //
// // toolStripSeparator2
// tsbtnClasses //
// this.toolStripSeparator2.Name = "toolStripSeparator2";
this.tsbtnClasses.Image = ((System.Drawing.Image)(resources.GetObject("tsbtnClasses.Image"))); this.toolStripSeparator2.Size = new System.Drawing.Size(6, 56);
this.tsbtnClasses.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; //
this.tsbtnClasses.ImageTransparentColor = System.Drawing.Color.Magenta; // tsbtnClasses
this.tsbtnClasses.Name = "tsbtnClasses"; //
this.tsbtnClasses.Size = new System.Drawing.Size(86, 60); this.tsbtnClasses.Image = ((System.Drawing.Image)(resources.GetObject("tsbtnClasses.Image")));
this.tsbtnClasses.Text = "类型管理"; this.tsbtnClasses.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.tsbtnClasses.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; this.tsbtnClasses.ImageTransparentColor = System.Drawing.Color.Magenta;
this.tsbtnClasses.Click += new System.EventHandler(this.tsbtnClasses_Click); this.tsbtnClasses.Name = "tsbtnClasses";
// this.tsbtnClasses.Size = new System.Drawing.Size(60, 53);
// tsbtnDefectClasses this.tsbtnClasses.Text = "类型管理";
// this.tsbtnClasses.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
this.tsbtnDefectClasses.Image = ((System.Drawing.Image)(resources.GetObject("tsbtnDefectClasses.Image"))); this.tsbtnClasses.Click += new System.EventHandler(this.tsbtnClasses_Click);
this.tsbtnDefectClasses.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; //
this.tsbtnDefectClasses.ImageTransparentColor = System.Drawing.Color.Magenta; // tsbtnDefectClasses
this.tsbtnDefectClasses.Name = "tsbtnDefectClasses"; //
this.tsbtnDefectClasses.Size = new System.Drawing.Size(86, 60); this.tsbtnDefectClasses.Image = ((System.Drawing.Image)(resources.GetObject("tsbtnDefectClasses.Image")));
this.tsbtnDefectClasses.Text = "缺陷类别"; this.tsbtnDefectClasses.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.tsbtnDefectClasses.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; this.tsbtnDefectClasses.ImageTransparentColor = System.Drawing.Color.Magenta;
this.tsbtnDefectClasses.Visible = false; this.tsbtnDefectClasses.Name = "tsbtnDefectClasses";
this.tsbtnDefectClasses.Click += new System.EventHandler(this.tsbtnDefectClasses_Click); this.tsbtnDefectClasses.Size = new System.Drawing.Size(60, 53);
// this.tsbtnDefectClasses.Text = "缺陷类别";
// tsbtnRevise this.tsbtnDefectClasses.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
// this.tsbtnDefectClasses.Visible = false;
this.tsbtnRevise.Image = ((System.Drawing.Image)(resources.GetObject("tsbtnRevise.Image"))); this.tsbtnDefectClasses.Click += new System.EventHandler(this.tsbtnDefectClasses_Click);
this.tsbtnRevise.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; //
this.tsbtnRevise.ImageTransparentColor = System.Drawing.Color.Magenta; // tsbtnRevise
this.tsbtnRevise.Name = "tsbtnRevise"; //
this.tsbtnRevise.Size = new System.Drawing.Size(86, 60); this.tsbtnRevise.Image = ((System.Drawing.Image)(resources.GetObject("tsbtnRevise.Image")));
this.tsbtnRevise.Text = "开始校正"; this.tsbtnRevise.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.tsbtnRevise.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; this.tsbtnRevise.ImageTransparentColor = System.Drawing.Color.Magenta;
this.tsbtnRevise.Click += new System.EventHandler(this.tsbtnRevise_Click); this.tsbtnRevise.Name = "tsbtnRevise";
// this.tsbtnRevise.Size = new System.Drawing.Size(60, 53);
// toolStripSeparator3 this.tsbtnRevise.Text = "开始校正";
// this.tsbtnRevise.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
this.toolStripSeparator3.Name = "toolStripSeparator3"; this.tsbtnRevise.Click += new System.EventHandler(this.tsbtnRevise_Click);
this.toolStripSeparator3.Size = new System.Drawing.Size(6, 65); //
// // toolStripSeparator3
// tsbtnClose //
// this.toolStripSeparator3.Name = "toolStripSeparator3";
this.tsbtnClose.Image = ((System.Drawing.Image)(resources.GetObject("tsbtnClose.Image"))); this.toolStripSeparator3.Size = new System.Drawing.Size(6, 56);
this.tsbtnClose.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; //
this.tsbtnClose.ImageTransparentColor = System.Drawing.Color.Magenta; // tsbtnClose
this.tsbtnClose.Name = "tsbtnClose"; //
this.tsbtnClose.Size = new System.Drawing.Size(70, 60); this.tsbtnClose.Image = ((System.Drawing.Image)(resources.GetObject("tsbtnClose.Image")));
this.tsbtnClose.Text = " 关闭 "; this.tsbtnClose.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.tsbtnClose.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; this.tsbtnClose.ImageTransparentColor = System.Drawing.Color.Magenta;
this.tsbtnClose.Click += new System.EventHandler(this.tsbtnClose_Click); this.tsbtnClose.Name = "tsbtnClose";
// this.tsbtnClose.Size = new System.Drawing.Size(52, 53);
// statusStrip1 this.tsbtnClose.Text = " 关闭 ";
// this.tsbtnClose.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
this.statusStrip1.ImageScalingSize = new System.Drawing.Size(24, 24); this.tsbtnClose.Click += new System.EventHandler(this.tsbtnClose_Click);
this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { //
this.tsslCount}); // statusStrip1
this.statusStrip1.Location = new System.Drawing.Point(0, 766); //
this.statusStrip1.Name = "statusStrip1"; this.statusStrip1.ImageScalingSize = new System.Drawing.Size(24, 24);
this.statusStrip1.Size = new System.Drawing.Size(1311, 31); this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.statusStrip1.TabIndex = 21; this.tsslCount});
this.statusStrip1.Text = "statusStrip1"; this.statusStrip1.Location = new System.Drawing.Point(0, 509);
// this.statusStrip1.Name = "statusStrip1";
// tsslCount this.statusStrip1.Padding = new System.Windows.Forms.Padding(1, 0, 9, 0);
// this.statusStrip1.Size = new System.Drawing.Size(874, 22);
this.tsslCount.Name = "tsslCount"; this.statusStrip1.TabIndex = 21;
this.tsslCount.Size = new System.Drawing.Size(33, 24); this.statusStrip1.Text = "statusStrip1";
this.tsslCount.Text = "共 "; //
// // tsslCount
// dataGridView1 //
// this.tsslCount.Name = "tsslCount";
this.dataGridView1.AllowUserToAddRows = false; this.tsslCount.Size = new System.Drawing.Size(24, 17);
this.dataGridView1.AllowUserToDeleteRows = false; this.tsslCount.Text = "共 ";
dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; //
dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control; // dataGridView1
dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); //
dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText; this.dataGridView1.AllowUserToAddRows = false;
dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; this.dataGridView1.AllowUserToDeleteRows = false;
dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText; dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True; dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1; dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;
this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
this.colId, dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
this.colClasses, dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colCode, this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
this.colName, this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.colSpec, this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.colHoleCount, this.colId,
this.colTag, this.colClasses,
this.colTargetCount, this.colCode,
this.colCompleteCount, this.colName,
this.colStepName, this.colSpec,
this.colReviseStepName, this.colHoleCount,
this.colModifyCode, this.colTag,
this.colModifyTime}); this.colTargetCount,
dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; this.colCompleteCount,
dataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Window; this.colStepName,
dataGridViewCellStyle8.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.colReviseStepName,
dataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.ControlText; this.colModifyCode,
dataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight; this.colModifyTime});
dataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText; dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.False; dataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Window;
this.dataGridView1.DefaultCellStyle = dataGridViewCellStyle8; dataGridViewCellStyle8.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.dataGridView1.Dock = System.Windows.Forms.DockStyle.Fill; dataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.ControlText;
this.dataGridView1.Location = new System.Drawing.Point(0, 65); dataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight;
this.dataGridView1.MultiSelect = false; dataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
this.dataGridView1.Name = "dataGridView1"; dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
this.dataGridView1.ReadOnly = true; this.dataGridView1.DefaultCellStyle = dataGridViewCellStyle8;
this.dataGridView1.RowHeadersVisible = false; this.dataGridView1.Dock = System.Windows.Forms.DockStyle.Fill;
this.dataGridView1.RowHeadersWidth = 62; this.dataGridView1.Location = new System.Drawing.Point(0, 56);
dataGridViewCellStyle9.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.dataGridView1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.dataGridView1.RowsDefaultCellStyle = dataGridViewCellStyle9; this.dataGridView1.MultiSelect = false;
this.dataGridView1.RowTemplate.Height = 30; this.dataGridView1.Name = "dataGridView1";
this.dataGridView1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; this.dataGridView1.ReadOnly = true;
this.dataGridView1.Size = new System.Drawing.Size(1311, 701); this.dataGridView1.RowHeadersVisible = false;
this.dataGridView1.TabIndex = 22; this.dataGridView1.RowHeadersWidth = 62;
this.dataGridView1.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellContentClick); dataGridViewCellStyle9.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.dataGridView1.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellDoubleClick); this.dataGridView1.RowsDefaultCellStyle = dataGridViewCellStyle9;
this.dataGridView1.DataBindingComplete += new System.Windows.Forms.DataGridViewBindingCompleteEventHandler(this.dataGridView1_DataBindingComplete); this.dataGridView1.RowTemplate.Height = 30;
// this.dataGridView1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
// colId this.dataGridView1.Size = new System.Drawing.Size(874, 453);
// this.dataGridView1.TabIndex = 22;
this.colId.DataPropertyName = "Id"; this.dataGridView1.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellContentClick);
dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; this.dataGridView1.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellDoubleClick);
this.colId.DefaultCellStyle = dataGridViewCellStyle2; this.dataGridView1.DataBindingComplete += new System.Windows.Forms.DataGridViewBindingCompleteEventHandler(this.dataGridView1_DataBindingComplete);
this.colId.HeaderText = "ID"; //
this.colId.MinimumWidth = 8; // colId
this.colId.Name = "colId"; //
this.colId.ReadOnly = true; this.colId.DataPropertyName = "Id";
this.colId.Width = 35; dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
// this.colId.DefaultCellStyle = dataGridViewCellStyle2;
// colClasses this.colId.HeaderText = "ID";
// this.colId.MinimumWidth = 8;
this.colClasses.HeaderText = "类型"; this.colId.Name = "colId";
this.colClasses.MinimumWidth = 8; this.colId.ReadOnly = true;
this.colClasses.Name = "colClasses"; this.colId.Width = 35;
this.colClasses.ReadOnly = true; //
this.colClasses.Width = 150; // colClasses
// //
// colCode this.colClasses.HeaderText = "类型";
// this.colClasses.MinimumWidth = 8;
this.colCode.DataPropertyName = "Code"; this.colClasses.Name = "colClasses";
dataGridViewCellStyle3.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Bold); this.colClasses.ReadOnly = true;
this.colCode.DefaultCellStyle = dataGridViewCellStyle3; this.colClasses.Width = 150;
this.colCode.HeaderText = "料号"; //
this.colCode.MinimumWidth = 8; // colCode
this.colCode.Name = "colCode"; //
this.colCode.ReadOnly = true; this.colCode.DataPropertyName = "Code";
this.colCode.Width = 150; dataGridViewCellStyle3.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Bold);
// this.colCode.DefaultCellStyle = dataGridViewCellStyle3;
// colName this.colCode.HeaderText = "料号";
// this.colCode.MinimumWidth = 8;
this.colName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; this.colCode.Name = "colCode";
this.colName.DataPropertyName = "Name"; this.colCode.ReadOnly = true;
dataGridViewCellStyle4.BackColor = System.Drawing.Color.White; this.colCode.Width = 150;
dataGridViewCellStyle4.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); //
this.colName.DefaultCellStyle = dataGridViewCellStyle4; // colName
this.colName.HeaderText = "名称"; //
this.colName.MinimumWidth = 135; this.colName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
this.colName.Name = "colName"; this.colName.DataPropertyName = "Name";
this.colName.ReadOnly = true; dataGridViewCellStyle4.BackColor = System.Drawing.Color.White;
// dataGridViewCellStyle4.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
// colSpec this.colName.DefaultCellStyle = dataGridViewCellStyle4;
// this.colName.HeaderText = "名称";
this.colSpec.DataPropertyName = "Spec"; this.colName.MinimumWidth = 135;
this.colSpec.HeaderText = "规格"; this.colName.Name = "colName";
this.colSpec.MinimumWidth = 8; this.colName.ReadOnly = true;
this.colSpec.Name = "colSpec"; //
this.colSpec.ReadOnly = true; // colSpec
this.colSpec.Width = 130; //
// this.colSpec.DataPropertyName = "Spec";
// colHoleCount this.colSpec.HeaderText = "规格";
// this.colSpec.MinimumWidth = 8;
this.colHoleCount.DataPropertyName = "HoleCount"; this.colSpec.Name = "colSpec";
this.colHoleCount.HeaderText = "目数"; this.colSpec.ReadOnly = true;
this.colHoleCount.MinimumWidth = 8; this.colSpec.Width = 130;
this.colHoleCount.Name = "colHoleCount"; //
this.colHoleCount.ReadOnly = true; // colHoleCount
this.colHoleCount.Width = 150; //
// this.colHoleCount.DataPropertyName = "HoleCount";
// colTag this.colHoleCount.HeaderText = "目数";
// this.colHoleCount.MinimumWidth = 8;
this.colTag.DataPropertyName = "BatchId"; this.colHoleCount.Name = "colHoleCount";
this.colTag.HeaderText = "批次"; this.colHoleCount.ReadOnly = true;
this.colTag.MinimumWidth = 8; this.colHoleCount.Width = 150;
this.colTag.Name = "colTag"; //
this.colTag.ReadOnly = true; // colTag
this.colTag.Width = 150; //
// this.colTag.DataPropertyName = "BatchId";
// colTargetCount this.colTag.HeaderText = "批次";
// this.colTag.MinimumWidth = 8;
this.colTargetCount.DataPropertyName = "TargetCount"; this.colTag.Name = "colTag";
dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; this.colTag.ReadOnly = true;
this.colTargetCount.DefaultCellStyle = dataGridViewCellStyle5; this.colTag.Width = 150;
this.colTargetCount.HeaderText = "目标数"; //
this.colTargetCount.MinimumWidth = 8; // colTargetCount
this.colTargetCount.Name = "colTargetCount"; //
this.colTargetCount.ReadOnly = true; this.colTargetCount.DataPropertyName = "TargetCount";
this.colTargetCount.Width = 150; dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
// this.colTargetCount.DefaultCellStyle = dataGridViewCellStyle5;
// colCompleteCount this.colTargetCount.HeaderText = "目标数";
// this.colTargetCount.MinimumWidth = 8;
this.colCompleteCount.DataPropertyName = "CompleteCount"; this.colTargetCount.Name = "colTargetCount";
dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; this.colTargetCount.ReadOnly = true;
this.colCompleteCount.DefaultCellStyle = dataGridViewCellStyle6; this.colTargetCount.Width = 150;
this.colCompleteCount.HeaderText = "完成数"; //
this.colCompleteCount.MinimumWidth = 8; // colCompleteCount
this.colCompleteCount.Name = "colCompleteCount"; //
this.colCompleteCount.ReadOnly = true; this.colCompleteCount.DataPropertyName = "CompleteCount";
this.colCompleteCount.Width = 150; dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
// this.colCompleteCount.DefaultCellStyle = dataGridViewCellStyle6;
// colStepName this.colCompleteCount.HeaderText = "完成数";
// this.colCompleteCount.MinimumWidth = 8;
this.colStepName.HeaderText = "生产流程"; this.colCompleteCount.Name = "colCompleteCount";
this.colStepName.MinimumWidth = 8; this.colCompleteCount.ReadOnly = true;
this.colStepName.Name = "colStepName"; this.colCompleteCount.Width = 150;
this.colStepName.ReadOnly = true; //
this.colStepName.Width = 150; // colStepName
// //
// colReviseStepName this.colStepName.HeaderText = "生产流程";
// this.colStepName.MinimumWidth = 8;
this.colReviseStepName.HeaderText = "校正流程"; this.colStepName.Name = "colStepName";
this.colReviseStepName.MinimumWidth = 8; this.colStepName.ReadOnly = true;
this.colReviseStepName.Name = "colReviseStepName"; this.colStepName.Width = 150;
this.colReviseStepName.ReadOnly = true; //
this.colReviseStepName.Width = 200; // colReviseStepName
// //
// colModifyCode this.colReviseStepName.HeaderText = "校正流程";
// this.colReviseStepName.MinimumWidth = 8;
this.colModifyCode.DataPropertyName = "ModifyUserCode"; this.colReviseStepName.Name = "colReviseStepName";
this.colModifyCode.HeaderText = "修订人"; this.colReviseStepName.ReadOnly = true;
this.colModifyCode.MinimumWidth = 8; this.colReviseStepName.Width = 200;
this.colModifyCode.Name = "colModifyCode"; //
this.colModifyCode.ReadOnly = true; // colModifyCode
this.colModifyCode.Width = 150; //
// this.colModifyCode.DataPropertyName = "ModifyUserCode";
// colModifyTime this.colModifyCode.HeaderText = "修订人";
// this.colModifyCode.MinimumWidth = 8;
this.colModifyTime.DataPropertyName = "ModifyTime"; this.colModifyCode.Name = "colModifyCode";
dataGridViewCellStyle7.Format = "g"; this.colModifyCode.ReadOnly = true;
dataGridViewCellStyle7.NullValue = null; this.colModifyCode.Width = 150;
this.colModifyTime.DefaultCellStyle = dataGridViewCellStyle7; //
this.colModifyTime.HeaderText = "修订日期"; // colModifyTime
this.colModifyTime.MinimumWidth = 8; //
this.colModifyTime.Name = "colModifyTime"; this.colModifyTime.DataPropertyName = "ModifyTime";
this.colModifyTime.ReadOnly = true; dataGridViewCellStyle7.Format = "g";
this.colModifyTime.Width = 150; dataGridViewCellStyle7.NullValue = null;
// this.colModifyTime.DefaultCellStyle = dataGridViewCellStyle7;
// FrmProductList this.colModifyTime.HeaderText = "修订日期";
// this.colModifyTime.MinimumWidth = 8;
this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F); this.colModifyTime.Name = "colModifyTime";
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.colModifyTime.ReadOnly = true;
this.ClientSize = new System.Drawing.Size(1311, 797); this.colModifyTime.Width = 150;
this.Controls.Add(this.dataGridView1); //
this.Controls.Add(this.statusStrip1); // tsbtnClone
this.Controls.Add(this.toolStrip1); //
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.tsbtnClone.Image = ((System.Drawing.Image)(resources.GetObject("tsbtnClone.Image")));
this.Name = "FrmProductList"; this.tsbtnClone.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.ShowInTaskbar = false; this.tsbtnClone.ImageTransparentColor = System.Drawing.Color.Magenta;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.tsbtnClone.Name = "tsbtnClone";
this.Text = "产品管理"; this.tsbtnClone.Size = new System.Drawing.Size(52, 53);
this.Load += new System.EventHandler(this.FrmProductList_Load); this.tsbtnClone.Text = " 克隆 ";
this.toolStrip1.ResumeLayout(false); this.tsbtnClone.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
this.toolStrip1.PerformLayout(); this.tsbtnClone.ToolTipText = "克隆当前流程";
this.statusStrip1.ResumeLayout(false); this.tsbtnClone.Click += new System.EventHandler(this.tsbtnClone_Click);
this.statusStrip1.PerformLayout(); //
((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit(); // toolStripSeparator5
this.ResumeLayout(false); //
this.PerformLayout(); this.toolStripSeparator5.Name = "toolStripSeparator5";
this.toolStripSeparator5.Size = new System.Drawing.Size(6, 56);
//
// FrmProductList
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(874, 531);
this.Controls.Add(this.dataGridView1);
this.Controls.Add(this.statusStrip1);
this.Controls.Add(this.toolStrip1);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.Name = "FrmProductList";
this.ShowInTaskbar = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "产品管理";
this.Load += new System.EventHandler(this.FrmProductList_Load);
this.toolStrip1.ResumeLayout(false);
this.toolStrip1.PerformLayout();
this.statusStrip1.ResumeLayout(false);
this.statusStrip1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
} }
#endregion #endregion
@ -456,6 +480,8 @@
private System.Windows.Forms.DataGridViewTextBoxColumn colStepName; private System.Windows.Forms.DataGridViewTextBoxColumn colStepName;
private System.Windows.Forms.DataGridViewTextBoxColumn colReviseStepName; private System.Windows.Forms.DataGridViewTextBoxColumn colReviseStepName;
private System.Windows.Forms.DataGridViewTextBoxColumn colModifyCode; private System.Windows.Forms.DataGridViewTextBoxColumn colModifyCode;
private System.Windows.Forms.DataGridViewTextBoxColumn colModifyTime; private System.Windows.Forms.DataGridViewTextBoxColumn colModifyTime;
private System.Windows.Forms.ToolStripButton tsbtnClone;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator5;
} }
} }

View File

@ -181,8 +181,169 @@ namespace ProductionControl
private void tsbtnDefectClasses_Click(object sender, EventArgs e) private void tsbtnDefectClasses_Click(object sender, EventArgs e)
{ {
} }
private void tsbtnClone_Click(object sender, EventArgs e)
{
if (this.dataGridView1.CurrentRow == null)
{
MessageBox.Show("请选择要克隆的产品!", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning);
return;
}
var list = ((BindingSource)dataGridView1.DataSource).DataSource as List<Product>;
int liIndex = this.dataGridView1.CurrentRow.Index;//获取当前选中行的索引
Product newProduct = new Product()
{
Code = list[liIndex].Code + "_clone",
Name = $"{list[liIndex].Name} (克隆)",
Spec = list[liIndex].Spec,
ClassesId = list[liIndex].ClassesId,
ClassesInfo = list[liIndex].ClassesInfo,
HoleCount = list[liIndex].HoleCount,
DefectModelFile = list[liIndex].DefectModelFile,
AttachmentList = new List<Attachment>(),
BatchId = list[liIndex].BatchId,
TargetCount = list[liIndex].TargetCount,
CompleteCount = list[liIndex].CompleteCount,
BatchHistoryList = new List<BatchHistory>(),
QualifiedCriterionList = new List<QualifiedCriterion>(),
Note = list[liIndex].Note,
TensionBaseValue = list[liIndex].TensionBaseValue,
TensionUpFloatValue = list[liIndex].TensionUpFloatValue,
TensionDownFloatValue = list[liIndex].TensionDownFloatValue,
HeightBaseValue = list[liIndex].HeightBaseValue,
HeightUpFloatValue = list[liIndex].HeightUpFloatValue,
HeightDownFloatValue = list[liIndex].HeightDownFloatValue,
LineWidthBaseValue = list[liIndex].LineWidthBaseValue,
LineWidthUpFloatValue = list[liIndex].LineWidthUpFloatValue,
LineWidthDownFloatValue = list[liIndex].LineWidthDownFloatValue,
PTBaseValue = list[liIndex].PTBaseValue,
PTUpFloatValue = list[liIndex].PTUpFloatValue,
PTDownFloatValue = list[liIndex].PTDownFloatValue,
HeightBaseDec = list[liIndex].HeightBaseDec,
StepId = list[liIndex].StepId,
StepInfo = list[liIndex].StepInfo,
ProductProcessList = new List<ProductProcess>(),
ReviseStepId = list[liIndex].ReviseStepId,
ReviseStepInfo = list[liIndex].ReviseStepInfo,
ProductReviseProcessList = new List<ProductReviseProcess>(),
AssistStepId = list[liIndex].AssistStepId,
AssistStepInfo = list[liIndex].AssistStepInfo,
ProductAssistProcessList = new List<ProductAssistProcess>(),
//OrderList = new List<Order>(),
ModifyUserCode = Config.loginUser.Code,
CreateUserCode = Config.loginUser.Code
};
foreach (var item in list[liIndex].AttachmentList)
{
newProduct.AttachmentList.Add(new Attachment()
{
TBName = item.TBName,
Type = item.Type,
Pid = item.Pid,
Name = item.Name,
NameTimestamp = item.NameTimestamp,
ExtendName = item.ExtendName,
ModifyUserCode = Config.loginUser.Code,
CreateUserCode = Config.loginUser.Code
});
}
foreach (var item in list[liIndex].BatchHistoryList)
{
newProduct.BatchHistoryList.Add(new BatchHistory()
{
Pid = item.Pid,
BatchId = item.BatchId,
TargetCount = item.TargetCount,
CompleteCount = item.CompleteCount,
ModifyUserCode = Config.loginUser.Code,
CreateUserCode = Config.loginUser.Code
});
}
foreach (var item in list[liIndex].QualifiedCriterionList)
{
newProduct.QualifiedCriterionList.Add(new QualifiedCriterion()
{
Pid = item.Pid,
DefectCode = item.DefectCode,
Size = item.Size,
MaxDefectCount = item.MaxDefectCount,
ModifyUserCode = Config.loginUser.Code,
CreateUserCode = Config.loginUser.Code
});
}
foreach (var item in list[liIndex].ProductProcessList)
{
newProduct.ProductProcessList.Add(new ProductProcess()
{
Pid = item.Pid,
ProcessCode = item.ProcessCode,
ProcessParams = item.ProcessParams,
ModifyUserCode = Config.loginUser.Code,
CreateUserCode = Config.loginUser.Code
});
}
foreach (var item in list[liIndex].ProductReviseProcessList)
{
newProduct.ProductReviseProcessList.Add(new ProductReviseProcess()
{
Pid = item.Pid,
ProcessCode = item.ProcessCode,
ProcessParams = item.ProcessParams,
ModifyUserCode = Config.loginUser.Code,
CreateUserCode = Config.loginUser.Code
});
}
foreach (var item in list[liIndex].ProductAssistProcessList)
{
newProduct.ProductAssistProcessList.Add(new ProductAssistProcess()
{
Pid = item.Pid,
ProcessCode = item.ProcessCode,
ProcessParams = item.ProcessParams,
ModifyUserCode = Config.loginUser.Code,
CreateUserCode = Config.loginUser.Code
});
}
/*
foreach (var item in list[liIndex].OrderList)
{
newProduct.OrderList.Add(new Order()
{
ProductId = item.ProductId,
ProductInfo = item.ProductInfo,
SN = item.SN,
ModifyUserCode = Config.loginUser.Code,
CreateUserCode = Config.loginUser.Code
});
}*/
try
{
bool result = service.InsertNav(newProduct);
if (result)
{
MessageBox.Show("克隆成功!", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
initDataView(dataGridView1.Rows.Count);
}
else
throw new Exception("克隆失败!");
}
catch (Exception ex)
{
MessageBox.Show(ex.Message, "错误", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
} }
} }

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -48,6 +48,8 @@ namespace ProductionControl
this.chkSkipScannerCC.Checked = Util.ReadIniValue(configPath, "SKIP", "SkipScannerCC") == "1"; this.chkSkipScannerCC.Checked = Util.ReadIniValue(configPath, "SKIP", "SkipScannerCC") == "1";
this.chkSkipSmallAxis.Checked = Util.ReadIniValue(configPath, "SKIP", "SkipSmallAxis") == "1"; this.chkSkipSmallAxis.Checked = Util.ReadIniValue(configPath, "SKIP", "SkipSmallAxis") == "1";
this.ckSkipSizeFailed.Checked = Util.ReadIniValue(configPath, "SKIP", "MarkErrorStop") == "1";
//DEV //DEV
lsTmp = Util.ReadIniValue(configPath, "DEV", "Axis0_PulseOutMode"); lsTmp = Util.ReadIniValue(configPath, "DEV", "Axis0_PulseOutMode");
EnumUtil.BindToEnumName<AxisPulseOutMode>(this.cobAxis0PulseOutMode, typeof(AxisPulseOutMode), lsTmp == "" ? AxisPulseOutMode.O_CW_CCW : (AxisPulseOutMode)Convert.ToInt32(lsTmp)); EnumUtil.BindToEnumName<AxisPulseOutMode>(this.cobAxis0PulseOutMode, typeof(AxisPulseOutMode), lsTmp == "" ? AxisPulseOutMode.O_CW_CCW : (AxisPulseOutMode)Convert.ToInt32(lsTmp));
@ -140,21 +142,26 @@ namespace ProductionControl
this.txtDefect_Small_Path.Text = Util.ReadIniValue(configPath, "DEV", "Defect_Small_SavePath"); this.txtDefect_Small_Path.Text = Util.ReadIniValue(configPath, "DEV", "Defect_Small_SavePath");
this.txtDefect_Compress_SavePath.Text = Util.ReadIniValue(configPath, "DEV", "Defect_Compress_SavePath"); this.txtDefect_Compress_SavePath.Text = Util.ReadIniValue(configPath, "DEV", "Defect_Compress_SavePath");
int liTmp = -1; //int liTmp = -1;
double ldTmp = -1;
lsTmp = Util.ReadIniValue(configPath, "DEV", "Defect_SavePath_AutoClear"); lsTmp = Util.ReadIniValue(configPath, "DEV", "Defect_SavePath_AutoClear");
if (Util.IsNumber(lsTmp)) liTmp = Convert.ToInt32(lsTmp); //if (Util.IsNumber(lsTmp)) liTmp = Convert.ToInt32(lsTmp);
chkDefect_Path_AutoClear.Checked = (liTmp > -1); ldTmp = Convert.ToDouble(lsTmp);
if (liTmp > -1) numDefect_Path_AutoClear.Value = liTmp; chkDefect_Path_AutoClear.Checked = (ldTmp > -1);
if (ldTmp > -1) numDefect_Path_AutoClear.Value = (decimal)ldTmp;
lsTmp = Util.ReadIniValue(configPath, "DEV", "Defect_Compress_SavePath_AutoClear"); lsTmp = Util.ReadIniValue(configPath, "DEV", "Defect_Compress_SavePath_AutoClear");
if (Util.IsNumber(lsTmp)) liTmp = Convert.ToInt32(lsTmp); //if (Util.IsNumber(lsTmp)) liTmp = Convert.ToInt32(lsTmp);
chkDefect_Compress_SavePath_AutoClear.Checked = (liTmp > -1); ldTmp = Convert.ToDouble(lsTmp);
if (liTmp > -1) numDefect_Compress_SavePath_AutoClear.Value = liTmp; chkDefect_Compress_SavePath_AutoClear.Checked = (ldTmp > -1);
if (ldTmp > -1) numDefect_Compress_SavePath_AutoClear.Value = (decimal)ldTmp;
lsTmp = Util.ReadIniValue(configPath, "DEV", "Defect_Small_SavePath_AutoClear"); lsTmp = Util.ReadIniValue(configPath, "DEV", "Defect_Small_SavePath_AutoClear");
if (Util.IsNumber(lsTmp)) liTmp = Convert.ToInt32(lsTmp); //if (Util.IsNumber(lsTmp)) liTmp = Convert.ToInt32(lsTmp);
chkDefect_Small_Path_AutoClear.Checked = (liTmp > -1); ldTmp = Convert.ToDouble(lsTmp);
if (liTmp > -1) numDefect_Small_Path_AutoClear.Value = liTmp; chkDefect_Small_Path_AutoClear.Checked = (ldTmp > -1);
if (ldTmp > -1) numDefect_Small_Path_AutoClear.Value = (decimal)ldTmp;
this.chkSaveAllDefectImg.Checked= (Util.ReadIniValue(configPath, "DEV", "SaveAllDefectImg") == "1"); this.chkSaveAllDefectImg.Checked= (Util.ReadIniValue(configPath, "DEV", "SaveAllDefectImg") == "1");
this.chkMakeTag.Checked= (Util.ReadIniValue(configPath, "DEV", "MakeTag") == "1"); this.chkMakeTag.Checked= (Util.ReadIniValue(configPath, "DEV", "MakeTag") == "1");
@ -165,19 +172,22 @@ namespace ProductionControl
this.txtSizeBmp_Zoom_Image_SavePath.Text = Util.ReadIniValue(configPath, "DEV", "SizeBmp_Zoom_Image_SavePath"); this.txtSizeBmp_Zoom_Image_SavePath.Text = Util.ReadIniValue(configPath, "DEV", "SizeBmp_Zoom_Image_SavePath");
lsTmp = Util.ReadIniValue(configPath, "DEV", "SizeBmp_SavePath_AutoClear"); lsTmp = Util.ReadIniValue(configPath, "DEV", "SizeBmp_SavePath_AutoClear");
if (Util.IsNumber(lsTmp)) liTmp = Convert.ToInt32(lsTmp); //if (Util.IsNumber(lsTmp)) liTmp = Convert.ToInt32(lsTmp);
chkSizeBmp_SavePath_AutoClear.Checked = (liTmp > -1); ldTmp = Convert.ToDouble(lsTmp);
if (liTmp > -1) numSizeBmp_SavePath_AutoClear.Value = liTmp; chkSizeBmp_SavePath_AutoClear.Checked = (ldTmp > -1);
if (ldTmp > -1) numSizeBmp_SavePath_AutoClear.Value = (decimal)ldTmp;
lsTmp = Util.ReadIniValue(configPath, "DEV", "SizeBmp_Compare_SavePath_AutoClear"); lsTmp = Util.ReadIniValue(configPath, "DEV", "SizeBmp_Compare_SavePath_AutoClear");
if (Util.IsNumber(lsTmp)) liTmp = Convert.ToInt32(lsTmp); //if (Util.IsNumber(lsTmp)) liTmp = Convert.ToInt32(lsTmp);
chkSizeBmp_Compare_SavePath_AutoClear.Checked = (liTmp > -1); ldTmp = Convert.ToDouble(lsTmp);
if (liTmp > -1) numSizeBmp_Compare_SavePath_AutoClear.Value = liTmp; chkSizeBmp_Compare_SavePath_AutoClear.Checked = (ldTmp > -1);
if (ldTmp > -1) numSizeBmp_Compare_SavePath_AutoClear.Value = (decimal)ldTmp;
lsTmp = Util.ReadIniValue(configPath, "DEV", "SizeBmp_Zoom_Image_SavePath_AutoClear"); lsTmp = Util.ReadIniValue(configPath, "DEV", "SizeBmp_Zoom_Image_SavePath_AutoClear");
if (Util.IsNumber(lsTmp)) liTmp = Convert.ToInt32(lsTmp); //if (Util.IsNumber(lsTmp)) liTmp = Convert.ToInt32(lsTmp);
chkSizeBmp_Zoom_Image_SavePath_AutoClear.Checked = (liTmp > -1); ldTmp = Convert.ToDouble(lsTmp);
if (liTmp > -1) numSizeBmp_Zoom_Image_SavePath_AutoClear.Value = liTmp; chkSizeBmp_Zoom_Image_SavePath_AutoClear.Checked = (ldTmp > -1);
if (ldTmp > -1) numSizeBmp_Zoom_Image_SavePath_AutoClear.Value = (decimal)ldTmp;
//DB //DB
this.txtDBCon.Text = Util.ReadIniValue(configPath, "DB", "DBConStr"); this.txtDBCon.Text = Util.ReadIniValue(configPath, "DB", "DBConStr");
//HTTP //HTTP
@ -250,6 +260,8 @@ namespace ProductionControl
Util.WriteIniValue(configPath, "SKIP", "SkipScannerCC", this.chkSkipScannerCC.Checked ? "1" : "0"); Util.WriteIniValue(configPath, "SKIP", "SkipScannerCC", this.chkSkipScannerCC.Checked ? "1" : "0");
Util.WriteIniValue(configPath, "SKIP", "SkipSmallAxis", this.chkSkipSmallAxis.Checked ? "1" : "0"); Util.WriteIniValue(configPath, "SKIP", "SkipSmallAxis", this.chkSkipSmallAxis.Checked ? "1" : "0");
Util.WriteIniValue(configPath, "SKIP", "MarkErrorStop", this.ckSkipSizeFailed.Checked ? "1" : "0");
//DEV //DEV
Utils.Util.WriteIniValue(configPath, "DEV", "Axis0_PulseOutMode", ((int)EnumUtil.GetSelectedItemToEnum<AxisPulseOutMode>(this.cobAxis0PulseOutMode)).ToString()); Utils.Util.WriteIniValue(configPath, "DEV", "Axis0_PulseOutMode", ((int)EnumUtil.GetSelectedItemToEnum<AxisPulseOutMode>(this.cobAxis0PulseOutMode)).ToString());
Utils.Util.WriteIniValue(configPath, "DEV", "Axis1_PulseOutMode", ((int)EnumUtil.GetSelectedItemToEnum<AxisPulseOutMode>(this.cobAxis1PulseOutMode)).ToString()); Utils.Util.WriteIniValue(configPath, "DEV", "Axis1_PulseOutMode", ((int)EnumUtil.GetSelectedItemToEnum<AxisPulseOutMode>(this.cobAxis1PulseOutMode)).ToString());
@ -308,21 +320,21 @@ namespace ProductionControl
Utils.Util.WriteIniValue(configPath, "DEV", "IOCard_DeviceNum", IOCard_DeviceNum); Utils.Util.WriteIniValue(configPath, "DEV", "IOCard_DeviceNum", IOCard_DeviceNum);
Utils.Util.WriteIniValue(configPath, "DEV", "Defect_SavePath", Defect_SavePath); Utils.Util.WriteIniValue(configPath, "DEV", "Defect_SavePath", Defect_SavePath);
Utils.Util.WriteIniValue(configPath, "DEV", "Defect_SavePath_AutoClear", (chkDefect_Path_AutoClear.Checked ? (int)numDefect_Path_AutoClear.Value : -1)+""); Utils.Util.WriteIniValue(configPath, "DEV", "Defect_SavePath_AutoClear", (chkDefect_Path_AutoClear.Checked ? (double)numDefect_Path_AutoClear.Value : -1)+"");
Utils.Util.WriteIniValue(configPath, "DEV", "Defect_Compress_SavePath", Defect_Compress_SavePath); Utils.Util.WriteIniValue(configPath, "DEV", "Defect_Compress_SavePath", Defect_Compress_SavePath);
Utils.Util.WriteIniValue(configPath, "DEV", "Defect_Compress_SavePath_AutoClear", (chkDefect_Compress_SavePath_AutoClear.Checked ? (int)numDefect_Compress_SavePath_AutoClear.Value : -1) + ""); Utils.Util.WriteIniValue(configPath, "DEV", "Defect_Compress_SavePath_AutoClear", (chkDefect_Compress_SavePath_AutoClear.Checked ? (double)numDefect_Compress_SavePath_AutoClear.Value : -1) + "");
Utils.Util.WriteIniValue(configPath, "DEV", "Defect_Small_SavePath", Defect_Small_SavePath); Utils.Util.WriteIniValue(configPath, "DEV", "Defect_Small_SavePath", Defect_Small_SavePath);
Utils.Util.WriteIniValue(configPath, "DEV", "Defect_Small_SavePath_AutoClear", (chkDefect_Small_Path_AutoClear.Checked ? (int)numDefect_Small_Path_AutoClear.Value : -1) + ""); Utils.Util.WriteIniValue(configPath, "DEV", "Defect_Small_SavePath_AutoClear", (chkDefect_Small_Path_AutoClear.Checked ? (double)numDefect_Small_Path_AutoClear.Value : -1) + "");
Utils.Util.WriteIniValue(configPath, "DEV", "SaveAllDefectImg", this.chkSaveAllDefectImg.Checked ? "1" : "0"); Utils.Util.WriteIniValue(configPath, "DEV", "SaveAllDefectImg", this.chkSaveAllDefectImg.Checked ? "1" : "0");
Utils.Util.WriteIniValue(configPath, "DEV", "MakeTag", this.chkMakeTag.Checked ? "1" : "0"); Utils.Util.WriteIniValue(configPath, "DEV", "MakeTag", this.chkMakeTag.Checked ? "1" : "0");
Utils.Util.WriteIniValue(configPath, "DEV", "SizeEnginePath", this.txtSizeEnginePath.Text.Trim()); Utils.Util.WriteIniValue(configPath, "DEV", "SizeEnginePath", this.txtSizeEnginePath.Text.Trim());
Utils.Util.WriteIniValue(configPath, "DEV", "SizeBmp_SavePath", this.txtSizeBmp_SavePath.Text.Trim()); Utils.Util.WriteIniValue(configPath, "DEV", "SizeBmp_SavePath", this.txtSizeBmp_SavePath.Text.Trim());
Utils.Util.WriteIniValue(configPath, "DEV", "SizeBmp_SavePath_AutoClear", (chkSizeBmp_SavePath_AutoClear.Checked ? (int)numSizeBmp_SavePath_AutoClear.Value : -1) + ""); Utils.Util.WriteIniValue(configPath, "DEV", "SizeBmp_SavePath_AutoClear", (chkSizeBmp_SavePath_AutoClear.Checked ? (double)numSizeBmp_SavePath_AutoClear.Value : -1) + "");
Utils.Util.WriteIniValue(configPath, "DEV", "SizeBmp_Compare_SavePath", this.txtSizeBmp_Compare_SavePath.Text.Trim()); Utils.Util.WriteIniValue(configPath, "DEV", "SizeBmp_Compare_SavePath", this.txtSizeBmp_Compare_SavePath.Text.Trim());
Utils.Util.WriteIniValue(configPath, "DEV", "SizeBmp_Compare_SavePath_AutoClear", (chkSizeBmp_Compare_SavePath_AutoClear.Checked ? (int)numSizeBmp_Compare_SavePath_AutoClear.Value : -1) + ""); Utils.Util.WriteIniValue(configPath, "DEV", "SizeBmp_Compare_SavePath_AutoClear", (chkSizeBmp_Compare_SavePath_AutoClear.Checked ? (double)numSizeBmp_Compare_SavePath_AutoClear.Value : -1) + "");
Utils.Util.WriteIniValue(configPath, "DEV", "SizeBmp_Zoom_Image_SavePath", this.txtSizeBmp_Zoom_Image_SavePath.Text.Trim()); Utils.Util.WriteIniValue(configPath, "DEV", "SizeBmp_Zoom_Image_SavePath", this.txtSizeBmp_Zoom_Image_SavePath.Text.Trim());
Utils.Util.WriteIniValue(configPath, "DEV", "SizeBmp_Zoom_Image_SavePath_AutoClear", (chkSizeBmp_Zoom_Image_SavePath_AutoClear.Checked ? (int)numSizeBmp_Zoom_Image_SavePath_AutoClear.Value : -1) + ""); Utils.Util.WriteIniValue(configPath, "DEV", "SizeBmp_Zoom_Image_SavePath_AutoClear", (chkSizeBmp_Zoom_Image_SavePath_AutoClear.Checked ? (double)numSizeBmp_Zoom_Image_SavePath_AutoClear.Value : -1) + "");
//DB //DB
Utils.Util.WriteIniValue(configPath, "DB", "DBConStr", DBConStr); Utils.Util.WriteIniValue(configPath, "DB", "DBConStr", DBConStr);
//HTTP //HTTP

View File

@ -1,263 +1,263 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<root> <root>
<!-- <!--
Microsoft ResX Schema Microsoft ResX Schema
Version 2.0 Version 2.0
The primary goals of this format is to allow a simple XML format The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes various data types are done through the TypeConverter classes
associated with the data types. associated with the data types.
Example: Example:
... ado.net/XML headers & schema ... ... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader> <resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader> <resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader> <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader> <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data> <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data> <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64"> <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value> <value>[base64 mime encoded serialized .NET Framework object]</value>
</data> </data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value> <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment> <comment>This is a comment</comment>
</data> </data>
There are any number of "resheader" rows that contain simple There are any number of "resheader" rows that contain simple
name/value pairs. name/value pairs.
Each data row contains a name, and value. The row also contains a Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture. text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the Classes that don't support this are serialized and stored with the
mimetype set. mimetype set.
The mimetype is used for serialized objects, and tells the The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly: extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below. read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64 mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding. : and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64 mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding. : and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64 mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter : using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding. : and then encoded with base64 encoding.
--> -->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" /> <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true"> <xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType> <xsd:complexType>
<xsd:choice maxOccurs="unbounded"> <xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata"> <xsd:element name="metadata">
<xsd:complexType> <xsd:complexType>
<xsd:sequence> <xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" /> <xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence> </xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" /> <xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" /> <xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" /> <xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" /> <xsd:attribute ref="xml:space" />
</xsd:complexType> </xsd:complexType>
</xsd:element> </xsd:element>
<xsd:element name="assembly"> <xsd:element name="assembly">
<xsd:complexType> <xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" /> <xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" /> <xsd:attribute name="name" type="xsd:string" />
</xsd:complexType> </xsd:complexType>
</xsd:element> </xsd:element>
<xsd:element name="data"> <xsd:element name="data">
<xsd:complexType> <xsd:complexType>
<xsd:sequence> <xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" /> <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence> </xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" /> <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" /> <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" /> <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" /> <xsd:attribute ref="xml:space" />
</xsd:complexType> </xsd:complexType>
</xsd:element> </xsd:element>
<xsd:element name="resheader"> <xsd:element name="resheader">
<xsd:complexType> <xsd:complexType>
<xsd:sequence> <xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence> </xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" /> <xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType> </xsd:complexType>
</xsd:element> </xsd:element>
</xsd:choice> </xsd:choice>
</xsd:complexType> </xsd:complexType>
</xsd:element> </xsd:element>
</xsd:schema> </xsd:schema>
<resheader name="resmimetype"> <resheader name="resmimetype">
<value>text/microsoft-resx</value> <value>text/microsoft-resx</value>
</resheader> </resheader>
<resheader name="version"> <resheader name="version">
<value>2.0</value> <value>2.0</value>
</resheader> </resheader>
<resheader name="reader"> <resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<resheader name="writer"> <resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value> <value>17, 17</value>
</metadata> </metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="tsbtnSave.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="tsbtnSave.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAIfSURBVFhH7ZdPS9xAGMZfKUiFiuAXKFXqRfBmi8U/F1GL YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIfSURBVFhH7ZdPS9xAGMZfKUiFiuAXKFXqRfBmi8U/F1Hr
B097ELGpmZlk3rQexG/grbSXSj9AW8UWBL+AN9GjVfDQY2/iuVKslFbfGWazme7sbiYbBMEHfmR3Zt4n wdseRGxqZiaZN60H8Rt4K+2l0g/QVrEFwS/gTfRoFTz02Jt4rhQrpdV3htlspju7m8kGQfCBH9mdmffJ
z07eZHfhTg51QJSMEzOF4XIaeDJo/DxUqXQCi3dB4FUpcFwzzjklcLjOpH0mjXsOcTmWFjL8QZ/gM4h4 s5M32V24k0MdECXjxExhuJwGngwaPw9VKp3A4l0QeFUKHNeMc04JHK4zaZ9J455DXI6lhQx/0Cf4DCLe
wx/5CUL8rn1e4ilEUY85QwtFyWgagONHM1pMXL5JvYTcNqMtlA0g5JYZLSYh12te2i8wM02UDcDwixnN 8Ed+ghC/a5+XeApR1GPO0EJRMpoG4PjRjBYTl29SLyG3zWgLZQMIuWVGi0nI9ZqX9gvMTBNlAzD8Ykbz
L4ZLtHORfs3xvRVgHn9BmDzUcw3VToCVlS6q+6drlTi+S72qhPEBzXToeafaCRCG3VT3k7jQ77l8m3pZ i+ES7VykX3N8bwWYx18QJg/1XEO1E2BlpYvq/ulaJY7vUq8qYXxAMx163ql2AoRhN9X9JC70ey7fpl4W
yFU975TVA7hpRvMpSR7A7NxfXatkNaHFjp53yg7QZGED6dvWNK/ADxmvGk131g6gtvOZmfETwyGqPct4 clXPO2X1AG6a0XxKkgcwO/dX1ypZTWixo+edsgM0WdhA+rY1zSvwQ8arRtOdtQOo7XxmZvzEcIhqzzJe
1fAIoFBNdUJ8owfMUWtoHcdjCII/pr4ezwDlczsDBMF5Iap3RRavAMpEyOfAWG8h4vgx+exbnn47QI3V NTwCKFRTnRDf6AFz1Bpax/EYguCPqa/HM0D53M4AQXBeiOpdkcUrgDIR8jkw1luIOH5MPvuWp98OUGO1
rgQmlqfnJbikrl4GkTz1hsVPyG8m/VqucjubsEw8A1zQJXgB/NWAbih1zItaH0UjwOSh5XnzTSjR8vTe K4GJ5el5CS6pq5dBJE+9YfET8ptJv5ar3M4mLBPPABd0CV4AfzWgG0od86LWR9EIMHloed58E0q0PL13
ASEXQYh+WMI+ffwfNe6Cv35E9fQjVz+icwbI/ii1Ud8JfrgeQhr51ZzNIXXrOIvKpFmAILhPi/bqi0pi QMhFEKIflrBPH/9Hjbvgrx9RPf3I1Y/onAGyP0pt1HeCH66HkEZ+NWdzSN06zqIyaRYgCO7Tor36opJY
YeE37fK0OVsDVSr3aPEE9YP7b1dRBE7pvriTJYBrYeFlr2GPrA0AAAAASUVORK5CYII= WPhNuzxtztZAlco9WjxB/eD+21UUgVO6L+5kCeAaOZxlqQnAQFgAAAAASUVORK5CYII=
</value> </value>
</data> </data>
<data name="tsbtnClose.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="tsbtnClose.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAJQSURBVFhHxZfNctNAEIQFb0UuYEu8DFwoiOwrVPGbFPAE YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJQSURBVFhHxZfNctNAEIQFb0UuYEu8DFwoiOwrVPGbFPAE
vKhjV9huzSiz69aubA501XfwuGdms7ORtV3S8/9M/qHQs0T8/l9ArVKIzwbqMA4vj2P/5rDb3FgIcs+1 vKhjV9huzSiz69aubA501XfwuGdms7ORtV3S8/9M/qHQs0T8/l9ArVKIzwbqMA4vj2P/5rDb3FgIcs+1
UIfb/sVx//rtw4f+lYUoGLi609j/ftwPj85p139B3FQWXQuFWnnt4Y99NZmwqmiYjfvhK12TyuItKNRQ UIfb/sVx//rtw4f+lYUoGLi609j/ftwPj85p139B3FQWXQuFWnnt4Y99NZmwqmiYjfvhK12TyuItKNRQ
tR/G7Qbf03jcbd8pE7hyJ6jyL4+gJzw0Yz7K5JxuL9oJCjmqloOe8CFhOgOV1YLTuP0Gn6ls6lDwqhpO tR/G7Qbf03jcbd8pE7hyJ6jyL4+gJzw0Yz7K5JxuL9oJCjmqloOe8CFhOgOV1YLTuP0Gn6ls6lDwqhpO
3NU8cWFeTkr8blYoNn6qkTwq1ynOlSxQ3wm9CKrZ/Pw8zQXyQq2dGIcfZp2FmPI6C/9RWfM5CDXnOPb3 3NU8cWFeTkr8blYoNn6qkTwq1ynOlSxQ3wm9CKrZ/Pw8zQXyQq2dGIcfZp2FmPI6C/9RWfM5CDXnOPb3
ZsUz5F55nMr5yT5EqPY8+49AfecsjGzuUwYiVGsRNRrN2UMFI1RrvorinKjaQAZLqLTV1TlH4LU0SNV0 ZsUz5F55nMr5yT5EqPY8+49AfecsjGzuUwYiVGsRNRrN2UMFI1RrvorinKjaQAZLqLTV1TlH4LU0SNV0
ZFBBteYN4DE7pGpFZFBBpZl+Uk0j8JgdUrUiMlhCpZ/QX6qhAl5Lg1RNRwYj1CXNnZWLkEGHSjPNXlQu ZFBBteYN4DE7pGpFZFBBpZl+Uk0j8JgdUrUiMlhCpZ/QX6qhAl5Lg1RNRwYj1CXNnZWLkEGHSjPNXlQu
AblWBpI9VBBQreaYd+tcNBZxFmAQSv/HP1VBJ25xa0SoZVYo6xU/MAClVdef7fl8qeYi9LNBNN8Nd6qA AblWBpI9VBBQreaYd+tcNBZxFmAQSv/HP1VBJ25xa0SoZVYo6xU/MAClVdef7fl8qeYi9LNBNN8Nd6qA
s7ClVHtkw51ZIeYVBVo/qfV5Qs1FpB5mpZA4vZLt+88qwUmJS3OMUPCqGg56mXVKOrzf3CijkxLWPtsB s7ClVHtkw51ZIeYVBVo/qfV5Qs1FpB5mpZA4vZLt+88qwUmJS3OMUPCqGg56mXVKOrzf3CijkxLWPtsB
hRxVy0FP+JhQfy0/m9saqNp5yl7LKxeTNT+pS1BL58qvaE/GdF2KhvSaNc8pqSy+Fgq1strF1Ww24rqE hRxVy0FP+JhQfy0/m9saqNp5yl7LKxeTNT+pS1BL58qvaE/GdF2KhvSaNc8pqSy+Fgq1strF1Ww24rqE
C6TPxxQLXgOFmryc2pWs67ruL9BDjecFstIGAAAAAElFTkSuQmCC C6TPxxQLXgOFmryc2pWs67ruL9BDjecFstIGAAAAAElFTkSuQmCC
</value> </value>
</data> </data>
<data name="btnClearDefect_Path.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="btnClearDefect_Path.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL
DAAACwwBP0AiyAAAAB90RVh0U29mdHdhcmUATWFjcm9tZWRpYSBGaXJld29ya3MgOLVo0ngAAAJRSURB DAAACwwBP0AiyAAAAB90RVh0U29mdHdhcmUATWFjcm9tZWRpYSBGaXJld29ya3MgOLVo0ngAAAJRSURB
VFhHxZfNTsMwEISBtyoXKM3TwIUDTa9U4h8BT8CDAiphd+J118nENlCEpU9q7dmZrZ2mzZ6Mg38mfdN1 VFhHxZfNTsMwEISBtyoXKM3TwIUDTa9U4h8BT8CDAiphd+J118nENlCEpU9q7dmZrZ2mzZ6Mg38mfdN1
XUTGfpjfBfsDbx06HwVY+Fgujjbt4vR9uTgcCH8DvN+Wi9mmbc4k49h5Q4DuPtvmpVs1nfG5aq530ATC XUTGfpjfBfsDbx06HwVY+Fgujjbt4vR9uTgcCH8DvN+Wi9mmbc4k49h5Q4DuPtvmpVs1nfG5aq530ATC
4ZV6v5r3gb6QT3zsBU54o+tBzAImsTp4EG/JnIuuF8q2nzORYjvxnSZcePLJPZop2rgDMyYy5HiwE2HQ 4ZV6v5r3gb6QT3zsBU54o+tBzAImsTp4EG/JnIuuF8q2nzORYjvxnSZcePLJPZop2rgDMyYy5HiwE2HQ
UEcfrjXEy9BM1WpBfw1kulU2q+a2ogmEQ0s8DNtVHUnh1HkZ8qnuVBeKffB221VDag1k9PUYY4PCTsj6 UEcfrjXEy9BM1WpBfw1kulU2q+a2ogmEQ0s8DNtVHUnh1HkZ8qnuVBeKffB221VDag1k9PUYY4PCTsj6
qAlXWwofXk/bBmxCF2ULSztxH0wwEK5zRGvAc1sT83w4UFEwzJ9j2zw67SPTGPAK2kFe8iYSjctbeqmw qAlXWwofXk/bBmxCF2ULSztxH0wwEK5zRGvAc1sT83w4UFEwzJ9j2zw67SPTGPAK2kFe8iYSjctbeqmw
NQMePFwZTURqm8hRCFfoZCQ2UThfBmry4QqdTIhNrPLn7IG2HK7QyRGuiex5K9DUhSt0coRrYM1CPdDs NQMePFwZTURqm8hRCFfoZCQ2UThfBmry4QqdTIhNrPLn7IG2HK7QyRGuiex5K9DUhSt0coRrYM1CPdDs
sgEX/swCGdDWNUEnIz8JNyqboJPAhSd/VL4DavNN0MnqcPmqrRW2ZhSaGE1sw9vmiRkafovxmmgMeAXt sgEX/swCGdDWNUEnIz8JNyqboJPAhSd/VL4DavNN0MnqcPmqrRW2ZhSaGE1sw9vmiRkafovxmmgMeAXt
IC95g4lgmL+3h3AbVU2Ee0MYMS+G62IwemAGhqyPttTV5o9MvdPa2IAZZG+5LNyw+Yomkp9yLba/ZFes IC95g4lgmL+3h3AbVU2Ee0MYMS+G62IwemAGhqyPttTV5o9MvdPa2IAZZG+5LNyw+Yomkp9yLba/ZFes
wJD1qXOM2Dq0xMNAVu/TF71fnBwyoSEFtfd230T2OtJM0fcFhb/lw3Mr4pqYvJ6Gf8unHkxqflIprgl6 wJD1qXOM2Dq0xMNAVu/TF71fnBwyoSEFtfd230T2OtJM0fcFhb/lw3Mr4pqYvJ6Gf8unHkxqflIprgl6
XWmm6CDGEOGrF8h3F+f0k3AjNqFe3luyZB0jEcqD41wfIN8u/uDhVDzDw+m8z+v2vgCLN08Z7ifCRgAA XWmm6CDGEOGrF8h3F+f0k3AjNqFe3luyZB0jEcqD41wfIN8u/uDhVDzDw+m8z+v2vgCLN08Z7ifCRgAA
AABJRU5ErkJggg== AABJRU5ErkJggg==
</value> </value>
</data> </data>
<data name="btnClearDefect_Compress_SavePath.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="btnClearDefect_Compress_SavePath.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL
DAAACwwBP0AiyAAAAB90RVh0U29mdHdhcmUATWFjcm9tZWRpYSBGaXJld29ya3MgOLVo0ngAAAJRSURB DAAACwwBP0AiyAAAAB90RVh0U29mdHdhcmUATWFjcm9tZWRpYSBGaXJld29ya3MgOLVo0ngAAAJRSURB
VFhHxZfNTsMwEISBtyoXKM3TwIUDTa9U4h8BT8CDAiphd+J118nENlCEpU9q7dmZrZ2mzZ6Mg38mfdN1 VFhHxZfNTsMwEISBtyoXKM3TwIUDTa9U4h8BT8CDAiphd+J118nENlCEpU9q7dmZrZ2mzZ6Mg38mfdN1
XUTGfpjfBfsDbx06HwVY+Fgujjbt4vR9uTgcCH8DvN+Wi9mmbc4k49h5Q4DuPtvmpVs1nfG5aq530ATC XUTGfpjfBfsDbx06HwVY+Fgujjbt4vR9uTgcCH8DvN+Wi9mmbc4k49h5Q4DuPtvmpVs1nfG5aq530ATC
4ZV6v5r3gb6QT3zsBU54o+tBzAImsTp4EG/JnIuuF8q2nzORYjvxnSZcePLJPZop2rgDMyYy5HiwE2HQ 4ZV6v5r3gb6QT3zsBU54o+tBzAImsTp4EG/JnIuuF8q2nzORYjvxnSZcePLJPZop2rgDMyYy5HiwE2HQ
UEcfrjXEy9BM1WpBfw1kulU2q+a2ogmEQ0s8DNtVHUnh1HkZ8qnuVBeKffB221VDag1k9PUYY4PCTsj6 UEcfrjXEy9BM1WpBfw1kulU2q+a2ogmEQ0s8DNtVHUnh1HkZ8qnuVBeKffB221VDag1k9PUYY4PCTsj6
qAlXWwofXk/bBmxCF2ULSztxH0wwEK5zRGvAc1sT83w4UFEwzJ9j2zw67SPTGPAK2kFe8iYSjctbeqmw qAlXWwofXk/bBmxCF2ULSztxH0wwEK5zRGvAc1sT83w4UFEwzJ9j2zw67SPTGPAK2kFe8iYSjctbeqmw
NQMePFwZTURqm8hRCFfoZCQ2UThfBmry4QqdTIhNrPLn7IG2HK7QyRGuiex5K9DUhSt0coRrYM1CPdDs NQMePFwZTURqm8hRCFfoZCQ2UThfBmry4QqdTIhNrPLn7IG2HK7QyRGuiex5K9DUhSt0coRrYM1CPdDs
sgEX/swCGdDWNUEnIz8JNyqboJPAhSd/VL4DavNN0MnqcPmqrRW2ZhSaGE1sw9vmiRkafovxmmgMeAXt sgEX/swCGdDWNUEnIz8JNyqboJPAhSd/VL4DavNN0MnqcPmqrRW2ZhSaGE1sw9vmiRkafovxmmgMeAXt
IC95g4lgmL+3h3AbVU2Ee0MYMS+G62IwemAGhqyPttTV5o9MvdPa2IAZZG+5LNyw+Yomkp9yLba/ZFes IC95g4lgmL+3h3AbVU2Ee0MYMS+G62IwemAGhqyPttTV5o9MvdPa2IAZZG+5LNyw+Yomkp9yLba/ZFes
wJD1qXOM2Dq0xMNAVu/TF71fnBwyoSEFtfd230T2OtJM0fcFhb/lw3Mr4pqYvJ6Gf8unHkxqflIprgl6 wJD1qXOM2Dq0xMNAVu/TF71fnBwyoSEFtfd230T2OtJM0fcFhb/lw3Mr4pqYvJ6Gf8unHkxqflIprgl6
XWmm6CDGEOGrF8h3F+f0k3AjNqFe3luyZB0jEcqD41wfIN8u/uDhVDzDw+m8z+v2vgCLN08Z7ifCRgAA XWmm6CDGEOGrF8h3F+f0k3AjNqFe3luyZB0jEcqD41wfIN8u/uDhVDzDw+m8z+v2vgCLN08Z7ifCRgAA
AABJRU5ErkJggg== AABJRU5ErkJggg==
</value> </value>
</data> </data>
<data name="btnClearDefect_Small_Path.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="btnClearDefect_Small_Path.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL
DAAACwwBP0AiyAAAAB90RVh0U29mdHdhcmUATWFjcm9tZWRpYSBGaXJld29ya3MgOLVo0ngAAAJRSURB DAAACwwBP0AiyAAAAB90RVh0U29mdHdhcmUATWFjcm9tZWRpYSBGaXJld29ya3MgOLVo0ngAAAJRSURB
VFhHxZfNTsMwEISBtyoXKM3TwIUDTa9U4h8BT8CDAiphd+J118nENlCEpU9q7dmZrZ2mzZ6Mg38mfdN1 VFhHxZfNTsMwEISBtyoXKM3TwIUDTa9U4h8BT8CDAiphd+J118nENlCEpU9q7dmZrZ2mzZ6Mg38mfdN1
XUTGfpjfBfsDbx06HwVY+Fgujjbt4vR9uTgcCH8DvN+Wi9mmbc4k49h5Q4DuPtvmpVs1nfG5aq530ATC XUTGfpjfBfsDbx06HwVY+Fgujjbt4vR9uTgcCH8DvN+Wi9mmbc4k49h5Q4DuPtvmpVs1nfG5aq530ATC
4ZV6v5r3gb6QT3zsBU54o+tBzAImsTp4EG/JnIuuF8q2nzORYjvxnSZcePLJPZop2rgDMyYy5HiwE2HQ 4ZV6v5r3gb6QT3zsBU54o+tBzAImsTp4EG/JnIuuF8q2nzORYjvxnSZcePLJPZop2rgDMyYy5HiwE2HQ
UEcfrjXEy9BM1WpBfw1kulU2q+a2ogmEQ0s8DNtVHUnh1HkZ8qnuVBeKffB221VDag1k9PUYY4PCTsj6 UEcfrjXEy9BM1WpBfw1kulU2q+a2ogmEQ0s8DNtVHUnh1HkZ8qnuVBeKffB221VDag1k9PUYY4PCTsj6
qAlXWwofXk/bBmxCF2ULSztxH0wwEK5zRGvAc1sT83w4UFEwzJ9j2zw67SPTGPAK2kFe8iYSjctbeqmw qAlXWwofXk/bBmxCF2ULSztxH0wwEK5zRGvAc1sT83w4UFEwzJ9j2zw67SPTGPAK2kFe8iYSjctbeqmw
NQMePFwZTURqm8hRCFfoZCQ2UThfBmry4QqdTIhNrPLn7IG2HK7QyRGuiex5K9DUhSt0coRrYM1CPdDs NQMePFwZTURqm8hRCFfoZCQ2UThfBmry4QqdTIhNrPLn7IG2HK7QyRGuiex5K9DUhSt0coRrYM1CPdDs
sgEX/swCGdDWNUEnIz8JNyqboJPAhSd/VL4DavNN0MnqcPmqrRW2ZhSaGE1sw9vmiRkafovxmmgMeAXt sgEX/swCGdDWNUEnIz8JNyqboJPAhSd/VL4DavNN0MnqcPmqrRW2ZhSaGE1sw9vmiRkafovxmmgMeAXt
IC95g4lgmL+3h3AbVU2Ee0MYMS+G62IwemAGhqyPttTV5o9MvdPa2IAZZG+5LNyw+Yomkp9yLba/ZFes IC95g4lgmL+3h3AbVU2Ee0MYMS+G62IwemAGhqyPttTV5o9MvdPa2IAZZG+5LNyw+Yomkp9yLba/ZFes
wJD1qXOM2Dq0xMNAVu/TF71fnBwyoSEFtfd230T2OtJM0fcFhb/lw3Mr4pqYvJ6Gf8unHkxqflIprgl6 wJD1qXOM2Dq0xMNAVu/TF71fnBwyoSEFtfd230T2OtJM0fcFhb/lw3Mr4pqYvJ6Gf8unHkxqflIprgl6
XWmm6CDGEOGrF8h3F+f0k3AjNqFe3luyZB0jEcqD41wfIN8u/uDhVDzDw+m8z+v2vgCLN08Z7ifCRgAA XWmm6CDGEOGrF8h3F+f0k3AjNqFe3luyZB0jEcqD41wfIN8u/uDhVDzDw+m8z+v2vgCLN08Z7ifCRgAA
AABJRU5ErkJggg== AABJRU5ErkJggg==
</value> </value>
</data> </data>
<data name="btnSizeBmp_Zoom_Image_SavePath.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="btnSizeBmp_Zoom_Image_SavePath.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL
DAAACwwBP0AiyAAAAB90RVh0U29mdHdhcmUATWFjcm9tZWRpYSBGaXJld29ya3MgOLVo0ngAAAJRSURB DAAACwwBP0AiyAAAAB90RVh0U29mdHdhcmUATWFjcm9tZWRpYSBGaXJld29ya3MgOLVo0ngAAAJRSURB
VFhHxZfNTsMwEISBtyoXKM3TwIUDTa9U4h8BT8CDAiphd+J118nENlCEpU9q7dmZrZ2mzZ6Mg38mfdN1 VFhHxZfNTsMwEISBtyoXKM3TwIUDTa9U4h8BT8CDAiphd+J118nENlCEpU9q7dmZrZ2mzZ6Mg38mfdN1
XUTGfpjfBfsDbx06HwVY+Fgujjbt4vR9uTgcCH8DvN+Wi9mmbc4k49h5Q4DuPtvmpVs1nfG5aq530ATC XUTGfpjfBfsDbx06HwVY+Fgujjbt4vR9uTgcCH8DvN+Wi9mmbc4k49h5Q4DuPtvmpVs1nfG5aq530ATC
4ZV6v5r3gb6QT3zsBU54o+tBzAImsTp4EG/JnIuuF8q2nzORYjvxnSZcePLJPZop2rgDMyYy5HiwE2HQ 4ZV6v5r3gb6QT3zsBU54o+tBzAImsTp4EG/JnIuuF8q2nzORYjvxnSZcePLJPZop2rgDMyYy5HiwE2HQ
UEcfrjXEy9BM1WpBfw1kulU2q+a2ogmEQ0s8DNtVHUnh1HkZ8qnuVBeKffB221VDag1k9PUYY4PCTsj6 UEcfrjXEy9BM1WpBfw1kulU2q+a2ogmEQ0s8DNtVHUnh1HkZ8qnuVBeKffB221VDag1k9PUYY4PCTsj6
qAlXWwofXk/bBmxCF2ULSztxH0wwEK5zRGvAc1sT83w4UFEwzJ9j2zw67SPTGPAK2kFe8iYSjctbeqmw qAlXWwofXk/bBmxCF2ULSztxH0wwEK5zRGvAc1sT83w4UFEwzJ9j2zw67SPTGPAK2kFe8iYSjctbeqmw
NQMePFwZTURqm8hRCFfoZCQ2UThfBmry4QqdTIhNrPLn7IG2HK7QyRGuiex5K9DUhSt0coRrYM1CPdDs NQMePFwZTURqm8hRCFfoZCQ2UThfBmry4QqdTIhNrPLn7IG2HK7QyRGuiex5K9DUhSt0coRrYM1CPdDs
sgEX/swCGdDWNUEnIz8JNyqboJPAhSd/VL4DavNN0MnqcPmqrRW2ZhSaGE1sw9vmiRkafovxmmgMeAXt sgEX/swCGdDWNUEnIz8JNyqboJPAhSd/VL4DavNN0MnqcPmqrRW2ZhSaGE1sw9vmiRkafovxmmgMeAXt
IC95g4lgmL+3h3AbVU2Ee0MYMS+G62IwemAGhqyPttTV5o9MvdPa2IAZZG+5LNyw+Yomkp9yLba/ZFes IC95g4lgmL+3h3AbVU2Ee0MYMS+G62IwemAGhqyPttTV5o9MvdPa2IAZZG+5LNyw+Yomkp9yLba/ZFes
wJD1qXOM2Dq0xMNAVu/TF71fnBwyoSEFtfd230T2OtJM0fcFhb/lw3Mr4pqYvJ6Gf8unHkxqflIprgl6 wJD1qXOM2Dq0xMNAVu/TF71fnBwyoSEFtfd230T2OtJM0fcFhb/lw3Mr4pqYvJ6Gf8unHkxqflIprgl6
XWmm6CDGEOGrF8h3F+f0k3AjNqFe3luyZB0jEcqD41wfIN8u/uDhVDzDw+m8z+v2vgCLN08Z7ifCRgAA XWmm6CDGEOGrF8h3F+f0k3AjNqFe3luyZB0jEcqD41wfIN8u/uDhVDzDw+m8z+v2vgCLN08Z7ifCRgAA
AABJRU5ErkJggg== AABJRU5ErkJggg==
</value> </value>
</data> </data>
<data name="btnClearSizeBmp_Compare_SavePath.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="btnClearSizeBmp_Compare_SavePath.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL
DAAACwwBP0AiyAAAAB90RVh0U29mdHdhcmUATWFjcm9tZWRpYSBGaXJld29ya3MgOLVo0ngAAAJRSURB DAAACwwBP0AiyAAAAB90RVh0U29mdHdhcmUATWFjcm9tZWRpYSBGaXJld29ya3MgOLVo0ngAAAJRSURB
VFhHxZfNTsMwEISBtyoXKM3TwIUDTa9U4h8BT8CDAiphd+J118nENlCEpU9q7dmZrZ2mzZ6Mg38mfdN1 VFhHxZfNTsMwEISBtyoXKM3TwIUDTa9U4h8BT8CDAiphd+J118nENlCEpU9q7dmZrZ2mzZ6Mg38mfdN1
XUTGfpjfBfsDbx06HwVY+Fgujjbt4vR9uTgcCH8DvN+Wi9mmbc4k49h5Q4DuPtvmpVs1nfG5aq530ATC XUTGfpjfBfsDbx06HwVY+Fgujjbt4vR9uTgcCH8DvN+Wi9mmbc4k49h5Q4DuPtvmpVs1nfG5aq530ATC
4ZV6v5r3gb6QT3zsBU54o+tBzAImsTp4EG/JnIuuF8q2nzORYjvxnSZcePLJPZop2rgDMyYy5HiwE2HQ 4ZV6v5r3gb6QT3zsBU54o+tBzAImsTp4EG/JnIuuF8q2nzORYjvxnSZcePLJPZop2rgDMyYy5HiwE2HQ
UEcfrjXEy9BM1WpBfw1kulU2q+a2ogmEQ0s8DNtVHUnh1HkZ8qnuVBeKffB221VDag1k9PUYY4PCTsj6 UEcfrjXEy9BM1WpBfw1kulU2q+a2ogmEQ0s8DNtVHUnh1HkZ8qnuVBeKffB221VDag1k9PUYY4PCTsj6
qAlXWwofXk/bBmxCF2ULSztxH0wwEK5zRGvAc1sT83w4UFEwzJ9j2zw67SPTGPAK2kFe8iYSjctbeqmw qAlXWwofXk/bBmxCF2ULSztxH0wwEK5zRGvAc1sT83w4UFEwzJ9j2zw67SPTGPAK2kFe8iYSjctbeqmw
NQMePFwZTURqm8hRCFfoZCQ2UThfBmry4QqdTIhNrPLn7IG2HK7QyRGuiex5K9DUhSt0coRrYM1CPdDs NQMePFwZTURqm8hRCFfoZCQ2UThfBmry4QqdTIhNrPLn7IG2HK7QyRGuiex5K9DUhSt0coRrYM1CPdDs
sgEX/swCGdDWNUEnIz8JNyqboJPAhSd/VL4DavNN0MnqcPmqrRW2ZhSaGE1sw9vmiRkafovxmmgMeAXt sgEX/swCGdDWNUEnIz8JNyqboJPAhSd/VL4DavNN0MnqcPmqrRW2ZhSaGE1sw9vmiRkafovxmmgMeAXt
IC95g4lgmL+3h3AbVU2Ee0MYMS+G62IwemAGhqyPttTV5o9MvdPa2IAZZG+5LNyw+Yomkp9yLba/ZFes IC95g4lgmL+3h3AbVU2Ee0MYMS+G62IwemAGhqyPttTV5o9MvdPa2IAZZG+5LNyw+Yomkp9yLba/ZFes
wJD1qXOM2Dq0xMNAVu/TF71fnBwyoSEFtfd230T2OtJM0fcFhb/lw3Mr4pqYvJ6Gf8unHkxqflIprgl6 wJD1qXOM2Dq0xMNAVu/TF71fnBwyoSEFtfd230T2OtJM0fcFhb/lw3Mr4pqYvJ6Gf8unHkxqflIprgl6
XWmm6CDGEOGrF8h3F+f0k3AjNqFe3luyZB0jEcqD41wfIN8u/uDhVDzDw+m8z+v2vgCLN08Z7ifCRgAA XWmm6CDGEOGrF8h3F+f0k3AjNqFe3luyZB0jEcqD41wfIN8u/uDhVDzDw+m8z+v2vgCLN08Z7ifCRgAA
AABJRU5ErkJggg== AABJRU5ErkJggg==
</value> </value>
</data> </data>
<data name="btnClearSizeBmp_Path.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="btnClearSizeBmp_Path.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL
DAAACwwBP0AiyAAAAB90RVh0U29mdHdhcmUATWFjcm9tZWRpYSBGaXJld29ya3MgOLVo0ngAAAJRSURB DAAACwwBP0AiyAAAAB90RVh0U29mdHdhcmUATWFjcm9tZWRpYSBGaXJld29ya3MgOLVo0ngAAAJRSURB
VFhHxZfNTsMwEISBtyoXKM3TwIUDTa9U4h8BT8CDAiphd+J118nENlCEpU9q7dmZrZ2mzZ6Mg38mfdN1 VFhHxZfNTsMwEISBtyoXKM3TwIUDTa9U4h8BT8CDAiphd+J118nENlCEpU9q7dmZrZ2mzZ6Mg38mfdN1
XUTGfpjfBfsDbx06HwVY+Fgujjbt4vR9uTgcCH8DvN+Wi9mmbc4k49h5Q4DuPtvmpVs1nfG5aq530ATC XUTGfpjfBfsDbx06HwVY+Fgujjbt4vR9uTgcCH8DvN+Wi9mmbc4k49h5Q4DuPtvmpVs1nfG5aq530ATC
4ZV6v5r3gb6QT3zsBU54o+tBzAImsTp4EG/JnIuuF8q2nzORYjvxnSZcePLJPZop2rgDMyYy5HiwE2HQ 4ZV6v5r3gb6QT3zsBU54o+tBzAImsTp4EG/JnIuuF8q2nzORYjvxnSZcePLJPZop2rgDMyYy5HiwE2HQ
UEcfrjXEy9BM1WpBfw1kulU2q+a2ogmEQ0s8DNtVHUnh1HkZ8qnuVBeKffB221VDag1k9PUYY4PCTsj6 UEcfrjXEy9BM1WpBfw1kulU2q+a2ogmEQ0s8DNtVHUnh1HkZ8qnuVBeKffB221VDag1k9PUYY4PCTsj6
qAlXWwofXk/bBmxCF2ULSztxH0wwEK5zRGvAc1sT83w4UFEwzJ9j2zw67SPTGPAK2kFe8iYSjctbeqmw qAlXWwofXk/bBmxCF2ULSztxH0wwEK5zRGvAc1sT83w4UFEwzJ9j2zw67SPTGPAK2kFe8iYSjctbeqmw
NQMePFwZTURqm8hRCFfoZCQ2UThfBmry4QqdTIhNrPLn7IG2HK7QyRGuiex5K9DUhSt0coRrYM1CPdDs NQMePFwZTURqm8hRCFfoZCQ2UThfBmry4QqdTIhNrPLn7IG2HK7QyRGuiex5K9DUhSt0coRrYM1CPdDs
sgEX/swCGdDWNUEnIz8JNyqboJPAhSd/VL4DavNN0MnqcPmqrRW2ZhSaGE1sw9vmiRkafovxmmgMeAXt sgEX/swCGdDWNUEnIz8JNyqboJPAhSd/VL4DavNN0MnqcPmqrRW2ZhSaGE1sw9vmiRkafovxmmgMeAXt
IC95g4lgmL+3h3AbVU2Ee0MYMS+G62IwemAGhqyPttTV5o9MvdPa2IAZZG+5LNyw+Yomkp9yLba/ZFes IC95g4lgmL+3h3AbVU2Ee0MYMS+G62IwemAGhqyPttTV5o9MvdPa2IAZZG+5LNyw+Yomkp9yLba/ZFes
wJD1qXOM2Dq0xMNAVu/TF71fnBwyoSEFtfd230T2OtJM0fcFhb/lw3Mr4pqYvJ6Gf8unHkxqflIprgl6 wJD1qXOM2Dq0xMNAVu/TF71fnBwyoSEFtfd230T2OtJM0fcFhb/lw3Mr4pqYvJ6Gf8unHkxqflIprgl6
XWmm6CDGEOGrF8h3F+f0k3AjNqFe3luyZB0jEcqD41wfIN8u/uDhVDzDw+m8z+v2vgCLN08Z7ifCRgAA XWmm6CDGEOGrF8h3F+f0k3AjNqFe3luyZB0jEcqD41wfIN8u/uDhVDzDw+m8z+v2vgCLN08Z7ifCRgAA
AABJRU5ErkJggg== AABJRU5ErkJggg==
</value> </value>
</data> </data>
<metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>166, 17</value> <value>166, 17</value>
</metadata> </metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>56</value> <value>56</value>
</metadata> </metadata>
</root> </root>

File diff suppressed because it is too large Load Diff

View File

@ -6,9 +6,9 @@ using System.Runtime.InteropServices;
// 控制。更改这些特性值可修改 // 控制。更改这些特性值可修改
// 与程序集关联的信息。 // 与程序集关联的信息。
[assembly: AssemblyTitle("ProductionControl")] [assembly: AssemblyTitle("ProductionControl")]
[assembly: AssemblyDescription("18601576530")] [assembly: AssemblyDescription("MaiMu迈沐智能")]
[assembly: AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("wlq")] [assembly: AssemblyCompany("MaiMu")]
[assembly: AssemblyProduct("ProductionControl")] [assembly: AssemblyProduct("ProductionControl")]
[assembly: AssemblyCopyright("Copyright © 2022")] [assembly: AssemblyCopyright("Copyright © 2022")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
//可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值 //可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值
//通过使用 "*",如下所示: //通过使用 "*",如下所示:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")] [assembly: AssemblyVersion("1.2.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")] [assembly: AssemblyFileVersion("1.2.0.0")]

View File

@ -0,0 +1,199 @@
namespace ProductionControl.UI
{
partial class FrmGetPosByPic
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmGetPosByPic));
this.toolStrip1 = new System.Windows.Forms.ToolStrip();
this.tsbtnSave = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
this.tsbtnSetPTPos = new System.Windows.Forms.ToolStripButton();
this.tsbtnSetLinePos = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
this.tsbtnShowPos = new System.Windows.Forms.ToolStripButton();
this.tsbtnClear = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
this.tsbtnClose = new System.Windows.Forms.ToolStripButton();
this.imageBox1 = new ImageToolKits.ImageBox();
this.toolStrip1.SuspendLayout();
this.SuspendLayout();
//
// toolStrip1
//
this.toolStrip1.BackColor = System.Drawing.SystemColors.GradientInactiveCaption;
this.toolStrip1.ImageScalingSize = new System.Drawing.Size(32, 32);
this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.tsbtnSave,
this.toolStripSeparator2,
this.tsbtnSetPTPos,
this.tsbtnSetLinePos,
this.toolStripSeparator3,
this.tsbtnShowPos,
this.tsbtnClear,
this.toolStripSeparator1,
this.tsbtnClose});
this.toolStrip1.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.HorizontalStackWithOverflow;
this.toolStrip1.Location = new System.Drawing.Point(0, 0);
this.toolStrip1.Name = "toolStrip1";
this.toolStrip1.Size = new System.Drawing.Size(814, 56);
this.toolStrip1.TabIndex = 15;
this.toolStrip1.Text = "toolStrip1";
//
// tsbtnSave
//
this.tsbtnSave.Image = ((System.Drawing.Image)(resources.GetObject("tsbtnSave.Image")));
this.tsbtnSave.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.tsbtnSave.ImageTransparentColor = System.Drawing.Color.Magenta;
this.tsbtnSave.Name = "tsbtnSave";
this.tsbtnSave.Size = new System.Drawing.Size(52, 53);
this.tsbtnSave.Text = " 保存 ";
this.tsbtnSave.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
this.tsbtnSave.Click += new System.EventHandler(this.tsbtnSave_Click);
//
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
this.toolStripSeparator2.Size = new System.Drawing.Size(6, 56);
//
// tsbtnSetPTPos
//
this.tsbtnSetPTPos.Image = ((System.Drawing.Image)(resources.GetObject("tsbtnSetPTPos.Image")));
this.tsbtnSetPTPos.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.tsbtnSetPTPos.ImageTransparentColor = System.Drawing.Color.Magenta;
this.tsbtnSetPTPos.Name = "tsbtnSetPTPos";
this.tsbtnSetPTPos.Size = new System.Drawing.Size(74, 53);
this.tsbtnSetPTPos.Text = "设置PT选点";
this.tsbtnSetPTPos.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
this.tsbtnSetPTPos.ToolTipText = "设置PT";
this.tsbtnSetPTPos.Click += new System.EventHandler(this.tsbtnSetPTPos_Click);
//
// tsbtnSetLinePos
//
this.tsbtnSetLinePos.Image = ((System.Drawing.Image)(resources.GetObject("tsbtnSetLinePos.Image")));
this.tsbtnSetLinePos.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.tsbtnSetLinePos.ImageTransparentColor = System.Drawing.Color.Magenta;
this.tsbtnSetLinePos.Name = "tsbtnSetLinePos";
this.tsbtnSetLinePos.Size = new System.Drawing.Size(84, 53);
this.tsbtnSetLinePos.Text = "设置线宽选点";
this.tsbtnSetLinePos.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
this.tsbtnSetLinePos.ToolTipText = "设置线宽";
this.tsbtnSetLinePos.Click += new System.EventHandler(this.tsbtnSetLinePos_Click);
//
// toolStripSeparator3
//
this.toolStripSeparator3.Name = "toolStripSeparator3";
this.toolStripSeparator3.Size = new System.Drawing.Size(6, 56);
//
// tsbtnShowPos
//
this.tsbtnShowPos.Image = ((System.Drawing.Image)(resources.GetObject("tsbtnShowPos.Image")));
this.tsbtnShowPos.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.tsbtnShowPos.ImageTransparentColor = System.Drawing.Color.Magenta;
this.tsbtnShowPos.Name = "tsbtnShowPos";
this.tsbtnShowPos.Size = new System.Drawing.Size(84, 53);
this.tsbtnShowPos.Text = "显示所有标点";
this.tsbtnShowPos.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
this.tsbtnShowPos.ToolTipText = "显示标点";
this.tsbtnShowPos.Click += new System.EventHandler(this.tsbtnShowPos_Click);
//
// tsbtnClear
//
this.tsbtnClear.Image = ((System.Drawing.Image)(resources.GetObject("tsbtnClear.Image")));
this.tsbtnClear.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.tsbtnClear.ImageTransparentColor = System.Drawing.Color.Magenta;
this.tsbtnClear.Name = "tsbtnClear";
this.tsbtnClear.Size = new System.Drawing.Size(84, 53);
this.tsbtnClear.Text = "清空所有标点";
this.tsbtnClear.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
this.tsbtnClear.ToolTipText = "删除标点";
this.tsbtnClear.Click += new System.EventHandler(this.tsbtnClear_Click);
//
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
this.toolStripSeparator1.Size = new System.Drawing.Size(6, 56);
//
// tsbtnClose
//
this.tsbtnClose.Image = ((System.Drawing.Image)(resources.GetObject("tsbtnClose.Image")));
this.tsbtnClose.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.tsbtnClose.ImageTransparentColor = System.Drawing.Color.Magenta;
this.tsbtnClose.Name = "tsbtnClose";
this.tsbtnClose.Size = new System.Drawing.Size(52, 53);
this.tsbtnClose.Text = " 关闭 ";
this.tsbtnClose.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
this.tsbtnClose.Click += new System.EventHandler(this.tsbtnClose_Click);
//
// imageBox1
//
this.imageBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.imageBox1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.imageBox1.ColorName = System.Drawing.Color.LimeGreen;
this.imageBox1.DrawParam = null;
this.imageBox1.Image = null;
this.imageBox1.Location = new System.Drawing.Point(0, 56);
this.imageBox1.Margin = new System.Windows.Forms.Padding(0);
this.imageBox1.Name = "imageBox1";
this.imageBox1.Size = new System.Drawing.Size(805, 500);
this.imageBox1.TabIndex = 14;
//
// FrmGetPosByPic
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.SystemColors.ActiveCaption;
this.ClientSize = new System.Drawing.Size(814, 565);
this.Controls.Add(this.toolStrip1);
this.Controls.Add(this.imageBox1);
this.Name = "FrmGetPosByPic";
this.Text = "图纸抓取点位";
this.Load += new System.EventHandler(this.FrmGetPosByPic_Load);
this.toolStrip1.ResumeLayout(false);
this.toolStrip1.PerformLayout();
this.ResumeLayout(false);
this.PerformLayout();
}
#endregion
private System.Windows.Forms.ToolStrip toolStrip1;
private System.Windows.Forms.ToolStripButton tsbtnSave;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
private System.Windows.Forms.ToolStripButton tsbtnSetPTPos;
private System.Windows.Forms.ToolStripButton tsbtnSetLinePos;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator3;
private System.Windows.Forms.ToolStripButton tsbtnShowPos;
private System.Windows.Forms.ToolStripButton tsbtnClear;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
private System.Windows.Forms.ToolStripButton tsbtnClose;
private ImageToolKits.ImageBox imageBox1;
}
}

View File

@ -0,0 +1,156 @@
using ImageToolKits;
using OpenCvSharp;
using ProductionControl.Utils;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.IO;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace ProductionControl.UI
{
public partial class FrmGetPosByPic : Form
{
private SizeLibProp sizeLibProp;
List<ImageBox.BaseDrawParam> pickARoi = new List<ImageBox.BaseDrawParam>();
Mat Img;
string _Path;
public FrmGetPosByPic(SizeLibProp prop)
{
pickARoi.Clear();
sizeLibProp = prop;
InitializeComponent();
//lbPoslist.Items.Clear();
}
private void FrmGetPosByPic_Load(object sender, EventArgs e)
{
List<ImageBox.BaseDrawParam> roi = new List<ImageBox.BaseDrawParam>();
if (File.Exists(sizeLibProp.MapPath))
{
Img = new Mat(sizeLibProp.MapPath);
//this.imageBox1.RefreshWindow(Img);
if (sizeLibProp.GetPointList.Length == (14 * 2))
{
for (int i = 0; i < 14; i++)
{
//string pos = sizeLibProp.GetPointList[5 + 2 * i].ToString() + "," + sizeLibProp.GetPointList[5 + 2 * i +1].ToString();
//lbPoslist.Items.Add(pos);
ImageBox.BaseDrawParam point = new ImageBox.Point((float)sizeLibProp.GetPointList[2 * i + 1], (float)sizeLibProp.GetPointList[2 * i]);
roi.Add(point);
pickARoi.Add(point);
}
imageBox1.RefreshWindow(Img, roi);
imageBox1.Refresh();
}
else if (sizeLibProp.GetPointList.Length > 0)
MessageBox.Show("点位数据错误!", "警告", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
else
{
string maop_path = FileUtil.selectFile();
if (File.Exists(maop_path))
{
_Path = maop_path;
sizeLibProp.MapPath = maop_path;
Img = new Mat(maop_path);
this.imageBox1.RefreshWindow(Img);
}
else
{
MessageBox.Show("无图纸图片加载!", "警告", MessageBoxButtons.OK, MessageBoxIcon.Error);
return;
}
}
}
private void tsbtnSetPTPos_Click(object sender, EventArgs e)
{
if ((imageBox1.DrawParam != null) && ((imageBox1.DrawParam as ImageBox.Point).IsValid()))
{
bool isSame = false;
foreach (var t in pickARoi)
{
if (((t as ImageBox.Point).Row == (imageBox1.DrawParam as ImageBox.Point).Row) && ((t as ImageBox.Point).Column == (imageBox1.DrawParam as ImageBox.Point).Column))
isSame = true;
}
if (!isSame)
pickARoi.Add(imageBox1.DrawParam);
else
MessageBox.Show("点位相同!", "警告", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
private void tsbtnSetLinePos_Click(object sender, EventArgs e)
{
if ((imageBox1.DrawParam != null) && ((imageBox1.DrawParam as ImageBox.Point).IsValid()))
{
bool isSame = false;
foreach (var t in pickARoi)
{
if (((t as ImageBox.Point).Row == (imageBox1.DrawParam as ImageBox.Point).Row) && ((t as ImageBox.Point).Column == (imageBox1.DrawParam as ImageBox.Point).Column))
isSame = true;
}
if (!isSame)
pickARoi.Add(imageBox1.DrawParam);
else
MessageBox.Show("点位相同!", "警告", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
private void tsbtnShowPos_Click(object sender, EventArgs e)
{
imageBox1.RefreshWindow(Img, pickARoi, ImageBox.ImageModeEnum.Zoom);
}
private void tsbtnClear_Click(object sender, EventArgs e)
{
if (MessageBox.Show("是否清空所有点位?", "提示", MessageBoxButtons.OKCancel, MessageBoxIcon.Information) == DialogResult.OK)
{
pickARoi.Clear();
this.imageBox1.RefreshWindow(Img);
}
}
private void tsbtnClose_Click(object sender, EventArgs e)
{
this.Close();
}
private void tsbtnSave_Click(object sender, EventArgs e)
{
if (pickARoi.Count == 14)
{
sizeLibProp.GetPointList = new double[14 * 2];
for (int i = 0; i < 14; i++)
{
sizeLibProp.GetPointList[2 * i] = (pickARoi[i] as ImageBox.Point).Column;
sizeLibProp.GetPointList[2 * i + 1] = (pickARoi[i] as ImageBox.Point).Row;
}
sizeLibProp.MapPath = _Path;
this.DialogResult = DialogResult.OK;
}
else if (pickARoi.Count >0)
MessageBox.Show("点位设置错误,点数不对!", "警告", MessageBoxButtons.OK, MessageBoxIcon.Error);
else
{
sizeLibProp.GetPointList = new double[14 * 2];
for (int i = 0; i < 14; i++)
{
sizeLibProp.GetPointList[2 * i] = 0;
sizeLibProp.GetPointList[2 * i + 1] = 0;
}
}
}
}
}

View File

@ -0,0 +1,278 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="tsbtnSave.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIdSURBVFhH7ZdBS9xAFMefFEShRfALiC31UvBmS8Xai1T7
AXIQ0WhmJpkX60H6DXoTe2npB2itqCD0C/QmemwVPHj0Jj23FBWp+maYzWbc2d1MNhQE//AjuzPz/vnv
5CW7C3dyqAvidJyYKg2Xk8DTJ8bPQ0HQDSz5DgKvKoHjO+NcUAJHGkw6Z8K4FxCXL7JChsf0CdZAJF/9
kV8gwiPtM48nEMd95gxtFKdjWQCOn81oOXG5knkJuW1G2ygfQMgNM1pOQn6se2m/0My0UD4Aw00zWlwM
F2jnYv2a4wcrwDT+hSgd0HNN1UmA5eVeqrvUtUoc32deNaJkj2a69LxTnQSIogdU95s41e+5XM28LORb
Pe+U1QO4bkaLKU3vQzD9T9cqWU1o8U3PO2UHaLGwifRta5pX4KecV52WO2sHUNs5amb8xHCYan/lvOp4
BFCopjokftIDZr89tI7jAYThhalvxDNA9dzOAGH4pxS1uyKPVwBlIuRrYKy/FEnymHx2LU+/HaDG6lQC
U8vT8xKcU1cvgUifecOSp+Q3lX0t17idTVglngFO6RLMAV8c0g2ljkVR6+P4OTD5w/L8/00o0fL03gEh
Z0GIR7CAD/XxJmrcBX8zSPX0I1c/ogsGyP8otVHfCX64HkIauWXO5pC6dZxFVdIqQBj20KKdxqKKmJk5
o12eNGdroiC4R4tfUj+4/3aVReAr3Rd3sgRwDfSiZevD7cv7AAAAAElFTkSuQmCC
</value>
</data>
<data name="tsbtnSetPTPos.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
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
0MR3PqwIhTUAAAAASUVORK5CYII=
</value>
</data>
<data name="tsbtnSetLinePos.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
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
0MR3PqwIhTUAAAAASUVORK5CYII=
</value>
</data>
<data name="tsbtnShowPos.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
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
</value>
</data>
<data name="tsbtnClear.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
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
YII=
</value>
</data>
<data name="tsbtnClose.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJQSURBVFhHxZfNctNAEIQFb0UuYEu8DFwoiOwrVPGbFPAE
vKhjV9huzSiz69aubA501XfwuGdms7ORtV3S8/9M/qHQs0T8/l9ArVKIzwbqMA4vj2P/5rDb3FgIcs+1
UIfb/sVx//rtw4f+lYUoGLi609j/ftwPj85p139B3FQWXQuFWnnt4Y99NZmwqmiYjfvhK12TyuItKNRQ
tR/G7Qbf03jcbd8pE7hyJ6jyL4+gJzw0Yz7K5JxuL9oJCjmqloOe8CFhOgOV1YLTuP0Gn6ls6lDwqhpO
3NU8cWFeTkr8blYoNn6qkTwq1ynOlSxQ3wm9CKrZ/Pw8zQXyQq2dGIcfZp2FmPI6C/9RWfM5CDXnOPb3
ZsUz5F55nMr5yT5EqPY8+49AfecsjGzuUwYiVGsRNRrN2UMFI1RrvorinKjaQAZLqLTV1TlH4LU0SNV0
ZFBBteYN4DE7pGpFZFBBpZl+Uk0j8JgdUrUiMlhCpZ/QX6qhAl5Lg1RNRwYj1CXNnZWLkEGHSjPNXlQu
AblWBpI9VBBQreaYd+tcNBZxFmAQSv/HP1VBJ25xa0SoZVYo6xU/MAClVdef7fl8qeYi9LNBNN8Nd6qA
s7ClVHtkw51ZIeYVBVo/qfV5Qs1FpB5mpZA4vZLt+88qwUmJS3OMUPCqGg56mXVKOrzf3CijkxLWPtsB
hRxVy0FP+JhQfy0/m9saqNp5yl7LKxeTNT+pS1BL58qvaE/GdF2KhvSaNc8pqSy+Fgq1strF1Ww24rqE
C6TPxxQLXgOFmryc2pWs67ruL9BDjecFstIGAAAAAElFTkSuQmCC
</value>
</data>
</root>

View File

@ -29,6 +29,13 @@ namespace ProductionControl.UI
[PropertyOrder(1), Browsable(true), Category("1 数据"), DisplayName("1.5 保存标识"), Description("供后续轴移动时引用此标识数据,不设则在本工序内立即进行轴校正。")] [PropertyOrder(1), Browsable(true), Category("1 数据"), DisplayName("1.5 保存标识"), Description("供后续轴移动时引用此标识数据,不设则在本工序内立即进行轴校正。")]
public string SizeTag { get; set; } public string SizeTag { get; set; }
//2023-10-27 新增图纸选点
[PropertyOrder(1), Browsable(true), Category("1 数据"), DisplayName("1.6 图纸图片"), Description("图纸图片文件名")]
public string MapPath { get; set; }
[PropertyOrder(1), Browsable(true), Category("1 数据"), DisplayName("1.7 抓取位置"), Description("图纸上选取的点位根据选取的5个PT点9个线宽点计算真是走位。")]
//public double[] GetPointList { get; set; } = new double[23];//默认对应0和2号AXIS
public double[] GetPointList { get; set; } = new double[23] { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
[PropertyOrder(15), Browsable(true), Category("2 结果"), DisplayName("PT1"), Description("结果"), ReadOnly(true), JsonIgnore] [PropertyOrder(15), Browsable(true), Category("2 结果"), DisplayName("PT1"), Description("结果"), ReadOnly(true), JsonIgnore]
public double PT1 { get; set; } public double PT1 { get; set; }
[PropertyOrder(15), Browsable(true), Category("2 结果"), DisplayName("PT2"), Description("结果"), ReadOnly(true), JsonIgnore] [PropertyOrder(15), Browsable(true), Category("2 结果"), DisplayName("PT2"), Description("结果"), ReadOnly(true), JsonIgnore]

View File

@ -28,148 +28,169 @@
/// </summary> /// </summary>
private void InitializeComponent() private void InitializeComponent()
{ {
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(UISizeLib)); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(UISizeLib));
this.toolStrip1 = new System.Windows.Forms.ToolStrip(); this.toolStrip1 = new System.Windows.Forms.ToolStrip();
this.tsbtnOpenDev = new System.Windows.Forms.ToolStripButton(); this.tsbtnOpenDev = new System.Windows.Forms.ToolStripButton();
this.tbtnSave = new System.Windows.Forms.ToolStripButton(); this.tbtnSave = new System.Windows.Forms.ToolStripButton();
this.tssSave = new System.Windows.Forms.ToolStripSeparator(); this.tssSave = new System.Windows.Forms.ToolStripSeparator();
this.tbtnRun = new System.Windows.Forms.ToolStripButton(); this.tbtnRun = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); this.tbtnDebug = new System.Windows.Forms.ToolStripButton();
this.tbtnExport = new System.Windows.Forms.ToolStripButton(); this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
this.tbtnImport = new System.Windows.Forms.ToolStripButton(); this.tbtnExport = new System.Windows.Forms.ToolStripButton();
this.propertyGrid1 = new System.Windows.Forms.PropertyGrid(); this.tbtnImport = new System.Windows.Forms.ToolStripButton();
this.statusStrip1 = new System.Windows.Forms.StatusStrip(); this.propertyGrid1 = new System.Windows.Forms.PropertyGrid();
this.txtLog = new System.Windows.Forms.ToolStripStatusLabel(); this.statusStrip1 = new System.Windows.Forms.StatusStrip();
this.tbtnDebug = new System.Windows.Forms.ToolStripButton(); this.txtLog = new System.Windows.Forms.ToolStripStatusLabel();
this.toolStrip1.SuspendLayout(); this.tbtnGetPos = new System.Windows.Forms.ToolStripButton();
this.statusStrip1.SuspendLayout(); this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
this.SuspendLayout(); this.toolStrip1.SuspendLayout();
// this.statusStrip1.SuspendLayout();
// toolStrip1 this.SuspendLayout();
// //
this.toolStrip1.ImageScalingSize = new System.Drawing.Size(24, 24); // toolStrip1
this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { //
this.tsbtnOpenDev, this.toolStrip1.ImageScalingSize = new System.Drawing.Size(24, 24);
this.tbtnSave, this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.tssSave, this.tsbtnOpenDev,
this.tbtnRun, this.tbtnSave,
this.tbtnDebug, this.tssSave,
this.toolStripSeparator1, this.tbtnRun,
this.tbtnExport, this.tbtnDebug,
this.tbtnImport}); this.toolStripSeparator1,
this.toolStrip1.Location = new System.Drawing.Point(0, 0); this.tbtnExport,
this.toolStrip1.Name = "toolStrip1"; this.tbtnImport,
this.toolStrip1.Size = new System.Drawing.Size(1008, 33); this.toolStripSeparator2,
this.toolStrip1.TabIndex = 26; this.tbtnGetPos});
this.toolStrip1.Text = "toolStrip7"; this.toolStrip1.Location = new System.Drawing.Point(0, 0);
// this.toolStrip1.Name = "toolStrip1";
// tsbtnOpenDev this.toolStrip1.Size = new System.Drawing.Size(672, 31);
// this.toolStrip1.TabIndex = 26;
this.tsbtnOpenDev.Image = ((System.Drawing.Image)(resources.GetObject("tsbtnOpenDev.Image"))); this.toolStrip1.Text = "toolStrip7";
this.tsbtnOpenDev.ImageTransparentColor = System.Drawing.Color.Magenta; //
this.tsbtnOpenDev.Name = "tsbtnOpenDev"; // tsbtnOpenDev
this.tsbtnOpenDev.Size = new System.Drawing.Size(110, 28); //
this.tsbtnOpenDev.Text = "打开设备"; this.tsbtnOpenDev.Image = ((System.Drawing.Image)(resources.GetObject("tsbtnOpenDev.Image")));
this.tsbtnOpenDev.Click += new System.EventHandler(this.tsbtnOpenDev_Click); this.tsbtnOpenDev.ImageTransparentColor = System.Drawing.Color.Magenta;
// this.tsbtnOpenDev.Name = "tsbtnOpenDev";
// tbtnSave this.tsbtnOpenDev.Size = new System.Drawing.Size(84, 28);
// this.tsbtnOpenDev.Text = "打开设备";
this.tbtnSave.Image = ((System.Drawing.Image)(resources.GetObject("tbtnSave.Image"))); this.tsbtnOpenDev.Click += new System.EventHandler(this.tsbtnOpenDev_Click);
this.tbtnSave.ImageTransparentColor = System.Drawing.Color.Magenta; //
this.tbtnSave.Name = "tbtnSave"; // tbtnSave
this.tbtnSave.Size = new System.Drawing.Size(74, 28); //
this.tbtnSave.Text = "保存"; this.tbtnSave.Image = ((System.Drawing.Image)(resources.GetObject("tbtnSave.Image")));
this.tbtnSave.Click += new System.EventHandler(this.tbtnSave_Click); this.tbtnSave.ImageTransparentColor = System.Drawing.Color.Magenta;
// this.tbtnSave.Name = "tbtnSave";
// tssSave this.tbtnSave.Size = new System.Drawing.Size(60, 28);
// this.tbtnSave.Text = "保存";
this.tssSave.Name = "tssSave"; this.tbtnSave.Click += new System.EventHandler(this.tbtnSave_Click);
this.tssSave.Size = new System.Drawing.Size(6, 33); //
// // tssSave
// tbtnRun //
// this.tssSave.Name = "tssSave";
this.tbtnRun.Image = ((System.Drawing.Image)(resources.GetObject("tbtnRun.Image"))); this.tssSave.Size = new System.Drawing.Size(6, 31);
this.tbtnRun.ImageTransparentColor = System.Drawing.Color.Magenta; //
this.tbtnRun.Name = "tbtnRun"; // tbtnRun
this.tbtnRun.Size = new System.Drawing.Size(74, 28); //
this.tbtnRun.Text = "执行"; this.tbtnRun.Image = ((System.Drawing.Image)(resources.GetObject("tbtnRun.Image")));
this.tbtnRun.Click += new System.EventHandler(this.tbtnRun_Click); this.tbtnRun.ImageTransparentColor = System.Drawing.Color.Magenta;
// this.tbtnRun.Name = "tbtnRun";
// toolStripSeparator1 this.tbtnRun.Size = new System.Drawing.Size(60, 28);
// this.tbtnRun.Text = "执行";
this.toolStripSeparator1.Name = "toolStripSeparator1"; this.tbtnRun.Click += new System.EventHandler(this.tbtnRun_Click);
this.toolStripSeparator1.Size = new System.Drawing.Size(6, 33); //
// // tbtnDebug
// tbtnExport //
// this.tbtnDebug.Image = ((System.Drawing.Image)(resources.GetObject("tbtnDebug.Image")));
this.tbtnExport.Image = ((System.Drawing.Image)(resources.GetObject("tbtnExport.Image"))); this.tbtnDebug.ImageTransparentColor = System.Drawing.Color.Magenta;
this.tbtnExport.ImageTransparentColor = System.Drawing.Color.Magenta; this.tbtnDebug.Name = "tbtnDebug";
this.tbtnExport.Name = "tbtnExport"; this.tbtnDebug.Size = new System.Drawing.Size(84, 28);
this.tbtnExport.Size = new System.Drawing.Size(74, 28); this.tbtnDebug.Text = "打开调试";
this.tbtnExport.Text = "导出"; this.tbtnDebug.Click += new System.EventHandler(this.tbtnDebug_Click);
this.tbtnExport.Click += new System.EventHandler(this.tbtnExport_Click); //
// // toolStripSeparator1
// tbtnImport //
// this.toolStripSeparator1.Name = "toolStripSeparator1";
this.tbtnImport.Image = ((System.Drawing.Image)(resources.GetObject("tbtnImport.Image"))); this.toolStripSeparator1.Size = new System.Drawing.Size(6, 31);
this.tbtnImport.ImageTransparentColor = System.Drawing.Color.Magenta; //
this.tbtnImport.Name = "tbtnImport"; // tbtnExport
this.tbtnImport.Size = new System.Drawing.Size(74, 28); //
this.tbtnImport.Text = "导入"; this.tbtnExport.Image = ((System.Drawing.Image)(resources.GetObject("tbtnExport.Image")));
this.tbtnImport.Click += new System.EventHandler(this.tbtnImport_Click); this.tbtnExport.ImageTransparentColor = System.Drawing.Color.Magenta;
// this.tbtnExport.Name = "tbtnExport";
// propertyGrid1 this.tbtnExport.Size = new System.Drawing.Size(60, 28);
// this.tbtnExport.Text = "导出";
this.propertyGrid1.Dock = System.Windows.Forms.DockStyle.Fill; this.tbtnExport.Click += new System.EventHandler(this.tbtnExport_Click);
this.propertyGrid1.LineColor = System.Drawing.SystemColors.ActiveCaption; //
this.propertyGrid1.Location = new System.Drawing.Point(0, 33); // tbtnImport
this.propertyGrid1.Name = "propertyGrid1"; //
this.propertyGrid1.Size = new System.Drawing.Size(1008, 566); this.tbtnImport.Image = ((System.Drawing.Image)(resources.GetObject("tbtnImport.Image")));
this.propertyGrid1.TabIndex = 33; this.tbtnImport.ImageTransparentColor = System.Drawing.Color.Magenta;
this.propertyGrid1.ToolbarVisible = false; this.tbtnImport.Name = "tbtnImport";
// this.tbtnImport.Size = new System.Drawing.Size(60, 28);
// statusStrip1 this.tbtnImport.Text = "导入";
// this.tbtnImport.Click += new System.EventHandler(this.tbtnImport_Click);
this.statusStrip1.ImageScalingSize = new System.Drawing.Size(24, 24); //
this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { // propertyGrid1
this.txtLog}); //
this.statusStrip1.Location = new System.Drawing.Point(0, 599); this.propertyGrid1.Dock = System.Windows.Forms.DockStyle.Fill;
this.statusStrip1.Name = "statusStrip1"; this.propertyGrid1.LineColor = System.Drawing.SystemColors.ActiveCaption;
this.statusStrip1.Size = new System.Drawing.Size(1008, 22); this.propertyGrid1.Location = new System.Drawing.Point(0, 31);
this.statusStrip1.TabIndex = 32; this.propertyGrid1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.statusStrip1.Text = "statusStrip1"; this.propertyGrid1.Name = "propertyGrid1";
// this.propertyGrid1.Size = new System.Drawing.Size(672, 361);
// txtLog this.propertyGrid1.TabIndex = 33;
// this.propertyGrid1.ToolbarVisible = false;
this.txtLog.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); //
this.txtLog.Name = "txtLog"; // statusStrip1
this.txtLog.Size = new System.Drawing.Size(0, 15); //
// this.statusStrip1.ImageScalingSize = new System.Drawing.Size(24, 24);
// tbtnDebug this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
// this.txtLog});
this.tbtnDebug.Image = ((System.Drawing.Image)(resources.GetObject("tbtnDebug.Image"))); this.statusStrip1.Location = new System.Drawing.Point(0, 392);
this.tbtnDebug.ImageTransparentColor = System.Drawing.Color.Magenta; this.statusStrip1.Name = "statusStrip1";
this.tbtnDebug.Name = "tbtnDebug"; this.statusStrip1.Padding = new System.Windows.Forms.Padding(1, 0, 9, 0);
this.tbtnDebug.Size = new System.Drawing.Size(110, 28); this.statusStrip1.Size = new System.Drawing.Size(672, 22);
this.tbtnDebug.Text = "打开调试"; this.statusStrip1.TabIndex = 32;
this.tbtnDebug.Click += new System.EventHandler(this.tbtnDebug_Click); this.statusStrip1.Text = "statusStrip1";
// //
// UISizeLib // txtLog
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F); this.txtLog.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.txtLog.Name = "txtLog";
this.Controls.Add(this.propertyGrid1); this.txtLog.Size = new System.Drawing.Size(0, 17);
this.Controls.Add(this.statusStrip1); //
this.Controls.Add(this.toolStrip1); // tbtnGetPos
this.Name = "UISizeLib"; //
this.Size = new System.Drawing.Size(1008, 621); this.tbtnGetPos.Image = ((System.Drawing.Image)(resources.GetObject("tbtnGetPos.Image")));
this.toolStrip1.ResumeLayout(false); this.tbtnGetPos.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStrip1.PerformLayout(); this.tbtnGetPos.Name = "tbtnGetPos";
this.statusStrip1.ResumeLayout(false); this.tbtnGetPos.Size = new System.Drawing.Size(84, 28);
this.statusStrip1.PerformLayout(); this.tbtnGetPos.Text = "点位抓取";
this.ResumeLayout(false); this.tbtnGetPos.Click += new System.EventHandler(this.tbtnGetPos_Click);
this.PerformLayout(); //
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
this.toolStripSeparator2.Size = new System.Drawing.Size(6, 31);
//
// UISizeLib
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.propertyGrid1);
this.Controls.Add(this.statusStrip1);
this.Controls.Add(this.toolStrip1);
this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.Name = "UISizeLib";
this.Size = new System.Drawing.Size(672, 414);
this.toolStrip1.ResumeLayout(false);
this.toolStrip1.PerformLayout();
this.statusStrip1.ResumeLayout(false);
this.statusStrip1.PerformLayout();
this.ResumeLayout(false);
this.PerformLayout();
} }
#endregion #endregion
@ -184,6 +205,8 @@
private System.Windows.Forms.ToolStripButton tbtnSave; private System.Windows.Forms.ToolStripButton tbtnSave;
private System.Windows.Forms.ToolStripSeparator tssSave; private System.Windows.Forms.ToolStripSeparator tssSave;
private System.Windows.Forms.ToolStripButton tsbtnOpenDev; private System.Windows.Forms.ToolStripButton tsbtnOpenDev;
private System.Windows.Forms.ToolStripButton tbtnDebug; private System.Windows.Forms.ToolStripButton tbtnDebug;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
private System.Windows.Forms.ToolStripButton tbtnGetPos;
} }
} }

View File

@ -241,6 +241,12 @@ namespace ProductionControl.UI
return bmp; return bmp;
} }
//2023- 10-27 新增图纸选点
private void tbtnGetPos_Click(object sender, EventArgs e)
{
FrmGetPosByPic frm = new FrmGetPosByPic(prop);
frm.ShowDialog();
}
} }
} }

View File

@ -1,251 +1,278 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<root> <root>
<!-- <!--
Microsoft ResX Schema Microsoft ResX Schema
Version 2.0 Version 2.0
The primary goals of this format is to allow a simple XML format The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes various data types are done through the TypeConverter classes
associated with the data types. associated with the data types.
Example: Example:
... ado.net/XML headers & schema ... ... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader> <resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader> <resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader> <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader> <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data> <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data> <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64"> <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value> <value>[base64 mime encoded serialized .NET Framework object]</value>
</data> </data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value> <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment> <comment>This is a comment</comment>
</data> </data>
There are any number of "resheader" rows that contain simple There are any number of "resheader" rows that contain simple
name/value pairs. name/value pairs.
Each data row contains a name, and value. The row also contains a Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture. text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the Classes that don't support this are serialized and stored with the
mimetype set. mimetype set.
The mimetype is used for serialized objects, and tells the The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly: extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below. read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64 mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding. : and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64 mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding. : and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64 mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter : using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding. : and then encoded with base64 encoding.
--> -->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" /> <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true"> <xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType> <xsd:complexType>
<xsd:choice maxOccurs="unbounded"> <xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata"> <xsd:element name="metadata">
<xsd:complexType> <xsd:complexType>
<xsd:sequence> <xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" /> <xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence> </xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" /> <xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" /> <xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" /> <xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" /> <xsd:attribute ref="xml:space" />
</xsd:complexType> </xsd:complexType>
</xsd:element> </xsd:element>
<xsd:element name="assembly"> <xsd:element name="assembly">
<xsd:complexType> <xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" /> <xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" /> <xsd:attribute name="name" type="xsd:string" />
</xsd:complexType> </xsd:complexType>
</xsd:element> </xsd:element>
<xsd:element name="data"> <xsd:element name="data">
<xsd:complexType> <xsd:complexType>
<xsd:sequence> <xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" /> <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence> </xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" /> <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" /> <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" /> <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" /> <xsd:attribute ref="xml:space" />
</xsd:complexType> </xsd:complexType>
</xsd:element> </xsd:element>
<xsd:element name="resheader"> <xsd:element name="resheader">
<xsd:complexType> <xsd:complexType>
<xsd:sequence> <xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence> </xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" /> <xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType> </xsd:complexType>
</xsd:element> </xsd:element>
</xsd:choice> </xsd:choice>
</xsd:complexType> </xsd:complexType>
</xsd:element> </xsd:element>
</xsd:schema> </xsd:schema>
<resheader name="resmimetype"> <resheader name="resmimetype">
<value>text/microsoft-resx</value> <value>text/microsoft-resx</value>
</resheader> </resheader>
<resheader name="version"> <resheader name="version">
<value>2.0</value> <value>2.0</value>
</resheader> </resheader>
<resheader name="reader"> <resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<resheader name="writer"> <resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value> <value>17, 17</value>
</metadata> </metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="tsbtnOpenDev.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="tsbtnOpenDev.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAZ7SURBVFhH1Zd7TFN3FMdxtqWXN1UhpQUpbaEUqKCgVkRL YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAZ6SURBVFhH1Zd7TFN3FMdxtKWXp1SFQAtS2kIpUEFErIiW
iy8QAXnYIiAP8e0UnU5HdEOZbG6KD3xPdOoyzXQ6l2jUjcwZ3TLN/jBbsrnMzJAtDpI9smXZsiXfnXN7 Fl885FkoCMjTFzpFp8MR3VCmm5viA98TnbpMM53OJRp1I3NGt0yzP8yWbC4zM2aLg2SPbFm2bMl359ze
O8HW4uufneST/u7vnsfvnt/5PRrwvxKtIzhNa1eu1+QKVzSOwBtaq/APw23u43esI6k/PdHYhWVah/BV TpACvv7ZST7p7/7uefzu+Z3fo17/K9HY/RI1NuU6daZwRW33uaGZJPzDcJv7+B3rSOpPT9Q2YZnGLnyV
xkIVlp9LRld3Aa7eLcF3f68Q4Tb38TvWYV22kcwfXzS5ymqtTbg2rV2DT3rL8MWf83D5Dyfe/a0Ah361 vEiF5efi0H03B1fvFeK7v1eIcJv7+B3rsC7bSOaPL+pMZZXGKlyb3aHGJ70l+OLP+bj8hxPv/paDQ7/a
o+PnHBFucx+/Yx3WnbolBmzLPiR3jyYah9CaUh2Gs7cn4drvLhz/aQraf7Ri890xfmGdE6TLNmxrcoaC 0Plzhgi3uY/fsQ7rztoSDrZlH5K7RxO1XWiPrwrE2dvTce33chz/aSY6frRg8720IWGdE6TLNmxrdAaA
fLVIbh9OtA7lNutzQ/FRTxlO9+Zja7cVm+6MfiTY5nTvdHTR9LAv9im59y882rFNQ/FhTymOdDuw8VYW fLVJbh9ONHblNstzo/FRTwlO92Zj610LNt6Z+EiwzeneXHTT9LAv9im5H1p4tJOaR+PDnmIcuWvHhlup
Wr7OfCxayfYo+WBfWUtVA2eC58tUHobj3+Th4Lc2rL85EuueEPbRedsm+kwsDeVMVErhvIWLZtX5NHTe aPt6wmPRTrZHyQf7Sl2qGj4TPF9GRyCOf5OFg99ase7meKx9QthH122r6DOmOIAzUSGFGyhcNKvOJ6Lr
sqH5egbWfJb+VGBfh2/l4vkLFvBylcL1F142GfUqdHyegxeuZmDlZcuAWOerkJivRFNXqs/3fWkmn/tv lhWt15PR8lnSU4F9Hb6ViecvmMHLVQrXX3jZJNep0Pl5Bl64moyVl83DYlmgQky2Es3dCR7f96WVfO6/
ToClJhJau7BECitJecDg2DwBFTsSsK4rA89eSPXL3BMm8TerLhzGaQosei/ZS8cXG65koXxbAtfCl1Jk ORXm6mBobMISKawkDi/viCwBpTuisbY7Gc9eSBiShhNG8Te1NgiG2Qosfi9ugI4n1l9JhWNbNNfCl1Jk
t2hyA+3mWeGYvdeIukNJWHjG7JP6t5JgKQuFbXmU+JxVFwbDFAUa30nGvJO0CVWGo6bT4GXnoeGYCVUU l6gzfWymsiDM3WtA7aFYLDpj8kjdW7EwlwTAujxEfE6tDYR+pgKN78Rh/knahCqCUN2lH2Dnpv6YEZUU
I7ksHDEOpVUKT3NvF9qsi6Lg2mlAyas6zD1u8qL2SBJSi4NhmCxHZk2E2DeqKhT6PDnqjyYhe/5Q6Oxy I64kCOF2pUUKT3NvEzZZFoegfKceha9q0XDcOICaI7FIKPCDfoYcE6pHin0plQHQZclRdzQW6QtGQ2uT
pBQFo/5Ykpc9U/qaDs6deoylWLzPSOE5A8KVKc0alLcnoGB9HGXCgNo3E/uRuzwaCRRsTH0kVp0bIfal Iz7fD3XHYgfYM8WvaeHcqcMkisX7jBSeMyBcmdmqhqMjGjnrIikTetS8GdOPzOWhiKZgaXXBWHVunNiX
0yajy5Wj6oARy89aMKYhUtSxLYv2smcd9l22NQGT1sTwAC5K4TkDip6SzfEo3hQvKhW2DEflHgNm77tH RJuMNlOOygMGLD9rRlp9sKhjXRY6wJ512HfJ1mhMbwnnAVyUwnMGFD2Fm6NQsDFKVMprG4uKPXrM3Xef
Un4QdDY55tLXVe1391lKQxA/QQ5nh158nnMoUdRJKwntZ8sfNGPjcNF3cVs8il6Jh3aicEcKHxAwbKLw 2GxfaK1yNNDXVe539ZmL/RE1VQ5np058nncoRtRJLAzoZ8sfNGfDWNF3waYo5L8SBc004Y4U3strzDTh
l3OHAdNfihOVmBkbhqNiux6zduhRQYUTly2nQQio2mcU+xhzYQi0mYMpc+7nanqnsylgyFP+p8MUtbo/ L+cOPXJfihSVmDnrx6J0uw5lO3QopcKJTJfTIARU7jOIfYwpzx+aCd6UOddzFb3TWhXQZyn/02Hy210f
jJneEkeFqIc6W/mLFN49AFcHDeDFewNgCl8ajpmUmbLXdYgbJ4NxklJse5hNWZq1XYfyre7nmTTHcdky xuS2RVIh6hCWrvxFCu8aQHknDeDF+wNg8l4aiyLKTMnrWkROlsEwXSm23cylLJVt18Kx1fVcRHMcmS6D
6O1uvdLNOjGbfX3yACpoUP0GwFMwi5ZgkTQF91NI2UjOD0asVQbHihhxqphymk/+Qs+zbala1LHMDBMz zubSK96sFbPZ1ycPoJQG1W8APAVltATzpSl4kDzKRly2HyIsMthXhItTxThoPvkL3c/WpWGijrkoUMyg
6MsX65W26/pPARdhYRsVyBadTyMmhyt3jAwGe5D4zIPqS35zLPS5AjSjaZAr1V72HnjQ+Ru19xeh0JbT J1+sV9yh7T8FXIR5m6hAtmg9GjEZXLlpMuhtvuIzD6ov2a0R0GUKUE+kQa4MG2DvhgedvUHzYBEKmzKa
FA3nLoNPI4ar1+gIgpYC6MYrkd0YhalrtJi8WotxDVGIzw4Ug5sLQlC6xb2afOGiGONpRfVbhto85cQU Q+HcpfdoxHD1Guy+0FAA7RQl0htDMKtFgxmrNZhcH4KodB8xuCnHH8VbXKvJE+UUYwqtqH7LUJOlnBbv
ZzhqO5MemDquD+duA+0FdL5nyqDJkiGGfhlPO708HK7dep/2DK+EWtroTGVhvB2PlsK7ha9Rrr16cvDg DEJNV+ygqeP6cO7W015A5/sEGdSpMoTTL+NuJzmCUL5b59Ge4ZVQQxudsSSQt+OJUniX8DWqfK+OHAye
LHCqazoTMWWtBiOdETBQRox5QRjliqDiikX1G0avoutL5R5aQbt1UOcqb0ph74l4GNWp0Pi2CUUv+y5G BU51dVcMZq5RY7xzJPSUEUOWL1LKR1JxRaDqDcOAoutLxR5aQbu1CMtU3pTC3hfxMKpVofFtI/Jf9lyM
DzwdvLHU0Q7IVO03irucL10P7JN9j6iORKxDWCiF7S98HFfsSsCcw4m0Jzz4Sx4V9sW7YXmH7sHHMQtf bng6eGOppR2QqdxvEHc5T7pu2Cf7HlcVjAi7sEgK21/4OC7dFY15h2NoTxj8Sx4V9sW7oaNTO/hxzMIX
SAxFoWg8aRJ3r/v3hceBfVQdMKDxlAn66bRx+buQsFB1tqRVRdDxmSZuuU+SCa4HrotllywwO8O48h/u En1+ABpPGsXd68F94XFgH5UH9Gg8ZYQulzauoS4kLFSdbYmVI+n4TBS33CfJBNcD18WyS2aYnIFc+Q93
csoXSAudeEvOp6KW5nigmvAF29TRubH4XApSXFT1D3sp9QiP1lAUgvqTdNJdShUPFc+B4g/W4aJs+iAV OeULpJlOvCXnE1BDczxcTXiCbWrp3Gg6F4/4cqr6h72UuoVHq8/3R91JOukuJYiHivtAGQrW4aJs/iAB
9SeMYB/8j0lyO6AMIgYTAhEebQ1cTJeVG1mLhmDJxRSspfvd4rNmMa28EkroVGO4zX2L3zdj7fV00jVj dScMYB/8j0lyO6yMILwJgQgKtfg00WXlRuriUVhyMR5r6H7XdNYkppVXQiGdagy3ua/pfRPWXE8iXRNS
1AIVLTfFp+qcwAbyFUg8Q7B/v8JKIUQcwRvFTGJ+pEl2Rp2j6EmmW9Pk1hjUn6JbE/0Na6YbL8Nt7uN3 FqpouSk+DcvwqSdfPsQzBPsfUljJn4gkeKMoIhYEG2VnwjIUPXF0a5rRHo66U3Rror9hrXTjZbjNffwu
SXRjUo+V/6AyK46SbQGRTqgJ/ij271dYIYiIIUYRxcQCYg3Rohwy+CA5vhadJft+iFXRy6cooxqt6Imy lm5MYZPkP6hMiqNkm0MkEWEEfxT7H1JYwZcIJ1KIAmIh0UK0KUd5HyTH10JTZd+Psih6+RRlVBMVPSEW
yrpVKYqP5ZGDdpLuamIukU9YiCjCkwW/wiliJVYOI9gwltARBiKRMBFmIrUP/Mz9/F5PsL6WGEaEEgrC 2V1VvOJjefCInaS7mmggsgkzEUK4szCkcIpYiZUDCTaMILSEnoghjISJSOgDP3M/v9cRrK8hxhABhILw
R/CAgH8B/JidVBNDJ9YAAAAASUVORK5CYII= ENzL61/d2p1S7CtfNAAAAABJRU5ErkJggg==
</value> </value>
</data> </data>
<data name="tbtnSave.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="tbtnSave.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAIcSURBVFhH7ZdNaxNBGMefIpQKlkK/QLFiL4I3Wyx9uYhJ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIdSURBVFhH7ZdPaxNBGMbfIJQKlkK/QFHRi+BNS4t/LmLS
P0COZtt52Z1ntYfiN+hN9KL4AXzDFgS/gDepR2uhB4+9Fc+W0oqofWaYbHaaSbKzWYRA/vBjk5l5/vvP D5Bj3O7OzO68qx6C38Cb6MXSD9CqWKHQL+BN2mOr4MFjb8WzUlqR/nlnmGx2zCTZ2SxCIA/82GRm3mef
7LObBEbyaAzidIWol0aoGoj0lvULUKMxDjz5BBL/VYLAbetcUBLvdJgMzj3rXkBCLWeFHI/oE7wBmbwN zL67SWAih2oQpw+IRmm4rANPbxk/DzWbU8CSzyDwvBI4vjTOBSXwTo/J6Dwy7gXE5f2skOEBfYJ3IJL3
R70Ght+NzzoeQxxP2TP0UZwuZQEEvrKj5STUk8xLqg92tI/yAaR6b0fLSaoXbS/jF9mZHsoH4LhjR4uL /sgNiPCH9lnBQ4jjWXOGIYrTe1kAjutmtJy4fJV5CbllRocoH0DIj2a0nIRc7Xppv8DMDFA+AMNNM1pc
4wbtXGxeC3zuBGjiKbB0xsx11SABtrauUt1fU6sl8Fnm1YIlX2hmzMx7NUgAxiap7idxZt4L9TTzclCP DEPauVi/5vjWCtDCI4jSeT3XV6MEaLcvU92ZrlXi+Cbz6hAluzRT0/NOjRIgimao7hdxrN9z+TrzspAv
zbxXTg/gOztaTGl6DZrsj6nVcprQ4aOZ98oN0GNhF5nb1javxJc5rzY9d9YNoLdz0c6EieNtqv2R82oT 9LxTVg/gBzNaTGl6BVrhqa5VsprQYlvPO2UHGLCwj/Rta5pX4FrOq8vAnbUDqO1cMjN+Yniban/mvLp4
EECjm+qQ2KcHzLf+0DqBBxCx37a+k8AA1TOcASJ2UorWXZEnKIA2kWoNOJ8uRZLcJJ89xzNsB6ixBpXE BFCopvpO7NMD5utwaB3HbxCEf019L54Bqmc8AwTh71J07oo8XgGUiZDLwNhcKZLkBvnsWJ5+O0CNNaoE
1PEMvAS/qKs3QaYLwfBknvzq2ddyi+FswioJDHBGl6AJ4uGcaSh9LIpeH8d3gauvjuf/b0KFjmfwDkj1 ppan5yX4Q139HES64A1L7pJfI/ta7jCeTVglngGO6RI8Af70pm4odSyKWh/Hi8DknuX5/5tQouXpvQNC
AKS8ARs4a46X0eM+xKPrVE8/cs0jumCA/I9SF/2dEIbvIWRQu/ZsHulbx1tUJb0CRNEELfrcWVQRTXZO tkCI6xDiNX38FzXugj+7SvX0I1c/ogsGyP8otVHfCX64HkIa+cmczSF16ziLqmRQgCCYpkVfeosqohWe
u1yzZ+uiRuMKLV6lfvD/7SqLxPumL0ZyBHABC1BmYPLlTLYAAAAASUVORK5CYII= 0C7Xzdn6qNm8RIsfUj+4/3aVReBj3RcTWQK4AF41Zkfj/gngAAAAAElFTkSuQmCC
</value> </value>
</data> </data>
<data name="tbtnRun.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="tbtnRun.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAHnSURBVFhH7dfZK4RRGAbwzxKSklJKuVAuXCgXLlwoF8qF YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHnSURBVFhH7dfZK4RRGAbwzxKSklJKuVAuXCgXLlwoF8qF
Ev8Dg7GPfTf29d6fYd93Yx3bMDdISkqJZM8Yy8PRyPK9M987U74b3um5/j3nm3NOHel/fk6HOUnfYU5E Ev8Dg7GPfTf29d6fYd93Yx3bMDdISkqJZM8Yy8PRyPK9M987U74b3um5/j3nm3NOHel/fk6HOUnfYU5E
+3YC2rbj0bYVh1ZTLFpMMWjejEbTRhQaNyLRsB6B+rVw1K2FQb8ailpjCGqMwaheCULVciAqlwNQseSP +3YC2rbj0bYVh1ZTLFpMMWjejEbTRhQaNyLRsB6B+rVw1K2FQb8ailpjCGqMwaheCULVciAqlwNQseSP
8kU/lC/4omzBB6UGL72NoafTnIxfw+e9UWLwQvGcJ2zc9/nVlX/Bi2Y9UDjtLv8SquEz7ih4i439HDVx 8kU/lC/4omzBB6UGL72NoafTnIxfw+e9UWLwQvGcJ2zc9/nVlX/Bi2Y9UDjtLv8SquEz7ih4i439HDVx
3bSbvAAX372YxMe4iuumqALMlb/8+LmC509K8gLcz/6CJ1mcxfMmiALc//wZVjLO4LnjRAHuhnuCxW64 3bSbvAAX372YxMe4iuumqALMlb/8+LmC509K8gLcz/6CJ1mcxfMmiALc//wZVjLO4LnjRAHuhnuCxW64
eM4YUYCDiw33iDuH4eDZo0QBDi42nBU3ilHCs0aIAhxc7PYHXLLiCM8cJgpwcLHbLThnxx6uHSIKcHBx eM4YUYCDiw33iDuH4eDZo0QBDi42nBU3ilHCs0aIAhxc7PYHXLLiCM8cJgpwcLHbLThnxx6uHSIKcHBx
1O5xyo49XDtIFODg4qjd4YQVR3jGAFGAg4tzfotjxSjh6VQBDi7O+Q2OHIaDp/cTBTi4uGSucWg3XDyt 1O5xyo49XDtIFODg4qjd4YQVR3jGAFGAg4tzfotjxSjh6VQBDi7O+Q2OHIaDp/cTBTi4uGSucWg3XDyt
jyjAwcUlc4UDMs7gGqoABxc33CX2ZXEW1/QSBTi4uOEusPctruCpPUQBDi6uV+NZ1xu88x5XcboAA1e6 jyjAwcUlc4UDMs7gGqoABxc33CX2ZXEW1/QSBTi4uOEusPctruCpPUQBDi6uV+NZ1xu88x5XcboAA1e6
Xrk4WUBNnCwgHg1q4SndEv1AUQMXsXH0iEeD6iv/wyNJrzzCmH5Y8iSuAAAAAElFTkSuQmCC Xrk4WUBNnCwgHg1q4SndEv1AUQMXsXH0iEeD6iv/wyNJrzzCmH5Y8iSuAAAAAElFTkSuQmCC
</value> </value>
</data> </data>
<data name="tbtnDebug.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="tbtnDebug.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
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
rkJggg== gg==
</value> </value>
</data> </data>
<data name="tbtnExport.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="tbtnExport.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
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
AAAAAElFTkSuQmCC AAAAAElFTkSuQmCC
</value> </value>
</data> </data>
<data name="tbtnImport.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="tbtnImport.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
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
9Bdq9jSt+sit4QAAAABJRU5ErkJggg== Qv8A7O40mQFf7ZYAAAAASUVORK5CYII=
</value> </value>
</data> </data>
<metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <data name="tbtnGetPos.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>498, 17</value> <value>
</metadata> iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAATeSURBVFhHxVZJSGRXFBWcly7cKCK4cOFCFEGQtIiKG4Nu
FAVbsgmCihOkRRcdcaiKEIQmAUXBRJCItp1EhJgOZhHaMtEKiogjpbZDiOIQ24izpSfvvPrv++tbJYpC
Lhzum/5/55173/3fB/+z6QSefQ4kv3T5Z8Inq75pTHoNcpzrjGsVDGN3mU6Aiz/+QsCqeRMyVdswzzE1
bvYK9ybAhXz586+AQgGzN48Zx93mv76ZJxke7C5zCwEZ88GKb4FKA8z9u8C1BAnxQPcmwIVkzAf5gqbv
AYsBTW9cY9ILyDE1p6CNkwiVeJACTCQqYCTQMQy0/6p5Ad2LMXrV5ria43NSAUGA73sQAaUAT6AI/Dgu
YAd+0LwE2wIcc/ztRM9vh3htO5PrdQXEe/g+hvYuc09CkwI8ETccmQdsAvQjC1pf8zT79Dpa3zjQ+vO5
G4EHKWBOQklAyMuTcrO5v4B5A1T/6uoa3d3d6P9pHNbu92h4fSEJ8D1MwoddQyogYuemgCDAk3LDzX1g
64PwAluiTX9x6YTVakVvby9av7PhRfsGyr651EPwoFtAxp5ywEjg+MyFIwGSIAGLxYKqqiq8ffsLLB0j
+PTVJp6/cj7sGuohMChAAkw0nYA4MTemHZ/eKNDY2Ijy8nIUFhZi9Pc/UPnlO+Rat5Fpvbp/CKQCDIFZ
AZGETEASoPzq9PRUhNbQ0ICysjLk5+cjKysLf05M4ZM6GzJe7gkC165FXsw9B7RSrAgwB6gACTDh9Nhr
YJtWX1+P0tJS5OXlIS0tDampqbBPziDzs1EkvfiA62vvJG6HQBDQQ8BboF1DKkCYbwKNm5eUlCA3N1du
Hhsbi+TkZExML+Gj4jEcHh56JeEWAnMpVkmo1wAD1BiNJ6f8OTk5SElJQUREBAICAqQa7+wOTExM4Ojo
yCOJGwKaArcIsPIJyEoooFdErU/jRunp6cjIyEB0dDT8/f3h4+MjUVBQAIfDgampKRwfH7seMJgbAU+l
WEKr/XpfgH2CFhcXh/j4eERFRSEwMFDfXIHhmZmZkTg7066RZu5JaFLACIv2FdT79KJPi4yMRFhYGIKC
gm5trtDc3CxVWFxcxPn5uetBYV6TkKAS3qDmaSEhIXdurtDT0wO73Y7l5WVcXFzIZ28roP3RUAnlvbXp
aX5+fh43HB7WYmSy0dFRrK2t4fLy0pADWh0gCTOYG5lijt44xvU0tWFMTAyCg4P1fnZ2Nv7Z/1cWp6Ki
Ilmua2pq0N7ejunpaZyenroToArSi3AY+0xQ4xzbsi/aNG4WHh6O9Y0NmXCKgK+vL9bX1+XHqq+vD5OT
kzIPFhYWsLu7667AYyw0NBRzc3NoaWnB0tKS3FiRqK6uxuzsLIaGhmRBMtuTEBgbG0NdXR0qKirkySi9
IkByLEJtbW1YXV29VYyehEBXVxcqKysxMDAg5bXZbDoBgvP9/f0YHx93u4K0RxPgqfhHNDg4iM3NTezs
7MhTJiUl6QQSEhJwcnIir+H29rb2pMseTeDg4AArKyvyxUwqnnB/f18mHTdPTEyUBBkG/jewEBnt0QR4
WqfTqceWfmtrS/wrXsmPEI2J2dHRgaampqcn4MmY7VSGuVBbW4vi4mJ5FXkTnjwEnoynZ7llzDs7O2VF
nJ+fx97enl6CXQb8ByPXL/2UPF2mAAAAAElFTkSuQmCC
</value>
</data>
<metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>498, 17</value>
</metadata>
</root> </root>

File diff suppressed because it is too large Load Diff

View File

@ -37,6 +37,7 @@
"@typescript-eslint/parser": "^5.57.0", "@typescript-eslint/parser": "^5.57.0",
"@vitejs/plugin-vue": "^4.1.0", "@vitejs/plugin-vue": "^4.1.0",
"@vitejs/plugin-vue-jsx": "^3.0.1", "@vitejs/plugin-vue-jsx": "^3.0.1",
"@vue/compiler-sfc": "^3.3.7",
"@vue/runtime-core": "^3.2.47", "@vue/runtime-core": "^3.2.47",
"@vueuse/core": "^9.13.0", "@vueuse/core": "^9.13.0",
"@vueuse/integrations": "^9.13.0", "@vueuse/integrations": "^9.13.0",
@ -70,7 +71,7 @@
"unplugin-vue-components": "^0.24.1", "unplugin-vue-components": "^0.24.1",
"unplugin-vue-macros": "^1.11.2", "unplugin-vue-macros": "^1.11.2",
"unplugin-vue-router": "^0.5.4", "unplugin-vue-router": "^0.5.4",
"vite": "^4.2.1", "vite": "^4.5.0",
"vite-plugin-compression": "^0.5.1", "vite-plugin-compression": "^0.5.1",
"vite-plugin-inspect": "^0.7.18", "vite-plugin-inspect": "^0.7.18",
"vite-plugin-md": "^0.22.5", "vite-plugin-md": "^0.22.5",

View File

@ -101,6 +101,12 @@
<el-option v-for="item in QualifiedOptions" :key="item.value" :label="item.label" :value="item.value" /> <el-option v-for="item in QualifiedOptions" :key="item.value" :label="item.label" :value="item.value" />
</el-select> </el-select>
</div> </div>
<div>
修复
<el-select v-model="repairfiedValue" clearable placeholder="选择" style="width: 100px">
<el-option v-for="item in RepairfiedOptions" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</div>
<div> <div>
日期 日期
<!-- <el-date-picker <!-- <el-date-picker
@ -144,11 +150,27 @@
>{{ formatQualified(scope.row) }}</el-tag> >{{ formatQualified(scope.row) }}</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column fixed label="修复" width="80" >
<template #default="scope">
<el-tag size="small"
:type="scope.row.State===5?'success':scope.row.State===10?'danger':'primary'"
disable-transitions
>{{formatRepairfied(scope.row)}}</el-tag>
</template>
</el-table-column>
<el-table-column fixed prop="Abnormalities" label="异常情况" width="150" />
<el-table-column fixed prop="RepairCode" label="修复人员" width="100" />
<el-table-column label="比对" width="80" > <el-table-column label="比对" width="80" >
<template #default="scope"> <template #default="scope">
<el-text class="mx-1" size="small" :type="scope.row.CompareResult===2?'danger':'success'">{{formatCompareResult(scope.row)}}</el-text> <el-text class="mx-1" size="small" :type="scope.row.CompareResult===2?'danger':'success'">{{formatCompareResult(scope.row)}}</el-text>
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column prop="Tension1" label="张力1" width="80" :formatter="formatNum" /> <!-- <el-table-column prop="Tension1" label="张力1" width="80" :formatter="formatNum" />
<el-table-column prop="Tension2" label="张力2" width="80" :formatter="formatNum"/> <el-table-column prop="Tension2" label="张力2" width="80" :formatter="formatNum"/>
<el-table-column prop="Tension3" label="张力3" width="80" :formatter="formatNum"/> <el-table-column prop="Tension3" label="张力3" width="80" :formatter="formatNum"/>
@ -378,6 +400,7 @@ const productIdList=ref([])
const stepId=ref('') const stepId=ref('')
const compareResult = ref('') const compareResult = ref('')
const qualifiedValue = ref('') const qualifiedValue = ref('')
const repairfiedValue = ref('')
const dataList = ref([]) const dataList = ref([])
const orderHistoryList=ref([]) const orderHistoryList=ref([])
@ -409,6 +432,18 @@ const QualifiedOptions = [
label: '不合格', label: '不合格',
} }
] ]
const RepairfiedOptions = [
{
value: 0,
label: '未修复',
},{
value: 5,
label: '已修复',
},{
value: 10,
label: '异常',
}
]
const dialogFormVisible = ref(false) const dialogFormVisible = ref(false)
const dialogOrderHistoryVisible = ref(false) const dialogOrderHistoryVisible = ref(false)
@ -510,6 +545,9 @@ const loadData = (isExport=false) => {
req.domain.push({"FieldName": "CompareResult", "FieldValue": compareResult.value,"ConditionalType": 0}) req.domain.push({"FieldName": "CompareResult", "FieldValue": compareResult.value,"ConditionalType": 0})
if(qualifiedValue.value) if(qualifiedValue.value)
req.domain.push({"FieldName": "Qualified", "FieldValue": (qualifiedValue.value===1?qualifiedValue.value:0), "ConditionalType": 0}) req.domain.push({"FieldName": "Qualified", "FieldValue": (qualifiedValue.value===1?qualifiedValue.value:0), "ConditionalType": 0})
if(repairfiedValue.value)
req.domain.push({"FieldName": "State", "FieldValue": repairfiedValue.value, "ConditionalType": 0})
console.log('req',stepId.value,productIdList.value,req) console.log('req',stepId.value,productIdList.value,req)
// //
query_table(req).then(res=>{ query_table(req).then(res=>{
@ -564,11 +602,14 @@ const exExcel = (datas) => {
datas.forEach(data=>{ datas.forEach(data=>{
data.CreateTime=formatDateTime(data.CreateTime) data.CreateTime=formatDateTime(data.CreateTime)
data.CompareResult=formatCompareResult(data) data.CompareResult=formatCompareResult(data)
data.State=formatRepairfied(data)
if(CustomerVer.value!='A') if(CustomerVer.value!='A')
data.Qualified=formatQualified(data) data.Qualified=formatQualified(data)
}) })
let tableField = [ let tableField = [
"CreateTime","ProductName","ProductCode","StepName","SN","BatchId","Qualified","CompareResult", "CreateTime","ProductName","ProductCode","StepName","SN","BatchId","Qualified",
"State","Abnormalities","RepairCode",
"CompareResult",
"Tension1","Tension2","Tension3","Tension4","Tension5","TensionValue", "Tension1","Tension2","Tension3","Tension4","Tension5","TensionValue",
"Height1","Height2","Height3","Height4","Height5","HeightValue", "Height1","Height2","Height3","Height4","Height5","HeightValue",
"LineWidth1","LineWidth2","LineWidth3","LineWidth4","LineWidth5","LineWidth6","LineWidth7","LineWidth8","LineWidth9","LineWidthValue", "LineWidth1","LineWidth2","LineWidth3","LineWidth4","LineWidth5","LineWidth6","LineWidth7","LineWidth8","LineWidth9","LineWidthValue",
@ -583,6 +624,9 @@ const exExcel = (datas) => {
SN: "网版编码", SN: "网版编码",
BatchId: "批次", BatchId: "批次",
Qualified:"合格", Qualified:"合格",
State:"修复",
Abnormalities:"异常情况",
RepairCode:"修复人员",
CompareResult:"比对", CompareResult:"比对",
Tension1: "张力1", Tension1: "张力1",
Tension2: "张力2", Tension2: "张力2",
@ -799,6 +843,9 @@ const formatCompareResult=(row)=> {
const formatQualified=(row)=> { const formatQualified=(row)=> {
return row.Qualified==1?'合格':'不合格' return row.Qualified==1?'合格':'不合格'
} }
const formatRepairfied=(row)=> {
return row.State==5?'修复':( row.State==10?'异常':'未修复')
}
</script> </script>

View File

@ -8,7 +8,7 @@ export default defineConfig({
server: { server: {
proxy: {//代理转发 proxy: {//代理转发
"/api": { "/api": {
target: "http://localhost:18082",//转发到的目标地址 target: "http://127.0.0.1:18082",//转发到的目标地址
changeOrigin: true, changeOrigin: true,
// rewrite: (path) => path.replace(/^\/api/, ""),//转把时把URL中的/api/替换为空 // rewrite: (path) => path.replace(/^\/api/, ""),//转把时把URL中的/api/替换为空
}, },

View File

@ -121,7 +121,7 @@ namespace Models
public string Note { get; set; } public string Note { get; set; }
/// <summary> /// <summary>
/// 0-初始; 5-已检测 /// 0-初始; 5-已检测; 10-出现异常
/// </summary> /// </summary>
public int State { get; set; } public int State { get; set; }
@ -146,7 +146,16 @@ namespace Models
[SugarColumn(IsIgnore = true)] [SugarColumn(IsIgnore = true)]
//[Navigate(NavigateType.OneToMany, nameof(SizeTagData.Pid))] //[Navigate(NavigateType.OneToMany, nameof(SizeTagData.Pid))]
public List<SizeTagData> SizeTagDataList { get; set; } public List<SizeTagData> SizeTagDataList { get; set; }
//2023-10-30 添加异常列
/// <summary>
/// 异常情况
/// </summary>
public string Abnormalities { get; set; }
/// <summary>
/// 修复人员
/// </summary>
public string RepairCode { get; set; }
} }
[SugarIndex("index_{table}_pid", nameof(OrderHistory.Pid), OrderByType.Asc, isUnique: false)] [SugarIndex("index_{table}_pid", nameof(OrderHistory.Pid), OrderByType.Asc, isUnique: false)]
public class OrderHistory : BaseTable public class OrderHistory : BaseTable