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

UAS-MES/FunctionCode/Make/Make_PalletCollection.cs

@@ -89,7 +89,7 @@ namespace UAS_MES.Make
                 }
                 sql.Clear();
                 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");
+                sql.Append("from package where pa_outboxcode='" + palletcode.Text + "' and pa_type =3");
                 dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                 BaseUtil.SetFormValue(Controls, dt);
                 if (dt.Rows.Count > 0)
@@ -134,7 +134,7 @@ namespace UAS_MES.Make
                         palletcode_KeyDown(new object(), new KeyEventArgs(Keys.Enter));
                     }
                     //如果未装满的话
-                    dt = (DataTable)dh.ExecuteSql("select pa_mothercode,nvl(pa_status,0) pa_status from package where pa_outboxcode='" + outboxcode.Text + "' and pa_type=2", "select");
+                    dt = (DataTable)dh.ExecuteSql("select pa_mothercode,nvl(pa_status,0) pa_status from package where pa_outboxcode='" + outboxcode.Text + "'", "select");
                     if (dt.Rows.Count > 0)
                     {
                         //判断是否已经装箱
@@ -266,7 +266,6 @@ namespace UAS_MES.Make
             {
                 OperateResult.AppendText(">>" + palletcode.Text + "装栈板成功\n", Color.Black);
                 dh.ExecuteSql("update package set pa_status=1 where pa_outboxcode='" + palletcode.Text + "'", "update");
-
             }
             else OperateResult.AppendText(">>栈板号不能为空\n", Color.Red);
         }