Issue #23158:fix populating of supply order type and id
Merge pull request #324 from garyhgohoos/23158

Issue #23158:fix populating of supply order type and id