Fix lost asset serial numbers in stock entry for shipments

Third-Culture-Software · Jul 4, 2022 · d9b6f80 · d9b6f80
1 parent 1b043e3
commit d9b6f80
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/client/src/modules/stock/entry/entry.js b/client/src/modules/stock/entry/entry.js
@@ -515,6 +515,7 @@ function StockEntryController(
           isValid : true,
           lot : items[index].label,
           quantity : item.quantity,
+          serial_number : items[index].serial_number,
           expiration_date : new Date(items[index].expiration_date),
           uuid : items[index].uuid,
         });
@@ -776,6 +777,7 @@ function StockEntryController(
 
         const inventory = inventoryStore.get(line.inventory_uuid);
         const entryDate = vm.movement.date || Date();
+
         line.code = inventory.code;
         line.label = inventory.label;
         line.unit_cost = inventory.price;

diff --git a/server/controllers/stock/core.js b/server/controllers/stock/core.js
@@ -561,10 +561,10 @@ async function getLotsMovements(depotUuid, params) {
 
   const sql = `
     SELECT
-      BUID(l.uuid) AS uuid, l.label, m.quantity, m.reference, m.description,
+      BUID(l.uuid) AS uuid, l.label, l.serial_number, l.unit_cost, l.expiration_date,
+      m.quantity, m.reference, m.description,
       d.text AS depot_text, d.min_months_security_stock,
-      IF(is_exit = 1, "OUT", "IN") AS io, l.unit_cost,
-      l.expiration_date, BUID(l.inventory_uuid) AS inventory_uuid,
+      IF(is_exit = 1, "OUT", "IN") AS io, BUID(l.inventory_uuid) AS inventory_uuid,
       (SELECT MIN(sm.date) FROM stock_movement sm WHERE sm.lot_uuid = l.uuid) AS entry_date,
       i.code, i.text,
       BUID(m.depot_uuid) AS depot_uuid, m.is_exit, m.date, BUID(m.document_uuid) AS document_uuid,