Merge branch 'master' of ssh://10.10.100.21/source/mes-client

UAS-MES/UAS-MES.csproj

@@ -38,11 +38,11 @@
     <ProductName>优软MES系统</ProductName>
     <PublisherName>深圳市优软科技有限公司</PublisherName>
     <SuiteName>优软MES系统</SuiteName>
-    <MinimumRequiredVersion>1.0.0.465</MinimumRequiredVersion>
+    <MinimumRequiredVersion>1.0.0.490</MinimumRequiredVersion>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.htm</WebPage>
     <OpenBrowserOnPublish>false</OpenBrowserOnPublish>
-    <ApplicationRevision>466</ApplicationRevision>
+    <ApplicationRevision>491</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>true</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
@@ -165,6 +165,12 @@
     <Compile Include="CustomControl\AccordionMenu\AccordionMenu.Designer.cs">
       <DependentUpon>AccordionMenu.cs</DependentUpon>
     </Compile>
+    <Compile Include="CustomControl\BaseForm\BaseForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="CustomControl\BaseForm\BaseForm.Designer.cs">
+      <DependentUpon>BaseForm.cs</DependentUpon>
+    </Compile>
     <Compile Include="CustomControl\ButtonUtil\ArrowLeftButton.cs">
       <SubType>Component</SubType>
     </Compile>
@@ -370,6 +376,12 @@
     <Compile Include="CustomControl\TextBoxWithIcon\SnCollectionBox.Designer.cs">
       <DependentUpon>SnCollectionBox.cs</DependentUpon>
     </Compile>
+    <Compile Include="CustomControl\TextBoxWithIcon\SourceStepCount.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="CustomControl\TextBoxWithIcon\SourceStepCount.Designer.cs">
+      <DependentUpon>SourceStepCount.cs</DependentUpon>
+    </Compile>
     <Compile Include="CustomControl\TextBoxWithIcon\TextAreaForm.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -605,6 +617,12 @@
     <Compile Include="FunctionCode\Packing\Packing_ProdWeightSet.Designer.cs">
       <DependentUpon>Packing_ProdWeightSet.cs</DependentUpon>
     </Compile>
+    <Compile Include="FunctionCode\Query\Query_MakeInf.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="FunctionCode\Query\Query_MakeInf.Designer.cs">
+      <DependentUpon>Query_MakeInf.cs</DependentUpon>
+    </Compile>
     <Compile Include="FunctionCode\Special\Special_MendLabel.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -702,6 +720,7 @@
     <Compile Include="PublicMethod\ExceptionHandler.cs" />
     <Compile Include="PublicMethod\LogManager.cs" />
     <Compile Include="PublicMethod\LogStringBuilder.cs" />
+    <Compile Include="PublicMethod\ModeBusTCPServer.cs" />
     <Compile Include="PublicMethod\Print.cs" />
     <Compile Include="PublicMethod\ReadDataFromSerialPort.cs" />
     <Compile Include="FunctionCode\SMT\SMT_Feeding.cs">
@@ -926,12 +945,6 @@
     <Compile Include="FunctionCode\Query\Query_OnlineTraceBack.Designer.cs">
       <DependentUpon>Query_OnlineTraceBack.cs</DependentUpon>
     </Compile>
-    <Compile Include="FunctionCode\Query\Quert_RealTime.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="FunctionCode\Query\Quert_RealTime.Designer.cs">
-      <DependentUpon>Quert_RealTime.cs</DependentUpon>
-    </Compile>
     <Compile Include="FunctionCode\Special\Special_QCForce.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -991,6 +1004,9 @@
     <EmbeddedResource Include="CustomControl\AccordionMenu\AccordionMenu.resx">
       <DependentUpon>AccordionMenu.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>
@@ -1156,6 +1172,9 @@
     <EmbeddedResource Include="FunctionCode\Packing\Packing_ProdWeightSet.resx">
       <DependentUpon>Packing_ProdWeightSet.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="FunctionCode\Query\Query_MakeInf.resx">
+      <DependentUpon>Query_MakeInf.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="FunctionCode\Special\Special_MendLabel.resx">
       <DependentUpon>Special_MendLabel.cs</DependentUpon>
     </EmbeddedResource>
@@ -1299,9 +1318,6 @@
     <EmbeddedResource Include="FunctionCode\Query\Query_OnlineTraceBack.resx">
       <DependentUpon>Query_OnlineTraceBack.cs</DependentUpon>
     </EmbeddedResource>
-    <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>

UAS_AutoPass/AutoAnalysisXml.cs

@@ -252,7 +252,7 @@ namespace UAS_AutoPass
                 //获取资源,线别,工序相等，并且状态在线的序列号进行分配
                 sql.Clear();
                 sql.Append("select ms_sncode,ms_makecode from makeserial left join source on sc_code=ms_sccode where ");
-                sql.Append("ms_linecode='" + ilinecode + "' and ms_nextstepcode='" + istepcode + "' and ms_status=1 order by ms_id");
+                sql.Append("sc_linecode='" + ilinecode + "' and ms_nextstepcode='" + istepcode + "' and ms_status=1 order by ms_id");
                 dt = (DataTable)dh.ExecuteSql(sql.ToString(), "select");
                 if (dt.Rows.Count > 0)
                 {
@@ -282,6 +282,7 @@ namespace UAS_AutoPass
                         tipform.startthread(oErrMessage, "NG");
                         return;
                     }
+                    tipform.startthread("序列号 " + sncode + "通过检测", test_result);
                 }
                 else
                 {
@@ -555,7 +556,7 @@ namespace UAS_AutoPass
                     //获取资源,线别,工序相等，并且状态在线的序列号进行分配
                     sql.Clear();
                     sql.Append("select ms_sncode,ms_makecode from makeserial left join source on sc_code=ms_sccode where ");
-                    sql.Append("ms_linecode='" + ilinecode + "' and ms_nextstepcode='" + istepcode + "' and ms_status=1 order by ms_id");
+                    sql.Append(" sc_linecode='" + ilinecode + "' and ms_nextstepcode='" + istepcode + "' and ms_status=1 order by ms_id");
                     dt = (DataTable)dh.ExecuteSql(sql.ToString(), "select");
                     if (dt.Rows.Count > 0)
                     {