This commit is contained in:
mmrbnjd
2024-08-15 19:15:51 +03:30
parent 4c82d49a0e
commit 21eeb4d11b
9 changed files with 259 additions and 139 deletions

View File

@@ -276,14 +276,12 @@ namespace Back.Controllers
IsDeleted = false,
PatternID = Invoice.PatternID,
setm = Invoice.setm,
cui = Invoice.cui,
crn = Invoice.crn,
CottageDateOfCustomsDeclaration = Invoice.CottageDateOfCustomsDeclaration,
ft = Invoice.ft,
cdcn = Invoice.cdcn,
insp = Invoice.insp,
billid = Invoice.billid,
pspd = Invoice.pspd,
scc = Invoice.scc,
scln = Invoice.scln,
seventeentax = Invoice.seventeentax,
@@ -308,7 +306,21 @@ namespace Back.Controllers
olt = s.olt,
spro = s.spro,
sscv = s.sscv,
ssrv = s.ssrv
ssrv = s.ssrv,
pspd = s.pspd,
cui = s.cui,
}).ToList(),
payments=Invoice.payments.Select(s=>new InvoicePayment()
{
acn=s.acn,
iinn=s.iinn,
PaymentDateTime=s.PaymentDateTime,
pcn=s.pcn,
pid=s.pid,
pmt=s.pmt,
pv=s.pv,
trmn=s.trmn,
trn=s.trn,
}).ToList()
}, false);
if (result > 0)
@@ -331,14 +343,12 @@ namespace Back.Controllers
IsDeleted = false,
PatternID = Invoice.PatternID,
setm = Invoice.setm,
cui = Invoice.cui,
crn = Invoice.crn,
CottageDateOfCustomsDeclaration = Invoice.CottageDateOfCustomsDeclaration,
ft = Invoice.ft,
cdcn = Invoice.cdcn,
insp = Invoice.insp,
billid = Invoice.billid,
pspd = Invoice.pspd,
scc = Invoice.scc,
scln = Invoice.scln,
seventeentax = Invoice.seventeentax,
@@ -363,7 +373,21 @@ namespace Back.Controllers
olt = s.olt,
spro = s.spro,
sscv = s.sscv,
ssrv = s.ssrv
ssrv = s.ssrv,
pspd = s.pspd,
cui = s.cui,
}).ToList(),
payments = Invoice.payments.Select(s => new InvoicePayment()
{
acn = s.acn,
iinn = s.iinn,
PaymentDateTime = s.PaymentDateTime,
pcn = s.pcn,
pid = s.pid,
pmt = s.pmt,
pv = s.pv,
trmn = s.trmn,
trn = s.trn,
}).ToList()
}, false);
if (result1 > 0)
@@ -398,14 +422,12 @@ namespace Back.Controllers
IsDeleted = false,
PatternID = Invoice.PatternID,
setm = Invoice.setm,
cui = Invoice.cui,
crn = Invoice.crn,
CottageDateOfCustomsDeclaration = Invoice.CottageDateOfCustomsDeclaration,
ft = Invoice.ft,
cdcn = Invoice.cdcn,
insp = Invoice.insp,
billid = Invoice.billid,
pspd = Invoice.pspd,
scc = Invoice.scc,
scln = Invoice.scln,
seventeentax = Invoice.seventeentax,
@@ -430,7 +452,21 @@ namespace Back.Controllers
olt = s.olt,
spro = s.spro,
sscv = s.sscv,
ssrv = s.ssrv
ssrv = s.ssrv,
pspd = s.pspd,
cui = s.cui,
}).ToList(),
payments = Invoice.payments.Select(s => new InvoicePayment()
{
acn = s.acn,
iinn = s.iinn,
PaymentDateTime = s.PaymentDateTime,
pcn = s.pcn,
pid = s.pid,
pmt = s.pmt,
pv = s.pv,
trmn = s.trmn,
trn = s.trn,
}).ToList()
}, false);
if (result2 > 0)
@@ -490,19 +526,16 @@ namespace Back.Controllers
IsDeleted = false,
PatternID = Invoice.PatternID,
setm = Invoice.setm,
cui = Invoice.cui,
crn = Invoice.crn,
CottageDateOfCustomsDeclaration = Invoice.CottageDateOfCustomsDeclaration,
ft = Invoice.ft,
cdcn = Invoice.cdcn,
insp = Invoice.insp,
billid = Invoice.billid,
pspd = Invoice.pspd,
scc = Invoice.scc,
scln = Invoice.scln,
seventeentax = Invoice.seventeentax,
tinc = Invoice.tinc,
tinc = Invoice.tinc,
invoiceDetails = Invoice.invoiceDetails.Select(s => new InvoiceItem
{
CODID = s.CODID,
@@ -523,7 +556,21 @@ namespace Back.Controllers
olt = s.olt,
spro=s.spro,
sscv = s.sscv,
ssrv = s.ssrv
ssrv = s.ssrv,
pspd= s.pspd,
cui= s.cui,
}).ToList(),
payments = Invoice.payments.Select(s => new InvoicePayment()
{
acn = s.acn,
iinn = s.iinn,
PaymentDateTime = s.PaymentDateTime,
pcn = s.pcn,
pid = s.pid,
pmt = s.pmt,
pv = s.pv,
trmn = s.trmn,
trn = s.trn,
}).ToList()
}, true);
if (result > 0)