From 89e10875db672fe79d227cc7ea373d54368f6b9b Mon Sep 17 00:00:00 2001 From: pablone Date: Wed, 16 Oct 2024 12:52:07 +0200 Subject: [PATCH] fix: refs #6403 use mrwService weight --- back/methods/mrw-config/createShipment.ejs | 2 +- back/methods/mrw-config/createShipment.js | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/back/methods/mrw-config/createShipment.ejs b/back/methods/mrw-config/createShipment.ejs index 52ccc859c..5f15aa054 100644 --- a/back/methods/mrw-config/createShipment.ejs +++ b/back/methods/mrw-config/createShipment.ejs @@ -41,7 +41,7 @@ <%= mrw.defaultHeight %> <%= mrw.defaultLength %> <%= mrw.defaultWidth %> - <%= mrw.defaultWeight %> + <%= expeditionData.kg %> diff --git a/back/methods/mrw-config/createShipment.js b/back/methods/mrw-config/createShipment.js index 2ebb80774..1057d728a 100644 --- a/back/methods/mrw-config/createShipment.js +++ b/back/methods/mrw-config/createShipment.js @@ -53,7 +53,8 @@ module.exports = Self => { CONCAT( e.ticketFk, LPAD(e.counter, mc.counterWidth, '0')) reference, LPAD(IF(mw.serviceType IS NULL, ms.serviceType, mw.serviceType), mc.serviceTypeWidth, '0') serviceType, IF(mw.weekdays, 'S', 'N') weekDays, - ta.description deliveryObservation + ta.description deliveryObservation, + ms.kg FROM expedition e JOIN ticket t ON e.ticketFk = t.id JOIN agencyMode am ON am.id = t.agencyModeFk