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

UAS-MES/FunctionCode/Warehouse/Warehouse_FinishedProductOut.cs

@@ -215,6 +215,11 @@ namespace UAS_MES.Warehouse
                         }
                         else if (bigboxBtn.Checked)
                         {
+                            string outboxcode =  dh.getFieldDataByCondition("makeserial","ms_outboxcode","ms_sncode = '"+input.Text+"'").ToString();
+                            if (outboxcode != "")
+                            {
+                                input.Text = outboxcode;
+                            }
                             sql.Clear();
                             sql.Append("select pa_outboxcode,pa_status,nvl(pa_downstatus,0)pa_downstatus,pa_outno, pa_mothercode from package where pa_outboxcode='" + input.Text + "' and pa_type in(1,2)");
                             dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
@@ -350,6 +355,11 @@ namespace UAS_MES.Warehouse
                         }
                         else if (bigboxBtn.Checked)
                         {
+                            string outboxcode = dh.getFieldDataByCondition("makeserial", "ms_outboxcode", "ms_sncode = '" + input.Text + "'").ToString();
+                            if (outboxcode != "")
+                            {
+                                input.Text = outboxcode;
+                            }
                             sql.Clear();
                             sql.Append("select * from prodiomac where pim_inoutno='" + pi_inoutno.Text + "' and pim_outboxcode='" + input.Text + "' and pim_type='BOX'");
                             dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");