db/changes/230601/00-ticket_canAdvance.sql

@@ -0,0 +1,114 @@
+DROP PROCEDURE IF EXISTS vn.ticket_canAdvance;
+
+DELIMITER $$
+$$
+CREATE 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 vn.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 vn.itemTicketOut
+				WHERE shipped >= vDateInventory
+					AND shipped < vDateFuture
+					AND warehouseFk = vWarehouseFk
+			UNION ALL
+			SELECT itemFk, quantity
+				FROM vn.itemEntryIn
+				WHERE landed >= vDateInventory
+					AND landed < vDateFuture
+					AND isVirtualStock = FALSE
+					AND warehouseInFk = vWarehouseFk
+			UNION ALL
+			SELECT itemFk, quantity
+				FROM vn.itemEntryOut
+				WHERE shipped >= vDateInventory
+					AND shipped < vDateFuture
+					AND warehouseOutFk = vWarehouseFk
+		) t
+		GROUP BY itemFk HAVING amount != 0;
+
+	DROP TEMPORARY TABLE IF EXISTS tmp.filter;
+	CREATE TEMPORARY TABLE tmp.filter
+        (INDEX (id))
+
+    SELECT
+            *,
+            CASE WHEN sub.futureLines = hasStock THEN '1' ELSE '0' END AS fullMovable
+        FROM (SELECT s.ticketFk futureId,
+                        t2.ticketFk id,
+                        count(DISTINCT s.id) saleCount,
+                        t2.state,
+                        st.name futureState,
+                        GROUP_CONCAT(DISTINCT ipt.code  ORDER BY ipt.code) futureIpt,
+                        t2.ipt,
+                        t.workerFk,
+                        CAST(SUM(litros) AS DECIMAL(10,0)) futureLiters,
+                        CAST(COUNT(*) AS DECIMAL(10,0)) `futureLines`,
+                        t2.shipped,
+                        t.shipped futureShipped,
+                        t2.totalWithVat,
+                        t.totalWithVat futureTotalWithVat,
+                        t2.agency,
+                        am.name futureAgency,
+                        t2.lines,
+                        t2.liters,
+                        SUM((s.quantity <= IFNULL(st.amount,0))) AS hasStock
+                    FROM vn.ticket t
+                        JOIN vn.sale s ON s.ticketFk = t.id
+                    	JOIN vn.saleVolume sv ON sv.saleFk = s.id
+                    	JOIN vn.item i ON i.id = s.itemFk
+                        JOIN vn.ticketState ts ON ts.ticketFk = t.id
+                        JOIN vn.state st ON st.id = ts.stateFk
+                        JOIN vn.agencyMode am ON t.agencyModeFk = am.id
+                        LEFT JOIN vn.itemPackingType ipt ON ipt.code = i.itemPackingTypeFk
+                        LEFT JOIN tmp.stock st ON st.itemFk = s.itemFk
+                        JOIN (SELECT
+                                    t2.id ticketFk,
+                                    t2.addressFk,
+                                    st.name state,
+                                    GROUP_CONCAT(DISTINCT ipt.code ORDER BY ipt.code) ipt,
+                                    t2.shipped,
+                                    t2.totalWithVat,
+                                    am.name agency,
+                                    CAST(SUM(litros) AS DECIMAL(10,0)) liters,
+                                    CAST(COUNT(*) AS DECIMAL(10,0)) `lines`
+                                    FROM vn.ticket t2
+                                        JOIN vn.sale s ON s.ticketFk = t2.id
+                                        JOIN vn.saleVolume sv ON sv.saleFk = s.id
+                                        JOIN vn.item i ON i.id = s.itemFk
+                                        JOIN vn.ticketState ts ON ts.ticketFk = t2.id
+                                        JOIN vn.state st ON st.id = ts.stateFk
+                                        JOIN vn.agencyMode am ON t2.agencyModeFk = am.id
+                                        LEFT JOIN vn.itemPackingType ipt ON ipt.code = i.itemPackingTypeFk
+                                    WHERE t2.shipped BETWEEN vDateToAdvance AND util.dayend(vDateToAdvance)
+                                        AND t2.warehouseFk = vWarehouseFk
+                                        AND st.order <= 5
+                                    GROUP BY t2.id) t2 ON t2.addressFk = t.addressFk
+                    WHERE t.shipped BETWEEN vDateFuture AND util.dayend(vDateFuture)
+                        AND t.warehouseFk = vWarehouseFk
+                    GROUP BY id, futureId
+        ) sub
+        WHERE hasStock != 0;
+
+	DROP TEMPORARY TABLE tmp.stock;
+END$$
+DELIMITER ;

e2e/helpers/selectors.js

@@ -776,8 +776,6 @@ export default {
         ipt: 'vn-autocomplete[label="Destination IPT"]',
         tableIpt: 'vn-autocomplete[name="ipt"]',
         tableFutureIpt: 'vn-autocomplete[name="futureIpt"]',
-        futureState: 'vn-autocomplete[label="Origin Grouped State"]',
-        state: 'vn-autocomplete[label="Destination Grouped State"]',
         warehouseFk: 'vn-autocomplete[label="Warehouse"]',
         tableButtonSearch: 'vn-button[vn-tooltip="Search"]',
         moveButton: 'vn-button[vn-tooltip="Advance tickets"]',

e2e/paths/05-ticket/22_advance.spec.js

@@ -10,6 +10,10 @@ describe('Ticket Advance path', () => {
         page = browser.page;
         await page.loginAndModule('employee', 'ticket');
         await page.accessToSection('ticket.advance');
+        page.on('request', req => {
+            if (req.url().includes(`Tickets/getTicketsAdvance`))
+                httpRequests.push(req.url());
+        });
     });
 
     afterAll(async() => {
@@ -70,30 +74,6 @@ describe('Ticket Advance path', () => {
         await page.waitForNumberOfElements(selectors.ticketAdvance.table, 1);
     });
 
-    it('should search with the origin grouped state', async() => {
-        await page.waitToClick(selectors.ticketAdvance.openAdvancedSearchButton);
-        await page.autocompleteSearch(selectors.ticketAdvance.futureState, 'Free');
-        await page.waitToClick(selectors.ticketAdvance.submit);
-        await page.waitForNumberOfElements(selectors.ticketAdvance.table, 1);
-
-        await page.waitToClick(selectors.ticketAdvance.openAdvancedSearchButton);
-        await page.clearInput(selectors.ticketAdvance.futureState);
-        await page.waitToClick(selectors.ticketAdvance.submit);
-        await page.waitForNumberOfElements(selectors.ticketAdvance.table, 1);
-    });
-
-    it('should search with the destination grouped state', async() => {
-        await page.waitToClick(selectors.ticketAdvance.openAdvancedSearchButton);
-        await page.autocompleteSearch(selectors.ticketAdvance.state, 'Free');
-        await page.waitToClick(selectors.ticketAdvance.submit);
-        await page.waitForNumberOfElements(selectors.ticketAdvance.table, 0);
-
-        await page.waitToClick(selectors.ticketAdvance.openAdvancedSearchButton);
-        await page.clearInput(selectors.ticketAdvance.state);
-        await page.waitToClick(selectors.ticketAdvance.submit);
-        await page.waitForNumberOfElements(selectors.ticketAdvance.table, 1);
-    });
-
     it('should search in smart-table with an IPT Origin', async() => {
         await page.waitToClick(selectors.ticketAdvance.tableButtonSearch);
         await page.autocompleteSearch(selectors.ticketAdvance.tableFutureIpt, 'Vertical');

modules/ticket/back/methods/ticket/specs/getTicketsAdvance.spec.js

@@ -1,7 +1,7 @@
 const models = require('vn-loopback/server/server').models;
 
 describe('ticket getTicketsAdvance()', () => {
-    const today = Date.vnNew();
+    const today = new Date();
     today.setHours(0, 0, 0, 0);
     let tomorrow = new Date();
     tomorrow.setDate(today.getDate() + 1);
@@ -70,7 +70,7 @@ describe('ticket getTicketsAdvance()', () => {
             const ctx = {req: {accessToken: {userId: 9}}, args};
             const result = await models.Ticket.getTicketsAdvance(ctx, options);
 
-            expect(result.length).toBeGreaterThan(0);
+            expect(result.length).toEqual(0);
 
             await tx.rollback();
         } catch (e) {