From be14ebcb295baeb97518adf29d715357f35b1d24 Mon Sep 17 00:00:00 2001 From: "CANCERYS\\kw093" Date: Mon, 8 Dec 2025 13:41:07 +0800 Subject: [PATCH] update --- .../fpsms/modules/master/service/BomService.kt | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/ffii/fpsms/modules/master/service/BomService.kt b/src/main/java/com/ffii/fpsms/modules/master/service/BomService.kt index f334e71..e1152c2 100644 --- a/src/main/java/com/ffii/fpsms/modules/master/service/BomService.kt +++ b/src/main/java/com/ffii/fpsms/modules/master/service/BomService.kt @@ -194,7 +194,10 @@ open class BomService( } 3 -> { bomMatRequest.uomName = tempCell.stringCellValue.trim() + val salesUnit = uomConversionRepository.findByCodeAndDeletedFalse(tempCell.stringCellValue.trim()) + bomMatRequest.salesUnit = salesUnit } + /* 6 -> { bomMatRequest.qty = tempCell.numericCellValue.toBigDecimal() } @@ -202,6 +205,16 @@ open class BomService( val salesUnit = uomConversionRepository.findByCodeAndDeletedFalse(tempCell.stringCellValue.trim()) bomMatRequest.salesUnit = salesUnit } + */ + 2-> { + bomMatRequest.qty = tempCell.numericCellValue.toBigDecimal() + } + /* + 2 -> { + val salesUnit = uomConversionRepository.findByCodeAndDeletedFalse(tempCell.stringCellValue.trim()) + bomMatRequest.salesUnit = salesUnit + }*/ + 10 -> { println("seqNo: ${tempCell.numericCellValue.toInt()}") println("bomId: ${bom.id!!}") @@ -513,7 +526,8 @@ open class BomService( val resolver = PathMatchingResourcePatternResolver() // val excels = resolver.getResources("bomImport/*.xlsx") //val excels = resolver.getResources("file:C:/Users/Kelvin YAU/Downloads/bom/*.xlsx") - val excels = resolver.getResources("file:C:/Users/Kelvin YAU/Downloads/bom/*.xlsx") + //val excels = resolver.getResources("file:C:/Users/Kelvin YAU/Downloads/bom/*.xlsx") + val excels = resolver.getResources("file:C:/Users/kw093/Downloads/bom/bom/*.xlsx") // val excels = resolver.getResources("file:C:/Users/2Fi/Desktop/Third Wave of BOM Excel/*.xlsx") println("size: ${excels.size}") val logExcel = ClassPathResource("excelTemplate/bom_excel_issue_log.xlsx")