update

UAS-MES/CustomControl/HeadBar/PDFOperater.cs

@@ -6,84 +6,84 @@ using System.Data;
 using System.Linq;
 using System.Text;
 using System.Windows.Forms;
-using O2S.Components.PDFView4NET;
+
 using UAS_MES.PublicMethod;
-using O2S.Components.PDFView4NET.Text;
+
 
 namespace UAS_MES.CustomControl
 {
     public partial class PDFOperater : UserControl
     {
-        private PDFPageView PageView1;
+        //private PDFPageView PageView1;
 
-        public PDFPageView PageView
-        {
-            get
-            {
-                return PageView1;
-            }
+        //public PDFPageView PageView
+        //{
+        //    get
+        //    {
+        //        return PageView1;
+        //    }
 
-            set
-            {
-                PageView1 = value;
-            }
-        }
+        //    set
+        //    {
+        //        PageView1 = value;
+        //    }
+        //}
 
-        public PDFOperater()
-        {
-            InitializeComponent();
-            for (int i = 1; i <= 20; i++)
-            {
-                ZoomComBox.Items.Add(i * 10);
-            }
-        }
+        //public PDFOperater()
+        //{
+        //    InitializeComponent();
+        //    for (int i = 1; i <= 20; i++)
+        //    {
+        //        ZoomComBox.Items.Add(i * 10);
+        //    }
+        //}
 
-        private void PDFOperater_Load(object sender, EventArgs e)
-        {
-            PageView1.Zoom = double.Parse(ZoomComBox.Text);
-        }
+        //private void PDFOperater_Load(object sender, EventArgs e)
+        //{
+        //    PageView1.Zoom = double.Parse(ZoomComBox.Text);
+        //}
 
-        private void ZoomComBox_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            PageView1.Zoom = double.Parse(ZoomComBox.Text);
-        }
+        //private void ZoomComBox_SelectedIndexChanged(object sender, EventArgs e)
+        //{
+        //    PageView1.Zoom = double.Parse(ZoomComBox.Text);
+        //}
 
-        private void ZoomComBox_KeyDown(object sender, KeyEventArgs e)
-        {
-            if (e.KeyCode == Keys.Enter)
-            {
-                PageView1.Zoom = double.Parse(ZoomComBox.Text);
-            }
-        }
+        //private void ZoomComBox_KeyDown(object sender, KeyEventArgs e)
+        //{
+        //    if (e.KeyCode == Keys.Enter)
+        //    {
+        //        PageView1.Zoom = double.Parse(ZoomComBox.Text);
+        //    }
+        //}
 
-        private void ScrollSpan_KeyDown(object sender, KeyEventArgs e)
-        {
-            if (e.KeyCode == Keys.Enter)
-            {
-                ScrollTimer.Interval = int.Parse(ScrollSpan.Text) * 1000;
-                ScrollTimer.Start();
-                BaseUtil.SetCacheData("ScrollSpan", ScrollSpan.Text);
-            }
-        }
+        //private void ScrollSpan_KeyDown(object sender, KeyEventArgs e)
+        //{
+        //    if (e.KeyCode == Keys.Enter)
+        //    {
+        //        ScrollTimer.Interval = int.Parse(ScrollSpan.Text) * 1000;
+        //        ScrollTimer.Start();
+        //        BaseUtil.SetCacheData("ScrollSpan", ScrollSpan.Text);
+        //    }
+        //}
 
-        private void ScrollTimer_Tick(object sender, EventArgs e)
-        {
-            if (PageView1.Document.PageCount - 1 == PageView1.PageNumber)
-            {
-                PageView1.GoToFirstPage();
-            }
-            else
-            {
-                PageView1.GoToNextPage();
-            }
-        }
+        //private void ScrollTimer_Tick(object sender, EventArgs e)
+        //{
+        //    if (PageView1.Document.PageCount - 1 == PageView1.PageNumber)
+        //    {
+        //        PageView1.GoToFirstPage();
+        //    }
+        //    else
+        //    {
+        //        PageView1.GoToNextPage();
+        //    }
+        //}
 
-        private void toolStripTextBox1_KeyDown(object sender, KeyEventArgs e)
-        {
-            if (e.KeyCode == Keys.Enter)
-            {
-                PageView1.SearchText(KeyWord.Text, PDFHighlightSearchResultsMode.AllResults);
-            }
-        }
+        //private void toolStripTextBox1_KeyDown(object sender, KeyEventArgs e)
+        //{
+        //    if (e.KeyCode == Keys.Enter)
+        //    {
+        //        PageView1.SearchText(KeyWord.Text, PDFHighlightSearchResultsMode.AllResults);
+        //    }
+        //}
     }
 }

UAS-MES/UAS-MES.csproj

@@ -38,11 +38,11 @@
     <ProductName>优软MES系统</ProductName>
     <PublisherName>深圳市优软科技有限公司</PublisherName>
     <SuiteName>优软MES系统</SuiteName>
-    <MinimumRequiredVersion>1.0.0.536</MinimumRequiredVersion>
+    <MinimumRequiredVersion>1.0.0.603</MinimumRequiredVersion>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.htm</WebPage>
     <OpenBrowserOnPublish>false</OpenBrowserOnPublish>
-    <ApplicationRevision>537</ApplicationRevision>
+    <ApplicationRevision>604</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>true</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
@@ -137,12 +137,6 @@
     <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>
@@ -298,12 +292,6 @@
     <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>
@@ -611,18 +599,36 @@
     <Compile Include="FunctionCode\Make\Make_SeqProgramTransform.Designer.cs">
       <DependentUpon>Make_SeqProgramTransform.cs</DependentUpon>
     </Compile>
+    <Compile Include="FunctionCode\Make\Make_SmtTestCollection.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="FunctionCode\Make\Make_SmtTestCollection.Designer.cs">
+      <DependentUpon>Make_SmtTestCollection.cs</DependentUpon>
+    </Compile>
     <Compile Include="FunctionCode\Make\Make_SpecialCartonPack.cs">
       <SubType>Form</SubType>
     </Compile>
     <Compile Include="FunctionCode\Make\Make_SpecialCartonPack.Designer.cs">
       <DependentUpon>Make_SpecialCartonPack.cs</DependentUpon>
     </Compile>
+    <Compile Include="FunctionCode\Make\Make_SpiTestCollection.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="FunctionCode\Make\Make_SpiTestCollection.Designer.cs">
+      <DependentUpon>Make_SpiTestCollection.cs</DependentUpon>
+    </Compile>
     <Compile Include="FunctionCode\Make\Make_UpdateCollectCode.cs">
       <SubType>Form</SubType>
     </Compile>
     <Compile Include="FunctionCode\Make\Make_UpdateCollectCode.Designer.cs">
       <DependentUpon>Make_UpdateCollectCode.cs</DependentUpon>
     </Compile>
+    <Compile Include="FunctionCode\Make\Make_XrayTestCollection.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="FunctionCode\Make\Make_XrayTestCollection.Designer.cs">
+      <DependentUpon>Make_XrayTestCollection.cs</DependentUpon>
+    </Compile>
     <Compile Include="FunctionCode\OQC\OQC_CheckNoSplit.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -653,29 +659,17 @@
     <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">
+    <Compile Include="FunctionCode\Query\Query_SnMessage.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="FunctionCode\Query\Query_ShowPicture.Designer.cs">
-      <DependentUpon>Query_ShowPicture.cs</DependentUpon>
+    <Compile Include="FunctionCode\Query\Query_SnMessage.Designer.cs">
+      <DependentUpon>Query_SnMessage.cs</DependentUpon>
     </Compile>
-    <Compile Include="FunctionCode\Query\Query_SpecialReport.cs">
+    <Compile Include="FunctionCode\Special\Special_CancelProdinout.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="FunctionCode\Query\Query_SpecialReport.Designer.cs">
-      <DependentUpon>Query_SpecialReport.cs</DependentUpon>
+    <Compile Include="FunctionCode\Special\Special_CancelProdinout.Designer.cs">
+      <DependentUpon>Special_CancelProdinout.cs</DependentUpon>
     </Compile>
     <Compile Include="FunctionCode\Special\Special_MendLabel.cs">
       <SubType>Form</SubType>
@@ -701,6 +695,12 @@
     <Compile Include="FunctionCode\Warehouse\Warehouse_ProductMakeIn.Designer.cs">
       <DependentUpon>Warehouse_ProductMakeIn.cs</DependentUpon>
     </Compile>
+    <Compile Include="FunctionCode\Warehouse\Warehouse_ProductMakeInTest.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="FunctionCode\Warehouse\Warehouse_ProductMakeInTest.Designer.cs">
+      <DependentUpon>Warehouse_ProductMakeInTest.cs</DependentUpon>
+    </Compile>
     <Compile Include="Login.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -1085,9 +1085,6 @@
     <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>
@@ -1214,12 +1211,21 @@
     <EmbeddedResource Include="FunctionCode\Make\Make_SeqProgramTransform.resx">
       <DependentUpon>Make_SeqProgramTransform.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="FunctionCode\Make\Make_SmtTestCollection.resx">
+      <DependentUpon>Make_SmtTestCollection.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="FunctionCode\Make\Make_SpecialCartonPack.resx">
       <DependentUpon>Make_SpecialCartonPack.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="FunctionCode\Make\Make_SpiTestCollection.resx">
+      <DependentUpon>Make_SpiTestCollection.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="FunctionCode\Make\Make_UpdateCollectCode.resx">
       <DependentUpon>Make_UpdateCollectCode.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="FunctionCode\Make\Make_XrayTestCollection.resx">
+      <DependentUpon>Make_XrayTestCollection.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="FunctionCode\OQC\OQC_CheckNoSplit.resx">
       <DependentUpon>OQC_CheckNoSplit.cs</DependentUpon>
     </EmbeddedResource>
@@ -1235,17 +1241,11 @@
     <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 Include="FunctionCode\Query\Query_SnMessage.resx">
+      <DependentUpon>Query_SnMessage.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 Include="FunctionCode\Special\Special_CancelProdinout.resx">
+      <DependentUpon>Special_CancelProdinout.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="FunctionCode\Special\Special_MendLabel.resx">
       <DependentUpon>Special_MendLabel.cs</DependentUpon>
@@ -1256,6 +1256,9 @@
     <EmbeddedResource Include="FunctionCode\Warehouse\Warehouse_ProductMakeIn.resx">
       <DependentUpon>Warehouse_ProductMakeIn.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="FunctionCode\Warehouse\Warehouse_ProductMakeInTest.resx">
+      <DependentUpon>Warehouse_ProductMakeInTest.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Login.resx">
       <DependentUpon>Login.cs</DependentUpon>
     </EmbeddedResource>