refs #5342 feat: añadido icono en los tickets que tengan sales fragiles
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/head This commit looks good
Details
This commit is contained in:
parent
1a79bb586c
commit
2f2d65bfd6
|
@ -8,7 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
||||||
## [2312.01] - 2023-04-06
|
## [2312.01] - 2023-04-06
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
-
|
- (Monitor tickets) Muestra un icono al lado de la zona, si es frágil y se envía por agencia
|
||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
-
|
-
|
||||||
|
|
|
@ -0,0 +1,35 @@
|
||||||
|
DROP PROCEDURE IF EXISTS `vn`.`sale_getWarnings`;
|
||||||
|
|
||||||
|
DELIMITER $$
|
||||||
|
$$
|
||||||
|
CREATE DEFINER=`root`@`%` PROCEDURE `vn`.`sale_getWarnings`()
|
||||||
|
BEGIN
|
||||||
|
/**
|
||||||
|
* Calcula las advertencias de cada venta para un conjunto de tickets.
|
||||||
|
*
|
||||||
|
* @table tmp.sale_getWarnings(ticketFk) Identificadores de los tickets a calcular
|
||||||
|
* @return tmp.sale_warnings
|
||||||
|
*/
|
||||||
|
|
||||||
|
DROP TEMPORARY TABLE IF EXISTS tmp.sale_warnings;
|
||||||
|
CREATE TEMPORARY TABLE tmp.sale_warnings (
|
||||||
|
ticketFk INT(11),
|
||||||
|
saleFk INT(11),
|
||||||
|
isFragile INTEGER(1) DEFAULT 0,
|
||||||
|
PRIMARY KEY (ticketFk, saleFk)
|
||||||
|
) ENGINE = MEMORY;
|
||||||
|
|
||||||
|
-- Frágil
|
||||||
|
INSERT INTO tmp.sale_warnings(ticketFk, saleFk, isFragile)
|
||||||
|
SELECT tt.ticketFk, s.id, TRUE
|
||||||
|
FROM tmp.sale_getWarnings tt
|
||||||
|
LEFT JOIN sale s ON s.ticketFk = tt.ticketFk
|
||||||
|
LEFT JOIN item i ON i.id = s.itemFk
|
||||||
|
LEFT JOIN itemType it ON it.id = i.typeFk
|
||||||
|
LEFT JOIN itemCategory ic ON ic.id = it.categoryFk
|
||||||
|
LEFT JOIN agencyMode am ON am.id = tt.agencyModeFk
|
||||||
|
LEFT JOIN deliveryMethod dm ON dm.id = am.deliveryMethodFk
|
||||||
|
WHERE dm.code IN ('AGENCY', 'DELIVERY')
|
||||||
|
AND (ic.code = 'plant' OR it.code IN ('ZKA', 'ZKE'));
|
||||||
|
END$$
|
||||||
|
DELIMITER ;
|
|
@ -0,0 +1,36 @@
|
||||||
|
DROP PROCEDURE IF EXISTS `vn`.`ticket_getWarnings`;
|
||||||
|
|
||||||
|
DELIMITER $$
|
||||||
|
$$
|
||||||
|
CREATE PROCEDURE `vn`.`ticket_getWarnings`()
|
||||||
|
BEGIN
|
||||||
|
/**
|
||||||
|
* Calcula las adventencias para un conjunto de tickets.
|
||||||
|
* Agrupados por ticket
|
||||||
|
*
|
||||||
|
* @table tmp.sale_getWarnings(ticketFk) Identificadores de los tickets a calcular
|
||||||
|
* @return tmp.ticket_warnings
|
||||||
|
*/
|
||||||
|
CALL sale_getWarnings();
|
||||||
|
|
||||||
|
DROP TEMPORARY TABLE IF EXISTS tmp.ticket_warnings;
|
||||||
|
CREATE TEMPORARY TABLE tmp.ticket_warnings
|
||||||
|
(PRIMARY KEY (ticketFk))
|
||||||
|
ENGINE = MEMORY
|
||||||
|
SELECT
|
||||||
|
sw.ticketFk,
|
||||||
|
MAX(sw.isFragile) AS isFragile,
|
||||||
|
0 AS totalWarnings
|
||||||
|
FROM tmp.sale_warnings sw
|
||||||
|
GROUP BY sw.ticketFk;
|
||||||
|
|
||||||
|
UPDATE tmp.ticket_warnings tw
|
||||||
|
SET tw.totalWarnings =
|
||||||
|
(
|
||||||
|
(tw.isFragile)
|
||||||
|
);
|
||||||
|
|
||||||
|
DROP TEMPORARY TABLE
|
||||||
|
tmp.sale_warnings;
|
||||||
|
END$$
|
||||||
|
DELIMITER ;
|
|
@ -295,11 +295,26 @@ module.exports = Self => {
|
||||||
risk = t.debt + t.credit, totalProblems = totalProblems + 1
|
risk = t.debt + t.credit, totalProblems = totalProblems + 1
|
||||||
`);
|
`);
|
||||||
|
|
||||||
|
stmts.push('DROP TEMPORARY TABLE IF EXISTS tmp.sale_getWarnings');
|
||||||
|
|
||||||
stmt = new ParameterizedSQL(`
|
stmt = new ParameterizedSQL(`
|
||||||
SELECT t.*, tp.*,
|
CREATE TEMPORARY TABLE tmp.sale_getWarnings
|
||||||
((tp.risk) + cc.riskTolerance < 0) AS hasHighRisk
|
(INDEX (ticketFk, agencyModeFk))
|
||||||
|
ENGINE = MEMORY
|
||||||
|
SELECT f.id ticketFk, f.agencyModeFk
|
||||||
|
FROM tmp.filter f`);
|
||||||
|
stmts.push(stmt);
|
||||||
|
|
||||||
|
stmts.push('CALL ticket_getWarnings()');
|
||||||
|
|
||||||
|
stmt = new ParameterizedSQL(`
|
||||||
|
SELECT t.*,
|
||||||
|
tp.*,
|
||||||
|
((tp.risk) + cc.riskTolerance < 0) AS hasHighRisk,
|
||||||
|
tw.*
|
||||||
FROM tmp.tickets t
|
FROM tmp.tickets t
|
||||||
LEFT JOIN tmp.ticket_problems tp ON tp.ticketFk = t.id
|
LEFT JOIN tmp.ticket_problems tp ON tp.ticketFk = t.id
|
||||||
|
LEFT JOIN tmp.ticket_warnings tw ON tw.ticketFk = t.id
|
||||||
JOIN clientConfig cc`);
|
JOIN clientConfig cc`);
|
||||||
|
|
||||||
const hasProblems = args.problems;
|
const hasProblems = args.problems;
|
||||||
|
|
|
@ -13,3 +13,4 @@ Practical: Práctica
|
||||||
Preparation: Preparación
|
Preparation: Preparación
|
||||||
Auto-refresh: Auto-refresco
|
Auto-refresh: Auto-refresco
|
||||||
Toggle auto-refresh every 2 minutes: Conmuta el refresco automático cada 2 minutos
|
Toggle auto-refresh every 2 minutes: Conmuta el refresco automático cada 2 minutos
|
||||||
|
Is fragile: Es frágil
|
||||||
|
|
|
@ -68,6 +68,7 @@
|
||||||
<th field="stateFk">
|
<th field="stateFk">
|
||||||
<span translate>State</span>
|
<span translate>State</span>
|
||||||
</th>
|
</th>
|
||||||
|
<th field="isFragile"></th>
|
||||||
<th field="zoneFk">
|
<th field="zoneFk">
|
||||||
<span translate>Zone</span>
|
<span translate>Zone</span>
|
||||||
</th>
|
</th>
|
||||||
|
@ -175,6 +176,14 @@
|
||||||
{{ticket.state}}
|
{{ticket.state}}
|
||||||
</span>
|
</span>
|
||||||
</td>
|
</td>
|
||||||
|
<td number>
|
||||||
|
<vn-icon
|
||||||
|
ng-show="ticket.isFragile"
|
||||||
|
translate-attr="{title: 'Is fragile'}"
|
||||||
|
class="bright"
|
||||||
|
icon="local_bar">
|
||||||
|
</vn-icon>
|
||||||
|
</td>
|
||||||
<td name="zone">
|
<td name="zone">
|
||||||
<span
|
<span
|
||||||
title="{{ticket.zoneName}}"
|
title="{{ticket.zoneName}}"
|
||||||
|
|
Loading…
Reference in New Issue