verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 64 Releases Wiki Activity

cr changes

This commit is contained in:
Bernat Exposito 2020-12-18 10:08:51 +01:00
parent a13b554a26
commit b9344832d6
5 changed files with 59 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
modules/supplier/back/methods/supplier/consumption.js
View File

@ -71,9 +71,9 @@ module.exports = Self => {
case 'buyerId':
return {'it.workerFk': value};
case 'from':
return {'e.shipped': {gte: value}};
return {'t.shipped': {gte: value}};
case 'to':
return {'e.shipped': {lte: value}};
return {'t.shipped': {lte: value}};
}
});
@ -93,9 +93,13 @@ module.exports = Self => {
e.supplierFk,
t.shipped
FROM vn.entry e
JOIN vn.travel t ON t.id = e.travelFk`);
JOIN vn.travel t ON t.id = e.travelFk
JOIN buy b ON b.id = b.entryFk
JOIN item i ON i.id = b.itemFk
JOIN itemType it ON it.id = i.typeFk`);
stmt.merge(conn.makeWhere(filter.where));
stmt.merge(conn.makeGroupBy('e.id'));
stmt.merge(conn.makeLimit(filter));
stmts.push(stmt);
const entriesIndex = stmts.push('SELECT * FROM tmp.entry') - 1;
@ -129,19 +133,18 @@ module.exports = Self => {
it.workerFk,
it.categoryFk,
it.code AS itemTypeCode
FROM buy b
FROM buy b
JOIN tmp.entry e ON e.id = b.entryFk
JOIN item i ON i.id = b.itemFk
JOIN itemType it ON it.id = i.typeFk`
);
stmt.merge(conn.makeWhere(filter.where));
stmt.merge('WHERE b.quantity > 0');
stmt.merge(conn.makeGroupBy('b.id'));
stmt.merge(conn.makeOrderBy(filter.order));
const buysIndex = stmts.push(stmt) - 1;
stmts.push(`DROP TEMPORARY TABLE tmp.entry`);
const sql = ParameterizedSQL.join(stmts, ';');
stmt.merge(conn.makePagination(filter));
const result = await conn.executeStmt(sql);
const entries = result[entriesIndex];

12
modules/supplier/front/consumption/index.html
View File

@ -36,12 +36,12 @@
ng-if="entry.buys">
<vn-thead>
<vn-tr>
<vn-th field="entryFk">Entry </vn-th>
<vn-td >{{::entry.id}}</vn-td>
<vn-th field="entryFk" expand>Entry </vn-th>
<vn-td expand>{{::entry.id}}</vn-td>
<vn-th field="data">Date</vn-th>
<vn-td>{{::entry.shipped | date: 'dd/MM/yyyy'}}</vn-td>
<vn-th field="ref">Reference</vn-th>
<vn-td >{{::entry.ref}}</vn-td>
<vn-td vn-tooltip="{{::entry.ref}}">{{::entry.ref}}</vn-td>
</vn-tr>
</vn-thead>
<vn-tbody>
@ -62,6 +62,8 @@
<vn-td number>{{::buy.total | dashIfEmpty}}</vn-td>
<vn-td></vn-td>
</vn-tr>
</vn-tbody>
<vn-tfoot>
<vn-tr>
<vn-td>
<vn-label-value
@ -69,8 +71,8 @@
value="{{$ctrl.getTotal(entry)}}">
</vn-label-value>
</vn-td>
</vn-tr>
</vn-tbody>
</vn-tr>
</vn-tfoot>
</vn-table>
</vn-card>
</vn-data-viewer>

1
modules/supplier/front/routes.json
View File

@ -82,6 +82,7 @@
"state": "supplier.card.consumption",
"component": "vn-supplier-consumption",
"description": "Consumption",
"acl": ["administrative"],
"params": {
"supplier": "$ctrl.supplier"
}

64
print/templates/reports/supplier-campaign-metrics/sql/buys.sql
View File

@ -1,33 +1,33 @@
SELECT
b.id AS buyId,
b.itemFk,
b.entryFk,
CAST(b.buyingValue AS DECIMAL(10,2)) AS price,
b.quantity,
i.id,
i.description,
i.name AS itemName,
i.subName,
i.size AS itemSize,
i.typeFk AS itemTypeFk,
i.tag5,
i.value5,
i.tag6,
i.value6,
i.tag7,
i.value7,
i.tag8,
i.value8,
i.tag9,
i.value9,
i.tag10,
i.value10,
it.id,
it.workerFk,
it.categoryFk,
it.code AS itemTypeCode
FROM buy b
JOIN item i ON i.id = b.itemFk
JOIN itemType it ON it.id = i.typeFk
WHERE b.entryFk IN(:entriesId) AND b.quantity > 0
ORDER BY i.typeFk , i.name
b.id AS buyId,
b.itemFk,
b.entryFk,
CAST(b.buyingValue AS DECIMAL(10,2)) AS price,
b.quantity,
i.id,
i.description,
i.name AS itemName,
i.subName,
i.size AS itemSize,
i.typeFk AS itemTypeFk,
i.tag5,
i.value5,
i.tag6,
i.value6,
i.tag7,
i.value7,
i.tag8,
i.value8,
i.tag9,
i.value9,
i.tag10,
i.value10,
it.id,
it.workerFk,
it.categoryFk,
it.code AS itemTypeCode
FROM buy b
JOIN item i ON i.id = b.itemFk
JOIN itemType it ON it.id = i.typeFk
WHERE b.entryFk IN(:entriesId) AND b.quantity > 0
ORDER BY i.typeFk , i.name

16
print/templates/reports/supplier-campaign-metrics/sql/entries.sql
View File

@ -1,8 +1,8 @@
SELECT
e.id,
e.ref,
e.supplierFk,
t.shipped
FROM vn.entry e
JOIN vn.travel t ON t.id = e.travelFk
WHERE e.supplierFk = ? AND DATE(t.shipped) BETWEEN ? AND ?
SELECT
e.id,
e.ref,
e.supplierFk,
t.shipped
FROM vn.entry e
JOIN vn.travel t ON t.id = e.travelFk
WHERE e.supplierFk = ? AND DATE(t.shipped) BETWEEN ? AND ?