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

UAS-MES/CustomControl/RichText/RichTextAutoBottom.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Drawing;
+using System.Media;
 using System.Threading;
 using System.Windows.Forms;
 using UAS_MES.PublicMethod;
@@ -37,14 +38,13 @@ namespace UAS_MES.CustomControl.RichText
             {
                 FileName = Application.StartupPath + @"\Resources\Sound\5185.wav";
                 thread.Start();
-                thread = new Thread(PlaySound);
+
             }
-            else if(color == Color.Green && Entity.SystemInf.CheckAudioEnable)
+            else if (color == Color.Green && Entity.SystemInf.CheckAudioEnable)
             {
                 //颜色是绿色，进行正确提示音
                 FileName = Application.StartupPath + @"\Resources\Sound\8378.wav";
                 thread.Start();
-                thread = new Thread(PlaySound);
             }
         }
 
@@ -66,7 +66,7 @@ namespace UAS_MES.CustomControl.RichText
                 thread.Start();
                 thread = new Thread(PlaySound);
             }
-            else if(color == Color.Green && Entity.SystemInf.CheckAudioEnable)
+            else if (color == Color.Green && Entity.SystemInf.CheckAudioEnable)
             {
                 //颜色是绿色，进行正确提示音
                 FileName = Application.StartupPath + @"\Resources\Sound\8378.wav";
@@ -84,15 +84,14 @@ namespace UAS_MES.CustomControl.RichText
             }
             try
             {
-                SpeechLib.SpVoiceClass pp = new SpeechLib.SpVoiceClass();
-                SpeechLib.SpFileStreamClass spFs = new SpeechLib.SpFileStreamClass();
-                spFs.Open(FileName, SpeechLib.SpeechStreamFileMode.SSFMOpenForRead, true);
-                SpeechLib.ISpeechBaseStream Istream = spFs as SpeechLib.ISpeechBaseStream;
-                pp.SpeakStream(Istream, SpeechLib.SpeechVoiceSpeakFlags.SVSFIsFilename);
-                spFs.Close();
+                SoundPlayer player = new SoundPlayer();
+                player.SoundLocation = FileName;
+                player.Load();
+                player.Play();
             }
-            catch (Exception)
+            catch (Exception e)
             {
+                MessageBox.Show(e.Message);
                 Entity.SystemInf.CheckAudioEnable = false;
             }
         }

UAS-MES/FunctionCode/Make/Make_BigBoxCollection.cs

@@ -119,6 +119,10 @@ namespace UAS_MES.Make
                     OperateResult.AppendText(">>大箱号不存在\n", Color.Red);
                     return;
                 }
+                if (pa_standardqty.Text == pa_currentqty.Text)
+                {
+                    Packing_Click(new object(), new EventArgs());
+                }
                 sql.Clear();
                 sql.Append("select count(0) cn from packagedetail left join package on pa_id=pd_paid where ");
                 sql.Append("pa_outboxcode='" + bigoutboxcode.Text + "'");
@@ -156,7 +160,6 @@ namespace UAS_MES.Make
                                     Printlab.PerformClick();
                                 }
                                 OperateResult.AppendText(">>大箱" + bigoutboxcode.Text + "已采集满\n", Color.Green);
-                                Packing_Click(new object(), new EventArgs());
                             }
                         }
                         else OperateResult.AppendText(">>卡通箱号" + outboxcode.Text + "已采集\n", Color.Red, outboxcode);
@@ -222,7 +225,7 @@ namespace UAS_MES.Make
             if (PrintLabel.Items.Count != 0)
             {
                 OperateResult.AppendText(">>打印箱号" + bigoutboxcode.Text + "\n", Color.Black);
-                Print.CodeSoft(Tag.ToString(),lbl, PrintLabel.Text.Split(':')[1], PrintLabel.SelectedValue.ToString(), PrinterList.Text, pa_outboxcode.Text, int.Parse(PrintNum.Text), indate[PrintLabel.SelectedIndex]);
+                Print.CodeSoft(Tag.ToString(), lbl, PrintLabel.Text.Split(':')[1], PrintLabel.SelectedValue.ToString(), PrinterList.Text, pa_outboxcode.Text, int.Parse(PrintNum.Text), indate[PrintLabel.SelectedIndex]);
             }
             else
                 OperateResult.AppendText(">>产品" + pa_prodcode.Text + "未维护打印标签\n", Color.Red);

UAS-MES/FunctionCode/Make/Make_PalletCollection.cs

@@ -86,7 +86,7 @@ namespace UAS_MES.Make
                     return;
                 }
                 sql.Clear();
-                sql.Append("select pa_makecode,pa_packageqty,pa_currentqty,pa_prodcode,pa_outboxcode,pa_totalqty,pa_custcode,pa_salecode ");
+                sql.Append("select pa_makecode,pa_status,pa_packageqty,pa_currentqty,pa_prodcode,pa_outboxcode,pa_totalqty,pa_custcode,pa_salecode ");
                 sql.Append("from package where pa_outboxcode='" + palletcode.Text + "'  and pa_type =3");
                 dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                 BaseUtil.SetFormValue(Controls, dt);
@@ -118,6 +118,10 @@ namespace UAS_MES.Make
                     OperateResult.AppendText(">>栈板号不存在\n", Color.Red);
                     return;
                 }
+                if (pa_standardqty.Text == pa_currentqty.Text)
+                {
+                    Packing_Click(new object(), new EventArgs());
+                }
                 sql.Clear();
                 sql.Append("select count(0) cn from packagedetail left join package on pa_id=pd_paid  where ");
                 sql.Append("pa_outboxcode='" + palletcode.Text + "'");
@@ -142,8 +146,6 @@ namespace UAS_MES.Make
                             dh.ExecuteSql("update package set pa_makecode='" + carton_macode + "' where pa_outboxcode='" + palletcode.Text + "'", "update");
                         }
                         OperateResult.AppendText(">>箱号" + outboxcode.Text + "采集成功！\n", Color.Green, outboxcode);
-                        LoadGridData();
-                        LoadCollectNum();
                     }
                     else OperateResult.AppendText(">>箱号" + outboxcode.Text + "已采集\n", Color.Red, outboxcode);
                 }
@@ -229,11 +231,11 @@ namespace UAS_MES.Make
         {
             if (pa_prodcode.Text != "" && palletcode.Text != "")
             {
-                OperateResult.AppendText(">>" + palletcode.Text + "装箱成功\n", Color.Red);
+                OperateResult.AppendText(">>" + palletcode.Text + "装栈板成功\n", Color.Black);
                 palletcode.Text = LogicHandler.GetOutBoxCode("PALLET", "", pa_prodcode.Text, User.UserCode);
                 sql.Clear();
                 sql.Append("insert into package (pa_id,pa_outboxcode,pa_makecode,pa_indate,pa_packageqty,pa_type,pa_prodcode，pa_level，PA_STATUS,pa_standardqty)values");
-                sql.Append("(package_seq.nextval,'" + palletcode.Text + "','" + pa_makecode.Text + "',sysdate,'0',3,'" + pa_prodcode.Text + "',0,'','" + pa_standardqty.Text + "')");
+                sql.Append("(package_seq.nextval,'" + palletcode.Text + "','" + pa_makecode.Text + "',sysdate,'0',3,'" + pa_prodcode.Text + "',0,'1','" + pa_standardqty.Text + "')");
                 dh.ExecuteSql(sql.GetString(), "insert");
                 palletcode_KeyDown(new object(), new KeyEventArgs(Keys.Enter));
             }