Browse Source

项目覆盖

Hcsy 7 years ago
parent
commit
1b8e54e14f
2 changed files with 46 additions and 22 deletions
  1. 2 2
      UAS-MES/FunctionCode/Query/Query_OperationInstruction.cs
  2. 44 20
      UAS-MES/UAS-MES.csproj

+ 2 - 2
UAS-MES/FunctionCode/Query/Query_OperationInstruction.cs

@@ -50,8 +50,8 @@ namespace UAS_MES.Query
             switch (BaseUtil.GetFileSuffix(FileList.Text))
             {
                 case "MP4":
-                    Query.Query_ShowVideo ShowVideo = new Query_ShowVideo(FileList.Text);
-                    ShowVideo.Show();
+                    //Query.Query_ShowVideo ShowVideo = new Query_ShowVideo(FileList.Text);
+                    //ShowVideo.Show();
                     break;
                 case "PDF":
                     Query.Query_ShowPDF ShowPdf = new Query_ShowPDF(FileList.Text);

+ 44 - 20
UAS-MES/UAS-MES.csproj

@@ -38,11 +38,11 @@
     <ProductName>优软MES系统</ProductName>
     <PublisherName>深圳市优软科技有限公司</PublisherName>
     <SuiteName>优软MES系统</SuiteName>
-    <MinimumRequiredVersion>1.0.0.525</MinimumRequiredVersion>
+    <MinimumRequiredVersion>1.0.0.536</MinimumRequiredVersion>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.htm</WebPage>
     <OpenBrowserOnPublish>false</OpenBrowserOnPublish>
-    <ApplicationRevision>526</ApplicationRevision>
+    <ApplicationRevision>537</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>true</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
@@ -137,6 +137,12 @@
     <Reference Include="NPOI">
       <HintPath>Tool\NPOI.dll</HintPath>
     </Reference>
+    <Reference Include="O2S.Components.PDF4NET">
+      <HintPath>Tool\O2S.Components.PDF4NET.dll</HintPath>
+    </Reference>
+    <Reference Include="O2S.Components.PDFView4NET">
+      <HintPath>Tool\O2S.Components.PDFView4NET.dll</HintPath>
+    </Reference>
     <Reference Include="Oracle.ManagedDataAccess">
       <HintPath>Tool\Oracle.ManagedDataAccess.dll</HintPath>
     </Reference>
@@ -292,6 +298,12 @@
     <Compile Include="CustomControl\HeadBar\HeadBar.Designer.cs">
       <DependentUpon>HeadBar.cs</DependentUpon>
     </Compile>
+    <Compile Include="CustomControl\HeadBar\PDFOperater.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="CustomControl\HeadBar\PDFOperater.Designer.cs">
+      <DependentUpon>PDFOperater.cs</DependentUpon>
+    </Compile>
     <Compile Include="CustomControl\ListViewExpand\ListViewExpand.cs">
       <SubType>Component</SubType>
     </Compile>
@@ -455,12 +467,6 @@
     <Compile Include="Entity\SystemInf.cs" />
     <Compile Include="Entity\User.cs" />
     <Compile Include="Enum\EMouseState.cs" />
-    <Compile Include="Form1.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Form1.Designer.cs">
-      <DependentUpon>Form1.cs</DependentUpon>
-    </Compile>
     <Compile Include="FunctionCode\Make\Make_BigBoxCollection.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -647,6 +653,24 @@
     <Compile Include="FunctionCode\Query\Query_MakeInf.Designer.cs">
       <DependentUpon>Query_MakeInf.cs</DependentUpon>
     </Compile>
+    <Compile Include="FunctionCode\Query\Query_OperationInstruction.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="FunctionCode\Query\Query_OperationInstruction.Designer.cs">
+      <DependentUpon>Query_OperationInstruction.cs</DependentUpon>
+    </Compile>
+    <Compile Include="FunctionCode\Query\Query_ShowPDF.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="FunctionCode\Query\Query_ShowPDF.Designer.cs">
+      <DependentUpon>Query_ShowPDF.cs</DependentUpon>
+    </Compile>
+    <Compile Include="FunctionCode\Query\Query_ShowPicture.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="FunctionCode\Query\Query_ShowPicture.Designer.cs">
+      <DependentUpon>Query_ShowPicture.cs</DependentUpon>
+    </Compile>
     <Compile Include="FunctionCode\Query\Query_SpecialReport.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -957,12 +981,6 @@
     <Compile Include="FunctionCode\Stock\Stock_BarcodeInf.Designer.cs">
       <DependentUpon>Stock_BarcodeInf.cs</DependentUpon>
     </Compile>
-    <Compile Include="FunctionCode\Query\Query_ProductTraceBack.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="FunctionCode\Query\Query_ProductTraceBack.Designer.cs">
-      <DependentUpon>Query_ProductTraceBack.cs</DependentUpon>
-    </Compile>
     <Compile Include="FunctionCode\Query\Query_ExeProgress.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -1067,6 +1085,9 @@
     <EmbeddedResource Include="CustomControl\HeadBar\HeadBar.zu.resx">
       <DependentUpon>HeadBar.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="CustomControl\HeadBar\PDFOperater.resx">
+      <DependentUpon>PDFOperater.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="CustomControl\Pagination\Pagination.resx">
       <DependentUpon>Pagination.cs</DependentUpon>
     </EmbeddedResource>
@@ -1121,9 +1142,6 @@
     <EmbeddedResource Include="DbFind.resx">
       <DependentUpon>DbFind.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Form1.resx">
-      <DependentUpon>Form1.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="FunctionCode\Make\Make_BigBoxCollection.resx">
       <DependentUpon>Make_BigBoxCollection.cs</DependentUpon>
     </EmbeddedResource>
@@ -1217,6 +1235,15 @@
     <EmbeddedResource Include="FunctionCode\Query\Query_MakeInf.resx">
       <DependentUpon>Query_MakeInf.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="FunctionCode\Query\Query_OperationInstruction.resx">
+      <DependentUpon>Query_OperationInstruction.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="FunctionCode\Query\Query_ShowPDF.resx">
+      <DependentUpon>Query_ShowPDF.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="FunctionCode\Query\Query_ShowPicture.resx">
+      <DependentUpon>Query_ShowPicture.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="FunctionCode\Query\Query_SpecialReport.resx">
       <DependentUpon>Query_SpecialReport.cs</DependentUpon>
     </EmbeddedResource>
@@ -1354,9 +1381,6 @@
     <EmbeddedResource Include="FunctionCode\Stock\Stock_Split.resx">
       <DependentUpon>Stock_Split.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="FunctionCode\Query\Query_ProductTraceBack.resx">
-      <DependentUpon>Query_ProductTraceBack.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="FunctionCode\Query\Query_ExeProgress.resx">
       <DependentUpon>Query_ExeProgress.cs</DependentUpon>
     </EmbeddedResource>