u

src/providers/mssql/queries/article.js

@@ -664,8 +664,11 @@ SELECT
                         SELECT SUM(ma_s.amount)
                         FROM manifest m_s
                         INNER JOIN manifestarticle ma_s ON ma_s.manifest_id = m_s.id
+                        LEFT JOIN shipmentsummary ss ON ss.manifest_id = m_s.id
                         WHERE m_s.company_id = m.company_id
                           AND m_s.[type] = 'shipment'
+                          AND ISNULL(ss.state, 'new') != 'cancelled'
+                          AND m_s.[number] NOT LIKE '%#cancelled#%'
                           AND ma_s.sku = a.sku
                           AND m_s.[number] LIKE m.[number] + COALESCE((SELECT prefix FROM numbers WHERE company_id = m.company_id AND [type] = 'shipment'), '-L-') + '%'
                     ), 0), 3) AS amount
@@ -682,8 +685,11 @@ SELECT
                     SELECT SUM(ma_s.amount)
                     FROM manifest m_s
                     INNER JOIN manifestarticle ma_s ON ma_s.manifest_id = m_s.id
+                    LEFT JOIN shipmentsummary ss ON ss.manifest_id = m_s.id
                     WHERE m_s.company_id = m.company_id
                       AND m_s.[type] = 'shipment'
+                      AND ISNULL(ss.state, 'new') != 'cancelled'
+                      AND m_s.[number] NOT LIKE '%#cancelled#%'
                       AND ma_s.sku = a.sku
                       AND m_s.[number] LIKE m.[number] + COALESCE((SELECT prefix FROM numbers WHERE company_id = m.company_id AND [type] = 'shipment'), '-L-') + '%'
                 ), 0)) > 0

src/providers/mssql/queries/ledger.js

@@ -145,3 +145,26 @@ WHERE ma.sku = @sku
   AND (@warehouseId IS NULL OR l.warehouse_id = @warehouseId)
 ORDER BY l.id ASC;
 `;
+
+export const GET_ARTICLE_TRACK_STOCK = `
+SELECT TOP 1 a.id, a.sku, a.track_stock
+FROM article a
+WHERE a.company_id = @companyId
+  AND (
+    a.sku = @sku
+    OR EXISTS (SELECT 1 FROM articlesupplier asup WHERE asup.article_id = a.id AND asup.sku = @sku)
+  );
+`;
+
+export const GET_ARTICLE_WAREHOUSE_STOCK = `
+SELECT COALESCE(SUM(l.amount), 0) AS stock
+FROM ledger l
+INNER JOIN manifestarticle ma ON ma.id = l.manifestarticle_id
+INNER JOIN manifest m ON m.id = ma.manifest_id
+WHERE l.warehouse_id = @warehouseId
+  AND m.company_id = @companyId
+  AND (
+    ma.sku = @sku
+    OR ma.sku IN (SELECT asup.sku FROM articlesupplier asup WHERE asup.article_id = @articleId)
+  );
+`;

src/providers/mssql/queries/shipment.js

@@ -22,9 +22,11 @@ WHERE company_id = @companyId AND [type] = 'shipment';
 export const LIST_SHIPMENTS_BY_ORDER_NUMBER_PATTERN = `
 SELECT m.id, m.[number], m.[type], m.entity_id AS entityId, m.external_number AS externalNumber, m.[date], m.created_at AS createdAt
 FROM manifest m
+LEFT JOIN shipmentsummary ss ON ss.manifest_id = m.id
 WHERE m.company_id = @companyId
   AND m.[type] = 'shipment'
   AND m.[number] LIKE @pattern
+  AND (ss.state IS NULL OR ss.state != 'cancelled')
 ORDER BY m.id ASC;
 `;
 
@@ -32,10 +34,12 @@ export const GET_SHIPPED_AMOUNTS_BY_ORDER_PATTERN = `
 SELECT ma.sku, SUM(ma.amount) AS shippedAmount
 FROM manifest m
 INNER JOIN manifestarticle ma ON ma.manifest_id = m.id
+LEFT JOIN shipmentsummary ss ON ss.manifest_id = m.id
 WHERE m.company_id = @companyId
   AND m.[type] = 'shipment'
   AND m.[number] LIKE @pattern
   AND (@excludeShipmentId IS NULL OR m.id != @excludeShipmentId)
+  AND (ss.state IS NULL OR ss.state != 'cancelled')
 GROUP BY ma.sku;
 `;
 
@@ -57,6 +61,7 @@ FROM manifest m
 LEFT JOIN shipmentsummary ss ON ss.manifest_id = m.id AND ss.company_id = @companyId
 WHERE m.company_id = @companyId
   AND m.[type] = 'shipment'
+  AND (ss.state IS NULL OR ss.state != 'cancelled')
   AND (
     m.[number] LIKE @pattern
     OR ss.order_id = @orderId
@@ -69,3 +74,33 @@ DELETE FROM manifest
 WHERE id = @id AND company_id = @companyId AND [type] = 'shipment';
 `;
 
+export const GET_DEFAULT_WAREHOUSE = `
+SELECT TOP 1 id, name
+FROM warehouse
+WHERE company_id = @companyId
+ORDER BY sort ASC, name ASC, id ASC;
+`;
+
+export const GET_ARTICLE_TRACK_STOCK = `
+SELECT TOP 1 a.id, a.sku, a.track_stock
+FROM article a
+WHERE a.company_id = @companyId
+  AND (
+    a.sku = @sku
+    OR EXISTS (SELECT 1 FROM articlesupplier asup WHERE asup.article_id = a.id AND asup.sku = @sku)
+  );
+`;
+
+export const GET_ARTICLE_WAREHOUSE_STOCK = `
+SELECT COALESCE(SUM(l.amount), 0) AS stock
+FROM ledger l
+INNER JOIN manifestarticle ma ON ma.id = l.manifestarticle_id
+INNER JOIN manifest m ON m.id = ma.manifest_id
+WHERE l.warehouse_id = @warehouseId
+  AND m.company_id = @companyId
+  AND (
+    ma.sku = @sku
+    OR ma.sku IN (SELECT asup.sku FROM articlesupplier asup WHERE asup.article_id = @articleId)
+  );
+`;
+

src/providers/sqlite3/queries/article.js

@@ -307,8 +307,11 @@ SELECT auth.*,
                SELECT SUM(ma_s.amount)
                FROM manifest m_s
                INNER JOIN manifestarticle ma_s ON ma_s.manifest_id = m_s.id
+               LEFT JOIN shipmentsummary ss ON ss.manifest_id = m_s.id
                WHERE m_s.company_id = m.company_id
                  AND m_s."type" = 'shipment'
+                 AND COALESCE(ss.state, 'new') != 'cancelled'
+                 AND m_s."number" NOT LIKE '%#cancelled#%'
                  AND ma_s.sku = a.sku
                  AND m_s."number" LIKE m."number" || COALESCE((SELECT prefix FROM numbers WHERE company_id = m.company_id AND "type" = 'shipment'), '-L-') || '%'
              ), 0), 3) AS amount
@@ -321,7 +324,18 @@ SELECT auth.*,
              AND ma.sku = a.sku
              AND COALESCE(os.is_shipped, 0) = 0
            GROUP BY m.id, m."number", m."date", os.customer_name, e.first_name, e.name
-           HAVING amount > 0
+           HAVING (SUM(ma.amount) - COALESCE((
+             SELECT SUM(ma_s.amount)
+             FROM manifest m_s
+             INNER JOIN manifestarticle ma_s ON ma_s.manifest_id = m_s.id
+             LEFT JOIN shipmentsummary ss ON ss.manifest_id = m_s.id
+             WHERE m_s.company_id = m.company_id
+               AND m_s."type" = 'shipment'
+               AND COALESCE(ss.state, 'new') != 'cancelled'
+               AND m_s."number" NOT LIKE '%#cancelled#%'
+               AND ma_s.sku = a.sku
+               AND m_s."number" LIKE m."number" || COALESCE((SELECT prefix FROM numbers WHERE company_id = m.company_id AND "type" = 'shipment'), '-L-') || '%'
+           ), 0)) > 0
            ORDER BY m."date" ASC, m.id ASC
          ) uo
        ))

src/providers/sqlite3/queries/ledger.js

@@ -147,3 +147,27 @@ WHERE ma.sku = @sku
   AND (@warehouseId IS NULL OR l.warehouse_id = @warehouseId)
 ORDER BY l.id ASC;
 `;
+
+export const GET_ARTICLE_TRACK_STOCK = `
+SELECT a.id, a.sku, a.track_stock
+FROM article a
+WHERE a.company_id = @companyId
+  AND (
+    a.sku = @sku
+    OR EXISTS (SELECT 1 FROM articlesupplier asup WHERE asup.article_id = a.id AND asup.sku = @sku)
+  )
+LIMIT 1;
+`;
+
+export const GET_ARTICLE_WAREHOUSE_STOCK = `
+SELECT COALESCE(SUM(l.amount), 0) AS stock
+FROM ledger l
+INNER JOIN manifestarticle ma ON ma.id = l.manifestarticle_id
+INNER JOIN manifest m ON m.id = ma.manifest_id
+WHERE l.warehouse_id = @warehouseId
+  AND m.company_id = @companyId
+  AND (
+    ma.sku = @sku
+    OR ma.sku IN (SELECT asup.sku FROM articlesupplier asup WHERE asup.article_id = @articleId)
+  );
+`;

src/providers/sqlite3/queries/shipment.js

@@ -13,5 +13,8 @@ export const {
   CHECK_SHIPMENT_PACKAGES_SHIPPED,
   CHECK_ORDER_HAS_SHIPMENTS,
   DELETE_SHIPMENT,
+  GET_DEFAULT_WAREHOUSE,
+  GET_ARTICLE_TRACK_STOCK,
+  GET_ARTICLE_WAREHOUSE_STOCK,
 } = queries;