Merge repos.ubtob.net:usoft/mes-client

UAS-MES/App.config

@@ -44,7 +44,7 @@
   <applicationSettings>
     <UAS_MES.Properties.Settings>
       <setting name="MES" serializeAs="String">
-        <value>Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=MES_ZZ;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=192.168.230.200)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));</value>
+        <value>Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=MES_ZZ;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=220.161.94.175)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));</value>
       </setting>
     </UAS_MES.Properties.Settings>
   </applicationSettings>

UAS-MES/FunctionCode/Make/Make_RePrintLabel.cs

@@ -144,6 +144,7 @@ namespace UAS_MES.Make
                     //无值,可补打
                     inputValue.Text = inputText.Text;
                     inputText.Text = "";
+                    printBtn.Enabled = true;
                 }
                 //打印类型为卡通箱
                 else if (CartonBox.Checked || BigBox.Checked || Pallte.Checked)
@@ -163,6 +164,7 @@ namespace UAS_MES.Make
                     //展示产品编号和标签模板到界面
                     inputValue.Text = inputText.Text;
                     inputText.Text = "";
+                    printBtn.Enabled = true;
                 }
             }
         }
@@ -366,7 +368,7 @@ namespace UAS_MES.Make
                                     dh.ExecuteSQLTran("update makeserial set ms_downstatus='0' where ms_id='" + re_ms_id + "'", sql.GetString());
                                 }
                             }
-                            printBtn.Enabled = true;
+                            //printBtn.Enabled = true;
                             //记录操作日志commandlog ， 补打核对，核对成功
                             LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, infoc.Rows[0]["ms_makecode"].ToString(), User.UserLineCode, User.UserSourceCode, "标签补打核对", "核对成功", TSN, "");
                         }
@@ -416,7 +418,7 @@ namespace UAS_MES.Make
                                     dh.ExecuteSQLTran("update package set pa_downstatus='0' where pa_outboxcode='" + TSN + "'", sql.GetString());
                                 }
                             }
-                            printBtn.Enabled = true;
+                            //printBtn.Enabled = true;
                             //记录操作日志commandlog ， 补打核对，核对成功
                             LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, infoc.Rows[0]["pa_makecode"].ToString(), User.UserLineCode, User.UserSourceCode, "标签补打核对,箱号:" + TSN, "核对成功", TSN, "");
                         }

UAS-MES/FunctionCode/Make/Make_SeqTransform.cs

@@ -50,6 +50,18 @@ namespace UAS_MES.Make
             {
                 if (sncode.Text != "")
                 {
+                    if (sncode.Text.Contains(":"))
+                    {
+                        if (sncode.Text.Contains("SN:"))
+                        {
+                            sncode.Text = sncode.Text.Split(':')[1];
+                        }
+                        else
+                        {
+                            sncode.Clear();
+                            return;
+                        }
+                    }
                     if (LogicHandler.CheckStepAttribute(Tag.ToString(), User.UserSourceCode, out errorMessage))
                     {
                         OperateResult.AppendText(">>" + sncode.Text + "\n", Color.Black);

UAS-MES/FunctionCode/Make/Make_TestCollection.cs

@@ -181,6 +181,18 @@ namespace UAS_MES.Make
                 ChoosedRejectList.Items.Clear();
                 WaitList.Clear();
                 ChoosedList.Clear();
+                if (ms_sncode.Text.Contains(":"))
+                {
+                    if (ms_sncode.Text.Contains("SN:"))
+                    {
+                        ms_sncode.Text = ms_sncode.Text.Split(':')[1];
+                    }
+                    else
+                    {
+                        ms_sncode.Clear();
+                        return;
+                    }
+                }
                 if (LogicHandler.CheckStepAttribute(Tag.ToString(), User.UserSourceCode, out ErrorMessage))
                 {
                     //是否提示过工单切换框，检测前执行

UAS-MES/UAS-MES.csproj

@@ -125,11 +125,6 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\UAS_MES_HY\Tool\ICSharpCode.SharpZipLib.dll</HintPath>
     </Reference>
-    <Reference Include="Interop.LabelManager2, Version=6.0.0.0, Culture=neutral, processorArchitecture=x86">
-      <SpecificVersion>False</SpecificVersion>
-      <EmbedInteropTypes>False</EmbedInteropTypes>
-      <HintPath>bin\Debug\Interop.LabelManager2.dll</HintPath>
-    </Reference>
     <Reference Include="Interop.SpeechLib">
       <HintPath>Tool\Interop.SpeechLib.dll</HintPath>
       <EmbedInteropTypes>False</EmbedInteropTypes>
@@ -1861,6 +1856,15 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
+    <COMReference Include="LabelManager2">
+      <Guid>{3624B9C2-9E5D-11D3-A896-00C04F324E22}</Guid>
+      <VersionMajor>22</VersionMajor>
+      <VersionMinor>0</VersionMinor>
+      <Lcid>0</Lcid>
+      <WrapperTool>tlbimp</WrapperTool>
+      <Isolated>False</Isolated>
+      <EmbedInteropTypes>False</EmbedInteropTypes>
+    </COMReference>
     <COMReference Include="stdole">
       <Guid>{00020430-0000-0000-C000-000000000046}</Guid>
       <VersionMajor>2</VersionMajor>
@@ -1870,6 +1874,15 @@
       <Isolated>False</Isolated>
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </COMReference>
+    <COMReference Include="TkxRFTAG">
+      <Guid>{E726B66A-5AD1-43AE-8826-6C35F0DEE9F5}</Guid>
+      <VersionMajor>2</VersionMajor>
+      <VersionMinor>0</VersionMinor>
+      <Lcid>0</Lcid>
+      <WrapperTool>tlbimp</WrapperTool>
+      <Isolated>False</Isolated>
+      <EmbedInteropTypes>False</EmbedInteropTypes>
+    </COMReference>
   </ItemGroup>
   <ItemGroup>
     <PublishFile Include="BtSystem.Client">