章政 8 жил өмнө
parent
commit
bd32ee34bd

+ 2 - 1
UAS-MES/FunctionCode/Make/Make_BigBoxCollection.cs

@@ -169,6 +169,7 @@ namespace UAS_MES.Make
                                     //判断明细和箱内的件数的差是不是1,如果只相差1则表示此时已经采集慢了
                                     if (packageqty + 1 == pa_stanqty)
                                     {
+                                        dh.ExecuteSql("update package set pa_status=1 where pa_outboxcode='" + bigoutboxcode.Text + "'", "update");
                                         if (AutoPrint.Checked)
                                         {
                                             OperateResult.AppendText(">>箱已装满,自动打印!\n", Color.Green);
@@ -277,7 +278,7 @@ namespace UAS_MES.Make
                 bigoutboxcode.Text = LogicHandler.GetOutBoxCode("BIGBOX", "", pa_prodcode.Text, User.UserCode);
                 sql.Clear();
                 sql.Append("insert into package (pa_id,pa_outboxcode,pa_makecode,pa_indate,pa_packageqty,pa_type,pa_prodcode,pa_level,PA_STATUS,pa_standardqty,pa_sccode,pa_currentstep)values");
-                sql.Append("(package_seq.nextval,'" + bigoutboxcode.Text + "','" + pa_makecode.Text + "',sysdate,'0',2,'" + pa_prodcode.Text + "',0,'','" + pa_standardqty.Text + "','"+User.UserSourceCode+"','"+User.CurrentStepCode+"')");
+                sql.Append("(package_seq.nextval,'" + bigoutboxcode.Text + "','" + pa_makecode.Text + "',sysdate,'0',2,'" + pa_prodcode.Text + "',0,'','" + pa_standardqty.Text + "','" + User.UserSourceCode + "','" + User.CurrentStepCode + "')");
                 dh.ExecuteSql(sql.GetString(), "insert");
                 palletcode_KeyDown(new object(), new KeyEventArgs(Keys.Enter));
             }

+ 2 - 2
UAS-MES/FunctionCode/Make/Make_PalletCollection.cs

@@ -151,9 +151,9 @@ namespace UAS_MES.Make
                                 OperateResult.AppendText(">>箱号" + outboxcode.Text + "采集成功!\n", Color.Green, outboxcode);
                                 LoadGridData();
                             }
-                            else OperateResult.AppendText(">>箱号" + outboxcode.Text + "已采集\n", Color.Red, outboxcode);
+                            else OperateResult.AppendText(">>箱号" + outboxcode.Text + "尚未封箱\n", Color.Red, outboxcode);
                         }
-                        else OperateResult.AppendText(">>箱号" + outboxcode.Text + "尚未封箱\n", Color.Red, outboxcode);
+                        else OperateResult.AppendText(">>箱号" + outboxcode.Text + "已采集\n", Color.Red, outboxcode);
                     }
                     else OperateResult.AppendText(">>箱号" + outboxcode.Text + "不存在\n", Color.Red, outboxcode);
                 }