cry-klikvet-logic 1.0.225 → 1.0.226
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/anonimizirajPodatke.mjs +423 -655
- package/dist/anonimizirajPodatke.mjs.map +1 -1
- package/dist/besediloKarence.mjs +13 -16
- package/dist/besediloKarence.mjs.map +1 -1
- package/dist/blagovnicaZaSpremembeZaloge.mjs +61 -64
- package/dist/blagovnicaZaSpremembeZaloge.mjs.map +1 -1
- package/dist/certs.mjs +13 -26
- package/dist/certs.mjs.map +1 -1
- package/dist/dopisiSerijskeNaNapravi.d.mts.map +1 -1
- package/dist/dopisiSerijskeNaNapravi.mjs +32 -65
- package/dist/dopisiSerijskeNaNapravi.mjs.map +1 -1
- package/dist/ensureIndexes.mjs +143 -159
- package/dist/ensureIndexes.mjs.map +1 -1
- package/dist/fmtDateRange.mjs +4 -5
- package/dist/fmtDateRange.mjs.map +1 -1
- package/dist/idjiArtiklovKiImajoLahkoZalogo.mjs +12 -23
- package/dist/idjiArtiklovKiImajoLahkoZalogo.mjs.map +1 -1
- package/dist/karticaArtikla.mjs +126 -141
- package/dist/karticaArtikla.mjs.map +1 -1
- package/dist/koledar.mjs +24 -35
- package/dist/koledar.mjs.map +1 -1
- package/dist/maint/nastaviNbcArtiklomIzMpc.mjs +27 -58
- package/dist/maint/nastaviNbcArtiklomIzMpc.mjs.map +1 -1
- package/dist/maint/poisciNapakeVSpremembiZaloge.mjs +49 -60
- package/dist/maint/poisciNapakeVSpremembiZaloge.mjs.map +1 -1
- package/dist/maint/poknjiziVsoZgodovino.mjs +243 -338
- package/dist/maint/poknjiziVsoZgodovino.mjs.map +1 -1
- package/dist/maint/popraviNabaveCeneNaRacunih.mjs +16 -48
- package/dist/maint/popraviNabaveCeneNaRacunih.mjs.map +1 -1
- package/dist/maint/popraviNabavneCeneNaInventurah.mjs +14 -46
- package/dist/maint/popraviNabavneCeneNaInventurah.mjs.map +1 -1
- package/dist/models/Serijske.d.mts +1 -1
- package/dist/models/Serijske.d.mts.map +1 -1
- package/dist/nazivStranke.mjs +1 -2
- package/dist/nazivStranke.mjs.map +1 -1
- package/dist/neuporabljeno.mjs +25 -59
- package/dist/neuporabljeno.mjs.map +1 -1
- package/dist/parseSerijaStr.d.mts +1 -1
- package/dist/parseSerijaStr.d.mts.map +1 -1
- package/dist/parseSerijaStr.mjs +12 -9
- package/dist/parseSerijaStr.mjs.map +1 -1
- package/dist/pobrisiZgodovinoNaDan.mjs +17 -28
- package/dist/pobrisiZgodovinoNaDan.mjs.map +1 -1
- package/dist/podatkiRejca.mjs +113 -124
- package/dist/podatkiRejca.mjs.map +1 -1
- package/dist/poisciSerijskeZaNapravo.mjs +20 -52
- package/dist/poisciSerijskeZaNapravo.mjs.map +1 -1
- package/dist/polnaInventura.mjs +110 -131
- package/dist/polnaInventura.mjs.map +1 -1
- package/dist/porabaZaDobavnico.mjs +16 -1
- package/dist/porabaZaDobavnico.mjs.map +1 -1
- package/dist/porabaZaObravnavo.mjs +22 -10
- package/dist/porabaZaObravnavo.mjs.map +1 -1
- package/dist/preveriKnjizenjeZalogeArtikla.mjs +97 -111
- package/dist/preveriKnjizenjeZalogeArtikla.mjs.map +1 -1
- package/dist/q-blagovnice.mjs +12 -24
- package/dist/q-blagovnice.mjs.map +1 -1
- package/dist/q-isciPoObravnavah.mjs +25 -36
- package/dist/q-isciPoObravnavah.mjs.map +1 -1
- package/dist/q-isciPoRacunih.mjs +26 -37
- package/dist/q-isciPoRacunih.mjs.map +1 -1
- package/dist/q-mojPromet.mjs +24 -35
- package/dist/q-mojPromet.mjs.map +1 -1
- package/dist/q-porabaZdravil.mjs +110 -113
- package/dist/q-porabaZdravil.mjs.map +1 -1
- package/dist/q-prodano.mjs +36 -47
- package/dist/q-prodano.mjs.map +1 -1
- package/dist/q-prodanoPorabljeno.mjs +47 -48
- package/dist/q-prodanoPorabljeno.mjs.map +1 -1
- package/dist/q-promet.mjs +24 -35
- package/dist/q-promet.mjs.map +1 -1
- package/dist/q-racunovodji.mjs +229 -239
- package/dist/q-racunovodji.mjs.map +1 -1
- package/dist/q-skupineIzdelkov.mjs +20 -31
- package/dist/q-skupineIzdelkov.mjs.map +1 -1
- package/dist/q-skupineStrank.mjs +20 -31
- package/dist/q-skupineStrank.mjs.map +1 -1
- package/dist/q-strankeKlasificiraj.mjs +58 -69
- package/dist/q-strankeKlasificiraj.mjs.map +1 -1
- package/dist/q-strankeZadnjiObiski.mjs +22 -33
- package/dist/q-strankeZadnjiObiski.mjs.map +1 -1
- package/dist/q-zakljucek-blagajne.mjs +135 -150
- package/dist/q-zakljucek-blagajne.mjs.map +1 -1
- package/dist/razknjiziBlagovnico.mjs +46 -57
- package/dist/razknjiziBlagovnico.mjs.map +1 -1
- package/dist/razknjiziDobavnico.mjs +47 -58
- package/dist/razknjiziDobavnico.mjs.map +1 -1
- package/dist/serije.d.mts +5 -5
- package/dist/serije.d.mts.map +1 -1
- package/dist/serije.mjs +76 -97
- package/dist/serije.mjs.map +1 -1
- package/dist/skladisceLokacije.mjs +10 -21
- package/dist/skladisceLokacije.mjs.map +1 -1
- package/dist/smsCepljen.mjs +19 -28
- package/dist/smsCepljen.mjs.map +1 -1
- package/dist/smsCepljenjaNaDan.mjs +60 -67
- package/dist/smsCepljenjaNaDan.mjs.map +1 -1
- package/dist/smsNarocen.mjs +18 -26
- package/dist/smsNarocen.mjs.map +1 -1
- package/dist/smsNaroceniNaDan.mjs +40 -48
- package/dist/smsNaroceniNaDan.mjs.map +1 -1
- package/dist/spremembaZalogeZaObdobje.mjs +78 -91
- package/dist/spremembaZalogeZaObdobje.mjs.map +1 -1
- package/dist/spremeniZalogo.mjs +125 -132
- package/dist/spremeniZalogo.mjs.map +1 -1
- package/dist/spremeniZalogoNaPodlagiRacuna.mjs +122 -140
- package/dist/spremeniZalogoNaPodlagiRacuna.mjs.map +1 -1
- package/dist/spremeniZalogoZaDobavo.mjs +218 -221
- package/dist/spremeniZalogoZaDobavo.mjs.map +1 -1
- package/dist/spremeniZalogoZaInventuro.mjs +131 -136
- package/dist/spremeniZalogoZaInventuro.mjs.map +1 -1
- package/dist/spremeniZalogoZaPrenos.mjs +83 -114
- package/dist/spremeniZalogoZaPrenos.mjs.map +1 -1
- package/dist/spremeniZalogoZaPrevzem.mjs +69 -103
- package/dist/spremeniZalogoZaPrevzem.mjs.map +1 -1
- package/dist/strankaInfo.mjs +11 -22
- package/dist/strankaInfo.mjs.map +1 -1
- package/dist/support/poisciSpremembeMpc.js +26 -32
- package/dist/support/poisciSpremembeMpc.js.map +1 -1
- package/dist/test/dvojne-dobave.mjs +150 -163
- package/dist/test/dvojne-dobave.mjs.map +1 -1
- package/dist/test/memdb.mjs +29 -46
- package/dist/test/memdb.mjs.map +1 -1
- package/dist/test/mesane-enote.mjs +49 -62
- package/dist/test/mesane-enote.mjs.map +1 -1
- package/dist/test/prestavitev.mjs +108 -123
- package/dist/test/prestavitev.mjs.map +1 -1
- package/dist/test/serijske.mjs +303 -328
- package/dist/test/serijske.mjs.map +1 -1
- package/dist/test/sprememba-cene.mjs +213 -234
- package/dist/test/sprememba-cene.mjs.map +1 -1
- package/dist/test/sprememba-cene2.mjs +137 -154
- package/dist/test/sprememba-cene2.mjs.map +1 -1
- package/dist/test/sprememba-cene3.mjs +138 -155
- package/dist/test/sprememba-cene3.mjs.map +1 -1
- package/dist/test/sprememba-cene4.mjs +100 -115
- package/dist/test/sprememba-cene4.mjs.map +1 -1
- package/dist/test/sprememba-cene5.mjs +100 -115
- package/dist/test/sprememba-cene5.mjs.map +1 -1
- package/dist/test/sprememba-cene6.mjs +141 -158
- package/dist/test/sprememba-cene6.mjs.map +1 -1
- package/dist/test/tuja-zaloga.mjs +108 -123
- package/dist/test/tuja-zaloga.mjs.map +1 -1
- package/dist/test/zaloge.mjs +150 -173
- package/dist/test/zaloge.mjs.map +1 -1
- package/dist/test/zaloge2.mjs +160 -177
- package/dist/test/zaloge2.mjs.map +1 -1
- package/dist/types/DbFunctions.d.mts +1 -1
- package/dist/types/DbFunctions.d.mts.map +1 -1
- package/dist/types/ZalogaDbAccessor.d.mts +2 -2
- package/dist/types/ZalogaDbAccessor.d.mts.map +1 -1
- package/dist/types/nastavitve.d.mts +6 -6
- package/dist/types/nastavitve.d.mts.map +1 -1
- package/dist/updatePotrditevBrejosti.mjs +1 -1
- package/dist/updatePotrditevBrejosti.mjs.map +1 -1
- package/dist/updatePresusitve.mjs +1 -1
- package/dist/updatePresusitve.mjs.map +1 -1
- package/dist/updateStatusOsemenitve.mjs +1 -1
- package/dist/updateStatusOsemenitve.mjs.map +1 -1
- package/dist/vseSkladiscaLokacij.mjs +9 -20
- package/dist/vseSkladiscaLokacij.mjs.map +1 -1
- package/dist/vsotaDobavZaObdobje.mjs +35 -47
- package/dist/vsotaDobavZaObdobje.mjs.map +1 -1
- package/dist/zakljuciBlagovnico.mjs +46 -57
- package/dist/zakljuciBlagovnico.mjs.map +1 -1
- package/dist/zalogaDbAccessorInMem.d.mts +2 -2
- package/dist/zalogaDbAccessorInMem.d.mts.map +1 -1
- package/dist/zalogaDbAccessorInMem.mjs +58 -86
- package/dist/zalogaDbAccessorInMem.mjs.map +1 -1
- package/dist/zalogaNaDan.mjs +27 -59
- package/dist/zalogaNaDan.mjs.map +1 -1
- package/dist/zalogaNaDanIzracunana.mjs +36 -48
- package/dist/zalogaNaDanIzracunana.mjs.map +1 -1
- package/dist/zalogaPoDnevih.mjs +34 -36
- package/dist/zalogaPoDnevih.mjs.map +1 -1
- package/dist/zapisiPorabeZaDobavnice.mjs +61 -92
- package/dist/zapisiPorabeZaDobavnice.mjs.map +1 -1
- package/dist/zapisiPorabeZaObravnave.mjs +58 -89
- package/dist/zapisiPorabeZaObravnave.mjs.map +1 -1
- package/dist/zapisiPoraboZaObravnavo.mjs +51 -62
- package/dist/zapisiPoraboZaObravnavo.mjs.map +1 -1
- package/dist/zapisiZalogoPoDnevih.mjs +67 -110
- package/dist/zapisiZalogoPoDnevih.mjs.map +1 -1
- package/dist/zapisiZalogoPoDnevih_old.mjs +86 -140
- package/dist/zapisiZalogoPoDnevih_old.mjs.map +1 -1
- package/dist/zaracunajDobavnice.mjs +155 -193
- package/dist/zaracunajDobavnice.mjs.map +1 -1
- package/dist/zavarovanje.mjs +2 -4
- package/dist/zavarovanje.mjs.map +1 -1
- package/dist/zbrisiZalogoArtiklovKiJeNeMorejoImeti.mjs +17 -30
- package/dist/zbrisiZalogoArtiklovKiJeNeMorejoImeti.mjs.map +1 -1
- package/dist/zdruziOdprteRacune.mjs +34 -61
- package/dist/zdruziOdprteRacune.mjs.map +1 -1
- package/dist/zdruziPaciente.mjs +57 -85
- package/dist/zdruziPaciente.mjs.map +1 -1
- package/dist/zdruziStranke.mjs +143 -193
- package/dist/zdruziStranke.mjs.map +1 -1
- package/package.json +1 -1
- package/tsconfig.tsbuildinfo +1 -1
@@ -1,115 +1,81 @@
|
|
1
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
2
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
3
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
4
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
5
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
6
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
7
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
8
|
-
});
|
9
|
-
};
|
10
|
-
var __asyncValues = (this && this.__asyncValues) || function (o) {
|
11
|
-
if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
|
12
|
-
var m = o[Symbol.asyncIterator], i;
|
13
|
-
return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
|
14
|
-
function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
|
15
|
-
function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
|
16
|
-
};
|
17
1
|
import { ObjectID } from './ObjectId.mjs';
|
18
2
|
import { poisciArtikel, _poknjiziPoraboZaloge } from './spremeniZalogo.mjs';
|
19
3
|
import { lahkoImaZalogo } from './lahkoImaZalogo.mjs';
|
20
4
|
import { odstraniSerijskeStevilke } from './serije.mjs';
|
21
5
|
import dayjs from './dayjs.mjs';
|
22
6
|
import { dopisiSerijskeNaNapravi } from './dopisiSerijskeNaNapravi.mjs';
|
23
|
-
export function spremeniZalogoZaPrevzem(blagovnica, privzetaRazknjizbaZdravil, privzetaRazknjizbaIzdelkov, spremljamoSerijske, mongo, brezRocnih = false) {
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
return vpisaliSmoSerijske;
|
30
|
-
});
|
7
|
+
export async function spremeniZalogoZaPrevzem(blagovnica, privzetaRazknjizbaZdravil, privzetaRazknjizbaIzdelkov, spremljamoSerijske, mongo, brezRocnih = false) {
|
8
|
+
let vpisaliSmoSerijske = await spremeniZalogoZaPorabo(blagovnica, privzetaRazknjizbaZdravil, privzetaRazknjizbaIzdelkov, spremljamoSerijske, mongo, brezRocnih);
|
9
|
+
if (vpisaliSmoSerijske && !blagovnica.serijskeVpisaneNaNapravo) {
|
10
|
+
await dopisiSerijskeNaNapravi({ naprava_id: blagovnica.naprava_id, postavke: blagovnica.postavke, prevzel: "(klikvet-logic)", prevzeto: blagovnica.datum }, { find: mongo.find, insert: mongo.insert });
|
11
|
+
}
|
12
|
+
return vpisaliSmoSerijske;
|
31
13
|
}
|
32
|
-
export function spremeniZalogoZaPorabo(blagovnica, privzetaRazknjizbaZdravil, privzetaRazknjizbaIzdelkov, spremljamoSerijske, mongo, brezRocnih = false) {
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
|
54
|
-
|
55
|
-
|
56
|
-
|
57
|
-
|
58
|
-
|
59
|
-
|
60
|
-
|
61
|
-
|
62
|
-
|
63
|
-
|
64
|
-
|
65
|
-
|
66
|
-
|
67
|
-
|
68
|
-
if (brezRocnih && artikel.kategorija === "zdravilo" && privzetaRazknjizbaZdravil === "ročno")
|
69
|
-
continue;
|
70
|
-
if (brezRocnih && artikel.kategorija === "izdelek" && privzetaRazknjizbaIzdelkov === "ročno")
|
71
|
-
continue;
|
72
|
-
if (artikel.zadnjaInventura && dayjs(artikel.zadnjaInventura).isAfter(blagovnica.datum)) {
|
73
|
-
console.warn(`preskoči knjižbo porabe po zadnji inventuri (datum računa ${dayjs(blagovnica.datum).format("D.M.YYYY")}, artikel ${artikel._id} ${artikel.naziv}, zadnja inventura ${dayjs(artikel.zadnjaInventura).format("D.M.YYYY")}`);
|
74
|
-
continue;
|
75
|
-
}
|
76
|
-
let z = yield mongo.findOne("zaloga", { skladisce_id: blagovnica.skladisce_id, artikel_id: artikel._id });
|
77
|
-
let zaloga = z || { _id: new ObjectID().toHexString(), artikel_id: artikel._id, skladisce_id: blagovnica.skladisce_id, zaloga: 0, nbc: 0, vrednost: 0 };
|
78
|
-
let vrsta = blagovnica.vrsta || "dobavnica";
|
79
|
-
let stara_nbc = artikel.nbc || 0;
|
80
|
-
yield _poknjiziPoraboZaloge(zaloga, vrsta, postavka, stara_nbc, mongo, artikel, {
|
81
|
-
vrsta: vrsta,
|
82
|
-
_id: blagovnica._id,
|
83
|
-
datum: blagovnica.datum
|
84
|
-
});
|
85
|
-
if (spremljamoSerijske) {
|
86
|
-
let ret = yield odstraniSerijskeStevilke({
|
87
|
-
artikel_id: postavka.artikel_id,
|
88
|
-
skladisce_id: blagovnica.skladisce_id,
|
89
|
-
serijske: postavka.stevilkeZdravil || ((_f = (_e = (_d = postavka.stevilkaZdravila) === null || _d === void 0 ? void 0 : _d.split(",")) === null || _e === void 0 ? void 0 : _e.map(a => a === null || a === void 0 ? void 0 : a.trim())) === null || _f === void 0 ? void 0 : _f.filter(a => !!a)) || [],
|
90
|
-
uporabnik: blagovnica.izvedel || blagovnica.izdal,
|
91
|
-
vir: vrsta,
|
92
|
-
dokument_id: blagovnica._id,
|
93
|
-
stevilo: postavka.kolicina,
|
94
|
-
}, mongo);
|
95
|
-
if (ret.length) {
|
96
|
-
if (postavka.stevilkeZdravil)
|
97
|
-
postavka.stevilkeZdravil = ret;
|
98
|
-
if (postavka.stevilkaZdravila)
|
99
|
-
postavka.stevilkaZdravila = ret.join(",");
|
100
|
-
vpisaliSmoSerijske = true;
|
101
|
-
}
|
102
|
-
}
|
103
|
-
}
|
14
|
+
export async function spremeniZalogoZaPorabo(blagovnica, privzetaRazknjizbaZdravil, privzetaRazknjizbaIzdelkov, spremljamoSerijske, mongo, brezRocnih = false) {
|
15
|
+
let vpisaliSmoSerijske = false;
|
16
|
+
for await (let postavka of blagovnica.postavke) {
|
17
|
+
if (["storitev", "potrošni material"].includes(postavka.kategorija))
|
18
|
+
continue;
|
19
|
+
if (postavka.neRazknjizi || postavka.navidezniPrevzem)
|
20
|
+
continue;
|
21
|
+
let vecEnakih = blagovnica.postavke.filter(p => p.artikel_id.toString() === postavka.artikel_id.toString()).length > 1;
|
22
|
+
let zeObstajaIz = vecEnakih ? false : await mongo.findOne("spremembaZaloge", {
|
23
|
+
artikel_id: postavka.artikel_id,
|
24
|
+
skladisce_id: blagovnica.skladisce_id,
|
25
|
+
dokument_id: blagovnica._id
|
26
|
+
});
|
27
|
+
if (zeObstajaIz) {
|
28
|
+
console.error("spremeniZalogoZaPorabo: postavka že razknjižena za blagovnico " + blagovnica._id, {
|
29
|
+
artikel_id: postavka.artikel_id,
|
30
|
+
skladisce_id: blagovnica.skladisce_id,
|
31
|
+
dokument_id: blagovnica._id
|
32
|
+
});
|
33
|
+
continue;
|
34
|
+
}
|
35
|
+
;
|
36
|
+
let artikel = await poisciArtikel(postavka.artikel_id, mongo, `ni artikla za porabo: ${postavka.artikel_id} - ${postavka.naziv || postavka.opis}`);
|
37
|
+
if (!artikel)
|
38
|
+
continue;
|
39
|
+
if (!lahkoImaZalogo(artikel, privzetaRazknjizbaZdravil, privzetaRazknjizbaIzdelkov))
|
40
|
+
continue;
|
41
|
+
if (brezRocnih && artikel.zalogoRazknjizi === "ročno")
|
42
|
+
continue;
|
43
|
+
if (brezRocnih && artikel.kategorija === "zdravilo" && privzetaRazknjizbaZdravil === "ročno")
|
44
|
+
continue;
|
45
|
+
if (brezRocnih && artikel.kategorija === "izdelek" && privzetaRazknjizbaIzdelkov === "ročno")
|
46
|
+
continue;
|
47
|
+
if (artikel.zadnjaInventura && dayjs(artikel.zadnjaInventura).isAfter(blagovnica.datum)) {
|
48
|
+
console.warn(`preskoči knjižbo porabe po zadnji inventuri (datum računa ${dayjs(blagovnica.datum).format("D.M.YYYY")}, artikel ${artikel._id} ${artikel.naziv}, zadnja inventura ${dayjs(artikel.zadnjaInventura).format("D.M.YYYY")}`);
|
49
|
+
continue;
|
104
50
|
}
|
105
|
-
|
106
|
-
|
107
|
-
|
108
|
-
|
51
|
+
let z = await mongo.findOne("zaloga", { skladisce_id: blagovnica.skladisce_id, artikel_id: artikel._id });
|
52
|
+
let zaloga = z || { _id: new ObjectID().toHexString(), artikel_id: artikel._id, skladisce_id: blagovnica.skladisce_id, zaloga: 0, nbc: 0, vrednost: 0 };
|
53
|
+
let vrsta = blagovnica.vrsta || "dobavnica";
|
54
|
+
let stara_nbc = artikel.nbc || 0;
|
55
|
+
await _poknjiziPoraboZaloge(zaloga, vrsta, postavka, stara_nbc, mongo, artikel, {
|
56
|
+
vrsta: vrsta,
|
57
|
+
_id: blagovnica._id,
|
58
|
+
datum: blagovnica.datum
|
59
|
+
});
|
60
|
+
if (spremljamoSerijske) {
|
61
|
+
let ret = await odstraniSerijskeStevilke({
|
62
|
+
artikel_id: postavka.artikel_id,
|
63
|
+
skladisce_id: blagovnica.skladisce_id,
|
64
|
+
serijske: postavka.stevilkeZdravil || postavka.stevilkaZdravila?.split(",")?.map(a => a?.trim())?.filter(a => !!a) || [],
|
65
|
+
uporabnik: blagovnica.izvedel || blagovnica.izdal,
|
66
|
+
vir: vrsta,
|
67
|
+
dokument_id: blagovnica._id,
|
68
|
+
stevilo: postavka.kolicina,
|
69
|
+
}, mongo);
|
70
|
+
if (ret.length) {
|
71
|
+
if (postavka.stevilkeZdravil)
|
72
|
+
postavka.stevilkeZdravil = ret;
|
73
|
+
if (postavka.stevilkaZdravila)
|
74
|
+
postavka.stevilkaZdravila = ret.join(",");
|
75
|
+
vpisaliSmoSerijske = true;
|
109
76
|
}
|
110
|
-
finally { if (e_1) throw e_1.error; }
|
111
77
|
}
|
112
|
-
|
113
|
-
|
78
|
+
}
|
79
|
+
return vpisaliSmoSerijske;
|
114
80
|
}
|
115
81
|
//# sourceMappingURL=spremeniZalogoZaPrevzem.mjs.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"spremeniZalogoZaPrevzem.mjs","sourceRoot":"","sources":["../src/spremeniZalogoZaPrevzem.mts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"spremeniZalogoZaPrevzem.mjs","sourceRoot":"","sources":["../src/spremeniZalogoZaPrevzem.mts"],"names":[],"mappings":"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"}
|
package/dist/strankaInfo.mjs
CHANGED
@@ -1,29 +1,18 @@
|
|
1
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
2
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
3
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
4
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
5
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
6
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
7
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
8
|
-
});
|
9
|
-
};
|
10
1
|
import { Base, Mongo } from "cry-db";
|
11
2
|
/**
|
12
3
|
* Vrne podatke o stranki, vključno z zadnjimi obiski.
|
13
4
|
*/
|
14
|
-
export default function strankaInfo(tenant, _id) {
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
};
|
26
|
-
});
|
5
|
+
export default async function strankaInfo(tenant, _id) {
|
6
|
+
let db = new Mongo(tenant);
|
7
|
+
let stranka = await db.findById('stranke', _id);
|
8
|
+
if (!stranka)
|
9
|
+
return null;
|
10
|
+
let racuni = (await db.find('racuni', { "stranka._id": Base.objectid(_id) }, { sort: { _id: -1 } }));
|
11
|
+
await db.close();
|
12
|
+
return {
|
13
|
+
stranka,
|
14
|
+
racuni,
|
15
|
+
};
|
27
16
|
}
|
28
17
|
// (async function () {
|
29
18
|
// let res = await strankaInfo("vet","5f8fb8d8aec9a98a06b261c2")
|
package/dist/strankaInfo.mjs.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"strankaInfo.mjs","sourceRoot":"","sources":["../src/strankaInfo.mts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"strankaInfo.mjs","sourceRoot":"","sources":["../src/strankaInfo.mts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAA;AAKpC;;GAEG;AACH,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,WAAW,CAAC,MAAa,EAAE,GAAO;IAE5D,IAAI,EAAE,GAAG,IAAI,KAAK,CAAC,MAAM,CAAC,CAAA;IAE1B,IAAI,OAAO,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,SAAS,EAAE,GAAG,CAAmB,CAAC;IAClE,IAAI,CAAC,OAAO;QAAE,OAAO,IAAI,CAAC;IAC1B,IAAI,MAAM,GAAG,CAAC,MAAM,EAAE,CAAC,IAAI,CAAQ,QAAQ,EAAC,EAAE,aAAa,EAAE,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAS,EAAC,EAAE,IAAI,EAAC,EAAC,GAAG,EAAC,CAAC,CAAC,EAAC,EAAC,CAAC,CAAY,CAAC;IAEvH,MAAM,EAAE,CAAC,KAAK,EAAE,CAAC;IAEjB,OAAO;QACH,OAAO;QACP,MAAM;KACT,CAAA;AACL,CAAC;AAED,uBAAuB;AACvB,oEAAoE;AACpE,8BAA8B;AAC9B,QAAQ"}
|
@@ -1,12 +1,3 @@
|
|
1
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
2
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
3
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
4
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
5
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
6
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
7
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
8
|
-
});
|
9
|
-
};
|
10
1
|
import { Mongo } from "cry-db";
|
11
2
|
import { round2 } from "cry-helpers";
|
12
3
|
function diff(n1, n2) {
|
@@ -16,31 +7,34 @@ function diff(n1, n2) {
|
|
16
7
|
// {
|
17
8
|
// return round2(n).toString().replace(".",",")
|
18
9
|
// }
|
19
|
-
export function poisciSpremembeMpc(tenant, od) {
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
{
|
24
|
-
$
|
25
|
-
datum: { $gte: od }
|
26
|
-
}
|
27
|
-
},
|
28
|
-
{ $unwind: "$postavke" },
|
29
|
-
{ $project: { datum: 1, artikel_id: "$postavke.artikel_id", naziv: "$postavke.opis", mpc: "$postavke.mpc0" } },
|
30
|
-
{ $sort: { naziv: 1, datum: 1 } },
|
31
|
-
]);
|
32
|
-
let spremembe = [];
|
33
|
-
let zadnjeCene = {};
|
34
|
-
for (let sprememba of cene) {
|
35
|
-
let zadnjaMpc = zadnjeCene[sprememba.artikel_id];
|
36
|
-
if (zadnjaMpc !== undefined) {
|
37
|
-
if (round2(diff(sprememba.mpc, zadnjaMpc)) !== 0)
|
38
|
-
spremembe.push(Object.assign(Object.assign({}, sprememba), { naziv: sprememba.naziv.trim(), prej: zadnjaMpc, delta: sprememba.mpc - zadnjaMpc }));
|
10
|
+
export async function poisciSpremembeMpc(tenant, od) {
|
11
|
+
let mongo = new Mongo(tenant);
|
12
|
+
let cene = await mongo.aggregate("racuni", [
|
13
|
+
{
|
14
|
+
$match: {
|
15
|
+
datum: { $gte: od }
|
39
16
|
}
|
40
|
-
|
17
|
+
},
|
18
|
+
{ $unwind: "$postavke" },
|
19
|
+
{ $project: { datum: 1, artikel_id: "$postavke.artikel_id", naziv: "$postavke.opis", mpc: "$postavke.mpc0" } },
|
20
|
+
{ $sort: { naziv: 1, datum: 1 } },
|
21
|
+
]);
|
22
|
+
let spremembe = [];
|
23
|
+
let zadnjeCene = {};
|
24
|
+
for (let sprememba of cene) {
|
25
|
+
let zadnjaMpc = zadnjeCene[sprememba.artikel_id];
|
26
|
+
if (zadnjaMpc !== undefined) {
|
27
|
+
if (round2(diff(sprememba.mpc, zadnjaMpc)) !== 0)
|
28
|
+
spremembe.push({
|
29
|
+
...sprememba,
|
30
|
+
naziv: sprememba.naziv.trim(),
|
31
|
+
prej: zadnjaMpc,
|
32
|
+
delta: sprememba.mpc - zadnjaMpc,
|
33
|
+
});
|
41
34
|
}
|
42
|
-
|
43
|
-
}
|
35
|
+
zadnjeCene[sprememba.artikel_id] = sprememba.mpc;
|
36
|
+
}
|
37
|
+
return spremembe;
|
44
38
|
}
|
45
39
|
// (async function () {
|
46
40
|
// console.log("; datum; naziv; prej; sprememba; po; id")
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"poisciSpremembeMpc.js","sourceRoot":"","sources":["../../src/support/poisciSpremembeMpc.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"poisciSpremembeMpc.js","sourceRoot":"","sources":["../../src/support/poisciSpremembeMpc.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAC/B,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAWrC,SAAS,IAAI,CAAC,EAAU,EAAE,EAAU;IAChC,OAAO,IAAI,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,CAAC,CAAA;AAC5B,CAAC;AAED,0BAA0B;AAC1B,IAAI;AACJ,mDAAmD;AACnD,IAAI;AAEJ,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACxC,MAAc,EACV,EAAQ;IAGR,IAAI,KAAK,GAAG,IAAI,KAAK,CAAC,MAAM,CAAC,CAAA;IAE7B,IAAI,IAAI,GAAG,MAAM,KAAK,CAAC,SAAS,CAC5B,QAAQ,EACR;QACI;YACI,MAAM,EAAE;gBACJ,KAAK,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE;aACtB;SACJ;QACD,EAAE,OAAO,EAAE,WAAW,EAAE;QACxB,EAAE,QAAQ,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,UAAU,EAAE,sBAAsB,EAAE,KAAK,EAAE,gBAAgB,EAAE,GAAG,EAAE,gBAAgB,EAAE,EAAE;QAC9G,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;KACpC,CACJ,CAAC;IAEF,IAAI,SAAS,GAAiB,EAAE,CAAA;IAChC,IAAI,UAAU,GAA4B,EAAE,CAAA;IAE5C,KAAK,IAAI,SAAS,IAAI,IAAI,EAAE;QACxB,IAAI,SAAS,GAAG,UAAU,CAAC,SAAS,CAAC,UAAU,CAAC,CAAA;QAChD,IAAI,SAAS,KAAK,SAAS,EAAE;YACzB,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC,KAAK,CAAC;gBAAE,SAAS,CAAC,IAAI,CAAC;oBAC7D,GAAG,SAAS;oBACZ,KAAK,EAAE,SAAS,CAAC,KAAK,CAAC,IAAI,EAAE;oBAC7B,IAAI,EAAE,SAAS;oBACf,KAAK,EAAE,SAAS,CAAC,GAAG,GAAG,SAAS;iBACnC,CAAC,CAAA;SACL;QACD,UAAU,CAAC,SAAS,CAAC,UAAU,CAAC,GAAG,SAAS,CAAC,GAAG,CAAC;KACpD;IAED,OAAO,SAAS,CAAC;AACrB,CAAC;AAED,uBAAuB;AAEvB,6DAA6D;AAC7D,sFAAsF;AACtF,sBAAsB;AACtB,yCAAyC;AACzC,yDAAyD;AACzD,yPAAyP;AACzP,oCAAoC;AACpC,QAAQ;AAER,sBAAsB;AAEtB,QAAQ"}
|