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

UAS-MES/FunctionCode/Make/Make_BigBoxCollection.cs

@@ -86,7 +86,7 @@ namespace UAS_MES.Make
             if (e.KeyCode == Keys.Enter)
             {
                 sql.Clear();
-                sql.Append("select pa_id,pa_standardqty,pa_makecode,pa_prodcode,pa_id,pa_packageqty,pa_outboxcode,pa_totalqty,pa_currentqty, ");
+                sql.Append("select pa_id,nvl(pa_standardqty,'0')pa_standardqty,pa_makecode,pa_prodcode,pa_id,pa_packageqty,pa_outboxcode,pa_totalqty,pa_currentqty, ");
                 sql.Append("pa_salecode,pa_custcode 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)
@@ -415,7 +415,8 @@ namespace UAS_MES.Make
         {
             if (dh.getRowCount("packagedetail", "pd_outboxcode='" + pa_outboxcode.Text + "'") > 0)
             {
-                if (dh.getFieldDataByCondition("package", "pa_mothercode", "pa_outboxcode='" + pa_outboxcode.Text + "'").ToString() == "")
+                string pa_mothercode = dh.getFieldDataByCondition("package", "pa_mothercode", "pa_outboxcode='" + pa_outboxcode.Text + "'").ToString();
+                if (pa_mothercode  == "")
                 {
                     string Delete = MessageBox.Show(this.ParentForm, "是否确认拆箱？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question).ToString();
                     if (Delete == "Yes")
@@ -452,7 +453,7 @@ namespace UAS_MES.Make
                         palletcode_KeyDown(new object(), new KeyEventArgs(Keys.Enter));
                     }
                 }
-                else OperateResult.AppendText(">>箱号" + pa_outboxcode.Text + "已装箱，不能取消解除装箱\n", Color.Red);
+                else OperateResult.AppendText(">>箱号" + pa_outboxcode.Text + "已装箱"+ pa_mothercode + "，不能取消解除装箱\n", Color.Red);
             }
             else OperateResult.AppendText(">>箱号" + pa_outboxcode.Text + "未采集箱\n", Color.Red);
         }

UAS-MES/FunctionCode/Make/Make_PackageCollection.cs

@@ -645,7 +645,7 @@ namespace UAS_MES.Make
                         }
                         else OperateResult.AppendText(">>箱号" + pa_outboxcode.Text + "已下地,不允许解除\n", Color.Red);
                     }
-                    else OperateResult.AppendText(">>箱号" + pa_outboxcode.Text + "已装箱,不允许解除\n", Color.Red);
+                    else OperateResult.AppendText(">>箱号" + pa_outboxcode.Text + "已装箱"+ dt.Rows[0]["pa_mothercode"].ToString() + ",不允许解除\n", Color.Red);
                 }
                 else OperateResult.AppendText(">>箱号" + pa_outboxcode.Text + "不存在\n", Color.Red);
             }

UAS-MES/FunctionCode/Make/Make_PackageCollectionWeigh.cs

@@ -743,7 +743,7 @@ namespace UAS_MES.Make
                         }
                         else OperateResult.AppendText(">>箱号" + pa_outboxcode.Text + "已下地,不允许解除\n", Color.Red);
                     }
-                    else OperateResult.AppendText(">>箱号" + pa_outboxcode.Text + "已装箱,不允许解除\n", Color.Red);
+                    else OperateResult.AppendText(">>箱号" + pa_outboxcode.Text + "已装箱" + dt.Rows[0]["pa_mothercode"].ToString() + ",不允许解除\n", Color.Red);
                 }
                 else OperateResult.AppendText(">>箱号" + pa_outboxcode.Text + "不存在\n", Color.Red);
             }