diff --git a/db/changes/234003/00-ticket_canAdvance_zone.sql b/db/changes/234003/00-ticket_canAdvance_zone.sql
new file mode 100644
index 000000000..ee07ce978
--- /dev/null
+++ b/db/changes/234003/00-ticket_canAdvance_zone.sql
@@ -0,0 +1,133 @@
+DELIMITER $$
+$$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_canAdvance`(vDateFuture DATE, vDateToAdvance DATE, vWarehouseFk INT)
+BEGIN
+/**
+ * Devuelve los tickets y la cantidad de lineas de venta que se pueden adelantar.
+ *
+ * @param vDateFuture Fecha de los tickets que se quieren adelantar.
+ * @param vDateToAdvance Fecha a cuando se quiere adelantar.
+ * @param vWarehouseFk Almacén
+ */
+ DECLARE vDateInventory DATE;
+
+ SELECT inventoried INTO vDateInventory FROM config;
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.stock;
+ CREATE TEMPORARY TABLE tmp.stock
+ (itemFk INT PRIMARY KEY,
+ amount INT)
+ ENGINE = MEMORY;
+
+ INSERT INTO tmp.stock(itemFk, amount)
+ SELECT itemFk, SUM(quantity) amount FROM
+ (
+ SELECT itemFk, quantity
+ FROM itemTicketOut
+ WHERE shipped >= vDateInventory
+ AND shipped < vDateFuture
+ AND warehouseFk = vWarehouseFk
+ UNION ALL
+ SELECT itemFk, quantity
+ FROM itemEntryIn
+ WHERE landed >= vDateInventory
+ AND landed < vDateFuture
+ AND isVirtualStock = FALSE
+ AND warehouseInFk = vWarehouseFk
+ UNION ALL
+ SELECT itemFk, quantity
+ FROM itemEntryOut
+ WHERE shipped >= vDateInventory
+ AND shipped < vDateFuture
+ AND warehouseOutFk = vWarehouseFk
+ ) t
+ GROUP BY itemFk HAVING amount != 0;
+
+ CREATE OR REPLACE TEMPORARY TABLE tmp.filter
+ (INDEX (id))
+ SELECT
+ origin.ticketFk futureId,
+ dest.ticketFk id,
+ dest.state,
+ origin.futureState,
+ origin.futureIpt,
+ dest.ipt,
+ origin.workerFk,
+ origin.futureLiters,
+ origin.futureLines,
+ dest.shipped,
+ origin.shipped futureShipped,
+ dest.totalWithVat,
+ origin.totalWithVat futureTotalWithVat,
+ dest.agency,
+ origin.futureAgency,
+ dest.lines,
+ dest.liters,
+ origin.futureLines - origin.hasStock AS notMovableLines,
+ (origin.futureLines = origin.hasStock) AS isFullMovable,
+ origin.futureZoneFk,
+ origin.futureZoneName,
+ origin.classColor futureClassColor,
+ dest.classColor
+ FROM (
+ SELECT
+ s.ticketFk,
+ c.salesPersonFk workerFk,
+ t.shipped,
+ t.totalWithVat,
+ st.name futureState,
+ t.addressFk,
+ am.name futureAgency,
+ count(s.id) futureLines,
+ GROUP_CONCAT(DISTINCT ipt.code ORDER BY ipt.code) futureIpt,
+ CAST(SUM(litros) AS DECIMAL(10,0)) futureLiters,
+ SUM((s.quantity <= IFNULL(st.amount,0))) hasStock,
+ z.id futureZoneFk,
+ z.name futureZoneName,
+ st.classColor
+ FROM ticket t
+ JOIN client c ON c.id = t.clientFk
+ JOIN sale s ON s.ticketFk = t.id
+ JOIN saleVolume sv ON sv.saleFk = s.id
+ JOIN item i ON i.id = s.itemFk
+ JOIN ticketState ts ON ts.ticketFk = t.id
+ JOIN state st ON st.id = ts.stateFk
+ JOIN agencyMode am ON t.agencyModeFk = am.id
+ JOIN zone z ON t.zoneFk = z.id
+ LEFT JOIN itemPackingType ipt ON ipt.code = i.itemPackingTypeFk
+ LEFT JOIN tmp.stock st ON st.itemFk = i.id
+ WHERE t.shipped BETWEEN vDateFuture AND util.dayend(vDateFuture)
+ AND t.warehouseFk = vWarehouseFk
+ GROUP BY t.id
+ ) origin
+ JOIN (
+ SELECT
+ t.id ticketFk,
+ t.addressFk,
+ st.name state,
+ GROUP_CONCAT(DISTINCT ipt.code ORDER BY ipt.code) ipt,
+ t.shipped,
+ t.totalWithVat,
+ am.name agency,
+ CAST(SUM(litros) AS DECIMAL(10,0)) liters,
+ CAST(COUNT(*) AS DECIMAL(10,0)) `lines`,
+ st.classColor
+ FROM ticket t
+ JOIN sale s ON s.ticketFk = t.id
+ JOIN saleVolume sv ON sv.saleFk = s.id
+ JOIN item i ON i.id = s.itemFk
+ JOIN ticketState ts ON ts.ticketFk = t.id
+ JOIN state st ON st.id = ts.stateFk
+ JOIN agencyMode am ON t.agencyModeFk = am.id
+ LEFT JOIN itemPackingType ipt ON ipt.code = i.itemPackingTypeFk
+ WHERE t.shipped BETWEEN vDateToAdvance AND util.dayend(vDateToAdvance)
+ AND t.warehouseFk = vWarehouseFk
+ AND st.order <= 5
+ GROUP BY t.id
+ ) dest ON dest.addressFk = origin.addressFk
+ WHERE origin.hasStock != 0;
+
+ DROP TEMPORARY TABLE tmp.stock;
+END$$
+DELIMITER ;
+
diff --git a/front/Dockerfile b/front/Dockerfile
index 098ee161e..d0ee26904 100644
--- a/front/Dockerfile
+++ b/front/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:stretch-slim
+FROM debian:bookworm-slim
EXPOSE 80
ENV TZ Europe/Madrid
diff --git a/modules/ticket/back/methods/ticket/getTicketsAdvance.js b/modules/ticket/back/methods/ticket/getTicketsAdvance.js
index ec9314db2..ab40b9559 100644
--- a/modules/ticket/back/methods/ticket/getTicketsAdvance.js
+++ b/modules/ticket/back/methods/ticket/getTicketsAdvance.js
@@ -28,32 +28,27 @@ module.exports = Self => {
{
arg: 'ipt',
type: 'string',
- description: 'Origin Item Packaging Type',
- required: false
+ description: 'Origin Item Packaging Type'
},
{
arg: 'futureIpt',
type: 'string',
- description: 'Destination Item Packaging Type',
- required: false
+ description: 'Destination Item Packaging Type'
},
{
arg: 'id',
type: 'number',
- description: 'Origin id',
- required: false
+ description: 'Origin id'
},
{
arg: 'futureId',
type: 'number',
- description: 'Destination id',
- required: false
+ description: 'Destination id'
},
{
arg: 'isFullMovable',
type: 'boolean',
- description: 'True when lines and stock of origin are equal',
- required: false
+ description: 'True when lines and stock of origin are equal'
},
{
arg: 'filter',
diff --git a/modules/ticket/front/advance/index.html b/modules/ticket/front/advance/index.html
index e6f16c965..a6cf8face 100644
--- a/modules/ticket/front/advance/index.html
+++ b/modules/ticket/front/advance/index.html
@@ -81,6 +81,9 @@
|
Liters
|
+
+ Zone
+ |
Not Movable
|
@@ -155,6 +158,7 @@
{{::ticket.futureLiters | dashIfEmpty}} |
+ {{::ticket.futureZoneName | dashIfEmpty}} |
{{::ticket.notMovableLines | dashIfEmpty}} |
{{::ticket.futureLines | dashIfEmpty}} |
diff --git a/modules/ticket/front/advance/index.js b/modules/ticket/front/advance/index.js
index 6f8a92ebe..389bcdf14 100644
--- a/modules/ticket/front/advance/index.js
+++ b/modules/ticket/front/advance/index.js
@@ -15,28 +15,22 @@ export default class Controller extends Section {
{
field: 'state',
searchable: false
- },
- {
+ }, {
field: 'futureState',
searchable: false
- },
- {
+ }, {
field: 'totalWithVat',
searchable: false
- },
- {
+ }, {
field: 'futureTotalWithVat',
searchable: false
- },
- {
+ }, {
field: 'shipped',
searchable: false
- },
- {
+ }, {
field: 'futureShipped',
searchable: false
- },
- {
+ }, {
field: 'ipt',
autocomplete: {
url: 'ItemPackingTypes',
@@ -44,8 +38,7 @@ export default class Controller extends Section {
showField: 'description',
valueField: 'code'
}
- },
- {
+ }, {
field: 'futureIpt',
autocomplete: {
url: 'ItemPackingTypes',
@@ -53,6 +46,11 @@ export default class Controller extends Section {
showField: 'description',
valueField: 'code'
}
+ }, {
+ field: 'futureZoneFk',
+ autocomplete: {
+ url: 'Zones',
+ }
},
]
};
@@ -158,27 +156,21 @@ export default class Controller extends Section {
exprBuilder(param, value) {
switch (param) {
case 'id':
- return {'id': value};
case 'futureId':
- return {'futureId': value};
case 'liters':
- return {'liters': value};
case 'futureLiters':
- return {'futureLiters': value};
case 'lines':
- return {'lines': value};
case 'futureLines':
- return {'futureLines': value};
+ case 'totalWithVat':
+ case 'futureTotalWithVat':
+ case 'futureZone':
+ case 'notMovableLines':
+ case 'futureZoneFk':
+ return {[param]: value};
case 'ipt':
return {'ipt': {like: `%${value}%`}};
case 'futureIpt':
return {'futureIpt': {like: `%${value}%`}};
- case 'totalWithVat':
- return {'totalWithVat': value};
- case 'futureTotalWithVat':
- return {'futureTotalWithVat': value};
- case 'notMovableLines':
- return {'notMovableLines': value};
}
}
}
|