修改上料提示音频

UAS_MES_LGDZ/CustomControl/RichText/RichTextAutoBottom.cs

@@ -39,7 +39,6 @@ namespace UAS_MES_NEW.CustomControl.RichText
                 FileName = Application.StartupPath + @"\Resources\Sound\5185.wav";
                 thread.Start();
                 thread = new Thread(PlaySound);
-
             }
             else if (color == Color.Green && Entity.SystemInf.CheckAudioEnable)
             {
@@ -48,10 +47,10 @@ namespace UAS_MES_NEW.CustomControl.RichText
                 thread.Start();
                 thread = new Thread(PlaySound);
             }
-            else if (color == Color.Blue && Entity.SystemInf.CheckAudioEnable)
+            else if (color == Color.GreenYellow && Entity.SystemInf.CheckAudioEnable)
             {
                 //颜色是绿色，进行正确提示音
-                FileName = Application.StartupPath + @"\Resources\Sound\4082.wav";
+                FileName = Application.StartupPath + @"\Resources\Sound\3285.wav";
                 thread.Start();
                 thread = new Thread(PlaySound);
             }
@@ -83,6 +82,13 @@ namespace UAS_MES_NEW.CustomControl.RichText
                 thread.Start();
                 thread = new Thread(PlaySound);
             }
+            else if (color == Color.GreenYellow && Entity.SystemInf.CheckAudioEnable)
+            {
+                //颜色是绿色，进行正确提示音
+                FileName = Application.StartupPath + @"\Resources\Sound\9865.wav";
+                thread.Start();
+                thread = new Thread(PlaySound);
+            }
             LogManager.DoLog(FindForm().Tag + str);
         }
 

UAS_MES_LGDZ/DataOperate/DataHelper.cs

@@ -9,7 +9,7 @@ namespace UAS_MES_NEW.DataOperate
 {
     class DataHelper
     {
-        //系统默认的的连接字符串
+        //系统默认的的连接字符串 
         private string ConnectionStrings = "Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=N_MES;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=172.16.30.253)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
 
         //public static readonly string ERPAddesss = "http://218.64.89.153:8099/mes/";

UAS_MES_LGDZ/FunctionCode/Make/Make_FeedingCollection.cs

@@ -521,7 +521,7 @@ namespace UAS_MES_NEW.Make
                 CollectDataSonCode.Clear();
                 //采集成功，设置序列号栏目为空
                 RemainIndex = 0;
-                OperateResult.AppendText(">>序列号" + sn_code.Text + "上料采集完成！\n", Color.Green);
+                OperateResult.AppendText(">>序列号" + sn_code.Text + "上料采集完成！\n", Color.GreenYellow);
                 LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, oMakeCode, User.UserLineCode, User.UserSourceCode, "上料采集", "上料成功", sn_code.Text, "");
                 if (LogicHandler.SetStepResult(ma_code, User.UserSourceCode, sn_code.Text, "上料采集", "上料成功", User.UserCode, out ErrorMessage))
                 {

UAS_MES_LGDZ/Properties/Resources.Designer.cs

@@ -186,6 +186,15 @@ namespace UAS_MES_NEW.Properties {
             }
         }
         
+        /// <summary>
+        ///   查找类似于 System.IO.MemoryStream 的 System.IO.UnmanagedMemoryStream 类型的本地化资源。
+        /// </summary>
+        internal static System.IO.UnmanagedMemoryStream _9865 {
+            get {
+                return ResourceManager.GetStream("_9865", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找 System.Drawing.Bitmap 类型的本地化资源。
         /// </summary>

UAS_MES_LGDZ/Properties/Resources.resx

@@ -436,4 +436,7 @@
   <data name="SN" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\b473847f-a85b-400e-807a-4875c4c07ff1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="_9865" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Sound\9865.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
 </root>

UAS_MES_LGDZ/PublicMethod/LogicHandler.cs

@@ -862,12 +862,12 @@ namespace UAS_MES_NEW.PublicMethod
             if (StepCode == CurrentStep)
             {
                 InsertMakeProcess(iSN, iMakeCode, iSourceCode, iMPKind, iResult, iUserCode);
-                return true;
             }
             else
             {
-                return CS_SetResult(iMakeCode, iSourceCode, iSN, iUserCode, iResult, out oErrorMessage);
+               
             }
+            return CS_SetResult(iMakeCode, iSourceCode, iSN, iUserCode, iResult, out oErrorMessage);
         }
 
         public static bool SetStepResult(string iMakeCode, string iSourceCode, string iSN, string iMPKind, string iResult, string iUserCode, out string oErrorMessage)
@@ -1017,8 +1017,8 @@ namespace UAS_MES_NEW.PublicMethod
                         dh.UpdateByCondition("makeserial", "ms_nextstepcode='',ms_status=3", "ms_sncode='" + iSnCode + "' and ms_makecode='" + iMakeCode + "' ");
                     else
                         dh.UpdateByCondition("makeserial", "ms_nextstepcode='',ms_paststep = ms_paststep ||'," + StepCode + "',ms_reworkstatus=3", "ms_sncode='" + iSnCode + "' and ms_makecode='" + iMakeCode + "'");
-                    SetTestResult(iMakeCode, iSourceCode, iSnCode, "不良采集", "NG", iUserCode, out oErrorMessage);
                 }
+                SetTestResult(iMakeCode, iSourceCode, iSnCode, "不良采集", "NG", iUserCode, out oErrorMessage);
             }
             return true;
         }

UAS_MES_LGDZ/UAS_MES_LGDZ.csproj

@@ -1993,6 +1993,7 @@
     <Content Include="Resources\Button\White-side.png" />
     <Content Include="Resources\change_password.png" />
     <None Include="Resources\Sound\4082.wav" />
+    <Content Include="Resources\Sound\9865.wav" />
     <Content Include="Tool\DevComponents.DotNetBar2.dll" />
     <Content Include="Tool\DevExpress.BonusSkins.v15.2.dll" />
     <Content Include="Tool\DevExpress.Data.v15.2.dll" />
@@ -2138,7 +2139,8 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>xcopy  $(ProjectDir)Resources $(ProjectDir)$(OutDir)Resources  /s /e /k /i /y</PostBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
   </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.