From 6c7dfabb348e893de18917086efcd56e03ce5810 Mon Sep 17 00:00:00 2001 From: "vluk@2fi-solutions.com.hk" Date: Thu, 19 Mar 2026 20:01:40 +0800 Subject: [PATCH] alter the generation of productprocesscode; also ignore the deleted bom in scheduling --- .../com/ffii/fpsms/modules/jobOrder/service/PSService.kt | 2 +- .../modules/master/service/ProductionScheduleService.kt | 2 +- .../productProcess/service/ProductProcessService.kt | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/ffii/fpsms/modules/jobOrder/service/PSService.kt b/src/main/java/com/ffii/fpsms/modules/jobOrder/service/PSService.kt index 8184df1..247f965 100644 --- a/src/main/java/com/ffii/fpsms/modules/jobOrder/service/PSService.kt +++ b/src/main/java/com/ffii/fpsms/modules/jobOrder/service/PSService.kt @@ -73,7 +73,7 @@ open class PSService( LEFT JOIN item_fake_onhand ON items.code = item_fake_onhand.itemCode LEFT JOIN item_uom iu ON iu.itemId = items.id AND iu.stockUnit = 1 LEFT JOIN uom_conversion uc_stock ON uc_stock.id = iu.uomId - WHERE 1 + WHERE bom.deleted = 0 and bom.description = 'FG' """.trimIndent() return jdbcDao.queryForList(sql, args) } diff --git a/src/main/java/com/ffii/fpsms/modules/master/service/ProductionScheduleService.kt b/src/main/java/com/ffii/fpsms/modules/master/service/ProductionScheduleService.kt index e97d453..d66d320 100644 --- a/src/main/java/com/ffii/fpsms/modules/master/service/ProductionScheduleService.kt +++ b/src/main/java/com/ffii/fpsms/modules/master/service/ProductionScheduleService.kt @@ -726,7 +726,7 @@ open class ProductionScheduleService( LEFT JOIN items ON bom.itemId = items.id LEFT JOIN inventory ON items.id = inventory.itemId left join item_fake_onhand on items.code = item_fake_onhand.itemCode - WHERE 1 + WHERE bom.deleted = 0 and bom.description = 'FG' -- and bom.itemId != 16771 ) AS i WHERE 1 diff --git a/src/main/java/com/ffii/fpsms/modules/productProcess/service/ProductProcessService.kt b/src/main/java/com/ffii/fpsms/modules/productProcess/service/ProductProcessService.kt index 25d99b0..6fd2eb7 100644 --- a/src/main/java/com/ffii/fpsms/modules/productProcess/service/ProductProcessService.kt +++ b/src/main/java/com/ffii/fpsms/modules/productProcess/service/ProductProcessService.kt @@ -115,7 +115,7 @@ open class ProductProcessService( // 2. 生成 productProcessCode（格式：PP-20251026-001） //val datePrefix = (request.date ?: LocalDate.now()).format(DateTimeFormatter.ofPattern("yyyyMMdd")) val datePrefix = (LocalDate.now()).format(DateTimeFormatter.ofPattern("yyyyMMdd")) - val productProcessCode = generateProductProcessCode(datePrefix) + val productProcessCode = generateProductProcessCode(datePrefix, request.bomId!!) println("🔢 Service: Generated code: $productProcessCode") // 3. 创建 ProductProcess @@ -160,8 +160,8 @@ open class ProductProcessService( ) } - private fun generateProductProcessCode(datePrefix: String): String { - val searchPattern = "PP-$datePrefix-" + private fun generateProductProcessCode(datePrefix: String, bomId: Long): String { + val searchPattern = "PP-$datePrefix-$bomId-" val latestCode = productProcessRepository .findTopByProductProcessCodeStartingWithOrderByProductProcessCodeDesc(searchPattern) ?.productProcessCode @@ -937,7 +937,7 @@ open class ProductProcessService( } val savedProcess = retryOnDuplicateProductProcessCode { - val newCode = generateProductProcessCode(datePrefix) + val newCode = generateProductProcessCode(datePrefix, bom?.id ?: 0L) productProcess.productProcessCode = newCode productProcessRepository.saveAndFlush(productProcess) }