标签补打修改

UAS_MES_HYSX/FunctionCode/Make/Make_RePrintLabel.cs

@@ -172,13 +172,13 @@ namespace UAS_MES_NEW.Make
                 //打印类型为卡通箱
                 else if (CartonBox.Checked)
                 {
-                    dt = (DataTable)dh.ExecuteSql("select ms_outboxcode from makeserial where ms_outboxcode='" + inputText.Text + "' or ms_sncode='" + inputText.Text + "'  order by ms_id desc", "select");
+                    dt = (DataTable)dh.ExecuteSql("select ms_outboxcode from makeserial left join package on pa_outboxcode=ms_outboxcode where ms_outboxcode='" + inputText.Text + "' or pa_zxcode='" + inputText.Text + "' or ms_sncode='" + inputText.Text + "'  order by ms_id desc", "select");
                     if (dt.Rows.Count > 0)
                     {
                         inputText.Text = dt.Rows[0]["ms_outboxcode"].ToString();
                     }
                     //查询箱号是否存在
-                    dt = (DataTable)dh.ExecuteSql("select pa_id,pa_prodcode pr_code,pa_makecode ms_makecode,pr_detail from package left join product on pr_code=pa_prodcode where pa_outboxcode='" + inputText.Text + "' and pa_type=1", "select");
+                    dt = (DataTable)dh.ExecuteSql("select pa_id,pa_prodcode pr_code,pa_makecode ms_makecode,pr_detail from package left join product on pr_code=pa_prodcode where pa_outboxcode='" + inputText.Text + "' or pa_zxcode='" + inputText.Text + "' and pa_type=1", "select");
                     if (dt.Rows.Count == 0)
                     {
                         //无值，返回提示用户“箱号不存在”， “>>请输入卡通箱号”
@@ -226,18 +226,10 @@ namespace UAS_MES_NEW.Make
                 }
                 else if (Pallte.Checked)
                 {
-                    dt = (DataTable)dh.ExecuteSql("select ms_outboxcode from makeserial where ms_imei1='" + inputText.Text + "' order by ms_id desc", "select");
+                    dt = (DataTable)dh.ExecuteSql("select pa_outboxcode from package where pa_outboxcode='"+inputText.Text+"' or pa_zxcode='"+inputText.Text+"'", "select");
                     if (dt.Rows.Count > 0)
                     {
-                        inputText.Text = dt.Rows[0]["ms_outboxcode"].ToString();
-                    }
-                    else
-                    {
-                        dt = (DataTable)dh.ExecuteSql("select ms_outboxcode from makeserial where ms_imei2='" + inputText.Text + "' order by ms_id desc", "select");
-                        if (dt.Rows.Count > 0)
-                        {
-                            inputText.Text = dt.Rows[0]["ms_outboxcode"].ToString();
-                        }
+                        inputText.Text = dt.Rows[0]["pa_outboxcode"].ToString();
                     }
                     //查询箱号是否存在
                     dt = (DataTable)dh.ExecuteSql("select pa_id,pa_prodcode pr_code,pa_makecode ms_makecode,pr_detail from package left join product on pr_code=pa_prodcode where pa_outboxcode='" + inputText.Text + "' and pa_type=3", "select");
@@ -344,7 +336,7 @@ namespace UAS_MES_NEW.Make
             else if (CartonBox.Checked)
             {
                 //select pa_downstatus from package where pa_outboxcode=? 输入值code
-                mapB = (DataTable)dh.ExecuteSql("select pa_downstatus from package where pa_outboxcode='" + inputValue.Text + "'", "select");
+                mapB = (DataTable)dh.ExecuteSql("select pa_downstatus from package where pa_outboxcode='" + inputValue.Text + "' or pa_zxcode='" + inputText.Text + "'", "select");
                 //无值提示用户箱号错误，不存在。
                 if (mapB.Rows.Count == 0)
                 {