verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 59 Releases Wiki Activity

8144-devToTest_2448 #3216

Merged
alexm merged 256 commits from 8144-devToTest_2448 into test 2024-11-19 07:36:04 +00:00
Conversation 0 Commits 256 Files Changed 376 +82 -40
13 changed files with 82 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 86c95e185c - Show all commits

3
back/methods/mrw-config/cancelShipment.js
View File

@ -39,6 +39,9 @@ module.exports = Self => {
const xmlString = response.data;
const parser = new DOMParser();
const xmlDoc = parser.parseFromString(xmlString, 'text/xml');
await Self.rawSql('CALL util.debugAdd(?,?);', ['cancelShipment', xmlDoc]);
const result = xmlDoc.getElementsByTagName('Mensaje')[0].textContent;
return result.toLowerCase().includes('se ha cancelado correctamente');
};

2
db/routines/vn/procedures/stockBought_calculate.sql
View File

@ -59,7 +59,7 @@ proc: BEGIN
INSERT INTO stockBought(workerFk, bought, dated)
SELECT tb.workerFk,
ROUND(GREATEST(tb.bought - IFNULL(ts.sold, 0), 0), 1),
ROUND(GREATEST(tb.bought - IFNULL(ts.sold, 0), 0), 2),
vDated
FROM tStockBought tb
LEFT JOIN tStockSold ts ON ts.workerFk = tb.workerFk;

5
db/versions/11251-navyChrysanthemum/00-firstScript.sql
View File

@ -1,3 +1,2 @@
UPDATE vn.sale
SET originalQuantity = quantity
WHERE originalQuantity IS NULL
-- Debido a que tardaba mucho en la subida a master, se ha creado una nueva versión para que el proceso no se vea afectado y se ejecute por la noche.
-- Se crea de nuevo en la versión 11344-grayBamboo

3
db/versions/11344-grayBamboo/00-firstScript.sql Normal file
View File

@ -0,0 +1,3 @@
UPDATE vn.sale
SET originalQuantity = quantity
WHERE originalQuantity IS NULL

0
db/versions/11251-navyChrysanthemum/01-firstScript.sql → db/versions/11344-grayBamboo/01-firstScript.sql
View File

2
db/versions/11348-bronzeCamellia/00-firstScript.sql Normal file
View File

@ -0,0 +1,2 @@
ALTER TABLE vn.clientObservation MODIFY COLUMN observationTypeFk tinyint(3) unsigned DEFAULT 4 NOT NULL;
UPDATE vn.clientObservation SET observationTypeFk=4 WHERE observationTypeFk=0;

2
modules/client/back/models/client-observation.json
View File

@ -55,7 +55,7 @@
"relation": "user",
"scope": {
"fields": [
"nickname"
"name"
]
}
}

9
modules/entry/back/methods/stock-bought/getStockBought.js
View File

@ -6,6 +6,9 @@ module.exports = Self => {
arg: 'workerFk',
type: 'number',
description: 'The id for a buyer',
}, {
arg: 'filter',
type: 'object',
},
{
arg: 'dated',
@ -23,7 +26,7 @@ module.exports = Self => {
}
});
Self.getStockBought = async(workerFk, dated = Date.vnNew()) => {
Self.getStockBought = async(workerFk, filter, dated = Date.vnNew()) => {
const models = Self.app.models;
const today = Date.vnNew();
dated.setHours(0, 0, 0, 0);
@ -31,7 +34,7 @@ module.exports = Self => {
await models.StockBought.rawSql(`CALL vn.stockBought_calculate(?)`, [dated]);
const filter = {
const defaultFilter = {
where: {dated},
include: [
{
@ -53,6 +56,6 @@ module.exports = Self => {
if (workerFk) filter.where.workerFk = workerFk;
return models.StockBought.find(filter);
return models.StockBought.find({...filter, ...defaultFilter});
};
};

27
modules/entry/back/methods/stock-bought/getStockBoughtDetail.js
View File

@ -1,3 +1,4 @@
const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
module.exports = Self => {
Self.remoteMethod('getStockBoughtDetail', {
description: 'Returns the detail of stock bought for a given date and a worker',
@ -12,6 +13,9 @@ module.exports = Self => {
type: 'string',
description: 'The date to filter',
required: true,
}, {
arg: 'filter',
type: 'object',
}
],
returns: {
@ -24,11 +28,10 @@ module.exports = Self => {
}
});
Self.getStockBoughtDetail = async(workerFk, dated) => {
const models = Self.app.models;
Self.getStockBoughtDetail = async(workerFk, dated, filter, options) => {
const conn = Self.dataSource.connector;
const myOptions = {};
let tx;
let result;
if (typeof options == 'object')
Object.assign(myOptions, options);
@ -39,8 +42,10 @@ module.exports = Self => {
}
try {
await models.StockBought.rawSql(`CALL vn.item_calculateStock(?)`, [dated], myOptions);
result = await Self.rawSql(
const stmts = [];
stmts.push(new ParameterizedSQL(`CALL vn.item_calculateStock(?)`, [dated]));
const query = new ParameterizedSQL(
`SELECT b.entryFk entryFk,
i.id itemFk,
i.name itemName,
@ -61,11 +66,17 @@ module.exports = Self => {
JOIN volumeConfig vc
WHERE ic.display
AND w.id = ?`,
[workerFk], myOptions
[workerFk]
);
await Self.rawSql(`DROP TEMPORARY TABLE tmp.item, tmp.buyUltimate;`, [], myOptions);
stmts.push(query.merge(conn.makeSuffix(filter)));
stmts.push(new ParameterizedSQL(`DROP TEMPORARY TABLE tmp.item, tmp.buyUltimate`));
const sql = ParameterizedSQL.join(stmts, ';');
const result = await conn.executeStmt(sql, myOptions);
if (tx) await tx.commit();
return result;
return result[1];
} catch (e) {
await tx.rollback();
throw e;

10
print/templates/reports/entry-order/assets/css/style.css
View File

@ -18,3 +18,13 @@ h3 {
font-size: 10px;
margin: 0;
}
.column-oriented th,
.column-oriented td{
padding: 5px
}
[row] {
display: flex;
column-gap: 5px;
}

52
print/templates/reports/entry-order/entry-order.html
View File

@ -41,42 +41,50 @@
<table class="column-oriented vn-mt-ml border-collapse">
<thead>
<tr>
<th width="5%">{{$t('code')}}</th>
<th class="number">{{$t('boxes')}}</th>
<th width="5%" class="number"></th>
<th width="1px" class="number"></th>
<th class="number">{{$t('packing')}}</th>
<th width="40%">{{$t('concept')}}</th>
<th width="10%">{{$t('reference')}}</th>
<th width="10%">{{$t('tags')}}</th>
<th width="10%" class="number">{{$t('quantity')}}</th>
<th width="5%" class="number"></th>
<th width="15%" class="number">{{$t('price')}}</th>
<th width="5%" class="number"></th>
<th width="15%" class="number">{{$t('amount')}}</th>
<th width="5%">{{$t('concept')}}</th>
<th width="20%">{{$t('reference')}}</th>
<th width="20%">{{$t('tags')}}</th>
<th width="5%" class="number">{{$t('quantity')}}</th>
<th width="1px" class="number"></th>
<th width="5%" class="number">{{$t('price')}}</th>
<th width="1px" class="number"></th>
<th width="5%" class="number">{{$t('amount')}}</th>
</tr>
</thead>
<tbody v-for="buy in buys">
<tr>
<td width="5%">{{buy.itemFk}}</td>
<td class="number">{{buy.stickers}}</td>
<td width="5%" class="number">x</td>
<td class="number">{{buy.packing}}</td>
<td width="40%" class="nowrap">{{buy.name}}</td>
<td width="10%">{{buy.comment}}</td>
<td width="10%" class="font light-gray tags">
<span v-if="buy.value5" class="nowrap"><strong>{{buy.tag5}} → </strong>{{buy.value5}} </span>
<span v-if="buy.value6" class="nowrap"><strong>{{buy.tag6}} → </strong>{{buy.value6}} </span>
<span v-if="buy.value7" class="nowrap"><strong>{{buy.tag7}} → </strong>{{buy.value7}} </span>
<td width="1px" class="number">x</td>
<td class="number align-left">{{buy.packing}}</td>
<td width="5%" class="nowrap">{{buy.name}}</td>
<td width="20%">referencia de prueba</td>
<td width="20%" class="font light-gray tags" row>
<div>
<div class="nowrap" v-if="buy.value5">{{buy.tag5}}<strong>→ {{buy.value5}}</strong></div>
<div class="nowrap" v-if="buy.value6">{{buy.tag6}}<strong>→ {{buy.value6}}</strong></div>
</div>
<div>
<div class="nowrap" v-if="buy.value7">{{buy.tag7}}<strong>→ {{buy.value7}}</strong></div>
<div class="nowrap" v-if="buy.value8">{{buy.tag8}}<strong>→ {{buy.value8}}</strong></div>
</div>
</td>
<td width="10%" class="number">{{buy.quantity | number($i18n.locale)}}</td>
<td width="5%" class="number">x</td>
<td width="15%" class="number">{{buy.buyingValue | currency('EUR', $i18n.locale)}}</td>
<td width="5%" class="number">=</td>
<td width="15%" class="number">
<td width="5%" class="number">{{buy.quantity | number($i18n.locale)}}</td>
<td width="1px" class="number">x</td>
<td width="5%" class="number">{{buy.buyingValue | currency('EUR', $i18n.locale)}}</td>
<td width="1px" class="number">=</td>
<td width="5%" class="number align-left">
{{buy.buyingValue * buy.quantity | currency('EUR', $i18n.locale)}}
</td>
</tr>
</tbody>
<tfoot>
<tr class="font bold">
<td></td>
<td class="number">{{getTotalBy('stickers')}}</td>
<td></td>
<td></td>

3
print/templates/reports/entry-order/locale/es.yml
View File

@ -16,4 +16,5 @@ entry: Entrada {0}
supplierData: Datos del proveedor
notes: Notas
reference: Referencia
tags: Tags
tags: Etiquetas
code: Código

4
print/templates/reports/entry-order/sql/buys.sql
View File

@ -10,7 +10,9 @@ SELECT b.itemFk,
i.tag6,
i.value6,
i.tag7,
i.value7
i.value7,
i.tag8,
i.value8
FROM buy b
JOIN item i ON i.id = b.itemFk
LEFT JOIN item i2 ON i2.id = b.itemOriginalFk