Merge branch 'master' into 6403-useServiceWeightOnCreateShipment

fix: refs #6403 use mrwService weight
2024-11-11 05:52:57 +00:00 · 2024-10-16 12:52:07 +02:00
2 changed files with 3 additions and 2 deletions
--- a/back/methods/mrw-config/createShipment.ejs
+++ b/back/methods/mrw-config/createShipment.ejs
@ -41,7 +41,7 @@
                            <mrw:Alto><%= mrw.defaultHeight %></mrw:Alto>
                            <mrw:Largo><%= mrw.defaultLength %></mrw:Largo>
                            <mrw:Ancho><%= mrw.defaultWidth %></mrw:Ancho>
-                            <mrw:Peso><%= mrw.defaultWeight %></mrw:Peso>
+                            <mrw:Peso><%= expeditionData.kg %></mrw:Peso>
                        </mrw:BultoRequest>
                    </mrw:Bultos>
                </mrw:DatosServicio>
--- 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
Author	SHA1	Message	Date
Pablo Natek	f48b5bae70	Merge branch 'master' into 6403-useServiceWeightOnCreateShipment	2024-11-11 05:52:57 +00:00
Pablo Natek	89e10875db	fix: refs #6403 use mrwService weight gitea/salix/pipeline/pr-master This commit looks good Details	2024-10-16 12:52:07 +02:00