It sounds like you got an ACD on the earlier case. The DA could restore that mater and you would face two different cases, but probably will not. The chance of your getting an ACD on the new case is poor because you failed once, but a good lawyer might convince the DA to give you another chance.
The DA could re-instate your ACD meaning you would be facing 2 cases. However, that probably won't happen. There may be a way to get the marijuana cases dismissed. Hire a criminal defense lawyer.
It sounds like you received either a conditional discharge or an ACD on your prior matter. I would recommend retaining an attorney prior to the DAT date so that your rights are protected at that court appearance.
The DA may reopen the prior matter but they may not.