修改提示信息

UAS-MES/FunctionCode/Make/Make_BigBoxCollection.cs

@@ -86,17 +86,15 @@ namespace UAS_MES.Make
             if (e.KeyCode == Keys.Enter)
             {
                 sql.Clear();
-                sql.Append("select pa_makecode,pa_standardqty,pa_packageqty,pa_prodcode,pa_outboxcode,pa_totalqty,pa_currentqty,pa_custcode,pa_salecode ");
+                sql.Append("select pa_makecode,pa_id,pa_standardqty,pa_id,pa_packageqty,pa_prodcode,pa_outboxcode,pa_totalqty,pa_currentqty,pa_custcode,pa_salecode ");
                 sql.Append("from package where pa_outboxcode='" + pa_outboxcode.Text + "'  and pa_type =2");
                 DataTable dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                 if (dt.Rows.Count > 0)
                 {
                     BaseUtil.SetFormValue(Controls, dt);
                     LoadGridData();
-                    dt = dh.getFieldsDataByCondition("Package", new string[] { "pa_id", "pa_standardqty" }, "pa_outboxcode='" + pa_outboxcode.Text + "'");
                     pa_stanqty = int.Parse(dt.Rows[0]["pa_standardqty"].ToString());
                     pa_id = dt.Rows[0]["pa_id"].ToString();
-                    FillPrintLabel();
                     outboxcode.Focus();
                 }
                 else outboxcode.Focus();
@@ -116,18 +114,26 @@ namespace UAS_MES.Make
                         return;
                     }
                     sql.Clear();
-                    sql.Append("select pd_makecode pa_makecode,pa_id,pd_prodcode pa_prodcode,pa_status,pa_mothercode,pa_nextstep,nvl(pr_bigboxinnerqty,0) pa_standardqty from packagedetail ");
-                    sql.Append("left join package on pd_paid=pa_id left join product on pd_prodcode=pr_code where pd_outboxcode='" + outboxcode.Text + "'");
+                    sql.Append("select pd_makecode pa_makecode,nvl(pa_downstatus,0)pa_downstatus,pa_id,pd_prodcode pa_prodcode,pa_status,pa_mothercode,pa_nextstep,nvl(pr_bigboxinnerqty,0) pa_standardqty  ");
+                    sql.Append("from packagedetail left join package on pd_paid=pa_id left join product on pd_prodcode=pr_code where pd_outboxcode='" + outboxcode.Text + "'");
                     dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                     //判断采集的卡通箱是否有明细
                     if (dt.Rows.Count > 0)
                     {
                         BaseUtil.SetFormValue(this.Controls, dt);
+                        if (dt.Rows[0]["pa_downstatus"].ToString() != "0")
+                        {
+                            OperateResult.AppendText(">>箱号" + outboxcode.Text + "下地状态不允许采集\n", Color.Red, outboxcode);
+                            return;
+                        }
                         //之前装过箱加载明细
                         if (dt.Rows[0]["pa_mothercode"].ToString() != "")
                         {
-                            pa_outboxcode.Text = dt.Rows[0]["pa_mothercode"].ToString();
-                            palletcode_KeyDown(sender, e);
+                            if (pa_outboxcode.Text == "")
+                            {
+                                pa_outboxcode.Text = dt.Rows[0]["pa_mothercode"].ToString();
+                                palletcode_KeyDown(sender, e);
+                            }
                         }
                         pa_nextstep = dt.Rows[0]["pa_nextstep"].ToString();
                         pa_stanqty = int.Parse(dt.Rows[0]["pa_standardqty"].ToString());
@@ -138,7 +144,7 @@ namespace UAS_MES.Make
                         }
                         if (pa_nextstep != User.CurrentStepCode && pa_nextstep != "")
                         {
-                            OperateResult.AppendText(">>卡通箱号" + outboxcode.Text + "的下一工序不是当前岗位资源对应工序\n", Color.Red, outboxcode);
+                            OperateResult.AppendText(">>卡通箱号" + outboxcode.Text + "的下一工序不是当前岗位资源对应工序,下一工序为" + pa_nextstep + "\n", Color.Red, outboxcode);
                             return;
                         }
                         //未空表示线外
@@ -280,7 +286,13 @@ namespace UAS_MES.Make
                             }
                         }
                     }
-                    else OperateResult.AppendText(">>卡通箱号" + outboxcode.Text + "已采集\n", Color.Red, outboxcode);
+                    else
+                    {
+                        if (dt.Rows[0]["pa_mothercode"].ToString() == pa_outboxcode.Text)
+                            OperateResult.AppendText(">>卡通箱号" + outboxcode.Text + "已在本大箱内\n", Color.Red, outboxcode);
+                        else
+                            OperateResult.AppendText(">>卡通箱号" + outboxcode.Text + "已采集至大箱" + dt.Rows[0]["pa_mothercode"].ToString() + "\n", Color.Red, outboxcode);
+                    }
                 }
                 else OperateResult.AppendText(">>卡通箱号" + outboxcode.Text + "尚未封箱\n", Color.Red, outboxcode);
             }

UAS-MES/FunctionCode/Make/Make_PackageCollection.cs

@@ -238,9 +238,13 @@ namespace UAS_MES.Make
                         if (!Cancel.Checked)
                         {
                             //判断序列号是否已经装箱
-                            if (dh.getFieldDataByCondition("makeserial", "ms_outboxcode", "ms_id='" + oMsID + "'").ToString() != "")
+                            string ms_outboxcode = dh.getFieldDataByCondition("makeserial", "ms_outboxcode", "ms_id='" + oMsID + "'").ToString();
+                            if (ms_outboxcode != "")
                             {
-                                OperateResult.AppendText(">>序列号" + sn_code.Text + "已经装箱！\n", Color.Red, sn_code);
+                                if (ms_outboxcode == pa_outboxcode.Text)
+                                    OperateResult.AppendText(">>序列号" + sn_code.Text + "已在本箱内\n", Color.Red, sn_code);
+                                else
+                                    OperateResult.AppendText(">>序列号" + sn_code.Text + "已采集至箱" + ms_outboxcode + "\n", Color.Red, sn_code);
                                 LoadData();
                             }
                             else

UAS-MES/FunctionCode/Make/Make_PackageCollectionWeigh.cs

@@ -316,10 +316,13 @@ namespace UAS_MES.Make
                         //如果未勾选了取消录入
                         if (!Cancel.Checked)
                         {
-                            //判断序列号是否已经装箱
-                            if (dh.getFieldDataByCondition("makeserial", "ms_outboxcode", "ms_id='" + oMsID + "'").ToString() != "")
+                            string ms_outboxcode = dh.getFieldDataByCondition("makeserial", "ms_outboxcode", "ms_id='" + oMsID + "'").ToString();
+                            if (ms_outboxcode != "")
                             {
-                                OperateResult.AppendText(">>序列号" + sn_code.Text + "已经装箱！\n", Color.Red, sn_code);
+                                if (ms_outboxcode == pa_outboxcode.Text)
+                                    OperateResult.AppendText(">>序列号" + sn_code.Text + "已在本箱内\n", Color.Red, sn_code);
+                                else
+                                    OperateResult.AppendText(">>序列号" + sn_code.Text + "已采集至箱" + ms_outboxcode + "\n", Color.Red, sn_code);
                                 LoadData();
                             }
                             else

UAS-MES/FunctionCode/Make/Make_PalletCollection.cs

@@ -84,17 +84,15 @@ namespace UAS_MES.Make
             if (e.KeyCode == Keys.Enter)
             {
                 sql.Clear();
-                sql.Append("select pa_makecode,pa_standardqty,pa_status,pa_packageqty,pa_currentqty,pa_prodcode,pa_outboxcode,pa_totalqty,pa_custcode,pa_salecode ");
+                sql.Append("select pa_makecode,pa_id,pa_standardqty,pa_status,pa_packageqty,pa_currentqty,pa_prodcode,pa_outboxcode,pa_totalqty,pa_custcode,pa_salecode ");
                 sql.Append("from package where pa_outboxcode='" + pa_outboxcode.Text + "' and pa_type =3");
                 DataTable dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                 if (dt.Rows.Count > 0)
                 {
                     BaseUtil.SetFormValue(Controls, dt);
                     LoadGridData();
-                    dt = dh.getFieldsDataByCondition("Package", new string[] { "pa_standardqty", "pa_id" }, "pa_outboxcode='" + pa_outboxcode.Text + "'");
                     pa_stanqty = int.Parse(dt.Rows[0]["pa_standardqty"].ToString());
                     pa_id = dt.Rows[0]["pa_id"].ToString();
-                    FillPrintLabel();
                     outboxcode.Focus();
                 }
                 else outboxcode.Focus();
@@ -114,16 +112,24 @@ namespace UAS_MES.Make
                         return;
                     }
                     sql.Clear();
-                    sql.Append("select pd_makecode pa_makecode,pa_id,pd_prodcode pa_prodcode,pa_mothercode,pa_status,pa_nextstep,nvl(pr_palletqty,0) pa_standardqty  from packagedetail ");
+                    sql.Append("select pd_makecode pa_makecode,nvl(pa_downstatus,0)pa_downstatus,pa_id,pd_prodcode pa_prodcode,pa_mothercode,pa_status,pa_nextstep,nvl(pr_palletqty,0) pa_standardqty  from packagedetail ");
                     sql.Append("left join package on pd_paid=pa_id left join product on pr_code=pd_prodcode where pd_outboxcode='" + outboxcode.Text + "'");
                     dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                     if (dt.Rows.Count > 0)
                     {
                         BaseUtil.SetFormValue(this.Controls, dt);
+                        if (dt.Rows[0]["pa_downstatus"].ToString() != "0")
+                        {
+                            OperateResult.AppendText(">>箱号" + outboxcode.Text + "下地状态不允许采集\n", Color.Red, outboxcode);
+                            return;
+                        }
                         if (dt.Rows[0]["pa_mothercode"].ToString() != "")
                         {
-                            pa_outboxcode.Text = dt.Rows[0]["pa_mothercode"].ToString();
-                            palletcode_KeyDown(sender, e);
+                            if (pa_outboxcode.Text == "")
+                            {
+                                pa_outboxcode.Text = dt.Rows[0]["pa_mothercode"].ToString();
+                                palletcode_KeyDown(sender, e);
+                            }
                         }
                         pa_nextstep = dt.Rows[0]["pa_nextstep"].ToString();
                         pa_stanqty = int.Parse(dt.Rows[0]["pa_standardqty"].ToString());
@@ -250,7 +256,13 @@ namespace UAS_MES.Make
                             }
                             else OperateResult.AppendText(">>箱号" + outboxcode.Text + "尚未封箱\n", Color.Red, outboxcode);
                         }
-                        else OperateResult.AppendText(">>箱号" + outboxcode.Text + "已采集\n", Color.Red, outboxcode);
+                        else
+                        {
+                            if (dt.Rows[0]["pa_mothercode"].ToString() == pa_outboxcode.Text)
+                                OperateResult.AppendText(">>箱号" + outboxcode.Text + "已在本栈板内\n", Color.Red, outboxcode);
+                            else
+                                OperateResult.AppendText(">>箱号" + outboxcode.Text + "已采集至栈板" + dt.Rows[0]["pa_mothercode"].ToString() + "\n", Color.Red, outboxcode);
+                        }
                     }
                     else OperateResult.AppendText(">>箱号" + outboxcode.Text + "不存在\n", Color.Red, outboxcode);
                 }
@@ -314,8 +326,11 @@ namespace UAS_MES.Make
                     OperateResult.AppendText(">>打印箱号" + pa_outboxcode.Text + "\n", Color.Black);
                     doc = lbl.Documents.Open(ftpOperater.DownLoadTo + PrintLabel.Text);
                     Print.CodeSoft(Tag.ToString(), doc, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), PrinterList.Text, pa_outboxcode.Text, int.Parse(PrintNum.Text));
-                    pa_outboxcode.Focus();
-                    pa_outboxcode.SelectAll();
+                    if (!AutoOutBoxCode.Checked)
+                    {
+                        pa_outboxcode.Focus();
+                        pa_outboxcode.SelectAll();
+                    }
                 }
                 else OperateResult.AppendText(">>必须封栈板才能进行打印\n", Color.Red);
             }