装箱方法修改

UAS_MES_PNE/FunctionCode/Packing/Packing_PalletCollection.cs

@@ -119,7 +119,7 @@ namespace UAS_MES_NEW.Packing
                         OperateResult.AppendText(">>箱号不能为空\n", Color.Red);
                         return;
                     }
-                    dt = (DataTable)dh.ExecuteSql("select ms_outboxcode from makeserial where ms_sncode='" + outboxcode.Text + "'", "select");
+                    dt = (DataTable)dh.ExecuteSql("select ms_outboxcode from makeserial where ms_sncode='" + outboxcode.Text + "' and ms_outboxcode is not null", "select");
                     if (dt.Rows.Count > 0)
                     {
                         outboxcode.Text = dt.Rows[0]["ms_outboxcode"].ToString();

UAS_MES_PNE/FunctionCode/Special/Special_AfterSaleIn.cs

@@ -54,7 +54,7 @@ namespace UAS_MES_NEW.Special
                 return;
             }
             dh.ExecuteSql("insert into AFSALES(as_id,as_sn,as_prodcode,as_indate)values(AFSALES_seq.nextval,'" + barcode.Text + "','" + pr_code.Text + "',sysdate)", "insert");
-            OperateResult.AppendText(">>条码号" + as_sn + "采集成功\n", Color.Green, barcode);
+            OperateResult.AppendText(">>条码号" + barcode.Text + "采集成功\n", Color.Green, barcode);
             LoadGridData();
         }