From d12a7cfeab304db1cdb02693f9422b7281672a24 Mon Sep 17 00:00:00 2001 From: "vluk@2fi-solutions.com.hk" Date: Mon, 9 Mar 2026 23:49:36 +0800 Subject: [PATCH] no message --- .../java/com/ffii/fpsms/m18/model/GoodsReceiptNoteRequest.kt | 2 +- .../fpsms/modules/master/service/ProductionScheduleService.kt | 4 ++-- .../ffii/fpsms/modules/stock/service/StockInLineService.kt | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/ffii/fpsms/m18/model/GoodsReceiptNoteRequest.kt b/src/main/java/com/ffii/fpsms/m18/model/GoodsReceiptNoteRequest.kt index 45a5749..686ecc1 100644 --- a/src/main/java/com/ffii/fpsms/m18/model/GoodsReceiptNoteRequest.kt +++ b/src/main/java/com/ffii/fpsms/m18/model/GoodsReceiptNoteRequest.kt @@ -33,7 +33,7 @@ data class GoodsReceiptNoteMainanValue( val staffId: Int = 329, val cnDeptId: Int? = null, val virDeptId: Int? = null, - val udfMTMSDNNO2: String? = null, // doNo (dnNo), same for same PO + val udfMTMSDNNO2: String? = null, // doNo (dnNo); always include in JSON (use "" when empty) for supplier log audit val udfpartiallyreceived: Boolean? = null, // true if any line acc>=demand, else false ) 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 2d46ec4..3f79375 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 @@ -874,8 +874,8 @@ open class ProductionScheduleService( var safetyStockDay = 2.0 var redLine = 1.9 - if(isFriSat){ - //record.daysLeft = record.daysLeft + // isFriSat inflated thresholds not suitable for lemon; lemon always uses standard values + if (isFriSat && (record.isLemon.toDouble()) <= 0) { safetyStockDay = 3.1 redLine = 2.7 } diff --git a/src/main/java/com/ffii/fpsms/modules/stock/service/StockInLineService.kt b/src/main/java/com/ffii/fpsms/modules/stock/service/StockInLineService.kt index 0ec64a7..23121b2 100644 --- a/src/main/java/com/ffii/fpsms/modules/stock/service/StockInLineService.kt +++ b/src/main/java/com/ffii/fpsms/modules/stock/service/StockInLineService.kt @@ -426,7 +426,7 @@ open class StockInLineService( else -> 1 } val firstLine = stockInLines.firstOrNull() - val doNo = firstLine?.dnNo?.takeIf { it != "DN00000" } ?: "" + val doNo = (firstLine?.dnNo?.takeIf { it != "DN00000" } ?: "").trim() val tDate = firstLine?.receiptDate?.toLocalDate()?.format(DateTimeFormatter.ofPattern("MM/dd/yyyy")) ?: LocalDate.now().format(DateTimeFormatter.ofPattern("MM/dd/yyyy")) // Group by POL first for udfpartiallyreceived: true = any POL short (accepted < ordered), false = all fully received @@ -449,7 +449,7 @@ open class StockInLineService( staffId = 329, virDeptId = po.shop?.m18Id?.toInt(), tDate = tDate, - udfMTMSDNNO2 = doNo.ifEmpty { null }, + udfMTMSDNNO2 = doNo.ifBlank { "" }, // always include for log audit; "" when no DN udfpartiallyreceived = udfpartiallyreceived, ) )