|
|
@@ -217,11 +217,11 @@ open class InventoryLotLineService( |
|
|
// .minus(inventoryLotLine.outQty ?: zero) |
|
|
// .minus(inventoryLotLine.outQty ?: zero) |
|
|
// .minus(inventoryLotLine.holdQty ?: zero) |
|
|
// .minus(inventoryLotLine.holdQty ?: zero) |
|
|
|
|
|
|
|
|
// 4. 使用 inventory_lot_line 的剩余数量(已经是库存单位,无需转换) |
|
|
|
|
|
field["acceptedQty"] = "%.2f".format(onHandQty) |
|
|
|
|
|
|
|
|
// Accepted qty at stock-in, no conversion (stays e.g. 50000 even after stock out) |
|
|
|
|
|
field["acceptedQty"] = "%.2f".format(info.acceptedQty) |
|
|
|
|
|
|
|
|
// 5. 使用 inventory_lot_line.stockUom 获取 UOM(通过 stockItemUomId) |
|
|
|
|
|
field["uom"] = inventoryLotLine.stockUom?.uom?.udfudesc ?: "N/A" |
|
|
|
|
|
|
|
|
val stockItemUom = itemUomRespository.findBaseUnitByItemIdAndStockUnitIsTrueAndDeletedIsFalse(info.itemId) |
|
|
|
|
|
field["uom"] = stockItemUom?.uom?.udfudesc ?: info.uom?.udfudesc?.toString() ?: "N/A" |
|
|
|
|
|
|
|
|
field["productionDate"] = info.productionDate?.format(DateTimeFormatter.ISO_LOCAL_DATE) ?: "" |
|
|
field["productionDate"] = info.productionDate?.format(DateTimeFormatter.ISO_LOCAL_DATE) ?: "" |
|
|
field["expiryDate"] = info.expiryDate?.format(DateTimeFormatter.ISO_LOCAL_DATE) ?: "" |
|
|
field["expiryDate"] = info.expiryDate?.format(DateTimeFormatter.ISO_LOCAL_DATE) ?: "" |
|
|
|