项目文件提交

UAS-MES/UAS-MES.csproj

@@ -38,11 +38,11 @@
     <ProductName>优软MES系统</ProductName>
     <PublisherName>深圳市优软科技有限公司</PublisherName>
     <SuiteName>优软MES系统</SuiteName>
-    <MinimumRequiredVersion>1.0.0.490</MinimumRequiredVersion>
+    <MinimumRequiredVersion>1.0.0.524</MinimumRequiredVersion>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.htm</WebPage>
     <OpenBrowserOnPublish>false</OpenBrowserOnPublish>
-    <ApplicationRevision>491</ApplicationRevision>
+    <ApplicationRevision>525</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>true</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
@@ -116,6 +116,15 @@
     <Reference Include="DevComponents.DotNetBar2">
       <HintPath>Tool\DevComponents.DotNetBar2.dll</HintPath>
     </Reference>
+    <Reference Include="DevExpress.Data.v15.2">
+      <HintPath>Tool\DevExpress.Data.v15.2.dll</HintPath>
+    </Reference>
+    <Reference Include="DevExpress.Utils.v15.2">
+      <HintPath>Tool\DevExpress.Utils.v15.2.dll</HintPath>
+    </Reference>
+    <Reference Include="DevExpress.XtraNavBar.v15.2">
+      <HintPath>Tool\DevExpress.XtraNavBar.v15.2.dll</HintPath>
+    </Reference>
     <Reference Include="ExcelHelper">
       <HintPath>Tool\ExcelHelper.dll</HintPath>
     </Reference>
@@ -165,6 +174,12 @@
     <Compile Include="CustomControl\AccordionMenu\AccordionMenu.Designer.cs">
       <DependentUpon>AccordionMenu.cs</DependentUpon>
     </Compile>
+    <Compile Include="CustomControl\AccordionMenu\NavagationBar.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="CustomControl\AccordionMenu\NavagationBar.Designer.cs">
+      <DependentUpon>NavagationBar.cs</DependentUpon>
+    </Compile>
     <Compile Include="CustomControl\BaseForm\BaseForm.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -219,6 +234,12 @@
     <Compile Include="CustomControl\ComBoxWithFocus\ComBoxWithFocus.Designer.cs">
       <DependentUpon>ComBoxWithFocus.cs</DependentUpon>
     </Compile>
+    <Compile Include="CustomControl\ComBoxWithFocus\ComboxWithTip.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="CustomControl\ComBoxWithFocus\ComboxWithTip.Designer.cs">
+      <DependentUpon>ComboxWithTip.cs</DependentUpon>
+    </Compile>
     <Compile Include="CustomControl\ComBoxWithFocus\PrinterCombox.cs">
       <SubType>UserControl</SubType>
     </Compile>
@@ -358,6 +379,12 @@
     <Compile Include="CustomControl\TextBoxWithIcon\NumOnlyTextBox.Designer.cs">
       <DependentUpon>NumOnlyTextBox.cs</DependentUpon>
     </Compile>
+    <Compile Include="CustomControl\TextBoxWithIcon\RoundTextBox.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="CustomControl\TextBoxWithIcon\RoundTextBox.Designer.cs">
+      <DependentUpon>RoundTextBox.cs</DependentUpon>
+    </Compile>
     <Compile Include="CustomControl\TextBoxWithIcon\SearchTextBox.cs">
       <SubType>UserControl</SubType>
     </Compile>
@@ -461,6 +488,12 @@
     <Compile Include="FunctionCode\Make\Make_BigBoxWeight.Designer.cs">
       <DependentUpon>Make_BigBoxWeight.cs</DependentUpon>
     </Compile>
+    <Compile Include="FunctionCode\Make\Make_CartonBoxSNWeigh.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="FunctionCode\Make\Make_CartonBoxSNWeigh.Designer.cs">
+      <DependentUpon>Make_CartonBoxSNWeigh.cs</DependentUpon>
+    </Compile>
     <Compile Include="FunctionCode\Make\Make_CollectBTMAC.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -569,6 +602,12 @@
     <Compile Include="FunctionCode\Make\Make_PalletWeightRecord.Designer.cs">
       <DependentUpon>Make_PalletWeightRecord.cs</DependentUpon>
     </Compile>
+    <Compile Include="FunctionCode\Make\Make_PalletWightCollection.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="FunctionCode\Make\Make_PalletWightCollection.Designer.cs">
+      <DependentUpon>Make_PalletWightCollection.cs</DependentUpon>
+    </Compile>
     <Compile Include="FunctionCode\Make\Make_RePrintLabel.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -623,6 +662,12 @@
     <Compile Include="FunctionCode\Query\Query_MakeInf.Designer.cs">
       <DependentUpon>Query_MakeInf.cs</DependentUpon>
     </Compile>
+    <Compile Include="FunctionCode\Query\Query_SpecialReport.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="FunctionCode\Query\Query_SpecialReport.Designer.cs">
+      <DependentUpon>Query_SpecialReport.cs</DependentUpon>
+    </Compile>
     <Compile Include="FunctionCode\Special\Special_MendLabel.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -1004,12 +1049,18 @@
     <EmbeddedResource Include="CustomControl\AccordionMenu\AccordionMenu.resx">
       <DependentUpon>AccordionMenu.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="CustomControl\AccordionMenu\NavagationBar.resx">
+      <DependentUpon>NavagationBar.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="CustomControl\BaseForm\BaseForm.resx">
       <DependentUpon>BaseForm.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="CustomControl\ClickPicBox\ClickPicBox.resx">
       <DependentUpon>ClickPicBox.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="CustomControl\ComBoxWithFocus\ComboxWithTip.resx">
+      <DependentUpon>ComboxWithTip.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="CustomControl\ComBoxWithFocus\PrinterCombox.resx">
       <DependentUpon>PrinterCombox.cs</DependentUpon>
     </EmbeddedResource>
@@ -1058,6 +1109,9 @@
     <EmbeddedResource Include="CustomControl\TextBoxWithIcon\NumOnlyTextBox.resx">
       <DependentUpon>NumOnlyTextBox.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="CustomControl\TextBoxWithIcon\RoundTextBox.resx">
+      <DependentUpon>RoundTextBox.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="CustomControl\TextBoxWithIcon\SearchTextBox.resx">
       <DependentUpon>SearchTextBox.cs</DependentUpon>
     </EmbeddedResource>
@@ -1094,6 +1148,9 @@
     <EmbeddedResource Include="FunctionCode\Make\Make_BigBoxWeight.resx">
       <DependentUpon>Make_BigBoxWeight.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="FunctionCode\Make\Make_CartonBoxSNWeigh.resx">
+      <DependentUpon>Make_CartonBoxSNWeigh.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="FunctionCode\Make\Make_CollectBTMAC.resx">
       <DependentUpon>Make_CollectBTMAC.cs</DependentUpon>
     </EmbeddedResource>
@@ -1148,6 +1205,9 @@
     <EmbeddedResource Include="FunctionCode\Make\Make_PalletWeightRecord.resx">
       <DependentUpon>Make_PalletWeightRecord.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="FunctionCode\Make\Make_PalletWightCollection.resx">
+      <DependentUpon>Make_PalletWightCollection.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="FunctionCode\Make\Make_RePrintLabel.resx">
       <DependentUpon>Make_RePrintLabel.cs</DependentUpon>
     </EmbeddedResource>
@@ -1175,6 +1235,9 @@
     <EmbeddedResource Include="FunctionCode\Query\Query_MakeInf.resx">
       <DependentUpon>Query_MakeInf.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="FunctionCode\Query\Query_SpecialReport.resx">
+      <DependentUpon>Query_SpecialReport.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="FunctionCode\Special\Special_MendLabel.resx">
       <DependentUpon>Special_MendLabel.cs</DependentUpon>
     </EmbeddedResource>