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

UAS-MES/FunctionCode/Make/Make_BigBoxCollection.cs

@@ -120,11 +120,10 @@ namespace UAS_MES.Make
                     return;
                 }
                 sql.Clear();
-                sql.Append("select count(0) cn from package left join packagedetail on pa_id=pd_paid  where ");
+                sql.Append("select count(0) cn from packagedetail left join package on pa_id=pd_paid where ");
                 sql.Append("pa_outboxcode='" + bigoutboxcode.Text + "'");
                 int packageqty = int.Parse((dh.ExecuteSql(sql.GetString(), "select") as DataTable).Rows[0][0].ToString());
                 //如果未装满的话
-                Console.WriteLine(packageqty);
                 if (packageqty < pa_totqty)
                 {
                     if (dh.CheckExist("Package", "pa_outboxcode='" + outboxcode.Text + "' and nvl(pa_type,1)=1"))
@@ -155,6 +154,7 @@ namespace UAS_MES.Make
                                     OperateResult.AppendText(">>箱已装满，自动打印!\n", Color.Green);
                                     Printlab.PerformClick();
                                 }
+                                OperateResult.AppendText(">>大箱"+ bigoutboxcode.Text + "已采集满\n", Color.Green);
                                 bigoutboxcode.Text = LogicHandler.GetOutBoxCode("PACKAGE", "", 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_totalqty)values");