refine onpack zip expiry

src/main/java/com/ffii/fpsms/modules/jobOrder/service/PlasticBagPrinterService.kt

@@ -162,7 +162,7 @@ class PlasticBagPrinterService(
             )
 
         fun onPackExpiryFileStem(itemCodeLower: String, indexOneBased: Int, totalForItem: Int): String =
-            if (totalForItem > 1) "$itemCodeLower-$indexOneBased" else itemCodeLower
+            if (totalForItem > 1 && indexOneBased > 1) "$itemCodeLower-$indexOneBased" else itemCodeLower
 
         /** ISO `yyyy-MM-dd`, compact `yyyyMMdd`, or already `Expiry Date yyyyMMdd`. */
         fun formatLaserExpiryParam(expiryDate: String?): String {

src/test/kotlin/com/ffii/fpsms/modules/jobOrder/service/OnPackExpiryZipStemTest.kt

@@ -8,10 +8,11 @@ import org.junit.jupiter.api.Test
 class OnPackExpiryZipStemTest {
 
     @Test
-    fun expiry_file_stem_suffixes_only_when_item_has_more_than_one_job() {
+    fun expiry_file_stem_suffixes_from_second_job_only() {
         assertEquals("pp2211", PlasticBagPrinterService.onPackExpiryFileStem("pp2211", 1, 1))
-        assertEquals("pp2211-1", PlasticBagPrinterService.onPackExpiryFileStem("pp2211", 1, 2))
+        assertEquals("pp2211", PlasticBagPrinterService.onPackExpiryFileStem("pp2211", 1, 2))
         assertEquals("pp2211-2", PlasticBagPrinterService.onPackExpiryFileStem("pp2211", 2, 2))
+        assertEquals("pp2211-3", PlasticBagPrinterService.onPackExpiryFileStem("pp2211", 3, 3))
     }
 
     @Test