verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 59 Releases Wiki Activity

refs #6184 saveCmr #1788

Merged
guillermo merged 58 commits from 6184-saveCmr into dev 2024-02-13 06:47:06 +00:00
Conversation 2 Commits 58 Files Changed 27 +16 -15
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2792efa9cd - Show all commits

23
modules/ticket/back/methods/ticket/saveCmr.js
View File

@ -31,38 +31,39 @@ module.exports = Self => {
} }
try { try {
for (const ticketId of tickets) { const dmsTypeCmr = await models.DmsType.findOne({
const ticket = await models.Ticket.findById(ticketId, myOptions);
if (ticket.cmrFk) {
const dmsType = await models.DmsType.findOne({
where: {code: 'cmr'}, where: {code: 'cmr'},
fields: ['id'] fields: ['id']
}, myOptions); }, myOptions);
guillermo marked this conversation as resolved Outdated
jgallego commented 2023-11-13 06:17:25 +00:00
Outdated
Review
Copy Link

Este el cree cada vegada pero es el mateix id per a tots. Pujal fora del for
El nom jo posaría dmsTypeCmr

Este el cree cada vegada pero es el mateix id per a tots. Pujal fora del for El nom jo posaría dmsTypeCmr
for (const ticketId of tickets) {
const ticket = await models.Ticket.findById(ticketId, myOptions);
if (ticket.cmrFk) {
const hasDmsCmr = await models.TicketDms.findOne({ const hasDmsCmr = await models.TicketDms.findOne({
where: { ticketFk: ticketId }, where: { ticketFk: ticketId },
include: { include: {
relation: 'dms', relation: 'dms',
fields: ['dmsFk'], fields: ['dmsFk'],
scope: { scope: {
where: { dmsTypeFk: dmsType.id } where: { dmsTypeFk: dmsTypeCmr.id }
} }
} }
}, myOptions); }, myOptions);
if (!hasDmsCmr.dms()) { if (!hasDmsCmr.dms()) {
const zip = await models.Route.downloadCmrsZip(ctx, ticket.cmrFk.toString(), myOptions); const zip = await models.Route.downloadCmrsZip(ctx, ticket.cmrFk.toString(), myOptions);
let ctxUploadFile;
ctx.req.file = Object.assign({}, zip); ctx.req.file = Object.assign({}, zip);
guillermo marked this conversation as resolved Outdated
jgallego commented 2023-11-13 06:28:53 +00:00
Outdated
Review
Copy Link

const

const
guillermo commented 2023-11-13 06:42:31 +00:00
Outdated
Review
Copy Link

En eixe cas te que ser let, fijat baix.
Per a que siga const he tingut que juntar-ho.

En eixe cas te que ser let, fijat baix. Per a que siga const he tingut que juntar-ho.
ctxUploadFile = Object.assign({}, ctx); const ctxUploadFile = {
ctxUploadFile.args = { ...ctx,
args: {
warehouseId: ticket.warehouseFk, warehouseId: ticket.warehouseFk,
companyId: ticket.companyFk, companyId: ticket.companyFk,
dmsTypeId: dmsType.id, dmsTypeId: dmsTypeCmr.id,
reference: '', reference: ticket.id,
guillermo marked this conversation as resolved Outdated
jgallego commented 2023-11-13 06:31:12 +00:00
Outdated
Review
Copy Link

si es dms, en reference posa ticket.cmrFk

si es dms, en reference posa ticket.cmrFk
description: `${ticket.cmrFk} - ${ticket.id}`, description: `${ticket.cmrFk} - ${ticket.id}`,
guillermo marked this conversation as resolved Outdated
jgallego commented 2023-11-09 09:22:26 +00:00
Outdated
Review
Copy Link

al ser el tipo cmr, no es neceario poner cmr, pueden buscar por tipo
quitar texto en español.
Propuesta: poner cmr: cmrFk, ticket: ticketFk

al ser el tipo cmr, no es neceario poner cmr, pueden buscar por tipo quitar texto en español. Propuesta: poner cmr: cmrFk, ticket: ticketFk
hasFile: false hasFile: false
}
}; };
const dms = await models.Dms.uploadFile(ctxUploadFile, myOptions); const dms = await models.Dms.uploadFile(ctxUploadFile, myOptions);
await models.TicketDms.create({ await models.TicketDms.create({