cry-klikvet-logic 0.10.147 → 0.10.148
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/ObjectId.js +9 -3
- package/dist/ObjectId.js.map +1 -1
- package/dist/calcTimeQuery.js +7 -3
- package/dist/calcTimeQuery.js.map +1 -1
- package/dist/certs.js +14 -7
- package/dist/certs.js.map +1 -1
- package/dist/davki.js +8 -4
- package/dist/davki.js.map +1 -1
- package/dist/dayjs.js +9 -4
- package/dist/dayjs.js.map +1 -1
- package/dist/ensureIndexes.js +7 -3
- package/dist/ensureIndexes.js.map +1 -1
- package/dist/idjiArtiklovKiImajoLahkoZalogo.js +9 -5
- package/dist/idjiArtiklovKiImajoLahkoZalogo.js.map +1 -1
- package/dist/index.js +140 -60
- package/dist/index.js.map +1 -1
- package/dist/izracunajNovoMaloprodajnoCeno.js +5 -1
- package/dist/izracunajNovoMaloprodajnoCeno.js.map +1 -1
- package/dist/karticaArtikla.js +15 -11
- package/dist/karticaArtikla.js.map +1 -1
- package/dist/koledar.js +11 -7
- package/dist/koledar.js.map +1 -1
- package/dist/lahkoImaZalogo.js +5 -1
- package/dist/lahkoImaZalogo.js.map +1 -1
- package/dist/maint/nastaviNbcArtiklomIzMpc.js +9 -5
- package/dist/maint/nastaviNbcArtiklomIzMpc.js.map +1 -1
- package/dist/maint/poknjiziVsoZgodovino.js +28 -20
- package/dist/maint/poknjiziVsoZgodovino.js.map +1 -1
- package/dist/maint/popraviNabaveCeneNaRacunih.js +13 -7
- package/dist/maint/popraviNabaveCeneNaRacunih.js.map +1 -1
- package/dist/maint/popraviNabavneCeneNaInventurah.js +15 -11
- package/dist/maint/popraviNabavneCeneNaInventurah.js.map +1 -1
- package/dist/models/Serijske.js +2 -1
- package/dist/models/Serijske.js.map +1 -1
- package/dist/models/SmsOddaja.js +2 -1
- package/dist/neuporabljeno.js +10 -5
- package/dist/neuporabljeno.js.map +1 -1
- package/dist/polnaInventura.js +24 -16
- package/dist/polnaInventura.js.map +1 -1
- package/dist/preracunajPostavkoBlagovnice.js +23 -15
- package/dist/preracunajPostavkoBlagovnice.js.map +1 -1
- package/dist/preracunajZalogo.js +13 -5
- package/dist/preracunajZalogo.js.map +1 -1
- package/dist/prisotnostOsebe.js +2 -1
- package/dist/q-blagovnice.js +13 -6
- package/dist/q-blagovnice.js.map +1 -1
- package/dist/q-isciPoObravnavah.js +19 -11
- package/dist/q-isciPoObravnavah.js.map +1 -1
- package/dist/q-isciPoRacunih.js +19 -11
- package/dist/q-isciPoRacunih.js.map +1 -1
- package/dist/q-mojPromet.js +12 -8
- package/dist/q-mojPromet.js.map +1 -1
- package/dist/q-porabaZdravil.js +20 -13
- package/dist/q-porabaZdravil.js.map +1 -1
- package/dist/q-prodano.js +12 -8
- package/dist/q-prodano.js.map +1 -1
- package/dist/q-prodanoPorabljeno.js +9 -5
- package/dist/q-prodanoPorabljeno.js.map +1 -1
- package/dist/q-promet.d.ts +2 -2
- package/dist/q-promet.js +17 -10
- package/dist/q-promet.js.map +1 -1
- package/dist/q-racunovodji.js +29 -17
- package/dist/q-racunovodji.js.map +1 -1
- package/dist/q-skupineIzdelkov.js +11 -8
- package/dist/q-skupineIzdelkov.js.map +1 -1
- package/dist/q-skupineStrank.js +11 -8
- package/dist/q-skupineStrank.js.map +1 -1
- package/dist/q-strankeKlasificiraj.js +12 -6
- package/dist/q-strankeKlasificiraj.js.map +1 -1
- package/dist/q-strankeZadnjiObiski.js +10 -5
- package/dist/q-strankeZadnjiObiski.js.map +1 -1
- package/dist/q-zakljucek-blagajne.js +15 -9
- package/dist/q-zakljucek-blagajne.js.map +1 -1
- package/dist/razknjiziBlagovnico.js +9 -5
- package/dist/razknjiziBlagovnico.js.map +1 -1
- package/dist/razknjiziDobavnico.js +7 -3
- package/dist/razknjiziDobavnico.js.map +1 -1
- package/dist/razpisiDatum.js +7 -2
- package/dist/razpisiDatum.js.map +1 -1
- package/dist/round.js +5 -1
- package/dist/round.js.map +1 -1
- package/dist/serije.js +19 -9
- package/dist/serije.js.map +1 -1
- package/dist/smsCepljen.js +9 -5
- package/dist/smsCepljen.js.map +1 -1
- package/dist/smsCepljenjaNaDan.js +17 -10
- package/dist/smsCepljenjaNaDan.js.map +1 -1
- package/dist/smsCepljenjeBesedilo.js +8 -4
- package/dist/smsCepljenjeBesedilo.js.map +1 -1
- package/dist/smsMenjave.js +12 -5
- package/dist/smsMenjave.js.map +1 -1
- package/dist/smsNarocen.js +9 -5
- package/dist/smsNarocen.js.map +1 -1
- package/dist/smsNarocenBesedilo.js +8 -4
- package/dist/smsNarocenBesedilo.js.map +1 -1
- package/dist/smsNaroceniNaDan.js +18 -11
- package/dist/smsNaroceniNaDan.js.map +1 -1
- package/dist/spremembaZalogeZaObdobje.js +23 -16
- package/dist/spremembaZalogeZaObdobje.js.map +1 -1
- package/dist/spremeniZalogo.js +36 -27
- package/dist/spremeniZalogo.js.map +1 -1
- package/dist/spremeniZalogoNaPodlagiRacuna.js +19 -15
- package/dist/spremeniZalogoNaPodlagiRacuna.js.map +1 -1
- package/dist/spremeniZalogoZaDobavo.js +29 -25
- package/dist/spremeniZalogoZaDobavo.js.map +1 -1
- package/dist/spremeniZalogoZaInventuro.js +23 -19
- package/dist/spremeniZalogoZaInventuro.js.map +1 -1
- package/dist/spremeniZalogoZaPorabo.js +14 -10
- package/dist/spremeniZalogoZaPorabo.js.map +1 -1
- package/dist/spremeniZalogoZaPrenos.js +22 -15
- package/dist/spremeniZalogoZaPrenos.js.map +1 -1
- package/dist/strankaInfo.js +7 -4
- package/dist/strankaInfo.js.map +1 -1
- package/dist/support/poisciSpremembeMpc.js +12 -5
- package/dist/support/poisciSpremembeMpc.js.map +1 -1
- package/dist/test/dvojne-dobave.js +8 -6
- package/dist/test/dvojne-dobave.js.map +1 -1
- package/dist/test/memdb.js +17 -15
- package/dist/test/memdb.js.map +1 -1
- package/dist/test/mesane-enote.js +10 -8
- package/dist/test/mesane-enote.js.map +1 -1
- package/dist/test/prestavitev.js +20 -18
- package/dist/test/prestavitev.js.map +1 -1
- package/dist/test/serijske.js +38 -36
- package/dist/test/serijske.js.map +1 -1
- package/dist/test/sprememba-cene.js +27 -25
- package/dist/test/sprememba-cene.js.map +1 -1
- package/dist/test/sprememba-cene2.js +20 -18
- package/dist/test/sprememba-cene2.js.map +1 -1
- package/dist/test/sprememba-cene3.js +20 -18
- package/dist/test/sprememba-cene3.js.map +1 -1
- package/dist/test/sprememba-cene4.js +16 -14
- package/dist/test/sprememba-cene4.js.map +1 -1
- package/dist/test/sprememba-cene5.js +16 -14
- package/dist/test/sprememba-cene5.js.map +1 -1
- package/dist/test/sprememba-cene6.js +24 -22
- package/dist/test/sprememba-cene6.js.map +1 -1
- package/dist/test/tuja-zaloga.js +21 -19
- package/dist/test/tuja-zaloga.js.map +1 -1
- package/dist/test/zaloge.js +56 -54
- package/dist/test/zaloge.js.map +1 -1
- package/dist/test/zaloge2.js +23 -21
- package/dist/test/zaloge2.js.map +1 -1
- package/dist/types/CommandForDevice.js +2 -1
- package/dist/types/Dobavnica.js +2 -1
- package/dist/types/GlavaDokumenta.js +2 -1
- package/dist/types/Obvestilo.js +2 -1
- package/dist/types/SpecifikacijaNeuporabljenega.js +2 -1
- package/dist/types/SpecifikacijaPolneInventure.js +2 -1
- package/dist/types/SpremembaCene.js +2 -1
- package/dist/types/VrstaRazknjizbeZdravila.js +2 -1
- package/dist/types/VrstaSpremembeZaloge.js +2 -1
- package/dist/types/VrsteDokumentov.js +2 -1
- package/dist/types/VrsteDokumentov.js.map +1 -1
- package/dist/types/ZalogaDbAccessor.js +2 -1
- package/dist/types/artikel.js +13 -5
- package/dist/types/artikel.js.map +1 -1
- package/dist/types/blagajna.js +2 -1
- package/dist/types/blagovnica.js +2 -1
- package/dist/types/cepljenje.js +2 -1
- package/dist/types/diagnoza.js +2 -1
- package/dist/types/enota.js +5 -2
- package/dist/types/enota.js.map +1 -1
- package/dist/types/karence.js +2 -1
- package/dist/types/lokacija.js +2 -1
- package/dist/types/nalepka.js +2 -1
- package/dist/types/naprava.js +2 -1
- package/dist/types/narocen.js +2 -1
- package/dist/types/naslov.js +2 -1
- package/dist/types/nastavitve.js +2 -1
- package/dist/types/obravnava.js +5 -2
- package/dist/types/obravnava.js.map +1 -1
- package/dist/types/pacient.js +2 -1
- package/dist/types/partnerji.js +2 -1
- package/dist/types/partnerji.js.map +1 -1
- package/dist/types/pasma.js +2 -1
- package/dist/types/podpis.js +2 -1
- package/dist/types/poslovalnica.js +2 -1
- package/dist/types/protokol.js +2 -1
- package/dist/types/racun.js +2 -1
- package/dist/types/shared.js +2 -1
- package/dist/types/skladisce.js +2 -1
- package/dist/types/stranka.js +2 -1
- package/dist/types/uporabnik.js +2 -1
- package/dist/types/vrsta.js +2 -1
- package/dist/types/vrstaObravnave.js +2 -1
- package/dist/types/zaloga.js +2 -1
- package/dist/vrsteDokumentov.js +8 -5
- package/dist/vrsteDokumentov.js.map +1 -1
- package/dist/vsotaDobavZaObdobje.js +15 -8
- package/dist/vsotaDobavZaObdobje.js.map +1 -1
- package/dist/zakljuciBlagovnico.js +10 -6
- package/dist/zakljuciBlagovnico.js.map +1 -1
- package/dist/zalogaDbAccessorInMem.js +15 -9
- package/dist/zalogaDbAccessorInMem.js.map +1 -1
- package/dist/zalogaNaDan.js +15 -8
- package/dist/zalogaNaDan.js.map +1 -1
- package/dist/zalogaNaDanIzracunana.js +15 -8
- package/dist/zalogaNaDanIzracunana.js.map +1 -1
- package/dist/zalogaPoDnevih.js +14 -7
- package/dist/zalogaPoDnevih.js.map +1 -1
- package/dist/zapisiZalogoPoDnevih.js +15 -8
- package/dist/zapisiZalogoPoDnevih.js.map +1 -1
- package/dist/zbrisiZalogoArtiklovKiJeNeMorejoImeti.js +10 -6
- package/dist/zbrisiZalogoArtiklovKiJeNeMorejoImeti.js.map +1 -1
- package/dist/zeleniPribitek.js +5 -1
- package/dist/zeleniPribitek.js.map +1 -1
- package/package.json +1 -2
- package/tsconfig.tsbuildinfo +1 -1
@@ -1,11 +1,15 @@
|
|
1
|
-
|
2
|
-
|
1
|
+
"use strict";
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
+
exports.smsNarocenBesedilo = void 0;
|
4
|
+
const smsMenjave_js_1 = require("./smsMenjave.js");
|
5
|
+
function smsNarocenBesedilo({ nastavitve, pacient, lokacija, narocen, razlog }) {
|
3
6
|
let smsText = nastavitve.opomnikiNarocanje && nastavitve.opomnikiBesediloNarocanje;
|
4
7
|
let koledarText = nastavitve.opomnikiBesediloZaKoledarNarocen;
|
5
8
|
let smsDniPrej = nastavitve.opomnikiNarocanje && nastavitve.opomnikiDniPredNarocanje;
|
6
|
-
smsText = smsText && smsMenjave({ text: smsText, datum: narocen.datum, id: narocen._id, razlog, pacient, lokacija });
|
7
|
-
koledarText = koledarText && smsMenjave({ text: koledarText, datum: narocen.datum, id: narocen._id, razlog, pacient, lokacija });
|
9
|
+
smsText = smsText && (0, smsMenjave_js_1.smsMenjave)({ text: smsText, datum: narocen.datum, id: narocen._id, razlog, pacient, lokacija });
|
10
|
+
koledarText = koledarText && (0, smsMenjave_js_1.smsMenjave)({ text: koledarText, datum: narocen.datum, id: narocen._id, razlog, pacient, lokacija });
|
8
11
|
let zaKdaj = narocen.datum;
|
9
12
|
return { smsText, smsDniPrej, koledarText, posiljatelj: nastavitve.opomnikiNaziv, zaKdaj };
|
10
13
|
}
|
14
|
+
exports.smsNarocenBesedilo = smsNarocenBesedilo;
|
11
15
|
//# sourceMappingURL=smsNarocenBesedilo.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"smsNarocenBesedilo.js","sourceRoot":"","sources":["../src/smsNarocenBesedilo.ts"],"names":[],"mappings":"AAIA,
|
1
|
+
{"version":3,"file":"smsNarocenBesedilo.js","sourceRoot":"","sources":["../src/smsNarocenBesedilo.ts"],"names":[],"mappings":";;;AAIA,mDAA6C;AAE7C,SAAgB,kBAAkB,CAAC,EAAE,UAAU,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAMlF;IACG,IAAI,OAAO,GAAG,UAAU,CAAC,iBAAiB,IAAI,UAAU,CAAC,yBAAyB,CAAC;IACnF,IAAI,WAAW,GAAG,UAAU,CAAC,gCAAgC,CAAC;IAC9D,IAAI,UAAU,GAAG,UAAU,CAAC,iBAAiB,IAAI,UAAU,CAAC,wBAAwB,CAAC;IAErF,OAAO,GAAG,OAAO,IAAI,IAAA,0BAAU,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,EAAE,EAAE,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,CAAC;IACrH,WAAW,GAAG,WAAW,IAAI,IAAA,0BAAU,EAAC,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,EAAE,EAAE,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,CAAA;IAChI,IAAI,MAAM,GAAG,OAAO,CAAC,KAAK,CAAA;IAC1B,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,WAAW,EAAE,UAAU,CAAC,aAAa,EAAE,MAAM,EAAE,CAAC;AAC/F,CAAC;AAfD,gDAeC"}
|
package/dist/smsNaroceniNaDan.js
CHANGED
@@ -1,20 +1,26 @@
|
|
1
|
-
|
2
|
-
|
3
|
-
|
4
|
-
|
1
|
+
"use strict";
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
4
|
+
};
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
6
|
+
exports.smsNaroceniNaDan = void 0;
|
7
|
+
const cry_db_1 = require("cry-db");
|
8
|
+
const cry_helpers_1 = require("cry-helpers");
|
9
|
+
const dayjs_js_1 = __importDefault(require("./dayjs.js"));
|
10
|
+
const smsNarocenBesedilo_js_1 = require("./smsNarocenBesedilo.js");
|
5
11
|
const SMS_DNI_PREJ = 3;
|
6
12
|
/**
|
7
13
|
* Iz baze nabere podatke o naročenih pacientih,
|
8
14
|
* katerim je potrebno poslati SMS sporočilo na nek dan.
|
9
15
|
*/
|
10
|
-
|
11
|
-
let mongo = new Mongo(tenant);
|
16
|
+
async function smsNaroceniNaDan({ tenant, dan }) {
|
17
|
+
let mongo = new cry_db_1.Mongo(tenant);
|
12
18
|
let nastavitve = (await mongo.findOne("nastavitve", {}));
|
13
19
|
if (!nastavitve)
|
14
20
|
return [];
|
15
21
|
if (!nastavitve.opomnikiNarocanje)
|
16
22
|
return [];
|
17
|
-
let naDan =
|
23
|
+
let naDan = (0, dayjs_js_1.default)(dan).add(nastavitve.opomnikiDniPredNarocanje ?? SMS_DNI_PREJ, "day");
|
18
24
|
let naroceni = await mongo.find("naroceni", {
|
19
25
|
datum: {
|
20
26
|
$gte: naDan.startOf("day").toDate(),
|
@@ -28,13 +34,13 @@ export async function smsNaroceniNaDan({ tenant, dan }) {
|
|
28
34
|
});
|
29
35
|
if (!naroceni.length)
|
30
36
|
return [];
|
31
|
-
let pacienti = arrayToObject(await mongo.find("pacienti", { _id: { $in: naroceni.map(n => n.pacient_id) } }, { project: { ime: true, vrsta: true, spol: true, mrtev: true, stranka_id: true, _deleted: true } }), "_id");
|
32
|
-
let lokacije = arrayToObject(await mongo.find("lokacije", { _id: { $in: naroceni.map(n => n.lokacija_id) } }, { project: { ime: true, naslov: true, telefon: true } }), "_id");
|
37
|
+
let pacienti = (0, cry_helpers_1.arrayToObject)(await mongo.find("pacienti", { _id: { $in: naroceni.map(n => n.pacient_id) } }, { project: { ime: true, vrsta: true, spol: true, mrtev: true, stranka_id: true, _deleted: true } }), "_id");
|
38
|
+
let lokacije = (0, cry_helpers_1.arrayToObject)(await mongo.find("lokacije", { _id: { $in: naroceni.map(n => n.lokacija_id) } }, { project: { ime: true, naslov: true, telefon: true } }), "_id");
|
33
39
|
let res = naroceni.map(narocen => {
|
34
40
|
return {
|
35
41
|
narocen,
|
36
42
|
pacient: pacienti[narocen.pacient_id],
|
37
|
-
...smsNarocenBesedilo({
|
43
|
+
...(0, smsNarocenBesedilo_js_1.smsNarocenBesedilo)({
|
38
44
|
narocen,
|
39
45
|
pacient: pacienti[narocen.pacient_id],
|
40
46
|
lokacija: lokacije[narocen.lokacija_id],
|
@@ -42,10 +48,11 @@ export async function smsNaroceniNaDan({ tenant, dan }) {
|
|
42
48
|
}),
|
43
49
|
};
|
44
50
|
}).filter(p => p?.pacient && !p.pacient.mrtev && !p.pacient._deleted && !p.pacient.oddan);
|
45
|
-
let stranke = arrayToObject(await mongo.find("stranke", { _id: { $in: res.map(r => r.pacient.stranka_id) } }, { project: { gdprSoglasjeNacin: 1 } }), "_id");
|
51
|
+
let stranke = (0, cry_helpers_1.arrayToObject)(await mongo.find("stranke", { _id: { $in: res.map(r => r.pacient.stranka_id) } }, { project: { gdprSoglasjeNacin: 1 } }), "_id");
|
46
52
|
res = res.filter(r => stranke[r.pacient.stranka_id].gdprSoglasjeNacin !== "ne poda");
|
47
53
|
return res;
|
48
54
|
}
|
55
|
+
exports.smsNaroceniNaDan = smsNaroceniNaDan;
|
49
56
|
// (async () => {
|
50
57
|
// let ret = await smsNaroceniNaDan({ tenant: 'zvitorepka', dan: new Date() });
|
51
58
|
// console.dir(ret)
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"smsNaroceniNaDan.js","sourceRoot":"","sources":["../src/smsNaroceniNaDan.ts"],"names":[],"mappings":"AACA,
|
1
|
+
{"version":3,"file":"smsNaroceniNaDan.js","sourceRoot":"","sources":["../src/smsNaroceniNaDan.ts"],"names":[],"mappings":"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"}
|
@@ -1,11 +1,17 @@
|
|
1
|
-
|
2
|
-
|
3
|
-
|
4
|
-
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
|
1
|
+
"use strict";
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
4
|
+
};
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
6
|
+
exports.spremembaZalogeZaObdobje = void 0;
|
7
|
+
const cry_db_1 = require("cry-db");
|
8
|
+
const ObjectId_js_1 = require("./ObjectId.js");
|
9
|
+
const cry_helpers_1 = require("cry-helpers");
|
10
|
+
const dayjs_js_1 = __importDefault(require("./dayjs.js"));
|
11
|
+
const idjiArtiklovKiImajoLahkoZalogo_js_1 = require("./idjiArtiklovKiImajoLahkoZalogo.js");
|
12
|
+
async function spremembaZalogeZaObdobje(spec) {
|
13
|
+
spec.odDne = (0, dayjs_js_1.default)(spec.odDne).startOf("day").toDate();
|
14
|
+
spec.doDne = (0, dayjs_js_1.default)(spec.doDne).endOf("day").toDate();
|
9
15
|
const allTimeCriteria = [
|
10
16
|
{ datum: { $gte: spec.odDne } },
|
11
17
|
{ datum: { $lt: spec.doDne } },
|
@@ -21,7 +27,7 @@ export async function spremembaZalogeZaObdobje(spec) {
|
|
21
27
|
if (spec.razenVrst?.length)
|
22
28
|
$match.vrstaDogodka = { $nin: spec.razenVrst };
|
23
29
|
// samo artikli, ki lahko imajo zalogo
|
24
|
-
let mozni = await idjiArtiklovKiImajoLahkoZalogo(spec.tenant);
|
30
|
+
let mozni = await (0, idjiArtiklovKiImajoLahkoZalogo_js_1.idjiArtiklovKiImajoLahkoZalogo)(spec.tenant);
|
25
31
|
$match.artikel_id = { $in: mozni };
|
26
32
|
let _id = {};
|
27
33
|
let proj = { _id: 0, sprememba: 1 };
|
@@ -47,7 +53,7 @@ export async function spremembaZalogeZaObdobje(spec) {
|
|
47
53
|
_id.skladisce_id = "$skladisce_id";
|
48
54
|
proj.skladisce_id = "$_id.skladisce_id";
|
49
55
|
}
|
50
|
-
let repo = new Repo("spremembaZaloge", spec.tenant);
|
56
|
+
let repo = new cry_db_1.Repo("spremembaZaloge", spec.tenant);
|
51
57
|
let spremembe = await repo.aggregate([
|
52
58
|
{ $match },
|
53
59
|
{
|
@@ -60,14 +66,14 @@ export async function spremembaZalogeZaObdobje(spec) {
|
|
60
66
|
]);
|
61
67
|
await repo.close();
|
62
68
|
if (spec.poDokumentih) {
|
63
|
-
let idjiBlag = spremembe.filter((s) => s.vrsta !== "prodaja").map((s) => s.dokument_id).filter(a => a).map(a => ObjectID.createFromHexString(a.toString()));
|
64
|
-
let idjiRac = spremembe.filter((s) => s.vrsta == "prodaja").map((s) => s.dokument_id).filter(a => a).map(a => ObjectID.createFromHexString(a.toString()));
|
65
|
-
let repoB = new Repo("blagovnice", spec.tenant);
|
66
|
-
let repoR = new Repo("racuni", spec.tenant);
|
69
|
+
let idjiBlag = spremembe.filter((s) => s.vrsta !== "prodaja").map((s) => s.dokument_id).filter(a => a).map(a => ObjectId_js_1.ObjectID.createFromHexString(a.toString()));
|
70
|
+
let idjiRac = spremembe.filter((s) => s.vrsta == "prodaja").map((s) => s.dokument_id).filter(a => a).map(a => ObjectId_js_1.ObjectID.createFromHexString(a.toString()));
|
71
|
+
let repoB = new cry_db_1.Repo("blagovnice", spec.tenant);
|
72
|
+
let repoR = new cry_db_1.Repo("racuni", spec.tenant);
|
67
73
|
let blagovnice = await repoB.find({ _id: { $in: idjiBlag } }, { project: { dokumentDobavitelja: 1 }, sort: { datum: 1 } });
|
68
74
|
let racuni = await repoR.find({ _id: { $in: idjiRac } }, { project: { stevilka: 1 }, sort: { datum: 1 } });
|
69
|
-
let blagObj = arrayToObject(blagovnice, "_id");
|
70
|
-
let racObj = arrayToObject(racuni, "_id");
|
75
|
+
let blagObj = (0, cry_helpers_1.arrayToObject)(blagovnice, "_id");
|
76
|
+
let racObj = (0, cry_helpers_1.arrayToObject)(racuni, "_id");
|
71
77
|
await repoB.close();
|
72
78
|
await repoR.close();
|
73
79
|
spremembe.forEach((s) => {
|
@@ -78,6 +84,7 @@ export async function spremembaZalogeZaObdobje(spec) {
|
|
78
84
|
}
|
79
85
|
return spremembe;
|
80
86
|
}
|
87
|
+
exports.spremembaZalogeZaObdobje = spremembaZalogeZaObdobje;
|
81
88
|
// (async function go() {
|
82
89
|
// let vzd = await spremembaZalogeZaObdobje({
|
83
90
|
// tenant: "max",
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"spremembaZalogeZaObdobje.js","sourceRoot":"","sources":["../src/spremembaZalogeZaObdobje.ts"],"names":[],"mappings":"AAAA,
|
1
|
+
{"version":3,"file":"spremembaZalogeZaObdobje.js","sourceRoot":"","sources":["../src/spremembaZalogeZaObdobje.ts"],"names":[],"mappings":"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"}
|
package/dist/spremeniZalogo.js
CHANGED
@@ -1,11 +1,14 @@
|
|
1
|
-
|
2
|
-
|
3
|
-
|
4
|
-
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
|
1
|
+
"use strict";
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
+
exports.spremeniZalogoNaPodlagiBlagovnice = exports.ignorirajNarocilo = exports._poknjiziPoraboZaloge = exports.poisciInPreusmeriArtikel = exports.poisciArtikel = exports.knjiziPoEnotiNabave = void 0;
|
4
|
+
const ObjectId_js_1 = require("./ObjectId.js");
|
5
|
+
const preracunajZalogo_js_1 = require("./preracunajZalogo.js");
|
6
|
+
const razpisiDatum_js_1 = require("./razpisiDatum.js");
|
7
|
+
const spremeniZalogoZaPrenos_js_1 = require("./spremeniZalogoZaPrenos.js");
|
8
|
+
const spremeniZalogoZaDobavo_js_1 = require("./spremeniZalogoZaDobavo.js");
|
9
|
+
const spremeniZalogoZaInventuro_js_1 = require("./spremeniZalogoZaInventuro.js");
|
10
|
+
const spremeniZalogoZaPorabo_js_1 = require("./spremeniZalogoZaPorabo.js");
|
11
|
+
function knjiziPoEnotiNabave(vrsta) {
|
9
12
|
return [
|
10
13
|
"dobava",
|
11
14
|
"vračilo",
|
@@ -14,6 +17,7 @@ export function knjiziPoEnotiNabave(vrsta) {
|
|
14
17
|
// "prenos",
|
15
18
|
].includes(vrsta);
|
16
19
|
}
|
20
|
+
exports.knjiziPoEnotiNabave = knjiziPoEnotiNabave;
|
17
21
|
// export function sestevki(postavke: (KolicinskaPostavkaBlagovnice & { nbc: number })[]): { nbc0: number, nbc: number, pop: number, dav: number, prc: number } {
|
18
22
|
// let d = { nbc0: 0, nbc: 0, pop: 0, dav: 0, prc: 0 }
|
19
23
|
// Object.values(postavke).forEach(p => {
|
@@ -24,7 +28,7 @@ export function knjiziPoEnotiNabave(vrsta) {
|
|
24
28
|
// })
|
25
29
|
// return d
|
26
30
|
// }
|
27
|
-
|
31
|
+
async function poisciArtikel(_id, mongo, errorText) {
|
28
32
|
let artikel = await mongo.findOne("artikli", { _id });
|
29
33
|
if (!artikel) {
|
30
34
|
console.error(errorText);
|
@@ -34,7 +38,8 @@ export async function poisciArtikel(_id, mongo, errorText) {
|
|
34
38
|
return null;
|
35
39
|
return artikel;
|
36
40
|
}
|
37
|
-
|
41
|
+
exports.poisciArtikel = poisciArtikel;
|
42
|
+
async function poisciInPreusmeriArtikel(_id, faktorRazknjizbe, mongo, errorText) {
|
38
43
|
let artikel = await mongo.findOne("artikli", { _id });
|
39
44
|
if (!artikel) {
|
40
45
|
console.error(errorText);
|
@@ -51,24 +56,25 @@ export async function poisciInPreusmeriArtikel(_id, faktorRazknjizbe, mongo, err
|
|
51
56
|
}
|
52
57
|
return { artikel, faktorRazknjizbe };
|
53
58
|
}
|
54
|
-
|
59
|
+
exports.poisciInPreusmeriArtikel = poisciInPreusmeriArtikel;
|
60
|
+
async function _poknjiziPoraboZaloge(zaloga, blagovniDogodek, postavka, stara_nbc, mongo, artikel, blagovnica) {
|
55
61
|
let faktor = knjiziPoEnotiNabave(blagovnica.vrsta) ? (postavka.enotaFaktor || 1) : 1;
|
56
|
-
let sprememba = preracunajPorabo({
|
62
|
+
let sprememba = (0, preracunajZalogo_js_1.preracunajPorabo)({
|
57
63
|
vrstaSpremembe: blagovniDogodek === "vnos" ? 1 /* VrstaSpremembeZaloge.NABAVA */ : -1 /* VrstaSpremembeZaloge.PORABA */,
|
58
64
|
zaloga,
|
59
65
|
kolicina: postavka.kolicina * faktor,
|
60
66
|
stara_nbc,
|
61
67
|
});
|
62
|
-
zaloga = vpisiSprememboZaloge(zaloga, sprememba);
|
68
|
+
zaloga = (0, preracunajZalogo_js_1.vpisiSprememboZaloge)(zaloga, sprememba);
|
63
69
|
await mongo.upsert("zaloga", { artikel_id: artikel._id, skladisce_id: zaloga.skladisce_id }, {
|
64
70
|
nbc: stara_nbc,
|
65
71
|
zaloga: sprememba.zaloga.nova,
|
66
72
|
vrednost: sprememba.vrednostZaloge.nova,
|
67
73
|
});
|
68
74
|
await mongo.insert("spremembaZaloge", {
|
69
|
-
_id: new ObjectID().toHexString(),
|
75
|
+
_id: new ObjectId_js_1.ObjectID().toHexString(),
|
70
76
|
datum: blagovnica.datum,
|
71
|
-
...razpisiDatum(blagovnica.datum),
|
77
|
+
...(0, razpisiDatum_js_1.razpisiDatum)(blagovnica.datum),
|
72
78
|
artikel_id: artikel._id,
|
73
79
|
skladisce_id: zaloga.skladisce_id,
|
74
80
|
dokument_id: blagovnica._id,
|
@@ -83,13 +89,15 @@ export async function _poknjiziPoraboZaloge(zaloga, blagovniDogodek, postavka, s
|
|
83
89
|
});
|
84
90
|
return zaloga;
|
85
91
|
}
|
86
|
-
|
92
|
+
exports._poknjiziPoraboZaloge = _poknjiziPoraboZaloge;
|
93
|
+
async function ignorirajNarocilo(blagovnica, mongo) {
|
87
94
|
console.error("Ignoriram spremembo zaloge na podlagi naročila ", blagovnica._id);
|
88
95
|
// prevent compiler error:
|
89
96
|
mongo.findOne("artikli", { noop: 1 });
|
90
97
|
return false;
|
91
98
|
}
|
92
|
-
|
99
|
+
exports.ignorirajNarocilo = ignorirajNarocilo;
|
100
|
+
async function spremeniZalogoNaPodlagiBlagovnice(blagovnica, nastavitve, mongo) {
|
93
101
|
if (!blagovnica)
|
94
102
|
return;
|
95
103
|
if (blagovnica.razknjizena)
|
@@ -101,16 +109,16 @@ export async function spremeniZalogoNaPodlagiBlagovnice(blagovnica, nastavitve,
|
|
101
109
|
// if (!inTransaction)
|
102
110
|
// await mongo.startTransaction()
|
103
111
|
let actions = {
|
104
|
-
dobava: () => spremeniZalogoZaDobavo(blagovnica, nastavitve, mongo),
|
105
|
-
poraba: () => spremeniZalogoZaPorabo(blagovnica, nastavitve.razknjizbaZdravil, !!nastavitve.spremljamoSerijske, mongo),
|
106
|
-
prevzem: () => spremeniZalogoZaPorabo(blagovnica, nastavitve.razknjizbaZdravil, !!nastavitve.spremljamoSerijske, mongo),
|
107
|
-
odpis: () => spremeniZalogoZaPorabo(blagovnica, nastavitve.razknjizbaZdravil, !!nastavitve.spremljamoSerijske, mongo),
|
108
|
-
izdaja: () => spremeniZalogoZaPorabo(blagovnica, nastavitve.razknjizbaZdravil, !!nastavitve.spremljamoSerijske, mongo),
|
109
|
-
vračilo: () => spremeniZalogoZaPorabo(blagovnica, nastavitve.razknjizbaZdravil, !!nastavitve.spremljamoSerijske, mongo),
|
110
|
-
iznos: () => spremeniZalogoZaPorabo(blagovnica, nastavitve.razknjizbaZdravil, !!nastavitve.spremljamoSerijske, mongo),
|
111
|
-
vnos: () => spremeniZalogoZaPorabo(blagovnica, nastavitve.razknjizbaZdravil, !!nastavitve.spremljamoSerijske, mongo),
|
112
|
-
inventura: () => spremeniZalogoZaInventuro(blagovnica, nastavitve.razknjizbaZdravil, !!nastavitve.spremljamoSerijske, mongo),
|
113
|
-
prenos: () => spremeniZalogoZaPrenos(blagovnica, nastavitve.razknjizbaZdravil, !!nastavitve.spremljamoSerijske, mongo),
|
112
|
+
dobava: () => (0, spremeniZalogoZaDobavo_js_1.spremeniZalogoZaDobavo)(blagovnica, nastavitve, mongo),
|
113
|
+
poraba: () => (0, spremeniZalogoZaPorabo_js_1.spremeniZalogoZaPorabo)(blagovnica, nastavitve.razknjizbaZdravil, !!nastavitve.spremljamoSerijske, mongo),
|
114
|
+
prevzem: () => (0, spremeniZalogoZaPorabo_js_1.spremeniZalogoZaPorabo)(blagovnica, nastavitve.razknjizbaZdravil, !!nastavitve.spremljamoSerijske, mongo),
|
115
|
+
odpis: () => (0, spremeniZalogoZaPorabo_js_1.spremeniZalogoZaPorabo)(blagovnica, nastavitve.razknjizbaZdravil, !!nastavitve.spremljamoSerijske, mongo),
|
116
|
+
izdaja: () => (0, spremeniZalogoZaPorabo_js_1.spremeniZalogoZaPorabo)(blagovnica, nastavitve.razknjizbaZdravil, !!nastavitve.spremljamoSerijske, mongo),
|
117
|
+
vračilo: () => (0, spremeniZalogoZaPorabo_js_1.spremeniZalogoZaPorabo)(blagovnica, nastavitve.razknjizbaZdravil, !!nastavitve.spremljamoSerijske, mongo),
|
118
|
+
iznos: () => (0, spremeniZalogoZaPorabo_js_1.spremeniZalogoZaPorabo)(blagovnica, nastavitve.razknjizbaZdravil, !!nastavitve.spremljamoSerijske, mongo),
|
119
|
+
vnos: () => (0, spremeniZalogoZaPorabo_js_1.spremeniZalogoZaPorabo)(blagovnica, nastavitve.razknjizbaZdravil, !!nastavitve.spremljamoSerijske, mongo),
|
120
|
+
inventura: () => (0, spremeniZalogoZaInventuro_js_1.spremeniZalogoZaInventuro)(blagovnica, nastavitve.razknjizbaZdravil, !!nastavitve.spremljamoSerijske, mongo),
|
121
|
+
prenos: () => (0, spremeniZalogoZaPrenos_js_1.spremeniZalogoZaPrenos)(blagovnica, nastavitve.razknjizbaZdravil, !!nastavitve.spremljamoSerijske, mongo),
|
114
122
|
"naročilo": () => ignorirajNarocilo(blagovnica, mongo),
|
115
123
|
};
|
116
124
|
if (!actions[blagovnica.vrsta])
|
@@ -131,6 +139,7 @@ export async function spremeniZalogoNaPodlagiBlagovnice(blagovnica, nastavitve,
|
|
131
139
|
// await mongo.abortTransaction()
|
132
140
|
}
|
133
141
|
}
|
142
|
+
exports.spremeniZalogoNaPodlagiBlagovnice = spremeniZalogoNaPodlagiBlagovnice;
|
134
143
|
// (async function () {
|
135
144
|
// let mongo = new Mongo("max")
|
136
145
|
// console.log('>>1');
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"spremeniZalogo.js","sourceRoot":"","sources":["../src/spremeniZalogo.ts"],"names":[],"mappings":"AAAA
|
1
|
+
{"version":3,"file":"spremeniZalogo.js","sourceRoot":"","sources":["../src/spremeniZalogo.ts"],"names":[],"mappings":"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"}
|
@@ -1,10 +1,13 @@
|
|
1
|
-
|
2
|
-
|
3
|
-
|
4
|
-
|
5
|
-
|
6
|
-
|
7
|
-
|
1
|
+
"use strict";
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
+
exports.spremeniZalogoNaPodlagiRacuna = void 0;
|
4
|
+
const ObjectId_js_1 = require("./ObjectId.js");
|
5
|
+
const preracunajZalogo_js_1 = require("./preracunajZalogo.js");
|
6
|
+
const artikel_js_1 = require("./types/artikel.js");
|
7
|
+
const razpisiDatum_js_1 = require("./razpisiDatum.js");
|
8
|
+
const spremeniZalogo_js_1 = require("./spremeniZalogo.js");
|
9
|
+
const serije_js_1 = require("./serije.js");
|
10
|
+
async function spremeniZalogoNaPodlagiRacuna(racun, nastavitve, mongo) {
|
8
11
|
if (!racun || racun.razknjizen)
|
9
12
|
return;
|
10
13
|
let vrstaDogodka = "prodaja";
|
@@ -39,32 +42,32 @@ export async function spremeniZalogoNaPodlagiRacuna(racun, nastavitve, mongo) {
|
|
39
42
|
});
|
40
43
|
if (["storitev", "potrošni material"].includes(postavka.kategorija))
|
41
44
|
continue;
|
42
|
-
let { artikel, faktorRazknjizbe } = await poisciInPreusmeriArtikel(postavka.artikel_id, 1, mongo, `ni artikla za razknjižbo prodaje: ${postavka.artikel_id} - ${postavka.opis}`);
|
45
|
+
let { artikel, faktorRazknjizbe } = await (0, spremeniZalogo_js_1.poisciInPreusmeriArtikel)(postavka.artikel_id, 1, mongo, `ni artikla za razknjižbo prodaje: ${postavka.artikel_id} - ${postavka.opis}`);
|
43
46
|
if (!artikel)
|
44
47
|
continue;
|
45
48
|
let z = await mongo.findOne("zaloga", { skladisce_id: racun.skladisce_id, artikel_id: artikel._id });
|
46
|
-
let zaloga = z || { _id: new ObjectID().toHexString(), artikel_id: artikel._id, skladisce_id: racun.skladisce_id, zaloga: 0, nbc: 0, vrednost: 0 };
|
47
|
-
let razknjiziZalogo = jeIzdelek(artikel)
|
49
|
+
let zaloga = z || { _id: new ObjectId_js_1.ObjectID().toHexString(), artikel_id: artikel._id, skladisce_id: racun.skladisce_id, zaloga: 0, nbc: 0, vrednost: 0 };
|
50
|
+
let razknjiziZalogo = (0, artikel_js_1.jeIzdelek)(artikel)
|
48
51
|
|| artikel.zalogoRazknjizi === "ob prodaji"
|
49
52
|
|| (!artikel.zalogoRazknjizi && nastavitve.razknjizbaZdravil === "ob prodaji");
|
50
53
|
if (!razknjiziZalogo)
|
51
54
|
continue;
|
52
55
|
let stara_nbc = artikel.nbc || 0;
|
53
|
-
let sprememba = preracunajPorabo({
|
56
|
+
let sprememba = (0, preracunajZalogo_js_1.preracunajPorabo)({
|
54
57
|
vrstaSpremembe,
|
55
58
|
zaloga,
|
56
59
|
kolicina: postavka.kolicina * (faktorRazknjizbe || 1),
|
57
60
|
stara_nbc,
|
58
61
|
});
|
59
|
-
zaloga = vpisiSprememboZaloge(zaloga, sprememba);
|
62
|
+
zaloga = (0, preracunajZalogo_js_1.vpisiSprememboZaloge)(zaloga, sprememba);
|
60
63
|
await mongo.upsert("zaloga", { artikel_id: artikel._id, skladisce_id: racun.skladisce_id }, {
|
61
64
|
zaloga: zaloga.zaloga,
|
62
65
|
vrednost: zaloga.vrednost,
|
63
66
|
});
|
64
67
|
await mongo.insert("spremembaZaloge", {
|
65
|
-
_id: new ObjectID().toHexString(),
|
68
|
+
_id: new ObjectId_js_1.ObjectID().toHexString(),
|
66
69
|
datum: racun.datum,
|
67
|
-
...razpisiDatum(racun.datum),
|
70
|
+
...(0, razpisiDatum_js_1.razpisiDatum)(racun.datum),
|
68
71
|
artikel_id: artikel._id,
|
69
72
|
skladisce_id: zaloga.skladisce_id,
|
70
73
|
kategorija: artikel.kategorija,
|
@@ -79,7 +82,7 @@ export async function spremeniZalogoNaPodlagiRacuna(racun, nastavitve, mongo) {
|
|
79
82
|
});
|
80
83
|
try {
|
81
84
|
if (nastavitve.spremljamoSerijske) {
|
82
|
-
let vpisane = await odstraniSerijskeStevilke({
|
85
|
+
let vpisane = await (0, serije_js_1.odstraniSerijskeStevilke)({
|
83
86
|
artikel_id: postavka.artikel_id,
|
84
87
|
skladisce_id: racun.skladisce_id,
|
85
88
|
serijske: postavka.stevilkaZdravila || "",
|
@@ -111,4 +114,5 @@ export async function spremeniZalogoNaPodlagiRacuna(racun, nastavitve, mongo) {
|
|
111
114
|
//await mongo.abortTransaction();
|
112
115
|
}
|
113
116
|
}
|
117
|
+
exports.spremeniZalogoNaPodlagiRacuna = spremeniZalogoNaPodlagiRacuna;
|
114
118
|
//# sourceMappingURL=spremeniZalogoNaPodlagiRacuna.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"spremeniZalogoNaPodlagiRacuna.js","sourceRoot":"","sources":["../src/spremeniZalogoNaPodlagiRacuna.ts"],"names":[],"mappings":"AAAA
|
1
|
+
{"version":3,"file":"spremeniZalogoNaPodlagiRacuna.js","sourceRoot":"","sources":["../src/spremeniZalogoNaPodlagiRacuna.ts"],"names":[],"mappings":"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"}
|
@@ -1,15 +1,18 @@
|
|
1
|
-
|
2
|
-
|
3
|
-
|
4
|
-
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
1
|
+
"use strict";
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
+
exports.spremeniZalogoZaDobavo = void 0;
|
4
|
+
const cry_db_1 = require("cry-db");
|
5
|
+
const ObjectId_js_1 = require("./ObjectId.js");
|
6
|
+
const izracunajNovoMaloprodajnoCeno_js_1 = require("./izracunajNovoMaloprodajnoCeno.js");
|
7
|
+
const preracunajZalogo_js_1 = require("./preracunajZalogo.js");
|
8
|
+
const preracunajPostavkoBlagovnice_js_1 = require("./preracunajPostavkoBlagovnice.js");
|
9
|
+
const razpisiDatum_js_1 = require("./razpisiDatum.js");
|
10
|
+
const lahkoImaZalogo_js_1 = require("./lahkoImaZalogo.js");
|
11
|
+
const zeleniPribitek_js_1 = require("./zeleniPribitek.js");
|
12
|
+
const serije_js_1 = require("./serije.js");
|
13
|
+
async function spremeniZalogoZaDobavo(blagovnica, nastavitve, mongo) {
|
11
14
|
let avtomatskaRazknjizba = {
|
12
|
-
_id: Repo.newid().toHexString(),
|
15
|
+
_id: cry_db_1.Repo.newid().toHexString(),
|
13
16
|
opis: `samodejna poraba za dobavo ${blagovnica.zapSt}`,
|
14
17
|
predhodnja_id: blagovnica._id,
|
15
18
|
datum: new Date(),
|
@@ -54,28 +57,28 @@ export async function spremeniZalogoZaDobavo(blagovnica, nastavitve, mongo) {
|
|
54
57
|
continue;
|
55
58
|
}
|
56
59
|
let z = await mongo.findOne("zaloga", { skladisce_id: blagovnica.skladisce_id, artikel_id: postavka.artikel_id });
|
57
|
-
let zaloga = z || { _id: new ObjectID().toHexString(), artikel_id: artikel._id, skladisce_id: blagovnica.skladisce_id, zaloga: 0, nbc: 0, vrednost: 0 };
|
60
|
+
let zaloga = z || { _id: new ObjectId_js_1.ObjectID().toHexString(), artikel_id: artikel._id, skladisce_id: blagovnica.skladisce_id, zaloga: 0, nbc: 0, vrednost: 0 };
|
58
61
|
if (!postavka.enotaFaktor)
|
59
62
|
throw new Error("postavka dobave mora vsebovati polje enotaFaktor");
|
60
63
|
const faktorEnote = postavka.enotaFaktor || 1;
|
61
64
|
const kolicina = postavka.kolicina * faktorEnote;
|
62
65
|
const stara_nbc = artikel.nbc || 0;
|
63
66
|
const zadnja_nbc = artikel.zadnjaNbc || stara_nbc;
|
64
|
-
const sprememba = preracunajNabavo({
|
67
|
+
const sprememba = (0, preracunajZalogo_js_1.preracunajNabavo)({
|
65
68
|
vrstaSpremembe: 1 /* VrstaSpremembeZaloge.NABAVA */,
|
66
69
|
zaloga,
|
67
70
|
kolicina: kolicina,
|
68
71
|
stara_nbc,
|
69
72
|
nova_nbc: postavka.nbcN / faktorEnote,
|
70
73
|
});
|
71
|
-
zaloga = vpisiSprememboZalogePoNabavi(zaloga, sprememba);
|
72
|
-
let imaZalogo = lahkoImaZalogo(artikel, nastavitve.razknjizbaZdravil, /*zaDobavo*/ true);
|
74
|
+
zaloga = (0, preracunajZalogo_js_1.vpisiSprememboZalogePoNabavi)(zaloga, sprememba);
|
75
|
+
let imaZalogo = (0, lahkoImaZalogo_js_1.lahkoImaZalogo)(artikel, nastavitve.razknjizbaZdravil, /*zaDobavo*/ true);
|
73
76
|
if (imaZalogo) {
|
74
77
|
await vpisiSprememboZaloge(artikel, razknjizujObDobavi, nastavitve, mongo, zaloga, sprememba, blagovnica, avtomatskaRazknjizba, postavka, kolicina, postavka.nbcN / faktorEnote, n++);
|
75
78
|
}
|
76
79
|
await spremeniMpcArtikla(artikel, postavka, nastavitve, sprememba, zadnja_nbc, stara_nbc, postavka.nbc0 / faktorEnote, blagovnica.datum, blagovnica.dobavitelj_id, mongo);
|
77
80
|
if (nastavitve.spremljamoSerijske && postavka.stevilkeZdravil) {
|
78
|
-
await dodajSerijskeStevilke({
|
81
|
+
await (0, serije_js_1.dodajSerijskeStevilke)({
|
79
82
|
artikel_id: postavka.artikel_id,
|
80
83
|
skladisce_id: blagovnica.skladisce_id,
|
81
84
|
vir: "dobava",
|
@@ -85,19 +88,20 @@ export async function spremeniZalogoZaDobavo(blagovnica, nastavitve, mongo) {
|
|
85
88
|
serijske: postavka.stevilkeZdravil,
|
86
89
|
}, mongo);
|
87
90
|
}
|
88
|
-
preracunajPostavkoDobave(postavka);
|
91
|
+
(0, preracunajPostavkoBlagovnice_js_1.preracunajPostavkoDobave)(postavka);
|
89
92
|
}
|
90
93
|
if (avtomatskaRazknjizba.postavke.length) {
|
91
|
-
let ss = izracunajSestevkeBlagovniceRazenDobave(avtomatskaRazknjizba.postavke);
|
94
|
+
let ss = (0, preracunajPostavkoBlagovnice_js_1.izracunajSestevkeBlagovniceRazenDobave)(avtomatskaRazknjizba.postavke);
|
92
95
|
avtomatskaRazknjizba.razknjizena = new Date();
|
93
96
|
avtomatskaRazknjizba.status = "zaključena";
|
94
97
|
avtomatskaRazknjizba.dav = ss.dav;
|
95
98
|
avtomatskaRazknjizba.nbc = ss.nbc;
|
96
|
-
razpisiDatum(avtomatskaRazknjizba.datum, avtomatskaRazknjizba);
|
99
|
+
(0, razpisiDatum_js_1.razpisiDatum)(avtomatskaRazknjizba.datum, avtomatskaRazknjizba);
|
97
100
|
await mongo.upsert("blagovnice", { _id: avtomatskaRazknjizba._id }, avtomatskaRazknjizba);
|
98
101
|
}
|
99
102
|
return false;
|
100
103
|
}
|
104
|
+
exports.spremeniZalogoZaDobavo = spremeniZalogoZaDobavo;
|
101
105
|
async function vpisiSprememboZaloge(artikel, razknjizujObDobavi, nastavitve, mongo, zaloga, sprememba, blagovnica, avtomatskaRazknjizba, postavka, kolicina, nova_nbc, n) {
|
102
106
|
const razknjizimoTakoj = (artikel.kategorija === "zdravilo"
|
103
107
|
&& razknjizujObDobavi
|
@@ -119,9 +123,9 @@ async function vpisiSprememboZaloge(artikel, razknjizujObDobavi, nastavitve, mon
|
|
119
123
|
});
|
120
124
|
}
|
121
125
|
await mongo.insert("spremembaZaloge", {
|
122
|
-
_id: new ObjectID().toHexString(),
|
126
|
+
_id: new ObjectId_js_1.ObjectID().toHexString(),
|
123
127
|
datum: new Date(blagovnica.datum.valueOf() + n),
|
124
|
-
...razpisiDatum(blagovnica.datum),
|
128
|
+
...(0, razpisiDatum_js_1.razpisiDatum)(blagovnica.datum),
|
125
129
|
artikel_id: artikel._id,
|
126
130
|
skladisce_id: zaloga.skladisce_id,
|
127
131
|
dokument_id: blagovnica._id,
|
@@ -136,9 +140,9 @@ async function vpisiSprememboZaloge(artikel, razknjizujObDobavi, nastavitve, mon
|
|
136
140
|
});
|
137
141
|
if (razknjizimoTakoj) {
|
138
142
|
await mongo.insert("spremembaZaloge", {
|
139
|
-
_id: new ObjectID().toHexString(),
|
143
|
+
_id: new ObjectId_js_1.ObjectID().toHexString(),
|
140
144
|
datum: blagovnica.datum,
|
141
|
-
...razpisiDatum(blagovnica.datum),
|
145
|
+
...(0, razpisiDatum_js_1.razpisiDatum)(blagovnica.datum),
|
142
146
|
artikel_id: artikel._id,
|
143
147
|
skladisce_id: zaloga.skladisce_id,
|
144
148
|
dokument_id: blagovnica._id,
|
@@ -173,7 +177,7 @@ async function spremeniMpcArtikla(artikel, postavka, nastavitve, sprememba, zadn
|
|
173
177
|
let razlog;
|
174
178
|
if (!postavka.mpcPreskoci) {
|
175
179
|
if (nastavitve.posodobiCeneObDobavi === "dobava") {
|
176
|
-
nova_mpc = izracunajNovoMaloprodajnoCeno(zadnja_nbc, nova_nbc, nastavitve, artikel);
|
180
|
+
nova_mpc = (0, izracunajNovoMaloprodajnoCeno_js_1.izracunajNovoMaloprodajnoCeno)(zadnja_nbc, nova_nbc, nastavitve, artikel);
|
177
181
|
razlog = "preračun";
|
178
182
|
}
|
179
183
|
if (postavka.mpcZakleni !== artikel.mpcLocked) {
|
@@ -181,7 +185,7 @@ async function spremeniMpcArtikla(artikel, postavka, nastavitve, sprememba, zadn
|
|
181
185
|
}
|
182
186
|
if (postavka.mpcNastavi) {
|
183
187
|
nova_mpc = Number(postavka.mpcNastavi.toFixed(nastavitve.zaokrozitevCen));
|
184
|
-
novi_pribitek = zeleniPribitek({ mpc: nova_mpc, nbc: nova_nbc, dst: artikel.dst || 0 });
|
188
|
+
novi_pribitek = (0, zeleniPribitek_js_1.zeleniPribitek)({ mpc: nova_mpc, nbc: nova_nbc, dst: artikel.dst || 0 });
|
185
189
|
// postavka.mpcZakleni = true;
|
186
190
|
razlog = "nastavi mpc";
|
187
191
|
}
|