Quellcode durchsuchen

update stock in line with remarks

master
MSI\derek vor 1 Monat
Ursprung
Commit
46843c9437
5 geänderte Dateien mit 13 neuen und 0 gelöschten Zeilen
  1. +1
    -0
      src/main/java/com/ffii/fpsms/modules/pickOrder/service/PickOrderService.kt
  2. +3
    -0
      src/main/java/com/ffii/fpsms/modules/stock/entity/StockInLine.kt
  3. +3
    -0
      src/main/java/com/ffii/fpsms/modules/stock/service/StockInLineService.kt
  4. +1
    -0
      src/main/java/com/ffii/fpsms/modules/stock/web/model/SaveStockInRequest.kt
  5. +5
    -0
      src/main/resources/db/changelog/changes/20250725_01_derek/02_update_stock_in_line_with_remarks.sql

+ 1
- 0
src/main/java/com/ffii/fpsms/modules/pickOrder/service/PickOrderService.kt Datei anzeigen

@@ -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)
}


+ 3
- 0
src/main/java/com/ffii/fpsms/modules/stock/entity/StockInLine.kt Datei anzeigen

@@ -89,4 +89,7 @@ open class StockInLine : BaseEntity<Long>() {
@Column(name = "invoiceNo")
open var invoiceNo: String? = null

@Column(name = "remarks")
open var remarks: String? = null

}

+ 3
- 0
src/main/java/com/ffii/fpsms/modules/stock/service/StockInLineService.kt Datei anzeigen

@@ -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)


+ 1
- 0
src/main/java/com/ffii/fpsms/modules/stock/web/model/SaveStockInRequest.kt Datei anzeigen

@@ -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<SaveQcResultRequest>?,


+ 5
- 0
src/main/resources/db/changelog/changes/20250725_01_derek/02_update_stock_in_line_with_remarks.sql Datei anzeigen

@@ -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`;

Laden…
Abbrechen
Speichern