@softwear/latestcollectioncore 1.0.138 → 1.0.139

package/dist/articleStatus.js

@@ -75,7 +75,16 @@ function addTransactionToAggregations(beginTimestamp, endTimestamp, aggregateKey
     }
     if (transaction.time > endTimestamp)
         return;
+    // Period transactions: add everything from BEGIN_STOCK_VECTOR_END onwards
     addVectors(aggregateVector, v, BEGIN_STOCK_VECTOR_END, v.length);
+    // Also update QTY_SHELF_STOCK and AMOUNT_SHELF_STOCK from period transactions
+    // (they're in the begin stock range but need to be updated by period transactions too)
+    if (v[QTY_SHELF_STOCK] !== undefined) {
+        aggregateVector[QTY_SHELF_STOCK] += v[QTY_SHELF_STOCK] || 0;
+    }
+    if (v[AMOUNT_SHELF_STOCK] !== undefined) {
+        aggregateVector[AMOUNT_SHELF_STOCK] += v[AMOUNT_SHELF_STOCK] || 0;
+    }
     // Calculate derived fields
     aggregateVector[QTY_RETURN] += v[QTY_SOLD] < 0 ? v[QTY_SOLD] : 0;
     aggregateVector[AMOUNT_RETURN] += v[AMOUNT_SOLD_EXCL] < 0 ? v[AMOUNT_SOLD_EXCL] : 0;
@@ -254,8 +263,14 @@ function postAgg(v, timeFrame) {
     const totalCostSold = v[COSTPRICE_SOLD] + v[COSTPRICE_B2B_SOLD] + v[COSTPRICE_B2B_RESOLD] - v[COSTPRICE_B2B_RETURN];
     v[QTY_END_STOCK] = v[QTY_STOCK] + v[QTY_RECIEVED] + v[QTY_CHANGE] + v[QTY_TRANSIT] - totalQtySold;
     v[AMOUNT_END_STOCK] = v[AMOUNT_STOCK] + v[AMOUNT_RECIEVED] + v[AMOUNT_CHANGE] + v[AMOUNT_TRANSIT] + v[AMOUNT_REVALUATE] - totalCostSold;
-    v[QTY_END_SHELF_STOCK] = v[QTY_END_STOCK] - v[QTY_CONSIGNMENT] - v[QTY_PICKLIST];
-    v[AMOUNT_END_SHELF_STOCK] = v[AMOUNT_END_STOCK] - v[COSTPRICE_CONSIGNMENT] - v[AMOUNT_PICKLIST];
+    // QTY_SHELF_STOCK includes:
+    // - beginStock from type 0 (same as QTY_STOCK)
+    // - beginShelfStock adjustment from type 10 (negative picktickets from previous shards)
+    // - shelfStock-affecting transactions during the period (type 1, type 2, etc.)
+    // So QTY_SHELF_STOCK already represents the shelfStock value including all transactions
+    // endShelfStock = QTY_SHELF_STOCK - consignment - picklist
+    v[QTY_END_SHELF_STOCK] = v[QTY_SHELF_STOCK] - v[QTY_CONSIGNMENT] - v[QTY_PICKLIST];
+    v[AMOUNT_END_SHELF_STOCK] = v[AMOUNT_SHELF_STOCK] - v[COSTPRICE_CONSIGNMENT] - v[AMOUNT_PICKLIST];
     v[SELLOUT_PERCENTAGE] = (totalQtySold / (totalQtySold + v[QTY_END_STOCK])) * 100;
     v[ROI] = totalAmountSold - v[AMOUNT_RECIEVED] + v[AMOUNT_TRANSIT];
     v[QTY_AVG_STOCK] = (v[QTY_STOCK] * timeFrame + v[STOCK_TIME_PRODUCT]) / timeFrame;

package/dist/transaction.js

@@ -138,6 +138,8 @@ const buildVector = function (transaction) {
         vector[tv.QTY_TRANSACTION] = transaction.qty;
         vector[tv.QTY_STOCK] = transaction.qty;
         vector[tv.AMOUNT_STOCK] = (0, index_1.round2)(transaction.buyprice * transaction.qty);
+        // Type 0 (START_STOCK) sets QTY_SHELF_STOCK to same value as QTY_STOCK
+        // Type 10 (START_SHELF_STOCK) will subtract outstanding picktickets from this
         vector[tv.QTY_SHELF_STOCK] = transaction.qty;
         vector[tv.AMOUNT_SHELF_STOCK] = (0, index_1.round2)(transaction.buyprice * transaction.qty);
         vector[tv.QTY_CHANGE] = transaction.qty;
@@ -197,10 +199,11 @@ const buildVector = function (transaction) {
         return vector;
     }
     if (transaction.type == types_1.transactionTypeE.PICK_LIST) {
+        // Type 94 (PICK_LIST) should NOT set QTY_SHELF_STOCK
+        // Picklists reduce shelfStock, which is handled by subtracting QTY_PICKLIST in postAgg
         const vector = new Float64Array(tv.COSTPRICE_PICKLIST + 1);
         vector[tv.QTY_TRANSACTION] = transaction.qty;
-        vector[tv.QTY_SHELF_STOCK] = transaction.qty;
-        vector[tv.AMOUNT_SHELF_STOCK] = (0, index_1.round2)(transaction.buyprice * transaction.qty);
+        // QTY_SHELF_STOCK is NOT set - picklists are subtracted separately via QTY_PICKLIST
         vector[tv.QTY_PICKLIST] = transaction.qty;
         vector[tv.AMOUNT_PICKLIST] = (0, index_1.round2)(transaction.sellprice * transaction.qty);
         vector[tv.COSTPRICE_PICKLIST] = (0, index_1.round2)(transaction.buyprice * transaction.qty);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@softwear/latestcollectioncore",
-  "version": "1.0.138",
+  "version": "1.0.139",
   "description": "Core functions for LatestCollections applications",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/articleStatus.ts

@@ -137,7 +137,16 @@ function addTransactionToAggregations(beginTimestamp: number, endTimestamp: numb
     return
   }
   if (transaction.time > endTimestamp) return
+  // Period transactions: add everything from BEGIN_STOCK_VECTOR_END onwards
   addVectors(aggregateVector, v, BEGIN_STOCK_VECTOR_END, v.length)
+  // Also update QTY_SHELF_STOCK and AMOUNT_SHELF_STOCK from period transactions
+  // (they're in the begin stock range but need to be updated by period transactions too)
+  if (v[QTY_SHELF_STOCK] !== undefined) {
+    aggregateVector[QTY_SHELF_STOCK] += v[QTY_SHELF_STOCK] || 0
+  }
+  if (v[AMOUNT_SHELF_STOCK] !== undefined) {
+    aggregateVector[AMOUNT_SHELF_STOCK] += v[AMOUNT_SHELF_STOCK] || 0
+  }
 
   // Calculate derived fields
 
@@ -336,8 +345,14 @@ function postAgg(v: any, timeFrame: number): void {
 
   v[QTY_END_STOCK] = v[QTY_STOCK] + v[QTY_RECIEVED] + v[QTY_CHANGE] + v[QTY_TRANSIT] - totalQtySold
   v[AMOUNT_END_STOCK] = v[AMOUNT_STOCK] + v[AMOUNT_RECIEVED] + v[AMOUNT_CHANGE] + v[AMOUNT_TRANSIT] + v[AMOUNT_REVALUATE] - totalCostSold
-  v[QTY_END_SHELF_STOCK] = v[QTY_END_STOCK] - v[QTY_CONSIGNMENT] - v[QTY_PICKLIST]
-  v[AMOUNT_END_SHELF_STOCK] = v[AMOUNT_END_STOCK] - v[COSTPRICE_CONSIGNMENT] - v[AMOUNT_PICKLIST]
+  // QTY_SHELF_STOCK includes:
+  // - beginStock from type 0 (same as QTY_STOCK)
+  // - beginShelfStock adjustment from type 10 (negative picktickets from previous shards)
+  // - shelfStock-affecting transactions during the period (type 1, type 2, etc.)
+  // So QTY_SHELF_STOCK already represents the shelfStock value including all transactions
+  // endShelfStock = QTY_SHELF_STOCK - consignment - picklist
+  v[QTY_END_SHELF_STOCK] = v[QTY_SHELF_STOCK] - v[QTY_CONSIGNMENT] - v[QTY_PICKLIST]
+  v[AMOUNT_END_SHELF_STOCK] = v[AMOUNT_SHELF_STOCK] - v[COSTPRICE_CONSIGNMENT] - v[AMOUNT_PICKLIST]
   v[SELLOUT_PERCENTAGE] = (totalQtySold / (totalQtySold + v[QTY_END_STOCK])) * 100
   v[ROI] = totalAmountSold - v[AMOUNT_RECIEVED] + v[AMOUNT_TRANSIT]
   v[QTY_AVG_STOCK] = (v[QTY_STOCK] * timeFrame + v[STOCK_TIME_PRODUCT]) / timeFrame

package/src/transaction.ts

@@ -146,6 +146,8 @@ const buildVector = function (transaction: TransactionI): Float64Array {
     vector[tv.QTY_TRANSACTION] = transaction.qty
     vector[tv.QTY_STOCK] = transaction.qty
     vector[tv.AMOUNT_STOCK] = round2(transaction.buyprice * transaction.qty)
+    // Type 0 (START_STOCK) sets QTY_SHELF_STOCK to same value as QTY_STOCK
+    // Type 10 (START_SHELF_STOCK) will subtract outstanding picktickets from this
     vector[tv.QTY_SHELF_STOCK] = transaction.qty
     vector[tv.AMOUNT_SHELF_STOCK] = round2(transaction.buyprice * transaction.qty)
     vector[tv.QTY_CHANGE] = transaction.qty
@@ -213,10 +215,11 @@ const buildVector = function (transaction: TransactionI): Float64Array {
   }
 
   if (transaction.type == transactionTypeE.PICK_LIST) {
+    // Type 94 (PICK_LIST) should NOT set QTY_SHELF_STOCK
+    // Picklists reduce shelfStock, which is handled by subtracting QTY_PICKLIST in postAgg
     const vector = new Float64Array(tv.COSTPRICE_PICKLIST + 1)
     vector[tv.QTY_TRANSACTION] = transaction.qty
-    vector[tv.QTY_SHELF_STOCK] = transaction.qty
-    vector[tv.AMOUNT_SHELF_STOCK] = round2(transaction.buyprice * transaction.qty)
+    // QTY_SHELF_STOCK is NOT set - picklists are subtracted separately via QTY_PICKLIST
     vector[tv.QTY_PICKLIST] = transaction.qty
     vector[tv.AMOUNT_PICKLIST] = round2(transaction.sellprice * transaction.qty)
     vector[tv.COSTPRICE_PICKLIST] = round2(transaction.buyprice * transaction.qty)

package/test/articleStatus.spec.js

@@ -267,6 +267,125 @@ describe('articleStatus', () => {
       expect(result[2].vector[articleStatus.VALUE_AVG_STOCK]).toBe(90.00000031709791)
       expect(result[2].vector[articleStatus.MARGIN]).toBe(50)
     })
+
+    it('should calculate shelfStock correctly with type 10 (beginShelfStock) and type 94 (picklist)', () => {
+      // Test scenario:
+      // - beginStock (type 0): 100 units
+      // - beginShelfStock (type 10): -5 units (outstanding picktickets from previous shard)
+      // - receiving (type 1): +20 units
+      // - picklist (type 94): +3 units (new pickticket created)
+      // - sale (type 2): -2 units
+      // Expected endStock: 100 + 20 - 2 = 118
+      // Expected endShelfStock: 118 + (-5) - 0 - 3 = 110
+      //   (endStock + beginShelfStock - consignment - picklist)
+
+      const shelfStockTransactions = [
+        {
+          time: 1546297200000, // Before beginTimestamp - beginStock
+          type: '0',
+          ean: 'TEST001',
+          wh: '50',
+          qty: 100,
+          buyprice: 10.0,
+          docnr: 'BEGINSTOCK',
+        },
+        {
+          time: 1546297200000, // Before beginTimestamp - beginShelfStock (negative picktickets)
+          type: '10',
+          ean: 'TEST001',
+          wh: '50',
+          qty: -5, // Negative: outstanding picktickets from previous shard
+          buyprice: 10.0,
+          docnr: 'PT-001',
+        },
+        {
+          time: 1569316408000, // Within timeframe - receiving
+          type: '1',
+          ean: 'TEST001',
+          wh: '50',
+          qty: 20,
+          buyprice: 10.0,
+          docnr: 'REC-001',
+        },
+        {
+          time: 1569316408500, // Within timeframe - picklist
+          type: '94',
+          ean: 'TEST001',
+          wh: '50',
+          qty: 3,
+          buyprice: 10.0,
+          sellprice: 15.0,
+          docnr: 'PT-002',
+        },
+        {
+          time: 1569316409000, // Within timeframe - sale
+          type: '2',
+          ean: 'TEST001',
+          wh: '50',
+          qty: 2,
+          buyprice: 10.0,
+          sellprice: 20.0,
+          vat: 21,
+          docnr: 'SALE-001',
+        },
+      ]
+
+      const rawAggregations = {}
+      articleStatus.runQuery(
+        { beginTimeStamp: 1569316407000, endTimeStamp: 1569316409000 + msYear },
+        rawAggregations,
+        true, // beginStock = true, so type 0 and type 10 are included
+        shelfStockTransactions,
+        ['transaction.ean'],
+        {},
+        {},
+        {},
+        false,
+        '',
+        false
+      )
+
+      const result = []
+      Object.entries(rawAggregations).map((oneAggregatedRow) => {
+        const vector = [].slice.call(oneAggregatedRow[1])
+        articleStatus.postAgg(vector, msYear)
+        result.push({ key: oneAggregatedRow[0], vector })
+      })
+
+      // Find the TEST001 result
+      const testResult = result.find((r) => r.key === 'TEST001')
+      expect(testResult).toBeDefined()
+
+      // Verify calculations
+      // beginStock: 100
+      expect(testResult.vector[articleStatus.QTY_STOCK]).toBe(100)
+      expect(testResult.vector[articleStatus.AMOUNT_STOCK]).toBe(1000)
+
+      // QTY_SHELF_STOCK includes beginShelfStock (100 - 5 = 95) + period transactions (20 - 2 = 18) = 113
+      // beginShelfStock from beginTimestamp: 100 (type 0) - 5 (type 10) = 95
+      // Period transactions: +20 (receiving) - 2 (sale) = +18
+      // Total: 95 + 18 = 113
+      expect(testResult.vector[articleStatus.QTY_SHELF_STOCK]).toBe(113)
+      expect(testResult.vector[articleStatus.AMOUNT_SHELF_STOCK]).toBe(1130)
+
+      // Transactions during period: +20 (receiving) - 2 (sale) = +18
+      // endStock: 100 + 20 - 2 = 118
+      expect(testResult.vector[articleStatus.QTY_END_STOCK]).toBe(118)
+      expect(testResult.vector[articleStatus.AMOUNT_END_STOCK]).toBe(1180)
+
+      // picklist: 3
+      expect(testResult.vector[articleStatus.QTY_PICKLIST]).toBe(3)
+      expect(testResult.vector[articleStatus.AMOUNT_PICKLIST]).toBe(45)
+
+      // consignment: 0 (not in test data)
+      expect(testResult.vector[articleStatus.QTY_CONSIGNMENT]).toBe(0)
+
+      // endShelfStock = QTY_SHELF_STOCK - consignment - picklist
+      // = 113 - 0 - 3 = 110
+      expect(testResult.vector[articleStatus.QTY_END_SHELF_STOCK]).toBe(110)
+      expect(testResult.vector[articleStatus.AMOUNT_END_SHELF_STOCK]).toBe(1085)
+    })
+
     it('#getDateRangeFromPicker', () => {
       const dateRange = articleStatus.getDateRangeFromPicker(['2024-01-01', '2024-12-31'])
       expect(dateRange.beginTimeStamp).toBe(1704063600000)

package/test/transaction.spec.js

@@ -356,7 +356,9 @@ describe('#Transactions', () => {
         wh: '51',
         time: 314159265,
         docnr: '51-123',
-        vector: [123, 0, 0, 123, 1223.85, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 123, 123 * 19.95, 123 * 9.95],
+        // Type 94 (PICK_LIST) does NOT set QTY_SHELF_STOCK or AMOUNT_SHELF_STOCK
+        // Picklists reduce shelfStock, which is handled by subtracting QTY_PICKLIST in postAgg
+        vector: [123, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 123, 123 * 19.95, 123 * 9.95],
       })
     })