Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7529-workerPIT

db/routines/vn/procedures/expedition_getFromRoute.sql

@@ -16,7 +16,8 @@ BEGIN
 			a.nickname,
 			sub2.itemPackingTypeConcat,
 			est.code,
-			es.isScanned
+			es2.isScanned,
+			es2.scanOrder
 		FROM expedition e
 			JOIN ticket t ON t.id = e.ticketFk
 			JOIN ticketState ts ON ts.ticketFk = e.ticketFk
@@ -38,6 +39,7 @@ BEGIN
 				    SELECT MAX(id)
 				    	FROM expeditionState es
 				    	WHERE expeditionFk = e.id)
+			LEFT JOIN expeditionState es2 ON es2.id = es.id
 		WHERE t.routeFk = vRouteFk AND e.freightItemFk <> FALSE
 		ORDER BY  r.created,  t.priority DESC;
 END$$

db/routines/vn/procedures/travel_cloneWithEntries.sql

@@ -71,6 +71,8 @@ BEGIN
 		UPDATE entry
 			SET evaNotes = vEvaNotes
 			WHERE id = vNewEntryFk;
+		
+		CALL buy_recalcPricesByEntry(vNewEntryFk);
 	END LOOP;
 
 	SET @isModeInventory = FALSE;

db/versions/11319-redEucalyptus/00-firstScript.sql

@@ -0,0 +1,3 @@
+USE vn;
+
+ALTER TABLE vn.expeditionState ADD scanOrder int(11) DEFAULT NULL NULL COMMENT 'Indica la posición al cargar la furgoneta';

db/versions/11325-navyEucalyptus/00-firstScript.sql

@@ -0,0 +1,7 @@
+UPDATE salix.ACL
+	SET property='buyLabelSupplier'
+	WHERE property = 'buyLabel'
+        AND model = 'Entry';
+
+INSERT IGNORE INTO salix.ACL (model,property,principalId)
+	VALUES ('Entry','buyLabel','employee');

db/versions/11326-limeOrchid/00-firstScript.sql

@@ -0,0 +1,7 @@
+DELETE FROM vn.report
+	WHERE `name` = 'LabelItemQr';
+
+UPDATE vn.report
+	SET `method` = 'Entries/{id}/{itemType}/buy-label',
+		`name` = 'LabelBuy'
+	WHERE `name` = 'LabelItemBarcode';

modules/entry/back/methods/entry/buyLabel.js

@@ -1,14 +1,28 @@
 module.exports = Self => {
     Self.remoteMethodCtx('buyLabel', {
-        description: 'Returns the entry buy labels',
+        description: 'Returns the buy label',
         accessType: 'READ',
         accepts: [
             {
                 arg: 'id',
                 type: 'number',
                 required: true,
-                description: 'The entry id',
+                description: 'The buy id',
                 http: {source: 'path'}
+            }, {
+                arg: 'labelType',
+                type: 'string',
+                required: true,
+                description: 'The label type',
+                http: {source: 'path'}
+            }, {
+                arg: 'packing',
+                type: 'number',
+                required: false
+            }, {
+                arg: 'copies',
+                type: 'number',
+                required: false
             }
         ],
         returns: [
@@ -27,11 +41,16 @@ module.exports = Self => {
             }
         ],
         http: {
-            path: '/:id/buy-label',
+            path: '/:id/:labelType/buy-label',
             verb: 'GET'
         },
         accessScopes: ['DEFAULT', 'read:multimedia']
     });
 
-    Self.buyLabel = (ctx, id) => Self.printReport(ctx, id, 'buy-label');
+    Self.buyLabel = (ctx, id, labelType) => {
+        if (labelType == 'qr')
+            return Self.printReport(ctx, id, 'buy-label-qr');
+        else
+            return Self.printReport(ctx, id, 'buy-label-barcode');
+    };
 };

modules/entry/back/methods/entry/buyLabelSupplier.js

@@ -0,0 +1,37 @@
+module.exports = Self => {
+    Self.remoteMethodCtx('buyLabelSupplier', {
+        description: 'Returns the entry buy labels',
+        accessType: 'READ',
+        accepts: [
+            {
+                arg: 'id',
+                type: 'number',
+                required: true,
+                description: 'The entry id',
+                http: {source: 'path'}
+            }
+        ],
+        returns: [
+            {
+                arg: 'body',
+                type: 'file',
+                root: true
+            }, {
+                arg: 'Content-Type',
+                type: 'String',
+                http: {target: 'header'}
+            }, {
+                arg: 'Content-Disposition',
+                type: 'String',
+                http: {target: 'header'}
+            }
+        ],
+        http: {
+            path: '/:id/buy-label-supplier',
+            verb: 'GET'
+        },
+        accessScopes: ['DEFAULT', 'read:multimedia']
+    });
+
+    Self.buyLabelSupplier = (ctx, id) => Self.printReport(ctx, id, 'buy-label-supplier');
+};

modules/entry/back/models/buy.js

@@ -2,4 +2,5 @@ module.exports = Self => {
     require('../methods/entry/editLatestBuys')(Self);
     require('../methods/entry/latestBuysFilter')(Self);
     require('../methods/entry/deleteBuys')(Self);
+    require('../methods/entry/buyLabel')(Self);
 };

modules/item/back/methods/item/labelBarcodePdf.js

@@ -1,55 +0,0 @@
-module.exports = Self => {
-    Self.remoteMethodCtx('labelBarcodePdf', {
-        description: 'Returns the item label pdf with barcode',
-        accessType: 'READ',
-        accepts: [
-            {
-                arg: 'id',
-                type: 'number',
-                required: true,
-                description: 'The item id',
-                http: {source: 'path'}
-            }, {
-                arg: 'warehouseId',
-                type: 'number',
-                required: true
-            }, {
-                arg: 'packing',
-                type: 'number',
-                required: false
-            }, {
-                arg: 'copies',
-                type: 'number',
-                required: false
-            }, {
-                arg: 'userId',
-                type: 'number',
-                description: 'The user id from accessToken',
-                http: ctx => ctx.req.accessToken.userId,
-                required: true
-            }
-        ],
-        returns: [
-            {
-                arg: 'body',
-                type: 'file',
-                root: true
-            }, {
-                arg: 'Content-Type',
-                type: 'String',
-                http: {target: 'header'}
-            }, {
-                arg: 'Content-Disposition',
-                type: 'String',
-                http: {target: 'header'}
-            }
-        ],
-        http: {
-            path: '/:id/label-barcode-pdf',
-            verb: 'GET'
-        },
-        accessScopes: ['DEFAULT', 'read:multimedia']
-    });
-
-    Self.labelBarcodePdf = (ctx, id) => Self.printReport(ctx, id, 'item-label-barcode');
-};

modules/item/back/methods/item/labelQrPdf.js

@@ -1,55 +0,0 @@
-module.exports = Self => {
-    Self.remoteMethodCtx('labelQrPdf', {
-        description: 'Returns the item label pdf with qr',
-        accessType: 'READ',
-        accepts: [
-            {
-                arg: 'id',
-                type: 'number',
-                required: true,
-                description: 'The item id',
-                http: {source: 'path'}
-            }, {
-                arg: 'warehouseId',
-                type: 'number',
-                required: true
-            }, {
-                arg: 'packing',
-                type: 'number',
-                required: false
-            }, {
-                arg: 'copies',
-                type: 'number',
-                required: false
-            }, {
-                arg: 'userId',
-                type: 'number',
-                description: 'The user id from accessToken',
-                http: ctx => ctx.req.accessToken.userId,
-                required: true
-            }
-        ],
-        returns: [
-            {
-                arg: 'body',
-                type: 'file',
-                root: true
-            }, {
-                arg: 'Content-Type',
-                type: 'String',
-                http: {target: 'header'}
-            }, {
-                arg: 'Content-Disposition',
-                type: 'String',
-                http: {target: 'header'}
-            }
-        ],
-        http: {
-            path: '/:id/label-qr-pdf',
-            verb: 'GET'
-        },
-        accessScopes: ['DEFAULT', 'read:multimedia']
-    });
-
-    Self.labelQrPdf = (ctx, id) => Self.printReport(ctx, id, 'item-label-qr');
-};

modules/item/back/models/item.js

@@ -15,8 +15,6 @@ module.exports = Self => {
     require('../methods/item/getWasteByItem')(Self);
     require('../methods/item/createIntrastat')(Self);
     require('../methods/item/buyerWasteEmail')(Self);
-    require('../methods/item/labelBarcodePdf')(Self);
-    require('../methods/item/labelQrPdf')(Self);
     require('../methods/item/setVisibleDiscard')(Self);
     require('../methods/item/get')(Self);
 

modules/ticket/back/methods/expedition-state/addExpeditionState.js

@@ -44,6 +44,7 @@ module.exports = Self => {
 
                 const typeFk = expeditionStateType.id;
                 expeditionId = expedition.expeditionFk;
+                expeditionPosition = expedition?.scanOrder ?? null;
                 const isScannedExpedition = expedition.isScanned ?? false;
 
                 await models.ExpeditionState.create({
@@ -51,6 +52,7 @@ module.exports = Self => {
                     typeFk,
                     userFk: userId,
                     isScanned: isScannedExpedition,
+                    scanOrder: expeditionPosition
                 }, myOptions);
             }
 

modules/ticket/back/models/expedition-state.json

@@ -27,6 +27,9 @@
         },
         "isScanned": {
             "type": "boolean"
+        },
+        "scanOrder": {
+            "type": "number"
         }
     },
     "relations": {

print/templates/reports/buy-label-barcode/assets/css/style.css

@@ -1,7 +1,7 @@
 html {
     font-family: "Roboto", "Helvetica", "Arial", sans-serif;
     margin-top: -9px;
-    margin-left: -6px;
+    margin-left: -3px;
 }
 table {
     width: 100%;
@@ -52,8 +52,8 @@ td {
     max-height: 50px;
 }
 .md-height {
-    height: 75px;
+    height: 70px;
-    max-height: 75px;
+    max-height: 70px;
 }
 .sm-width {
     width: 60px;

print/templates/reports/buy-label-barcode/buy-label-barcode.html

@@ -1,16 +1,16 @@
 <!DOCTYPE html>
 <html>
-<body table v-for="item in items" style="break-before: page">
+<body table v-for="buy in buys" style="break-before: page">
 	<table>
 			<tr>
 				<td class="md-txt bold center black-bg lg-width md-height">
 					<div class="overflow-multiline">
-						{{item.item}}
+						{{buy.item}}
 					</div>
 				</td>
 				<td colspan="2" class="xl-txt bold center black-bg md-height md-width">
 					<div class="overflow-line">
-						{{item.size}}
+						{{buy.size}}
 					</div>
 				</td>
 			</tr>
@@ -18,61 +18,64 @@
 				<td class="right lg-width">
 					<div class="overflow-line">
 						{{
-							(item.longName && item.size && item.subName)
+							(buy.longName && buy.size && buy.subName)
-							? `${item.longName} ${item.size} ${item.subName}`
+							? `${buy.longName} ${buy.size} ${buy.subName}`
-							: item.comment
+							: buy.comment
 						}}
 					</div>
 				</td>
 				<td class="center sm-width">
 					<div class="overflow-line">
-						{{item.producerName || item.producerFk}}
+						{{buy.producerName || buy.producerFk}}
 					</div>
 				</td>
 				<td class="center sm-width">
 					<div class="overflow-line">
-						{{item.inkFk}}
+						{{buy.inkFk}}
 					</div>
 				</td>
 			</tr>
 			<tr>
 				<td class="md-txt xl-width bold center">
 					<div class="overflow-line">
-						{{item.itemFk}}
+						{{buy.itemFk}}
 					</div>
 				</td>
 				<td colspan="2" class="md-txt md-width center">
 					<div class="overflow-line">
-						{{`${(packing || item.packing)} x ${item.stems || ''}`}}
+						{{`${(packing || buy.packing)} x ${buy.stems || ''}`}}
 					</div>
 				</td>
 			</tr>
 			<tr>
 				<td rowspan="2" class="center">
-					<div v-html="getBarcode(item.buyFk)"></div>
+					<div v-html="getBarcode(buy.buyFk)"></div>
 				</td>
 				<td colspan="2" class="center md-width xs-height xs-txt">
-					<div class="overflow-line">
+					<div v-if="buy.isLaid && typeId === 'buy'" class="overflow-line black-bg bold">
-						{{item.entryFk}}
+						{{'LAID'}}
+					</div>
+					<div v-else class="overflow-line">
+						{{buy.entryFk}}
 					</div>
 				</td>
 			</tr>
 			<tr>
 				<td class="center xs-txt sm-width">
 					<div class="overflow-line">
-						{{item.buyerName}}
+						{{buy.buyerName}}
 					</div>
 				</td>
 				<td class="center xs-txt sm-width">
 					<div class="overflow-line">
-						{{item.origin}}
+						{{buy.origin}}
 					</div>
 				</td>
 			</tr>
 			<tr>
 				<td class="center xl-width">
 					<div class="overflow-line">
-						{{item.buyFk}}
+						{{buy.buyFk}}
 					</div>
 				</td>
 				<td class="xs-txt sm-width center">
@@ -82,7 +85,7 @@
 				</td>
 				<td class="xs-txt sm-width cursive center bold">
 					<div class="overflow-line">
-						{{`${item.labelNum}/${item.quantity / (packing || item.packing)}`}}
+						{{`${buy.labelNum}/${buy.quantity / (packing || buy.packing)}`}}
 					</div>
 				</td>
 			</tr>

print/templates/reports/buy-label-barcode/buy-label-barcode.js

@@ -4,20 +4,11 @@ const moment = require('moment');
 const jsbarcode = require('jsbarcode');
 
 module.exports = {
-    name: 'item-label-barcode',
+    name: 'buy-label-barcode',
     async serverPrefetch() {
-        this.company = await this.findOneFromDef('company', [this.warehouseId]);
-        if (!this.company)
-            throw new UserError(`There is no company associated with that warehouse`);
-
         this.date = Date.vnNew();
-        this.lastBuy = await this.findOneFromDef('lastBuy', [
+        this.buys = await this.rawSqlFromDef('buy', [this.copies || 1, this.id]);
-            this.id,
+        if (!this.buys.length) throw new UserError(`Empty data source`);
-            this.warehouseId,
-            this.date
-        ]);
-        this.items = await this.rawSqlFromDef('item', [this.copies || 1, this.lastBuy.id]);
-        if (!this.items.length) throw new UserError(`Empty data source`);
         this.date = moment(this.date).format('WW/E');
     },
     methods: {
@@ -51,8 +42,8 @@ module.exports = {
         copies: {
             type: Number
         },
-        userId: {
+        typeId: {
-            type: Number
+            type: String
         }
     }
 };

print/templates/reports/buy-label-barcode/options.json

@@ -3,7 +3,7 @@
     "height": "4.9cm",
     "margin": {
         "top": "0.17cm",
-        "right": "0.745cm",
+        "right": "0.37cm",
         "bottom": "0cm",
         "left": "0cm"
     },

print/templates/reports/buy-label-barcode/sql/buy.sql

@@ -22,7 +22,9 @@ SELECT ROW_NUMBER() OVER() labelNum,
 		ig.longName,
 		ig.subName,
 		i.comment,
-		w.code buyerName
+		w.code buyerName,
+		i.isLaid,
+		c.code company
 	FROM vn.buy b
 		JOIN vn.item i ON i.id = b.itemFk
 		LEFT JOIN vn.item ig ON ig.id = b.itemOriginalFk
@@ -30,5 +32,7 @@ SELECT ROW_NUMBER() OVER() labelNum,
 		LEFT JOIN vn.producer p ON p.id = i.producerFk
 		JOIN vn.itemType it ON it.id = i.typeFk
 		JOIN vn.worker w ON w.id = it.workerFk
+		JOIN vn.entry e ON e.id = b.entryFk
+		JOIN vn.company c ON c.id = e.companyFk
 		JOIN numbers num
 	WHERE b.id = ?

print/templates/reports/buy-label-qr/assets/css/style.css

@@ -1,7 +1,7 @@
 html {
     font-family: "Roboto", "Helvetica", "Arial", sans-serif;
     margin-top: -7px;
-    margin-left: -6px;
+    margin-left: -3px;
 }
 .leftTable {
     width: 47%;

print/templates/reports/buy-label-qr/buy-label-qr.html

@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <html>
-<body v-for="item in items" style="break-before: page">
+<body v-for="buy in buys" style="break-before: page">
 	<table class="leftTable">
 			<tr>
 				<td>
@@ -12,7 +12,7 @@
 			</tr>
 			<tr>
 				<td colspan="2">
-					{{item.buyFk}}
+					{{buy.buyFk}}
 				</td>
 			</tr>
 			<tr>
@@ -28,58 +28,65 @@
 		<tr>
 			<td colspan="3" class="lg-width black-bg center bold xl-txt padding">
 				<div class="overflow-line">
-					{{item.itemFk}}
+					{{buy.itemFk}}
 				</div>
 			</td>
 		</tr>
 		<tr>
 			<td colspan="2" class="black-bg center bold md-txt md-width md-height">
 				<div class="overflow-multiline">
-					{{item.item}}
+					{{buy.item}}
 				</div>
 			</td>
 			<td class="xs-width black-bg center bold xl-txt">
 				<div class="overflow-line">
-					{{item.size}}
+					{{buy.size}}
 				</div>
 			</td>
 		</tr>
 		<tr>
 			<td class="sm-width">
 				<div class="overflow-line">
-					<i>Color:</i> <b>{{item.inkFk}}</b>
+					<i>Color:</i> <b>{{buy.inkFk}}</b>
 				</div>
 			</td>
 			<td rowspan="2" class="xs-width center md-txt">
 				<div class="overflow-line cell">
-					{{packing || item.packing}}
+					{{packing || buy.packing}}
 				</div>
 			</td>
 			<td rowspan="2" class="xs-width center md-txt">
 				<div class="overflow-line cell">
-					{{item.stems}}
+					{{buy.stems}}
 				</div>
 			</td>
 		</tr>
 		<tr>
 			<td class="sm-width">
 				<div class="overflow-line">
-					<i>Origen:</i> {{item.origin}}
+					<i>Origen:</i> {{buy.origin}}
 				</div>
 			</td>
 		</tr>
 		<tr>
 			<td colspan="2" class="md-width">
 				<div class="overflow-line">
-					<i>Productor:</i> {{item.producerName || item.producerFk}}
+					<i>Productor:</i> {{buy.producerName || buy.producerFk}}
+				</div>
+			</td>
+			<td class="center xs-width xs-txt">
+				<div v-if="buy.isLaid && typeId === 'buy'" class="overflow-line black-bg bold">
+					{{'LAID'}}
+				</div>
+				<div v-else class="overflow-line">
+					{{buy.entryFk}}
 				</div>
 			</td>
-			<td></td>
 		</tr>
 		<tr>
 			<td class="sm-width">
 				<div class="overflow-line">
-					<i>Comprador:</i> {{item.buyerName}}
+					<i>Comprador:</i> {{buy.buyerName}}
 				</div>
 			</td>
 			<td rowspan="2" class="xs-width">
@@ -89,14 +96,14 @@
 			</td>
 			<td rowspan="2" class="xs-width center cursive bold md-txt">
 				<div class="overflow-line">
-					{{`${item.labelNum}/${item.quantity / (packing || item.packing)}`}}
+					{{`${buy.labelNum}/${buy.quantity / (packing || buy.packing)}`}}
 				</div>
 			</td>
 		</tr>
 		<tr>
 			<td class="sm-width">
 				<div class="overflow-line">
-					<i>Entrada:</i> {{item.entryFk}}
+					<i>Entrada:</i> {{buy.entryFk}}
 				</div>
 			</td>
 		</tr>
@@ -104,9 +111,9 @@
 			<td colspan="3" class="lg-width center cursive bold">
 				<div class="overflow-line">
 					{{
-						(item.longName && item.size && item.subName)
+						(buy.longName && buy.size && buy.subName)
-						? `${item.longName} ${item.size} ${item.subName}`
+						? `${buy.longName} ${buy.size} ${buy.subName}`
-						: item.comment
+						: buy.comment
 					}}
 				</div>
 			</td>

print/templates/reports/buy-label-qr/buy-label-qr.js

@@ -3,27 +3,18 @@ const moment = require('moment');
 const qrcode = require('qrcode');
 
 module.exports = {
-    name: 'item-label-qr',
+    name: 'buy-label-qr',
     async serverPrefetch() {
-        this.company = await this.findOneFromDef('company', [this.warehouseId]);
-        if (!this.company)
-            throw new UserError(`There is no company associated with that warehouse`);
-
         this.date = Date.vnNew();
-        this.lastBuy = await this.findOneFromDef('lastBuy', [
+        this.buys = await this.rawSqlFromDef('buy', [this.copies || 1, this.id]);
-            this.id,
+        if (!this.buys.length) throw new UserError(`Empty data source`);
-            this.warehouseId,
+        this.qr = await this.getQr(this.buys[0].buyFk);
-            this.date
-        ]);
-        this.items = await this.rawSqlFromDef('item', [this.copies || 1, this.lastBuy.id]);
-        if (!this.items.length) throw new UserError(`Empty data source`);
-        this.qr = await this.getQr(this.items[0].buyFk);
         this.date = moment(this.date).format('WW/E');
     },
     methods: {
         getQr(data) {
             data = {
-                company: this.company,
+                company: this.buys.company,
                 user: this.userId,
                 created: this.date,
                 table: 'buy',
@@ -52,6 +43,9 @@ module.exports = {
         },
         userId: {
             type: Number
+        },
+        typeId: {
+            type: String
         }
     }
 };

print/templates/reports/buy-label-qr/options.json

@@ -3,7 +3,7 @@
     "height": "4.9cm",
     "margin": {
         "top": "0.17cm",
-        "right": "0.6cm",
+        "right": "0.3cm",
         "bottom": "0cm",
         "left": "0cm"
     },

print/templates/reports/buy-label-qr/sql/buy.sql

@@ -22,7 +22,9 @@ SELECT ROW_NUMBER() OVER() labelNum,
 		ig.longName,
 		ig.subName,
 		i.comment,
-		w.code buyerName
+		w.code buyerName,
+		i.isLaid,
+		c.code company
 	FROM vn.buy b
 		JOIN vn.item i ON i.id = b.itemFk
 		LEFT JOIN vn.item ig ON ig.id = b.itemOriginalFk
@@ -30,5 +32,7 @@ SELECT ROW_NUMBER() OVER() labelNum,
 		LEFT JOIN vn.producer p ON p.id = i.producerFk
 		JOIN vn.itemType it ON it.id = i.typeFk
 		JOIN vn.worker w ON w.id = it.workerFk
+		JOIN vn.entry e ON e.id = b.entryFk
+		JOIN vn.company c ON c.id = e.companyFk
 		JOIN numbers num
 	WHERE b.id = ?

print/templates/reports/buy-label-supplier/buy-label-supplier.js

@@ -5,7 +5,7 @@ const jsBarcode = require('jsbarcode');
 const moment = require('moment');
 
 module.exports = {
-    name: 'buy-label',
+    name: 'buy-label-supplier',
     mixins: [vnReport],
     async serverPrefetch() {
         const buy = await models.Buy.findById(this.id, null);

print/templates/reports/item-label-barcode/sql/company.sql

@@ -1,5 +0,0 @@
-SELECT co.code
-	FROM warehouse w
-		JOIN address a ON a.id = w.addressFk
-		JOIN company co ON co.clientFk = a.clientFk
-	WHERE w.id = ?

print/templates/reports/item-label-barcode/sql/lastBuy.sql

@@ -1 +0,0 @@
-SELECT buy_getUltimate(?, ?, ?) id

print/templates/reports/item-label-qr/sql/company.sql

@@ -1,5 +0,0 @@
-SELECT co.code
-	FROM warehouse w
-		JOIN address a ON a.id = w.addressFk
-		JOIN company co ON co.clientFk = a.clientFk
-	WHERE w.id = ?

print/templates/reports/item-label-qr/sql/lastBuy.sql

@@ -1 +0,0 @@
-SELECT buy_getUltimate(?, ?, ?) id