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

refs #6915 test_master24_8 #2067

Merged
alexm merged 561 commits from test_master24_8 into master 2024-02-22 07:31:34 +00:00
Conversation 0 Commits 561 Files Changed 306 +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

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

@ -31,38 +31,39 @@ module.exports = Self => {
}
try {
const dmsTypeCmr = await models.DmsType.findOne({
where: {code: 'cmr'},
fields: ['id']
}, myOptions);
for (const ticketId of tickets) {
const ticket = await models.Ticket.findById(ticketId, myOptions);
if (ticket.cmrFk) {
const dmsType = await models.DmsType.findOne({
where: {code: 'cmr'},
fields: ['id']
}, myOptions);
const hasDmsCmr = await models.TicketDms.findOne({
where: { ticketFk: ticketId },
include: {
relation: 'dms',
fields: ['dmsFk'],
scope: {
where: { dmsTypeFk: dmsType.id }
where: { dmsTypeFk: dmsTypeCmr.id }
}
}
}, myOptions);
if (!hasDmsCmr.dms()) {
const zip = await models.Route.downloadCmrsZip(ctx, ticket.cmrFk.toString(), myOptions);
let ctxUploadFile;
ctx.req.file = Object.assign({}, zip);
ctxUploadFile = Object.assign({}, ctx);
ctxUploadFile.args = {
warehouseId: ticket.warehouseFk,
companyId: ticket.companyFk,
dmsTypeId: dmsType.id,
reference: '',
description: `${ticket.cmrFk} - ${ticket.id}`,
hasFile: false
const ctxUploadFile = {
...ctx,
args: {
warehouseId: ticket.warehouseFk,
companyId: ticket.companyFk,
dmsTypeId: dmsTypeCmr.id,
reference: ticket.id,
description: `${ticket.cmrFk} - ${ticket.id}`,
hasFile: false
}
};
const dms = await models.Dms.uploadFile(ctxUploadFile, myOptions);
await models.TicketDms.create({