I think below issue is similar with our headache consignee issue . If Thailand customs do have this require on Consignee ,I think you need let your ITO approval on the process change ,so that “YX” partner code can be used in DN partner to instead of ZC ,so Invoice can show correct Consignee . Thanks .
If no process change ,this issue will happen again and again ,and we are not allowed to manually change Invoice /Packing list . Hope you understand .