修改项目文件

UAS-MES/Properties/DataSources/优软MES.Entity.ItemObject.datasource

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    This file is automatically generated by Visual Studio .Net. It is 
-    used to store generic object data source configuration information.  
-    Renaming the file extension or editing the content of this file may   
-    cause the file to be unrecognizable by the program.
--->
-<GenericObjectDataSource DisplayName="ItemObject" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>优软MES.Entity.ItemObject, 优软MES, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
-</GenericObjectDataSource>

UAS-MES/UAS-MES.csproj

@@ -12,31 +12,35 @@
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <IsWebBootstrapper>true</IsWebBootstrapper>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
     <TargetFrameworkProfile />
-    <SccProjectName>SAK</SccProjectName>
-    <SccLocalPath>SAK</SccLocalPath>
-    <SccAuxPath>SAK</SccAuxPath>
-    <SccProvider>SAK</SccProvider>
+    <SccProjectName>
+    </SccProjectName>
+    <SccLocalPath>
+    </SccLocalPath>
+    <SccAuxPath>
+    </SccAuxPath>
+    <SccProvider>
+    </SccProvider>
     <PublishUrl>F:\MESRelease\</PublishUrl>
     <Install>true</Install>
-    <InstallFrom>Web</InstallFrom>
+    <InstallFrom>Disk</InstallFrom>
     <UpdateEnabled>true</UpdateEnabled>
     <UpdateMode>Foreground</UpdateMode>
     <UpdateInterval>7</UpdateInterval>
     <UpdateIntervalUnits>Days</UpdateIntervalUnits>
     <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>true</UpdateRequired>
+    <UpdateRequired>false</UpdateRequired>
     <MapFileExtensions>true</MapFileExtensions>
-    <InstallUrl>http://218.17.158.219:8888/</InstallUrl>
+    <UpdateUrl>http://218.17.158.219:8888/publish.htm/</UpdateUrl>
     <TargetCulture>zh</TargetCulture>
     <ProductName>优软MES系统</ProductName>
     <PublisherName>深圳市优软科技有限公司</PublisherName>
     <SuiteName>优软MES系统</SuiteName>
     <MinimumRequiredVersion>1.0.0.59</MinimumRequiredVersion>
-    <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.htm</WebPage>
-    <ApplicationRevision>171</ApplicationRevision>
+    <OpenBrowserOnPublish>false</OpenBrowserOnPublish>
+    <ApplicationRevision>191</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>true</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
@@ -45,7 +49,7 @@
     <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
@@ -65,11 +69,10 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup>
-    <ManifestCertificateThumbprint>4FA99E585616700DE7B55D9E1B52AECEA80A31C9</ManifestCertificateThumbprint>
+    <ManifestCertificateThumbprint>0702B5BD480611CA32663309A8FD3717B722E307</ManifestCertificateThumbprint>
   </PropertyGroup>
   <PropertyGroup>
-    <ManifestKeyFile>
-    </ManifestKeyFile>
+    <ManifestKeyFile>Cert\深圳市优软科技有限公司.pfx</ManifestKeyFile>
   </PropertyGroup>
   <PropertyGroup>
     <GenerateManifests>true</GenerateManifests>
@@ -87,6 +90,17 @@
   <PropertyGroup>
     <ApplicationIcon>Resources\U_Icon.ico</ApplicationIcon>
   </PropertyGroup>
+  <PropertyGroup />
+  <PropertyGroup>
+    <Win32Resource>
+    </Win32Resource>
+  </PropertyGroup>
+  <PropertyGroup />
+  <PropertyGroup />
+  <PropertyGroup />
+  <PropertyGroup>
+    <NoWin32Manifest>true</NoWin32Manifest>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="DevComponents.DotNetBar2">
       <HintPath>Tool\DevComponents.DotNetBar2.dll</HintPath>
@@ -378,119 +392,139 @@
     <Compile Include="Form1.Designer.cs">
       <DependentUpon>Form1.cs</DependentUpon>
     </Compile>
-    <Compile Include="FunctionCode\Employee\Employee_ChooseUserToGroup.cs">
+    <Compile Include="FunctionCode\Make\Make_NewBadCode.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="FunctionCode\Employee\Employee_ChooseUserToGroup.Designer.cs">
-      <DependentUpon>Employee_ChooseUserToGroup.cs</DependentUpon>
+    <Compile Include="FunctionCode\Make\Make_NewBadCode.Designer.cs">
+      <DependentUpon>Make_NewBadCode.cs</DependentUpon>
     </Compile>
-    <Compile Include="FunctionCode\Employee\Employee_Data.cs">
+    <Compile Include="FunctionCode\Make\Make_NewMatainInf.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="FunctionCode\Employee\Employee_Data.Designer.cs">
-      <DependentUpon>Employee_Data.cs</DependentUpon>
+    <Compile Include="FunctionCode\Make\Make_NewMatainInf.Designer.cs">
+      <DependentUpon>Make_NewMatainInf.cs</DependentUpon>
     </Compile>
-    <Compile Include="FunctionCode\Employee\Employee_Group.cs">
+    <Compile Include="FunctionCode\Special\Special_MendLabel.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="FunctionCode\Employee\Employee_Group.Designer.cs">
-      <DependentUpon>Employee_Group.cs</DependentUpon>
+    <Compile Include="FunctionCode\Special\Special_MendLabel.Designer.cs">
+      <DependentUpon>Special_MendLabel.cs</DependentUpon>
     </Compile>
-    <Compile Include="FunctionCode\Employee\Employee_NewGroup.cs">
+    <Compile Include="Login.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="FunctionCode\Employee\Employee_NewGroup.Designer.cs">
-      <DependentUpon>Employee_NewGroup.cs</DependentUpon>
+    <Compile Include="Login.Designer.cs">
+      <DependentUpon>Login.cs</DependentUpon>
     </Compile>
-    <Compile Include="FunctionCode\Employee\Employee_Power.cs">
+    <Compile Include="Main.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="FunctionCode\Employee\Employee_Power.Designer.cs">
-      <DependentUpon>Employee_Power.cs</DependentUpon>
+    <Compile Include="Main.Designer.cs">
+      <DependentUpon>Main.cs</DependentUpon>
     </Compile>
-    <Compile Include="FunctionCode\Employee\Employee_PowerSarch.cs">
+    <Compile Include="FunctionCode\OQC\OQC_SamplingDataCollection.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="FunctionCode\Employee\Employee_PowerSarch.Designer.cs">
-      <DependentUpon>Employee_PowerSarch.cs</DependentUpon>
+    <Compile Include="FunctionCode\OQC\OQC_SamplingDataCollection.Designer.cs">
+      <DependentUpon>OQC_SamplingDataCollection.cs</DependentUpon>
     </Compile>
-    <Compile Include="FunctionCode\Make\Make_CartonBoxWeigh.cs">
+    <Compile Include="FunctionCode\OQC\OQC_BatchResultJudge.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="FunctionCode\Make\Make_CartonBoxWeigh.Designer.cs">
-      <DependentUpon>Make_CartonBoxWeigh.cs</DependentUpon>
+    <Compile Include="FunctionCode\OQC\OQC_BatchResultJudge.Designer.cs">
+      <DependentUpon>OQC_BatchResultJudge.cs</DependentUpon>
     </Compile>
-    <Compile Include="FunctionCode\Make\Make_CheckNoRelpace.cs">
+    <Compile Include="FunctionCode\OQC\OQC_PlanMaintain.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="FunctionCode\Make\Make_CheckNoRelpace.Designer.cs">
-      <DependentUpon>Make_CheckNoRelpace.cs</DependentUpon>
+    <Compile Include="FunctionCode\OQC\OQC_PlanMaintain.designer.cs">
+      <DependentUpon>OQC_PlanMaintain.cs</DependentUpon>
     </Compile>
-    <Compile Include="FunctionCode\Make\Make_ColorBoxWeigh.cs">
+    <Compile Include="FunctionCode\OQC\OQC_Inspection.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="FunctionCode\Make\Make_ColorBoxWeigh.Designer.cs">
-      <DependentUpon>Make_ColorBoxWeigh.cs</DependentUpon>
+    <Compile Include="FunctionCode\OQC\OQC_Inspection.Designer.cs">
+      <DependentUpon>OQC_Inspection.cs</DependentUpon>
     </Compile>
-    <Compile Include="FunctionCode\Make\Make_FeedingCollection.cs">
+    <Compile Include="Program.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="PublicForm\ChangePwd.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="FunctionCode\Make\Make_FeedingCollection.Designer.cs">
-      <DependentUpon>Make_FeedingCollection.cs</DependentUpon>
+    <Compile Include="PublicForm\ChangePwd.Designer.cs">
+      <DependentUpon>ChangePwd.cs</DependentUpon>
     </Compile>
-    <Compile Include="FunctionCode\Make\Make_LabelPrint.cs">
+    <Compile Include="PublicForm\DataChooseForm.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="FunctionCode\Make\Make_LabelPrint.Designer.cs">
-      <DependentUpon>Make_LabelPrint.cs</DependentUpon>
+    <Compile Include="PublicForm\DataChooseForm.Designer.cs">
+      <DependentUpon>DataChooseForm.cs</DependentUpon>
     </Compile>
-    <Compile Include="FunctionCode\Make\Make_NewBadCode.cs">
+    <Compile Include="PublicForm\SetLoadingWindow.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="FunctionCode\Make\Make_NewBadCode.Designer.cs">
-      <DependentUpon>Make_NewBadCode.cs</DependentUpon>
+    <Compile Include="PublicForm\SetLoadingWindow.Designer.cs">
+      <DependentUpon>SetLoadingWindow.cs</DependentUpon>
     </Compile>
-    <Compile Include="FunctionCode\Make\Make_NewMatainInf.cs">
+    <Compile Include="PublicMethod\AssemblyHelper.cs" />
+    <Compile Include="PublicMethod\AutoSizeFormClass.cs" />
+    <Compile Include="PublicMethod\BaseUtil.cs" />
+    <Compile Include="PublicMethod\DrawHelper.cs" />
+    <Compile Include="PublicMethod\Encryption.cs" />
+    <Compile Include="PublicMethod\ftpOperater.cs" />
+    <Compile Include="PublicMethod\GlobalEventsHandler.cs" />
+    <Compile Include="PublicMethod\LogicHandler.cs" />
+    <Compile Include="PublicMethod\ExceptionHandler.cs" />
+    <Compile Include="PublicMethod\LogManager.cs" />
+    <Compile Include="PublicMethod\LogStringBuilder.cs" />
+    <Compile Include="PublicMethod\Print.cs" />
+    <Compile Include="PublicMethod\ReadDataFromSerialPort.cs" />
+    <Compile Include="FunctionCode\SMT\SMT_Feeding.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="FunctionCode\Make\Make_NewMatainInf.Designer.cs">
-      <DependentUpon>Make_NewMatainInf.cs</DependentUpon>
+    <Compile Include="FunctionCode\SMT\SMT_Feeding.Designer.cs">
+      <DependentUpon>SMT_Feeding.cs</DependentUpon>
     </Compile>
-    <Compile Include="FunctionCode\Make\Make_NewPallet.cs">
+    <Compile Include="FunctionCode\SMT\SMT_MakeShift.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="FunctionCode\Make\Make_NewPallet.Designer.cs">
-      <DependentUpon>Make_NewPallet.cs</DependentUpon>
+    <Compile Include="FunctionCode\SMT\SMT_MakeShift.Designer.cs">
+      <DependentUpon>SMT_MakeShift.cs</DependentUpon>
     </Compile>
-    <Compile Include="FunctionCode\Make\Make_PackageCollection.cs">
+    <Compile Include="FunctionCode\SMT\SMT_PreMaterials.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="FunctionCode\Make\Make_PackageCollection.Designer.cs">
-      <DependentUpon>Make_PackageCollection.cs</DependentUpon>
+    <Compile Include="FunctionCode\SMT\SMT_PreMaterials.Designer.cs">
+      <DependentUpon>SMT_PreMaterials.cs</DependentUpon>
     </Compile>
-    <Compile Include="FunctionCode\Make\Make_PalletWeigh.cs">
+    <Compile Include="FunctionCode\SMT\SMT_MaterialsWaring.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="FunctionCode\Make\Make_PalletWeigh.Designer.cs">
-      <DependentUpon>Make_PalletWeigh.cs</DependentUpon>
+    <Compile Include="FunctionCode\SMT\SMT_MaterialsWaring.Designer.cs">
+      <DependentUpon>SMT_MaterialsWaring.cs</DependentUpon>
     </Compile>
-    <Compile Include="FunctionCode\Make\Make_PositionStock.cs">
+    <Compile Include="FunctionCode\SMT\SMT_WaringSetting.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="FunctionCode\Make\Make_PositionStock.Designer.cs">
-      <DependentUpon>Make_PositionStock.cs</DependentUpon>
+    <Compile Include="FunctionCode\SMT\SMT_WaringSetting.Designer.cs">
+      <DependentUpon>SMT_WaringSetting.cs</DependentUpon>
     </Compile>
-    <Compile Include="FunctionCode\Make\Make_Repair.cs">
+    <Compile Include="FunctionCode\SMT\SMT_ChangeLine.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="FunctionCode\Make\Make_Repair.Designer.cs">
-      <DependentUpon>Make_Repair.cs</DependentUpon>
+    <Compile Include="FunctionCode\SMT\SMT_ChangeLine.Designer.cs">
+      <DependentUpon>SMT_ChangeLine.cs</DependentUpon>
     </Compile>
-    <Compile Include="FunctionCode\Make\Make_SeqTransform.cs">
+    <Compile Include="FunctionCode\Make\Make_FeedingCollection.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="FunctionCode\Make\Make_SeqTransform.Designer.cs">
-      <DependentUpon>Make_SeqTransform.cs</DependentUpon>
+    <Compile Include="FunctionCode\Make\Make_FeedingCollection.Designer.cs">
+      <DependentUpon>Make_FeedingCollection.cs</DependentUpon>
     </Compile>
     <Compile Include="FunctionCode\Make\Make_SplitBoard.cs">
       <SubType>Form</SubType>
@@ -498,143 +532,143 @@
     <Compile Include="FunctionCode\Make\Make_SplitBoard.Designer.cs">
       <DependentUpon>Make_SplitBoard.cs</DependentUpon>
     </Compile>
-    <Compile Include="FunctionCode\Make\Make_TestCollection.cs">
+    <Compile Include="FunctionCode\Make\Make_PackageCollection.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="FunctionCode\Make\Make_TestCollection.Designer.cs">
-      <DependentUpon>Make_TestCollection.cs</DependentUpon>
+    <Compile Include="FunctionCode\Make\Make_PackageCollection.Designer.cs">
+      <DependentUpon>Make_PackageCollection.cs</DependentUpon>
     </Compile>
-    <Compile Include="FunctionCode\OQC\OQC_BatchResultJudge.cs">
+    <Compile Include="FunctionCode\Make\Make_CartonBoxWeigh.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="FunctionCode\OQC\OQC_BatchResultJudge.Designer.cs">
-      <DependentUpon>OQC_BatchResultJudge.cs</DependentUpon>
+    <Compile Include="FunctionCode\Make\Make_CartonBoxWeigh.Designer.cs">
+      <DependentUpon>Make_CartonBoxWeigh.cs</DependentUpon>
     </Compile>
-    <Compile Include="FunctionCode\OQC\OQC_Inspection.cs">
+    <Compile Include="FunctionCode\Make\Make_PositionStock.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="FunctionCode\OQC\OQC_Inspection.Designer.cs">
-      <DependentUpon>OQC_Inspection.cs</DependentUpon>
+    <Compile Include="FunctionCode\Make\Make_PositionStock.Designer.cs">
+      <DependentUpon>Make_PositionStock.cs</DependentUpon>
     </Compile>
-    <Compile Include="FunctionCode\OQC\OQC_PlanMaintain.cs">
+    <Compile Include="FunctionCode\Make\Make_CheckNoRelpace.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="FunctionCode\OQC\OQC_PlanMaintain.designer.cs">
-      <DependentUpon>OQC_PlanMaintain.cs</DependentUpon>
+    <Compile Include="FunctionCode\Make\Make_CheckNoRelpace.Designer.cs">
+      <DependentUpon>Make_CheckNoRelpace.cs</DependentUpon>
     </Compile>
-    <Compile Include="FunctionCode\OQC\OQC_SamplingDataCollection.cs">
+    <Compile Include="FunctionCode\Make\Make_SeqTransform.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="FunctionCode\OQC\OQC_SamplingDataCollection.Designer.cs">
-      <DependentUpon>OQC_SamplingDataCollection.cs</DependentUpon>
+    <Compile Include="FunctionCode\Make\Make_SeqTransform.Designer.cs">
+      <DependentUpon>Make_SeqTransform.cs</DependentUpon>
     </Compile>
-    <Compile Include="FunctionCode\Query\Quert_RealTime.cs">
+    <Compile Include="FunctionCode\Make\Make_ColorBoxWeigh.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="FunctionCode\Query\Quert_RealTime.Designer.cs">
-      <DependentUpon>Quert_RealTime.cs</DependentUpon>
+    <Compile Include="FunctionCode\Make\Make_ColorBoxWeigh.Designer.cs">
+      <DependentUpon>Make_ColorBoxWeigh.cs</DependentUpon>
     </Compile>
-    <Compile Include="FunctionCode\Query\Query_ExeProgress.cs">
+    <Compile Include="FunctionCode\Make\Make_NewPallet.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="FunctionCode\Query\Query_ExeProgress.Designer.cs">
-      <DependentUpon>Query_ExeProgress.cs</DependentUpon>
+    <Compile Include="FunctionCode\Make\Make_NewPallet.Designer.cs">
+      <DependentUpon>Make_NewPallet.cs</DependentUpon>
     </Compile>
-    <Compile Include="FunctionCode\Query\Query_OnlineTraceBack.cs">
+    <Compile Include="FunctionCode\Make\Make_LabelPrint.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="FunctionCode\Query\Query_OnlineTraceBack.Designer.cs">
-      <DependentUpon>Query_OnlineTraceBack.cs</DependentUpon>
+    <Compile Include="FunctionCode\Make\Make_LabelPrint.Designer.cs">
+      <DependentUpon>Make_LabelPrint.cs</DependentUpon>
     </Compile>
-    <Compile Include="FunctionCode\Query\Query_ProductTraceBack.cs">
+    <Compile Include="FunctionCode\Make\Make_PalletWeigh.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="FunctionCode\Query\Query_ProductTraceBack.Designer.cs">
-      <DependentUpon>Query_ProductTraceBack.cs</DependentUpon>
+    <Compile Include="FunctionCode\Make\Make_PalletWeigh.Designer.cs">
+      <DependentUpon>Make_PalletWeigh.cs</DependentUpon>
     </Compile>
-    <Compile Include="FunctionCode\SMT\SMT_ChangeLine.cs">
+    <Compile Include="FunctionCode\Make\Make_TestCollection.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="FunctionCode\SMT\SMT_ChangeLine.Designer.cs">
-      <DependentUpon>SMT_ChangeLine.cs</DependentUpon>
+    <Compile Include="FunctionCode\Make\Make_TestCollection.Designer.cs">
+      <DependentUpon>Make_TestCollection.cs</DependentUpon>
     </Compile>
-    <Compile Include="FunctionCode\SMT\SMT_Feeding.cs">
+    <Compile Include="FunctionCode\Make\Make_Repair.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="FunctionCode\SMT\SMT_Feeding.Designer.cs">
-      <DependentUpon>SMT_Feeding.cs</DependentUpon>
+    <Compile Include="FunctionCode\Make\Make_Repair.Designer.cs">
+      <DependentUpon>Make_Repair.cs</DependentUpon>
     </Compile>
-    <Compile Include="FunctionCode\SMT\SMT_MakeShift.cs">
+    <Compile Include="FunctionCode\Employee\Employee_Data.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="FunctionCode\SMT\SMT_MakeShift.Designer.cs">
-      <DependentUpon>SMT_MakeShift.cs</DependentUpon>
+    <Compile Include="FunctionCode\Employee\Employee_Data.Designer.cs">
+      <DependentUpon>Employee_Data.cs</DependentUpon>
     </Compile>
-    <Compile Include="FunctionCode\SMT\SMT_MaterialsWaring.cs">
+    <Compile Include="FunctionCode\Employee\Employee_Group.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="FunctionCode\SMT\SMT_MaterialsWaring.Designer.cs">
-      <DependentUpon>SMT_MaterialsWaring.cs</DependentUpon>
+    <Compile Include="FunctionCode\Employee\Employee_Group.Designer.cs">
+      <DependentUpon>Employee_Group.cs</DependentUpon>
     </Compile>
-    <Compile Include="FunctionCode\SMT\SMT_PreMaterials.cs">
+    <Compile Include="FunctionCode\Employee\Employee_ChooseUserToGroup.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="FunctionCode\SMT\SMT_PreMaterials.Designer.cs">
-      <DependentUpon>SMT_PreMaterials.cs</DependentUpon>
+    <Compile Include="FunctionCode\Employee\Employee_ChooseUserToGroup.Designer.cs">
+      <DependentUpon>Employee_ChooseUserToGroup.cs</DependentUpon>
     </Compile>
-    <Compile Include="FunctionCode\SMT\SMT_WaringSetting.cs">
+    <Compile Include="FunctionCode\Employee\Employee_NewGroup.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="FunctionCode\SMT\SMT_WaringSetting.Designer.cs">
-      <DependentUpon>SMT_WaringSetting.cs</DependentUpon>
+    <Compile Include="FunctionCode\Employee\Employee_NewGroup.Designer.cs">
+      <DependentUpon>Employee_NewGroup.cs</DependentUpon>
     </Compile>
-    <Compile Include="FunctionCode\Special\Special_BoxSplit.cs">
+    <Compile Include="FunctionCode\Employee\Employee_PowerSarch.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="FunctionCode\Special\Special_BoxSplit.Designer.cs">
-      <DependentUpon>Special_BoxSplit.cs</DependentUpon>
+    <Compile Include="FunctionCode\Employee\Employee_PowerSarch.Designer.cs">
+      <DependentUpon>Employee_PowerSarch.cs</DependentUpon>
     </Compile>
-    <Compile Include="FunctionCode\Special\Special_CancelCollection.cs">
+    <Compile Include="FunctionCode\Employee\Employee_Power.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="FunctionCode\Special\Special_CancelCollection.Designer.cs">
-      <DependentUpon>Special_CancelCollection.cs</DependentUpon>
+    <Compile Include="FunctionCode\Employee\Employee_Power.Designer.cs">
+      <DependentUpon>Employee_Power.cs</DependentUpon>
     </Compile>
-    <Compile Include="FunctionCode\Special\Special_MendLabel.cs">
+    <Compile Include="FunctionCode\Warehouse\Warehouse_FinishedProductIn.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="FunctionCode\Special\Special_MendLabel.Designer.cs">
-      <DependentUpon>Special_MendLabel.cs</DependentUpon>
+    <Compile Include="FunctionCode\Warehouse\Warehouse_FinishedProductIn.Designer.cs">
+      <DependentUpon>Warehouse_FinishedProductIn.cs</DependentUpon>
     </Compile>
-    <Compile Include="FunctionCode\Special\Special_MixPackage.cs">
+    <Compile Include="FunctionCode\Warehouse\Warehouse_FinishedProductOut.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="FunctionCode\Special\Special_MixPackage.Designer.cs">
-      <DependentUpon>Special_MixPackage.cs</DependentUpon>
+    <Compile Include="FunctionCode\Warehouse\Warehouse_FinishedProductOut.Designer.cs">
+      <DependentUpon>Warehouse_FinishedProductOut.cs</DependentUpon>
     </Compile>
-    <Compile Include="FunctionCode\Special\Special_QCForce.cs">
+    <Compile Include="FunctionCode\Warehouse\Warehouse_In.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="FunctionCode\Special\Special_QCForce.Designer.cs">
-      <DependentUpon>Special_QCForce.cs</DependentUpon>
+    <Compile Include="FunctionCode\Warehouse\Warehouse_In.Designer.cs">
+      <DependentUpon>Warehouse_In.cs</DependentUpon>
     </Compile>
-    <Compile Include="FunctionCode\Special\Special_SeqTransform.cs">
+    <Compile Include="FunctionCode\Warehouse\Warehouse_Out.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="FunctionCode\Special\Special_SeqTransform.Designer.cs">
-      <DependentUpon>Special_SeqTransform.cs</DependentUpon>
+    <Compile Include="FunctionCode\Warehouse\Warehouse_Out.Designer.cs">
+      <DependentUpon>Warehouse_Out.cs</DependentUpon>
     </Compile>
-    <Compile Include="FunctionCode\Stock\Sotck_StorageTransform.cs">
+    <Compile Include="FunctionCode\Stock\Stock_WarehouseTransform.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="FunctionCode\Stock\Sotck_StorageTransform.Designer.cs">
-      <DependentUpon>Sotck_StorageTransform.cs</DependentUpon>
+    <Compile Include="FunctionCode\Stock\Stock_WarehouseTransform.Designer.cs">
+      <DependentUpon>Stock_WarehouseTransform.cs</DependentUpon>
     </Compile>
-    <Compile Include="FunctionCode\Stock\Stock_BarcodeInf.cs">
+    <Compile Include="FunctionCode\Stock\Stock_Split.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="FunctionCode\Stock\Stock_BarcodeInf.Designer.cs">
-      <DependentUpon>Stock_BarcodeInf.cs</DependentUpon>
+    <Compile Include="FunctionCode\Stock\Stock_Split.Designer.cs">
+      <DependentUpon>Stock_Split.cs</DependentUpon>
     </Compile>
     <Compile Include="FunctionCode\Stock\Stock_Combine.cs">
       <SubType>Form</SubType>
@@ -642,116 +676,96 @@
     <Compile Include="FunctionCode\Stock\Stock_Combine.Designer.cs">
       <DependentUpon>Stock_Combine.cs</DependentUpon>
     </Compile>
-    <Compile Include="FunctionCode\Stock\Stock_Split.cs">
+    <Compile Include="FunctionCode\Stock\Sotck_StorageTransform.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="FunctionCode\Stock\Stock_Split.Designer.cs">
-      <DependentUpon>Stock_Split.cs</DependentUpon>
+    <Compile Include="FunctionCode\Stock\Sotck_StorageTransform.Designer.cs">
+      <DependentUpon>Sotck_StorageTransform.cs</DependentUpon>
     </Compile>
-    <Compile Include="FunctionCode\Stock\Stock_WarehouseTransform.cs">
+    <Compile Include="FunctionCode\Stock\Stock_BarcodeInf.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="FunctionCode\Stock\Stock_WarehouseTransform.Designer.cs">
-      <DependentUpon>Stock_WarehouseTransform.cs</DependentUpon>
+    <Compile Include="FunctionCode\Stock\Stock_BarcodeInf.Designer.cs">
+      <DependentUpon>Stock_BarcodeInf.cs</DependentUpon>
     </Compile>
-    <Compile Include="FunctionCode\SystemSetting\SystemSetting_LabelMaintain.cs">
+    <Compile Include="FunctionCode\Query\Query_ProductTraceBack.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="FunctionCode\SystemSetting\SystemSetting_LabelMaintain.Designer.cs">
-      <DependentUpon>SystemSetting_LabelMaintain.cs</DependentUpon>
+    <Compile Include="FunctionCode\Query\Query_ProductTraceBack.Designer.cs">
+      <DependentUpon>Query_ProductTraceBack.cs</DependentUpon>
     </Compile>
-    <Compile Include="FunctionCode\SystemSetting\SystemSetting_PrinterTest.cs">
+    <Compile Include="FunctionCode\Query\Query_ExeProgress.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="FunctionCode\SystemSetting\SystemSetting_PrinterTest.Designer.cs">
-      <DependentUpon>SystemSetting_PrinterTest.cs</DependentUpon>
+    <Compile Include="FunctionCode\Query\Query_ExeProgress.Designer.cs">
+      <DependentUpon>Query_ExeProgress.cs</DependentUpon>
     </Compile>
-    <Compile Include="FunctionCode\SystemSetting\SystemSetting_ScaleTest.cs">
+    <Compile Include="FunctionCode\Query\Query_OnlineTraceBack.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="FunctionCode\SystemSetting\SystemSetting_ScaleTest.Designer.cs">
-      <DependentUpon>SystemSetting_ScaleTest.cs</DependentUpon>
+    <Compile Include="FunctionCode\Query\Query_OnlineTraceBack.Designer.cs">
+      <DependentUpon>Query_OnlineTraceBack.cs</DependentUpon>
     </Compile>
-    <Compile Include="FunctionCode\SystemSetting\SystemSetting_SysNav.cs">
+    <Compile Include="FunctionCode\Query\Quert_RealTime.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="FunctionCode\SystemSetting\SystemSetting_SysNav.Designer.cs">
-      <DependentUpon>SystemSetting_SysNav.cs</DependentUpon>
+    <Compile Include="FunctionCode\Query\Quert_RealTime.Designer.cs">
+      <DependentUpon>Quert_RealTime.cs</DependentUpon>
     </Compile>
-    <Compile Include="FunctionCode\Warehouse\Warehouse_FinishedProductIn.cs">
+    <Compile Include="FunctionCode\Special\Special_QCForce.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="FunctionCode\Warehouse\Warehouse_FinishedProductIn.Designer.cs">
-      <DependentUpon>Warehouse_FinishedProductIn.cs</DependentUpon>
+    <Compile Include="FunctionCode\Special\Special_QCForce.Designer.cs">
+      <DependentUpon>Special_QCForce.cs</DependentUpon>
     </Compile>
-    <Compile Include="FunctionCode\Warehouse\Warehouse_FinishedProductOut.cs">
+    <Compile Include="FunctionCode\Special\Special_CancelCollection.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="FunctionCode\Warehouse\Warehouse_FinishedProductOut.Designer.cs">
-      <DependentUpon>Warehouse_FinishedProductOut.cs</DependentUpon>
+    <Compile Include="FunctionCode\Special\Special_CancelCollection.Designer.cs">
+      <DependentUpon>Special_CancelCollection.cs</DependentUpon>
     </Compile>
-    <Compile Include="FunctionCode\Warehouse\Warehouse_In.cs">
+    <Compile Include="FunctionCode\Special\Special_SeqTransform.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="FunctionCode\Warehouse\Warehouse_In.Designer.cs">
-      <DependentUpon>Warehouse_In.cs</DependentUpon>
+    <Compile Include="FunctionCode\Special\Special_SeqTransform.Designer.cs">
+      <DependentUpon>Special_SeqTransform.cs</DependentUpon>
     </Compile>
-    <Compile Include="FunctionCode\Warehouse\Warehouse_Out.cs">
+    <Compile Include="FunctionCode\Special\Special_BoxSplit.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="FunctionCode\Warehouse\Warehouse_Out.Designer.cs">
-      <DependentUpon>Warehouse_Out.cs</DependentUpon>
+    <Compile Include="FunctionCode\Special\Special_BoxSplit.Designer.cs">
+      <DependentUpon>Special_BoxSplit.cs</DependentUpon>
     </Compile>
-    <Compile Include="Login.cs">
+    <Compile Include="FunctionCode\Special\Special_MixPackage.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Login.Designer.cs">
-      <DependentUpon>Login.cs</DependentUpon>
+    <Compile Include="FunctionCode\Special\Special_MixPackage.Designer.cs">
+      <DependentUpon>Special_MixPackage.cs</DependentUpon>
     </Compile>
-    <Compile Include="Main.cs">
+    <Compile Include="FunctionCode\SystemSetting\SystemSetting_LabelMaintain.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Main.Designer.cs">
-      <DependentUpon>Main.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Include="PublicForm\ChangePwd.cs">
+    <Compile Include="FunctionCode\SystemSetting\SystemSetting_LabelMaintain.Designer.cs">
+      <DependentUpon>SystemSetting_LabelMaintain.cs</DependentUpon>
+    </Compile>
+    <Compile Include="FunctionCode\SystemSetting\SystemSetting_SysNav.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="PublicForm\ChangePwd.Designer.cs">
-      <DependentUpon>ChangePwd.cs</DependentUpon>
+    <Compile Include="FunctionCode\SystemSetting\SystemSetting_SysNav.Designer.cs">
+      <DependentUpon>SystemSetting_SysNav.cs</DependentUpon>
     </Compile>
-    <Compile Include="PublicForm\DataChooseForm.cs">
+    <Compile Include="FunctionCode\SystemSetting\SystemSetting_PrinterTest.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="PublicForm\DataChooseForm.Designer.cs">
-      <DependentUpon>DataChooseForm.cs</DependentUpon>
+    <Compile Include="FunctionCode\SystemSetting\SystemSetting_PrinterTest.Designer.cs">
+      <DependentUpon>SystemSetting_PrinterTest.cs</DependentUpon>
     </Compile>
-    <Compile Include="PublicForm\SetLoadingWindow.cs">
+    <Compile Include="FunctionCode\SystemSetting\SystemSetting_ScaleTest.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="PublicForm\SetLoadingWindow.Designer.cs">
-      <DependentUpon>SetLoadingWindow.cs</DependentUpon>
+    <Compile Include="FunctionCode\SystemSetting\SystemSetting_ScaleTest.Designer.cs">
+      <DependentUpon>SystemSetting_ScaleTest.cs</DependentUpon>
     </Compile>
-    <Compile Include="PublicMethod\AssemblyHelper.cs" />
-    <Compile Include="PublicMethod\AutoSizeFormClass.cs" />
-    <Compile Include="PublicMethod\BaseUtil.cs" />
-    <Compile Include="PublicMethod\DrawHelper.cs" />
-    <Compile Include="PublicMethod\Encryption.cs" />
-    <Compile Include="PublicMethod\ftpOperater.cs" />
-    <Compile Include="PublicMethod\GlobalEventsHandler.cs" />
-    <Compile Include="PublicMethod\LogicHandler.cs" />
-    <Compile Include="PublicMethod\ExceptionHandler.cs" />
-    <Compile Include="PublicMethod\LogManager.cs" />
-    <Compile Include="PublicMethod\LogStringBuilder.cs" />
-    <Compile Include="PublicMethod\Print.cs" />
-    <Compile Include="PublicMethod\ReadDataFromSerialPort.cs" />
     <EmbeddedResource Include="CustomControl\AccordionMenu\AccordionMenu.resx">
       <DependentUpon>AccordionMenu.cs</DependentUpon>
     </EmbeddedResource>
@@ -827,95 +841,46 @@
     <EmbeddedResource Include="Form1.resx">
       <DependentUpon>Form1.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="FunctionCode\Employee\Employee_ChooseUserToGroup.resx">
-      <DependentUpon>Employee_ChooseUserToGroup.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="FunctionCode\Employee\Employee_Data.resx">
-      <DependentUpon>Employee_Data.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="FunctionCode\Employee\Employee_Group.resx">
-      <DependentUpon>Employee_Group.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="FunctionCode\Employee\Employee_NewGroup.resx">
-      <DependentUpon>Employee_NewGroup.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="FunctionCode\Employee\Employee_Power.resx">
-      <DependentUpon>Employee_Power.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="FunctionCode\Employee\Employee_PowerSarch.resx">
-      <DependentUpon>Employee_PowerSarch.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="FunctionCode\Make\Make_CartonBoxWeigh.resx">
-      <DependentUpon>Make_CartonBoxWeigh.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="FunctionCode\Make\Make_CheckNoRelpace.resx">
-      <DependentUpon>Make_CheckNoRelpace.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="FunctionCode\Make\Make_ColorBoxWeigh.resx">
-      <DependentUpon>Make_ColorBoxWeigh.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="FunctionCode\Make\Make_FeedingCollection.resx">
-      <DependentUpon>Make_FeedingCollection.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="FunctionCode\Make\Make_LabelPrint.resx">
-      <DependentUpon>Make_LabelPrint.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="FunctionCode\Make\Make_NewBadCode.resx">
       <DependentUpon>Make_NewBadCode.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="FunctionCode\Make\Make_NewMatainInf.resx">
       <DependentUpon>Make_NewMatainInf.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="FunctionCode\Make\Make_NewPallet.resx">
-      <DependentUpon>Make_NewPallet.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="FunctionCode\Make\Make_PackageCollection.resx">
-      <DependentUpon>Make_PackageCollection.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="FunctionCode\Make\Make_PalletWeigh.resx">
-      <DependentUpon>Make_PalletWeigh.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="FunctionCode\Make\Make_PositionStock.resx">
-      <DependentUpon>Make_PositionStock.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="FunctionCode\Make\Make_Repair.resx">
-      <DependentUpon>Make_Repair.cs</DependentUpon>
+    <EmbeddedResource Include="FunctionCode\Special\Special_MendLabel.resx">
+      <DependentUpon>Special_MendLabel.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="FunctionCode\Make\Make_SeqTransform.resx">
-      <DependentUpon>Make_SeqTransform.cs</DependentUpon>
+    <EmbeddedResource Include="Login.resx">
+      <DependentUpon>Login.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="FunctionCode\Make\Make_SplitBoard.resx">
-      <DependentUpon>Make_SplitBoard.cs</DependentUpon>
+    <EmbeddedResource Include="Main.resx">
+      <DependentUpon>Main.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="FunctionCode\Make\Make_TestCollection.resx">
-      <DependentUpon>Make_TestCollection.cs</DependentUpon>
+    <EmbeddedResource Include="FunctionCode\OQC\OQC_SamplingDataCollection.resx">
+      <DependentUpon>OQC_SamplingDataCollection.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="FunctionCode\OQC\OQC_BatchResultJudge.resx">
       <DependentUpon>OQC_BatchResultJudge.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="FunctionCode\OQC\OQC_Inspection.resx">
-      <DependentUpon>OQC_Inspection.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="FunctionCode\OQC\OQC_PlanMaintain.resx">
       <DependentUpon>OQC_PlanMaintain.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="FunctionCode\OQC\OQC_SamplingDataCollection.resx">
-      <DependentUpon>OQC_SamplingDataCollection.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="FunctionCode\Query\Quert_RealTime.resx">
-      <DependentUpon>Quert_RealTime.cs</DependentUpon>
+    <EmbeddedResource Include="FunctionCode\OQC\OQC_Inspection.resx">
+      <DependentUpon>OQC_Inspection.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="FunctionCode\Query\Query_ExeProgress.resx">
-      <DependentUpon>Query_ExeProgress.cs</DependentUpon>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <SubType>Designer</SubType>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
-    <EmbeddedResource Include="FunctionCode\Query\Query_OnlineTraceBack.resx">
-      <DependentUpon>Query_OnlineTraceBack.cs</DependentUpon>
+    <EmbeddedResource Include="PublicForm\ChangePwd.resx">
+      <DependentUpon>ChangePwd.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="FunctionCode\Query\Query_ProductTraceBack.resx">
-      <DependentUpon>Query_ProductTraceBack.cs</DependentUpon>
+    <EmbeddedResource Include="PublicForm\DataChooseForm.resx">
+      <DependentUpon>DataChooseForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="FunctionCode\SMT\SMT_ChangeLine.resx">
-      <DependentUpon>SMT_ChangeLine.cs</DependentUpon>
+    <EmbeddedResource Include="PublicForm\SetLoadingWindow.resx">
+      <DependentUpon>SetLoadingWindow.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="FunctionCode\SMT\SMT_Feeding.resx">
       <DependentUpon>SMT_Feeding.cs</DependentUpon>
@@ -923,50 +888,74 @@
     <EmbeddedResource Include="FunctionCode\SMT\SMT_MakeShift.resx">
       <DependentUpon>SMT_MakeShift.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="FunctionCode\SMT\SMT_MaterialsWaring.resx">
-      <DependentUpon>SMT_MaterialsWaring.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="FunctionCode\SMT\SMT_PreMaterials.resx">
       <DependentUpon>SMT_PreMaterials.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="FunctionCode\SMT\SMT_MaterialsWaring.resx">
+      <DependentUpon>SMT_MaterialsWaring.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="FunctionCode\SMT\SMT_WaringSetting.resx">
       <DependentUpon>SMT_WaringSetting.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="FunctionCode\Special\Special_BoxSplit.resx">
-      <DependentUpon>Special_BoxSplit.cs</DependentUpon>
+    <EmbeddedResource Include="FunctionCode\SMT\SMT_ChangeLine.resx">
+      <DependentUpon>SMT_ChangeLine.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="FunctionCode\Special\Special_CancelCollection.resx">
-      <DependentUpon>Special_CancelCollection.cs</DependentUpon>
+    <EmbeddedResource Include="FunctionCode\Make\Make_FeedingCollection.resx">
+      <DependentUpon>Make_FeedingCollection.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="FunctionCode\Special\Special_MendLabel.resx">
-      <DependentUpon>Special_MendLabel.cs</DependentUpon>
+    <EmbeddedResource Include="FunctionCode\Make\Make_SplitBoard.resx">
+      <DependentUpon>Make_SplitBoard.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="FunctionCode\Special\Special_MixPackage.resx">
-      <DependentUpon>Special_MixPackage.cs</DependentUpon>
+    <EmbeddedResource Include="FunctionCode\Make\Make_PackageCollection.resx">
+      <DependentUpon>Make_PackageCollection.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="FunctionCode\Special\Special_QCForce.resx">
-      <DependentUpon>Special_QCForce.cs</DependentUpon>
+    <EmbeddedResource Include="FunctionCode\Make\Make_CartonBoxWeigh.resx">
+      <DependentUpon>Make_CartonBoxWeigh.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="FunctionCode\Special\Special_SeqTransform.resx">
-      <DependentUpon>Special_SeqTransform.cs</DependentUpon>
+    <EmbeddedResource Include="FunctionCode\Make\Make_PositionStock.resx">
+      <DependentUpon>Make_PositionStock.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="FunctionCode\Stock\Stock_Split.resx">
-      <DependentUpon>Stock_Split.cs</DependentUpon>
+    <EmbeddedResource Include="FunctionCode\Make\Make_CheckNoRelpace.resx">
+      <DependentUpon>Make_CheckNoRelpace.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="FunctionCode\Stock\Stock_WarehouseTransform.resx">
-      <DependentUpon>Stock_WarehouseTransform.cs</DependentUpon>
+    <EmbeddedResource Include="FunctionCode\Make\Make_SeqTransform.resx">
+      <DependentUpon>Make_SeqTransform.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="FunctionCode\SystemSetting\SystemSetting_LabelMaintain.resx">
-      <DependentUpon>SystemSetting_LabelMaintain.cs</DependentUpon>
+    <EmbeddedResource Include="FunctionCode\Make\Make_ColorBoxWeigh.resx">
+      <DependentUpon>Make_ColorBoxWeigh.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="FunctionCode\SystemSetting\SystemSetting_PrinterTest.resx">
-      <DependentUpon>SystemSetting_PrinterTest.cs</DependentUpon>
+    <EmbeddedResource Include="FunctionCode\Make\Make_NewPallet.resx">
+      <DependentUpon>Make_NewPallet.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="FunctionCode\SystemSetting\SystemSetting_ScaleTest.resx">
-      <DependentUpon>SystemSetting_ScaleTest.cs</DependentUpon>
+    <EmbeddedResource Include="FunctionCode\Make\Make_LabelPrint.resx">
+      <DependentUpon>Make_LabelPrint.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="FunctionCode\SystemSetting\SystemSetting_SysNav.resx">
-      <DependentUpon>SystemSetting_SysNav.cs</DependentUpon>
+    <EmbeddedResource Include="FunctionCode\Make\Make_PalletWeigh.resx">
+      <DependentUpon>Make_PalletWeigh.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="FunctionCode\Make\Make_TestCollection.resx">
+      <DependentUpon>Make_TestCollection.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="FunctionCode\Make\Make_Repair.resx">
+      <DependentUpon>Make_Repair.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="FunctionCode\Employee\Employee_NewGroup.resx">
+      <DependentUpon>Employee_NewGroup.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="FunctionCode\Employee\Employee_PowerSarch.resx">
+      <DependentUpon>Employee_PowerSarch.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="FunctionCode\Employee\Employee_Data.resx">
+      <DependentUpon>Employee_Data.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="FunctionCode\Employee\Employee_Group.resx">
+      <DependentUpon>Employee_Group.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="FunctionCode\Employee\Employee_ChooseUserToGroup.resx">
+      <DependentUpon>Employee_ChooseUserToGroup.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="FunctionCode\Employee\Employee_Power.resx">
+      <DependentUpon>Employee_Power.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="FunctionCode\Warehouse\Warehouse_FinishedProductIn.resx">
       <DependentUpon>Warehouse_FinishedProductIn.cs</DependentUpon>
@@ -980,27 +969,52 @@
     <EmbeddedResource Include="FunctionCode\Warehouse\Warehouse_Out.resx">
       <DependentUpon>Warehouse_Out.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Login.resx">
-      <DependentUpon>Login.cs</DependentUpon>
+    <EmbeddedResource Include="FunctionCode\Stock\Stock_WarehouseTransform.resx">
+      <DependentUpon>Stock_WarehouseTransform.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Main.resx">
-      <DependentUpon>Main.cs</DependentUpon>
+    <EmbeddedResource Include="FunctionCode\Stock\Stock_Split.resx">
+      <DependentUpon>Stock_Split.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <SubType>Designer</SubType>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    <EmbeddedResource Include="FunctionCode\Query\Query_ProductTraceBack.resx">
+      <DependentUpon>Query_ProductTraceBack.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="PublicForm\ChangePwd.resx">
-      <DependentUpon>ChangePwd.cs</DependentUpon>
+    <EmbeddedResource Include="FunctionCode\Query\Query_ExeProgress.resx">
+      <DependentUpon>Query_ExeProgress.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="PublicForm\DataChooseForm.resx">
-      <DependentUpon>DataChooseForm.cs</DependentUpon>
+    <EmbeddedResource Include="FunctionCode\Query\Query_OnlineTraceBack.resx">
+      <DependentUpon>Query_OnlineTraceBack.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="PublicForm\SetLoadingWindow.resx">
-      <DependentUpon>SetLoadingWindow.cs</DependentUpon>
+    <EmbeddedResource Include="FunctionCode\Query\Quert_RealTime.resx">
+      <DependentUpon>Quert_RealTime.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="FunctionCode\Special\Special_QCForce.resx">
+      <DependentUpon>Special_QCForce.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="FunctionCode\Special\Special_CancelCollection.resx">
+      <DependentUpon>Special_CancelCollection.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="FunctionCode\Special\Special_SeqTransform.resx">
+      <DependentUpon>Special_SeqTransform.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="FunctionCode\Special\Special_BoxSplit.resx">
+      <DependentUpon>Special_BoxSplit.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="FunctionCode\Special\Special_MixPackage.resx">
+      <DependentUpon>Special_MixPackage.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="FunctionCode\SystemSetting\SystemSetting_LabelMaintain.resx">
+      <DependentUpon>SystemSetting_LabelMaintain.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="FunctionCode\SystemSetting\SystemSetting_SysNav.resx">
+      <DependentUpon>SystemSetting_SysNav.cs</DependentUpon>
     </EmbeddedResource>
-    <None Include="Properties\DataSources\优软MES.Entity.ItemObject.datasource" />
+    <EmbeddedResource Include="FunctionCode\SystemSetting\SystemSetting_PrinterTest.resx">
+      <DependentUpon>SystemSetting_PrinterTest.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="FunctionCode\SystemSetting\SystemSetting_ScaleTest.resx">
+      <DependentUpon>SystemSetting_ScaleTest.cs</DependentUpon>
+    </EmbeddedResource>
+    <None Include="Cert\深圳市优软科技有限公司.pfx" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -1093,6 +1107,7 @@
     <Content Include="Resources\People_48px_500819_easyicon.net.png" />
     <Content Include="Resources\plus.gif" />
     <Content Include="Resources\preview_16px_25980_easyicon.net.png" />
+    <None Include="Resources\refresh.png" />
     <Content Include="Resources\search_16px_1202802_easyicon.net.png" />
     <Content Include="Resources\Sound\Windows Background.wav" />
     <Content Include="Resources\two_arrow_left.png" />
@@ -1419,6 +1434,9 @@
       <FileType>Assembly</FileType>
     </PublishFile>
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\DataSources\" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.