栈板采集逻辑与提示修改

UAS-MES/FunctionCode/Make/Make_BigBoxCollection.cs

@@ -240,7 +240,7 @@ namespace UAS_MES.Make
                             pa_id = dt.Rows[0]["pa_id"].ToString();
                         }
                         string error;
-                        if (!LogicHandler.CheckPackRule(pr_packrule.Text, pa_outboxcode.Text, outboxcode.Text, pa_makecode.Text, pa_salecode.Text, pa_prodcode.Text, out error))
+                        if (!LogicHandler.CheckPackRule(pr_packrule.Text, pa_outboxcode.Text, outboxcode.Text, pa_makecode.Text, pa_salecode.Text, pa_prodcode.Text, "大箱",out error))
                         {
                             OperateResult.AppendText(">>" + error + "\n", Color.Red, outboxcode);
                             return;

UAS-MES/FunctionCode/Make/Make_PalletCollection.cs

@@ -227,15 +227,15 @@ namespace UAS_MES.Make
                             sql.Append("insert into package (pa_id,pa_outboxcode,PA_STANDARDQTY,pa_makecode,pa_indate,pa_packageqty,pa_type,pa_prodcode，pa_level，PA_STATUS,pa_sccode,pa_currentstep,pa_salecode)values");
                             sql.Append("(" + pa_id + ",'" + pa_outboxcode.Text + "','" + pa_standardqty.Text + "','" + pd_makecode.Text + "',sysdate,'0',3,'" + pd_prodcode.Text + "',0,0,'" + User.UserSourceCode + "','" + User.CurrentStepCode + "','" + pd_salecode.Text + "')");
                             dh.ExecuteSql(sql.GetString(), "insert");
-                            palletcode_KeyDown(sender, e);
                         }
                         else
                         {
                             pa_id = dt.Rows[0]["pa_id"].ToString();
                         }
+                        palletcode_KeyDown(sender, e);
                         if (int.Parse(pa_totalqty.Text == "" ? "0" : pa_totalqty.Text) > 0)
                         {
-                            if (!LogicHandler.CheckPackRule(pr_packrule.Text, pa_outboxcode.Text, outboxcode.Text, pa_makecode.Text, pa_salecode.Text, pa_prodcode.Text, out ErrorMessage))
+                            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;
@@ -256,6 +256,10 @@ namespace UAS_MES.Make
                                         OperateResult.AppendText(">>采集箱号" + outboxcode.Text + "后超出容量\n", Color.Red, outboxcode);
                                         return;
                                     }
+                                    if (int.Parse(pa_totalqty.Text == "" ? "0" : pa_totalqty.Text) == 0)
+                                    {
+                                        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");
+                                    }
                                     List<string> SQLS = new List<string>();
                                     sql.Clear();
                                     sql.Append("insert into packagedetail(pd_id, pd_paid, pd_outboxcode,pd_makecode,pd_prodcode,pd_innerboxcode, pd_innerqty,pd_builddate)");
@@ -351,10 +355,6 @@ namespace UAS_MES.Make
             {
                 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);
         }
 

UAS-MES/PublicMethod/LogicHandler.cs

@@ -1322,7 +1322,7 @@ namespace UAS_MES.PublicMethod
         /// <param name="pa_prodcode"></param>
         /// <param name="error"></param>
         /// <returns></returns>
-        public static Boolean CheckPackRule(string packrule, string pa_outboxcode, string outboxcode, string pa_makecode, string pa_salecode, string pa_prodcode, out string error)
+        public static Boolean CheckPackRule(string packrule, string pa_outboxcode, string outboxcode, string pa_makecode, string pa_salecode, string pa_prodcode,string type, out string error)
         {
             //按工单核对装箱
             switch (packrule.ToUpper())
@@ -1331,7 +1331,7 @@ namespace UAS_MES.PublicMethod
                     string makecode = dh.getFieldDataByCondition("package", "pa_makecode", "pa_outboxcode='" + outboxcode + "'").ToString();
                     if (makecode != pa_makecode && pa_makecode != "")
                     {
-                        error = ">>当前箱" + outboxcode + "所属工单号" + makecode + "和待装箱号" + pa_outboxcode + "工单" + pa_makecode + "不相等";
+                        error = ">>当前箱" + outboxcode + "对应工单号" + makecode + "和所装"+type+"号" + pa_outboxcode + "对应工单" + pa_makecode + "不相等";
                         return false;
                     }
                     break;
@@ -1341,7 +1341,7 @@ namespace UAS_MES.PublicMethod
                         string salecode = dh.getFieldDataByCondition("package", "pa_salecode", "pa_outboxcode = '" + outboxcode + "'").ToString();
                         if (salecode != pa_salecode)
                         {
-                            error = ">>当前箱" + outboxcode + "所属订单号" + salecode + "和待装箱号" + pa_outboxcode + "订单" + pa_salecode + "不相等";
+                            error = ">>当前箱" + outboxcode + "对应订单号" + salecode + "和所装" + type + "号" + pa_outboxcode + "对应订单" + pa_salecode + "不相等";
                             return false;
                         }
                     }
@@ -1350,7 +1350,7 @@ namespace UAS_MES.PublicMethod
                     string prodcode = dh.getFieldDataByCondition("package", "pa_prodcode", "pa_outboxcode='" + outboxcode + "'").ToString();
                     if (prodcode != pa_prodcode)
                     {
-                        error = ">>当前箱" + outboxcode + "对应物料" + prodcode + "和待装箱号" + pa_outboxcode + "物料" + pa_prodcode + "不相等";
+                        error = ">>当前箱" + outboxcode + "对应物料" + prodcode + "和所装" + type + "号" + pa_outboxcode + "对应物料" + pa_prodcode + "不相等";
                         return false;
                     }
                     break;