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