栈板采集取消采集为空时栈板属性更新

UAS-MES/FunctionCode/Make/Make_PalletCollection.cs

@@ -233,10 +233,13 @@ namespace UAS_MES.Make
                         {
                             pa_id = dt.Rows[0]["pa_id"].ToString();
                         }
-                        if (!LogicHandler.CheckPackRule(pr_packrule.Text, pa_outboxcode.Text, outboxcode.Text, pa_makecode.Text, pa_salecode.Text, pa_prodcode.Text, out ErrorMessage))
+                        if (int.Parse(pa_totalqty.Text) > 0)
                         {
-                            OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red, outboxcode);
-                            return;
+                            if (!LogicHandler.CheckPackRule(pr_packrule.Text, pa_outboxcode.Text, outboxcode.Text, pa_makecode.Text, pa_salecode.Text, pa_prodcode.Text, out ErrorMessage))
+                            {
+                                OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red, outboxcode);
+                                return;
+                            }
                         }
                         dt = (DataTable)dh.ExecuteSql("select pa_totalqty,pa_mothercode,nvl(pa_status,0) pa_status from package where pa_outboxcode='" + outboxcode.Text + "'", "select");
                         if (dt.Rows.Count > 0)
@@ -344,6 +347,14 @@ namespace UAS_MES.Make
             sql.Append(",pd_makecode,pa_prodcode,pa_custcode,pa_packageqty from packagedetail left join package on pd_paid=pa_id left ");
             sql.Append("join product on pr_code=pa_prodcode where pa_outboxcode ='" + pa_outboxcode.Text + "' and pa_type=3");
             DataTable dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+            if (dt.Rows.Count == 0)
+            {
+                dh.ExecuteSql("update package set pa_checkno='',pa_prodcode='',pa_packtype='',pa_salecode='',pa_makecode='',pa_packageqty=0,pa_totalqty=0,pa_currentqty=0,pa_status=0 where pa_outboxcode='" + pa_outboxcode.Text + "'", "update");
+            }
+            else if (dt.Rows.Count == 1)
+            {
+                dh.ExecuteSql("update package set pa_prodcode='"+ pd_prodcode.Text + "',pa_salecode='"+ pd_salecode.Text + "',pa_makecode='"+ pd_makecode.Text + "' where pa_outboxcode='" + pa_outboxcode.Text + "'", "update");
+            }
             BaseUtil.FillDgvWithDataTable(PackageInf, dt);
         }