diff --git a/src/main/java/com/ffii/fpsms/modules/pickOrder/service/PickOrderService.kt b/src/main/java/com/ffii/fpsms/modules/pickOrder/service/PickOrderService.kt index 36f6348..afbe35b 100644 --- a/src/main/java/com/ffii/fpsms/modules/pickOrder/service/PickOrderService.kt +++ b/src/main/java/com/ffii/fpsms/modules/pickOrder/service/PickOrderService.kt @@ -490,6 +490,7 @@ open class PickOrderService( val inventoryLotLines = inventoryLotLineRepository.findAllByIdIn(saveSuggestedPickLots.mapNotNull { it.suggestedLotLine?.id }) saveSuggestedPickLots.forEach { lot -> +// val ratio = lot.suggestedLotLine!!.stockUom val lineIndex = inventoryLotLines.indexOf(lot.suggestedLotLine) inventoryLotLines[lineIndex].holdQty = (inventoryLotLines[lineIndex].holdQty ?: zero).plus(lot.qty ?: zero) } diff --git a/src/main/java/com/ffii/fpsms/modules/stock/entity/StockInLine.kt b/src/main/java/com/ffii/fpsms/modules/stock/entity/StockInLine.kt index d04760c..7a66060 100644 --- a/src/main/java/com/ffii/fpsms/modules/stock/entity/StockInLine.kt +++ b/src/main/java/com/ffii/fpsms/modules/stock/entity/StockInLine.kt @@ -89,4 +89,7 @@ open class StockInLine : BaseEntity() { @Column(name = "invoiceNo") open var invoiceNo: String? = null + @Column(name = "remarks") + open var remarks: String? = null + } \ No newline at end of file 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 499251f..99cf666 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 @@ -276,6 +276,7 @@ open class StockInLineService( this.inventoryLot = stockInLine.inventoryLot ?: savedInventoryLot this.inventoryLotLine = savedInventoryLotLine this.lotNo = stockInLine.lotNo ?: savedInventoryLot?.lotNo + this.remarks = stockInLine.remarks ?: request.remarks } val savedStockInLine = saveAndFlush(stockInLine) // check if all line completed @@ -318,6 +319,7 @@ open class StockInLineService( this.productLotNo = stockInLine.productLotNo this.dnNo = stockInLine.dnNo this.invoiceNo = stockInLine.invoiceNo + this.remarks = stockInLine.remarks ?: request.remarks this.receiptDate = stockInLine.receiptDate this.stockIn = stockInLine.stockIn this.demandQty = stockInLine.demandQty @@ -352,6 +354,7 @@ open class StockInLineService( this.productLotNo = stockInLine.productLotNo ?: request.productLotNo this.dnNo = stockInLine.dnNo ?: request.dnNo this.invoiceNo = stockInLine.invoiceNo ?: request.invoiceNo + this.remarks = stockInLine.remarks ?: request.remarks } val stockInLineEntries = listOf(stockInLine, newStockInLine) diff --git a/src/main/java/com/ffii/fpsms/modules/stock/web/model/SaveStockInRequest.kt b/src/main/java/com/ffii/fpsms/modules/stock/web/model/SaveStockInRequest.kt index 8177d9c..4837e42 100644 --- a/src/main/java/com/ffii/fpsms/modules/stock/web/model/SaveStockInRequest.kt +++ b/src/main/java/com/ffii/fpsms/modules/stock/web/model/SaveStockInRequest.kt @@ -46,6 +46,7 @@ data class SaveStockInLineRequest( var productLotNo: String?, var dnNo: String?, var invoiceNo: String?, + var remarks: String?, var receiptDate: LocalDate?, var productionDate: LocalDate?, var qcResult: List?, diff --git a/src/main/resources/db/changelog/changes/20250725_01_derek/02_update_stock_in_line_with_remarks.sql b/src/main/resources/db/changelog/changes/20250725_01_derek/02_update_stock_in_line_with_remarks.sql new file mode 100644 index 0000000..511ab68 --- /dev/null +++ b/src/main/resources/db/changelog/changes/20250725_01_derek/02_update_stock_in_line_with_remarks.sql @@ -0,0 +1,5 @@ +-- liquibase formatted sql +-- changeset derek:update_stock_in_line_with_remarks + +ALTER TABLE `stock_in_line` + ADD COLUMN `remarks` VARCHAR(500) NULL AFTER `invoiceNo`; \ No newline at end of file