修改大箱栈板解除提示

UAS-MES/FunctionCode/Make/Make_BigBoxCollection.cs

@@ -373,14 +373,22 @@ namespace UAS_MES.Make
         {
             if (bigoutboxcode.Text != "")
             {
-                if (dh.CheckExist("package", "pa_outboxcode='" + bigoutboxcode.Text + "' and nvl(pa_status,0)=0"))
+                sql.Clear();
+                sql.Append("select nvl(pa_status,0) pa_status from packagedetail left join package ");
+                sql.Append("on pa_id=pd_paid where pd_outboxcode='" + bigoutboxcode.Text + "'");
+                DataTable dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+                if (dt.Rows.Count > 0)
                 {
-                    OperateResult.AppendText(">>" + bigoutboxcode.Text + "封箱成功\n", Color.Green);
-                    LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, pa_makecode.Text, User.UserLineCode, User.UserSourceCode, "大箱采集", "装箱" + bigoutboxcode.Text + "成功", outboxcode.Text, "");
-                    dh.ExecuteSql("update package set pa_status=1 where pa_outboxcode='" + bigoutboxcode.Text + "'", "update");
-                    pa_status.Text = "1";
+                    if (dt.Rows[0]["pa_status"].ToString() == "0")
+                    {
+                        OperateResult.AppendText(">>大箱号" + bigoutboxcode.Text + "装大箱成功\n", Color.Green);
+                        LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, pa_makecode.Text, User.UserLineCode, User.UserSourceCode, "大箱采集", "装箱" + bigoutboxcode.Text + "成功", outboxcode.Text, "");
+                        dh.ExecuteSql("update package set pa_status=1 where pa_outboxcode='" + bigoutboxcode.Text + "'", "update");
+                        pa_status.Text = "1";
+                    }
+                    else OperateResult.AppendText(">>大箱号" + bigoutboxcode.Text + "已封大箱\n", Color.Red);
                 }
-                else OperateResult.AppendText(">>箱号" + bigoutboxcode.Text + "错误或者已封箱\n", Color.Red);
+                else OperateResult.AppendText(">>大箱号" + bigoutboxcode.Text + "未采集内容\n", Color.Red);
             }
             else OperateResult.AppendText(">>大箱号不能为空\n", Color.Red);
         }

UAS-MES/FunctionCode/Make/Make_PalletCollection.cs

@@ -326,11 +326,24 @@ namespace UAS_MES.Make
 
         private void Packing_Click(object sender, EventArgs e)
         {
-            if (pa_prodcode.Text != "" && palletcode.Text != "")
+            if (palletcode.Text != "")
             {
-                OperateResult.AppendText(">>" + palletcode.Text + "装栈板成功\n", Color.Green);
-                dh.ExecuteSql("update package set pa_status=1 where pa_outboxcode='" + palletcode.Text + "'", "update");
-                pa_status.Text = "1";
+                sql.Clear();
+                sql.Append("select nvl(pa_status,0) pa_status from packagedetail left join package ");
+                sql.Append("on pa_id=pd_paid where pd_outboxcode='" + palletcode.Text + "'");
+                DataTable dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+                if (dt.Rows.Count > 0)
+                {
+                    if (dt.Rows[0]["pa_status"].ToString() == "0")
+                    {
+                        OperateResult.AppendText(">>栈板号" + palletcode.Text + "装栈板成功\n", Color.Green);
+                        LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, pa_makecode.Text, User.UserLineCode, User.UserSourceCode, "栈板采集", "装栈板" + palletcode.Text + "成功", outboxcode.Text, "");
+                        dh.ExecuteSql("update package set pa_status=1 where pa_outboxcode='" + palletcode.Text + "'", "update");
+                        pa_status.Text = "1";
+                    }
+                    else OperateResult.AppendText(">>栈板号" + palletcode.Text + "已封栈板\n", Color.Red);
+                }
+                else OperateResult.AppendText(">>栈板号" + palletcode.Text + "未采集内容\n", Color.Red);
             }
             else OperateResult.AppendText(">>栈板号不能为空\n", Color.Red);
         }