Batch Number for non-stock Job-work item

ERPNext Stock/Inventory
1

We do Job Processing on Customer’s Material. For Statutory we have 2 items:

  1. Manufacturing item WITHOUT MAITAINING STOCK(as material is given on loan by customer) with Finish good’s HSN#
  2. Service Item with Job Work service HSN#

Delivery Note is made with Finish Goods Item and Sales Invoice is Made on Job work service item.

For the Finish Good item we would like to assign Batch#. But since it is non-stock item(loan from customer) we are not able to Assign Manufacturing Service Batch number to it.

My Ask is:

  1. Is there a way to assign Batch number to Manufacturing + Non Stock Item which is prepared using loan raw material from Customer?
  2. Any other way to setup Job work manufacturing service ?