seb/dashlibstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

u

Browse Source
This commit is contained in:
seb
2026-10-25 11:06:03 +00:00
parent 62d0643b99
commit c6171a1d90
4 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/providers/mssql/queries/article.js
View File

@@ -733,7 +733,7 @@ SELECT
AND m.[type] = 'order'
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
GROUP BY m.id, m.[number], m.[date], m.company_id, os.customer_name, e.first_name, e.name
HAVING (SUM(ma.amount) - COALESCE((
SELECT SUM(ma_s.amount)
FROM manifest m_s

2
src/providers/mssql/schema.js
View File

@@ -387,7 +387,7 @@ BEGIN
[date] DATETIME2 NOT NULL CONSTRAINT DF_companyhistory_date DEFAULT SYSUTCDATETIME(),
[text] NVARCHAR(MAX) NOT NULL,
CONSTRAINT FK_companyhistory_company FOREIGN KEY (company_id) REFERENCES company(id) ON DELETE CASCADE,
CONSTRAINT FK_companyhistory_companyuser FOREIGN KEY (companyuser_id) REFERENCES companyuser(id) ON DELETE SET NULL
CONSTRAINT FK_companyhistory_companyuser FOREIGN KEY (companyuser_id) REFERENCES companyuser(id) ON DELETE NO ACTION
);
END
`;

10
src/store/order/syncSummary.js
View File

@@ -176,15 +176,13 @@ export async function syncOrderSummary(runner, { companyId, manifestId, orderNum
const prefixRes = await runner.query(SQL_GET_SHIPMENT_PREFIX, { companyId });
const shipmentPrefix = prefixRes.rows[0]?.prefix?.trim?.() || '-L-';
const [lineRes, payRes, shipRes] = await Promise.all([
runner.query(SQL_LINE_TOTALS, { manifestId: orderId }),
runner.query(SQL_PAYMENT_TOTAL, { manifestId: orderId }),
runner.query(isSqlite ? SQL_SHIPPED_QTY_SQLITE : SQL_SHIPPED_QTY_MSSQL, {
const lineRes = await runner.query(SQL_LINE_TOTALS, { manifestId: orderId });
const payRes = await runner.query(SQL_PAYMENT_TOTAL, { manifestId: orderId });
const shipRes = await runner.query(isSqlite ? SQL_SHIPPED_QTY_SQLITE : SQL_SHIPPED_QTY_MSSQL, {
companyId,
orderNumber: num,
shipmentPrefix,
}),
]);
});
let customerName = null;
if (orderRow.entity_id) {

8
src/store/shipment/helpers.js
View File

@@ -40,11 +40,9 @@ export async function loadShipment(runner, q, companyId, id) {
const row = headerRes.rows[0];
if (!row) return null;
const [linesRes, shippingsRes, summaryRes] = await Promise.all([
runner.query(q.GET_MANIFEST_LINES, { manifestId: id }),
runner.query(q.SHIPPING_LIST_BY_MANIFEST, { manifestId: id }),
runner.query('SELECT state FROM shipmentsummary WHERE manifest_id = @manifestId', { manifestId: id }).catch(() => ({ rows: [] })),
]);
const linesRes = await runner.query(q.GET_MANIFEST_LINES, { manifestId: id });
const shippingsRes = await runner.query(q.SHIPPING_LIST_BY_MANIFEST, { manifestId: id });
const summaryRes = await runner.query('SELECT state FROM shipmentsummary WHERE manifest_id = @manifestId', { manifestId: id }).catch(() => ({ rows: [] }));
const lines = linesRes.rows.map(shapeLine);
const shippings = shippingsRes.rows.map(shapeShipping);