cry-klikvet-logic 1.0.225 → 1.0.227
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 +436 -653
- package/dist/anonimizirajPodatke.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 -158
- package/dist/ensureIndexes.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 +245 -337
- package/dist/maint/poknjiziVsoZgodovino.mjs.map +1 -1
- package/dist/maint/popraviNabaveCeneNaRacunih.mjs +17 -48
- package/dist/maint/popraviNabaveCeneNaRacunih.mjs.map +1 -1
- package/dist/maint/popraviNabavneCeneNaInventurah.mjs +15 -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/neuporabljeno.mjs +26 -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/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 +112 -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 +16 -1
- package/dist/porabaZaObravnavo.mjs.map +1 -1
- package/dist/preveriKnjizenjeZalogeArtikla.mjs +97 -110
- package/dist/preveriKnjizenjeZalogeArtikla.mjs.map +1 -1
- package/dist/q-blagovnice.mjs +12 -23
- 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 +25 -36
- package/dist/q-isciPoRacunih.mjs.map +1 -1
- package/dist/q-mojPromet.mjs +23 -34
- package/dist/q-mojPromet.mjs.map +1 -1
- package/dist/q-porabaZdravil.mjs +110 -110
- package/dist/q-porabaZdravil.mjs.map +1 -1
- package/dist/q-prodano.mjs +33 -44
- package/dist/q-prodano.mjs.map +1 -1
- package/dist/q-prodanoPorabljeno.mjs +47 -47
- 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 +132 -147
- 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 +75 -94
- 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 -27
- package/dist/smsCepljen.mjs.map +1 -1
- package/dist/smsCepljenjaNaDan.mjs +60 -66
- 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 -47
- package/dist/smsNaroceniNaDan.mjs.map +1 -1
- package/dist/spremembaZalogeZaObdobje.mjs +79 -90
- package/dist/spremembaZalogeZaObdobje.mjs.map +1 -1
- package/dist/spremeniZalogo.mjs +125 -132
- package/dist/spremeniZalogo.mjs.map +1 -1
- package/dist/spremeniZalogoNaPodlagiRacuna.mjs +123 -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 +132 -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 +70 -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 -46
- 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 -85
- package/dist/zalogaDbAccessorInMem.mjs.map +1 -1
- package/dist/zalogaNaDan.mjs +28 -59
- package/dist/zalogaNaDan.mjs.map +1 -1
- package/dist/zalogaNaDanIzracunana.mjs +36 -47
- package/dist/zalogaNaDanIzracunana.mjs.map +1 -1
- package/dist/zalogaPoDnevih.mjs +34 -35
- 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 +87 -140
- package/dist/zapisiZalogoPoDnevih_old.mjs.map +1 -1
- package/dist/zaracunajDobavnice.mjs +151 -184
- package/dist/zaracunajDobavnice.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 +39 -67
- package/dist/zdruziPaciente.mjs.map +1 -1
- package/dist/zdruziStranke.mjs +103 -148
- package/dist/zdruziStranke.mjs.map +1 -1
- package/package.json +1 -1
- package/tsconfig.tsbuildinfo +1 -1
package/dist/polnaInventura.mjs
CHANGED
@@ -1,143 +1,124 @@
|
|
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 { Mongo, Repo } from "cry-db";
|
19
3
|
import { arrayToObject, inBatches } from "cry-helpers";
|
20
4
|
import { razpisiDatum } from "./razpisiDatum.mjs";
|
21
5
|
import dayjs from "./dayjs.mjs";
|
22
6
|
const POSTAVK_NA_INVENTURO = 100;
|
23
|
-
export function zakljucekPolneInventure({ tenant, od, skladisce_id, server, izvedel, izlociTisteBrezZaloge, postavkNaList, kategorija, dodajBlokiraneInPopisane }) {
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
}
|
37
|
-
});
|
7
|
+
export async function zakljucekPolneInventure({ tenant, od, skladisce_id, server, izvedel, izlociTisteBrezZaloge, postavkNaList, kategorija, dodajBlokiraneInPopisane }) {
|
8
|
+
let mongo = new Mongo(tenant, server);
|
9
|
+
mongo.setAudit({ tenant, app: "logic/zakljucekPolneInventure" });
|
10
|
+
try {
|
11
|
+
let ret = await _zakljucekPolneInventure(mongo, { tenant, od, skladisce_id, izvedel, izlociTisteBrezZaloge, postavkNaList, kategorija, dodajBlokiraneInPopisane });
|
12
|
+
await mongo.close();
|
13
|
+
return ret;
|
14
|
+
}
|
15
|
+
catch (err) {
|
16
|
+
console.error("zakljucekPolneInventure error", err);
|
17
|
+
await mongo.close();
|
18
|
+
throw err;
|
19
|
+
}
|
38
20
|
}
|
39
|
-
function _zakljucekPolneInventure(mongo, { tenant, od, skladisce_id, izvedel, izlociTisteBrezZaloge, postavkNaList, kategorija, dodajBlokiraneInPopisane }) {
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
_blocked: { $ne: "hack" },
|
48
|
-
});
|
49
|
-
let zaloge = arrayToObject(yield mongo.find("zaloga", { skladisce_id }), "artikel_id");
|
50
|
-
let idji_popisanih = new Set((yield mongo.aggregate("blagovnice", [
|
51
|
-
{ $match: {
|
52
|
-
vrsta: "inventura",
|
53
|
-
datum: { $gte: new Date(od) },
|
54
|
-
skladisce_id,
|
55
|
-
_deleted: { $exists: false }
|
56
|
-
} },
|
57
|
-
{ $unwind: "$postavke" },
|
58
|
-
{ $group: { _id: "$postavke.artikel_id" } },
|
59
|
-
])).map(a => a._id.toString()));
|
60
|
-
// let imaZalogo = (a: Izdelek | Zdravilo) => {
|
61
|
-
// // pri polni inventuri popišemo VSE, tudi blokirano, z napačnim načinom razkljužbe...
|
62
|
-
// if (false) console.log(a)
|
63
|
-
// return true
|
64
|
-
// // if (a._deleted || a._blocked) return false;
|
65
|
-
// // if (a.kategorija === "izdelek") return true;
|
66
|
-
// // let razknjizbaArtikla = a.zalogoRazknjizi || razknjizba;
|
67
|
-
// // if (razknjizbaArtikla === "ob prodaji") return true;
|
68
|
-
// // if (razknjizbaArtikla === "ročno") return true;
|
69
|
-
// // /* ob dobavi */
|
70
|
-
// // return false;
|
71
|
-
// }
|
72
|
-
let zaInventuro = kandidati.filter(a => // imaZalogo(a) &&
|
73
|
-
(!idji_popisanih.has(a._id.toString()) || (dodajBlokiraneInPopisane && (a._blocked || (a === null || a === void 0 ? void 0 : a._deleted)))) &&
|
74
|
-
(!kategorija || a.kategorija === kategorija));
|
75
|
-
let postavke = zaInventuro.map(a => {
|
76
|
-
var _a;
|
77
|
-
return {
|
78
|
-
artikel_id: a._id,
|
79
|
-
kategorija: a.kategorija,
|
80
|
-
naziv: a.naziv,
|
81
|
-
nbc: a.nbc,
|
82
|
-
dst: a.dst,
|
83
|
-
tnbc: 0,
|
84
|
-
tdav: 0,
|
85
|
-
//enotaFaktor: a.enotaFaktor || 1,
|
86
|
-
kolicinaPrej: (((_a = zaloge[a._id]) === null || _a === void 0 ? void 0 : _a.zaloga) || 0),
|
87
|
-
kolicina: 0,
|
88
|
-
nepreverjeno: true,
|
89
|
-
razknjiNeglede: true,
|
90
|
-
};
|
91
|
-
});
|
92
|
-
if (izlociTisteBrezZaloge)
|
93
|
-
postavke = postavke.filter(p => p.kolicinaPrej !== 0);
|
94
|
-
// uredi postavke po dobaviteljih
|
95
|
-
let partnerji = arrayToObject(yield mongo.findAll("partnerji", {}, { project: { firma: 1, ime: 1, priimek: 1 } }), "_id");
|
96
|
-
let artikli = arrayToObject(yield mongo.findAll("artikli", { kategorija: { $in: ["izdelek", "zdravilo"] } }, { project: { zadnjiDobavitelj: 1 } }), "_id");
|
97
|
-
postavke.forEach(p => {
|
98
|
-
var _a;
|
99
|
-
let d = partnerji[((_a = artikli[p.artikel_id]) === null || _a === void 0 ? void 0 : _a.zadnjiDobavitelj) || ""];
|
100
|
-
if (d)
|
101
|
-
p.dobavitelj = `${d.firma || ""} ${d.ime || ""} ${d.priimek || ""}`.trim();
|
102
|
-
});
|
103
|
-
postavke = postavke.sort((a, b) => Math.abs(b.kolicinaPrej || 0) - Math.abs(a.kolicinaPrej || 0));
|
104
|
-
postavke = postavke.sort((a, b) => ((a.naziv || "").localeCompare(b.naziv || "")));
|
105
|
-
postavke = postavke.sort((a, b) => ((a.dobavitelj || "").localeCompare(b.dobavitelj || "")));
|
106
|
-
postavkNaList = postavkNaList || POSTAVK_NA_INVENTURO;
|
107
|
-
let listi = [];
|
108
|
-
let n = 0;
|
109
|
-
for (let list of inBatches(postavke, postavkNaList)) {
|
110
|
-
let inventurniList = Object.assign({ razknjiziCistoVse: true, vrsta: "inventura", status: "odprta", _id: new ObjectID().toHexString(), skladisce_id: skladisce === null || skladisce === void 0 ? void 0 : skladisce._id, lokacija_id: skladisce === null || skladisce === void 0 ? void 0 : skladisce.lokacija_id, datum: new Date(), zapSt: "SEQ_NEXT", izvedel, opomba: `nepopisani (${++n}) med ${dayjs(od).format("D.M.YYYY")} in ${dayjs().format("D.M.YYYY HH:mm")}`, postavke: list, dav: 0, nbc: 0, davki: [] }, razpisiDatum(new Date()));
|
111
|
-
listi.push(inventurniList);
|
112
|
-
}
|
113
|
-
return listi;
|
21
|
+
async function _zakljucekPolneInventure(mongo, { tenant, od, skladisce_id, izvedel, izlociTisteBrezZaloge, postavkNaList, kategorija, dodajBlokiraneInPopisane }) {
|
22
|
+
let skladisce = await mongo.findById("skladisca", skladisce_id);
|
23
|
+
if (!skladisce)
|
24
|
+
throw new Error(`zakljucekPolneInventure: skladisce ${skladisce_id} ne obstaja v bazi ${tenant}.`);
|
25
|
+
let kandidati = await mongo.find("artikli", {
|
26
|
+
kategorija: { $in: ["izdelek", "zdravilo"] },
|
27
|
+
_deleted: { $ne: "hack" },
|
28
|
+
_blocked: { $ne: "hack" },
|
114
29
|
});
|
115
|
-
}
|
116
|
-
|
117
|
-
|
118
|
-
|
119
|
-
|
120
|
-
|
121
|
-
|
122
|
-
|
123
|
-
|
124
|
-
|
125
|
-
|
126
|
-
|
127
|
-
|
128
|
-
|
129
|
-
|
130
|
-
|
131
|
-
|
132
|
-
|
133
|
-
|
134
|
-
|
135
|
-
|
136
|
-
|
137
|
-
|
138
|
-
|
139
|
-
|
30
|
+
let zaloge = arrayToObject(await mongo.find("zaloga", { skladisce_id }), "artikel_id");
|
31
|
+
let idji_popisanih = new Set((await mongo.aggregate("blagovnice", [
|
32
|
+
{ $match: {
|
33
|
+
vrsta: "inventura",
|
34
|
+
datum: { $gte: new Date(od) },
|
35
|
+
skladisce_id,
|
36
|
+
_deleted: { $exists: false }
|
37
|
+
} },
|
38
|
+
{ $unwind: "$postavke" },
|
39
|
+
{ $group: { _id: "$postavke.artikel_id" } },
|
40
|
+
])).map(a => a._id.toString()));
|
41
|
+
// let imaZalogo = (a: Izdelek | Zdravilo) => {
|
42
|
+
// // pri polni inventuri popišemo VSE, tudi blokirano, z napačnim načinom razkljužbe...
|
43
|
+
// if (false) console.log(a)
|
44
|
+
// return true
|
45
|
+
// // if (a._deleted || a._blocked) return false;
|
46
|
+
// // if (a.kategorija === "izdelek") return true;
|
47
|
+
// // let razknjizbaArtikla = a.zalogoRazknjizi || razknjizba;
|
48
|
+
// // if (razknjizbaArtikla === "ob prodaji") return true;
|
49
|
+
// // if (razknjizbaArtikla === "ročno") return true;
|
50
|
+
// // /* ob dobavi */
|
51
|
+
// // return false;
|
52
|
+
// }
|
53
|
+
let zaInventuro = kandidati.filter(a => // imaZalogo(a) &&
|
54
|
+
(!idji_popisanih.has(a._id.toString()) || (dodajBlokiraneInPopisane && (a._blocked || (a === null || a === void 0 ? void 0 : a._deleted)))) &&
|
55
|
+
(!kategorija || a.kategorija === kategorija));
|
56
|
+
let postavke = zaInventuro.map(a => {
|
57
|
+
var _a;
|
58
|
+
return {
|
59
|
+
artikel_id: a._id,
|
60
|
+
kategorija: a.kategorija,
|
61
|
+
naziv: a.naziv,
|
62
|
+
nbc: a.nbc,
|
63
|
+
dst: a.dst,
|
64
|
+
tnbc: 0,
|
65
|
+
tdav: 0,
|
66
|
+
//enotaFaktor: a.enotaFaktor || 1,
|
67
|
+
kolicinaPrej: (((_a = zaloge[a._id]) === null || _a === void 0 ? void 0 : _a.zaloga) || 0),
|
68
|
+
kolicina: 0,
|
69
|
+
nepreverjeno: true,
|
70
|
+
razknjiNeglede: true,
|
71
|
+
};
|
140
72
|
});
|
73
|
+
if (izlociTisteBrezZaloge)
|
74
|
+
postavke = postavke.filter(p => p.kolicinaPrej !== 0);
|
75
|
+
// uredi postavke po dobaviteljih
|
76
|
+
let partnerji = arrayToObject(await mongo.findAll("partnerji", {}, { project: { firma: 1, ime: 1, priimek: 1 } }), "_id");
|
77
|
+
let artikli = arrayToObject(await mongo.findAll("artikli", { kategorija: { $in: ["izdelek", "zdravilo"] } }, { project: { zadnjiDobavitelj: 1 } }), "_id");
|
78
|
+
postavke.forEach(p => {
|
79
|
+
var _a;
|
80
|
+
let d = partnerji[((_a = artikli[p.artikel_id]) === null || _a === void 0 ? void 0 : _a.zadnjiDobavitelj) || ""];
|
81
|
+
if (d)
|
82
|
+
p.dobavitelj = `${d.firma || ""} ${d.ime || ""} ${d.priimek || ""}`.trim();
|
83
|
+
});
|
84
|
+
postavke = postavke.sort((a, b) => Math.abs(b.kolicinaPrej || 0) - Math.abs(a.kolicinaPrej || 0));
|
85
|
+
postavke = postavke.sort((a, b) => ((a.naziv || "").localeCompare(b.naziv || "")));
|
86
|
+
postavke = postavke.sort((a, b) => ((a.dobavitelj || "").localeCompare(b.dobavitelj || "")));
|
87
|
+
postavkNaList = postavkNaList || POSTAVK_NA_INVENTURO;
|
88
|
+
let listi = [];
|
89
|
+
let n = 0;
|
90
|
+
for (let list of inBatches(postavke, postavkNaList)) {
|
91
|
+
let inventurniList = {
|
92
|
+
razknjiziCistoVse: true,
|
93
|
+
vrsta: "inventura",
|
94
|
+
status: "odprta",
|
95
|
+
_id: new ObjectID().toHexString(),
|
96
|
+
skladisce_id: skladisce === null || skladisce === void 0 ? void 0 : skladisce._id,
|
97
|
+
lokacija_id: skladisce === null || skladisce === void 0 ? void 0 : skladisce.lokacija_id,
|
98
|
+
datum: new Date(),
|
99
|
+
zapSt: "SEQ_NEXT",
|
100
|
+
izvedel,
|
101
|
+
opomba: `nepopisani (${++n}) med ${dayjs(od).format("D.M.YYYY")} in ${dayjs().format("D.M.YYYY HH:mm")}`,
|
102
|
+
postavke: list,
|
103
|
+
dav: 0,
|
104
|
+
nbc: 0,
|
105
|
+
davki: [],
|
106
|
+
...razpisiDatum(new Date()),
|
107
|
+
};
|
108
|
+
listi.push(inventurniList);
|
109
|
+
}
|
110
|
+
return listi;
|
111
|
+
}
|
112
|
+
export async function zakljucekPolneInventureSestaviInZapisi({ tenant, od, skladisce_id, server, izvedel, izlociTisteBrezZaloge, postavkNaList, kategorija, dodajBlokiraneInPopisane }) {
|
113
|
+
let listi = await zakljucekPolneInventure({ tenant, od, skladisce_id, server, izvedel, izlociTisteBrezZaloge, postavkNaList, kategorija, dodajBlokiraneInPopisane });
|
114
|
+
let repo = new Repo("odprteBlagovnice", tenant, server);
|
115
|
+
repo.setAudit({ tenant, app: "logic/zakljucekPolneInventureSestaviInZapisi" });
|
116
|
+
repo.useRevisions(true);
|
117
|
+
for await (let list of listi) {
|
118
|
+
await repo.insert(list);
|
119
|
+
}
|
120
|
+
await repo.close();
|
121
|
+
return listi;
|
141
122
|
}
|
142
123
|
// (async function name() {
|
143
124
|
// let i = await zakljucekPolneInventure({
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"polnaInventura.mjs","sourceRoot":"","sources":["../src/polnaInventura.mts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"polnaInventura.mjs","sourceRoot":"","sources":["../src/polnaInventura.mts"],"names":[],"mappings":"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"}
|
@@ -100,7 +100,22 @@ export function porabaZaDobavnico({ dobavnica, nastavitve, skladisce_id, lokacij
|
|
100
100
|
let datum = datumDokumenta || dobavnica.datumIzdaje || dobavnica.datum;
|
101
101
|
if (!datum)
|
102
102
|
console.log("dobavnica je brez datuma", dobavnica._id);
|
103
|
-
return
|
103
|
+
return {
|
104
|
+
_id,
|
105
|
+
datum: datum || zdaj,
|
106
|
+
datumDokumenta: datum || zdaj,
|
107
|
+
skladisce_id: skladisce_id,
|
108
|
+
lokacija_id: lokacija_id,
|
109
|
+
postavke: postavkeZaRazknjizbo,
|
110
|
+
vrsta: "poraba",
|
111
|
+
zapSt: "SEQ_NEXT",
|
112
|
+
opomba: `poraba za dobavnico ` + dobavnica.stevilka,
|
113
|
+
poraba_za_dobavnico_id: dobavnica._id,
|
114
|
+
izvedel: username,
|
115
|
+
za: username,
|
116
|
+
...izracunajSestevkeBlagovniceRazenDobave(postavkeZaRazknjizbo),
|
117
|
+
status: "odprta"
|
118
|
+
};
|
104
119
|
}
|
105
120
|
return null;
|
106
121
|
}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"porabaZaDobavnico.mjs","sourceRoot":"","sources":["../src/porabaZaDobavnico.mts"],"names":[],"mappings":"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
|
1
|
+
{"version":3,"file":"porabaZaDobavnico.mjs","sourceRoot":"","sources":["../src/porabaZaDobavnico.mts"],"names":[],"mappings":"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"}
|
@@ -79,7 +79,22 @@ export function porabaZaObravnavo({ obravnava, nastavitve, stranka, pacient, skl
|
|
79
79
|
return r;
|
80
80
|
});
|
81
81
|
if (postavkeZaRazknjizbo.length) {
|
82
|
-
return
|
82
|
+
return {
|
83
|
+
_id,
|
84
|
+
datum: obravnava.datum || new Date(),
|
85
|
+
skladisce_id: skladisce_id,
|
86
|
+
lokacija_id: obravnava.lokacija_id,
|
87
|
+
postavke: postavkeZaRazknjizbo,
|
88
|
+
vrsta: "poraba",
|
89
|
+
zapSt: "SEQ_NEXT",
|
90
|
+
opomba: `poraba za obravnavo`,
|
91
|
+
opis: `${jc(obravnava.namen, stranka === null || stranka === void 0 ? void 0 : stranka.firma, js(stranka === null || stranka === void 0 ? void 0 : stranka.ime, stranka === null || stranka === void 0 ? void 0 : stranka.priimek), pacient === null || pacient === void 0 ? void 0 : pacient.ime)}`,
|
92
|
+
izvedel: username,
|
93
|
+
za: username,
|
94
|
+
zaObravnavo: [obravnava._id],
|
95
|
+
...sestevkiBlagovniceRazenDobave(postavkeZaRazknjizbo),
|
96
|
+
status: "odprta"
|
97
|
+
};
|
83
98
|
}
|
84
99
|
return false;
|
85
100
|
}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"porabaZaObravnavo.mjs","sourceRoot":"","sources":["../src/porabaZaObravnavo.mts"],"names":[],"mappings":"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
|
1
|
+
{"version":3,"file":"porabaZaObravnavo.mjs","sourceRoot":"","sources":["../src/porabaZaObravnavo.mts"],"names":[],"mappings":"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"}
|
@@ -1,124 +1,111 @@
|
|
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 { karticaArtikla, } from "./index.mjs";
|
12
3
|
import dayjs from "./dayjs.mjs";
|
13
4
|
function prazenDan(dan) {
|
14
5
|
return { dan, kartica: 0, zaloga: 0, razlika: 0, tekocaRazlika: 0, tZaloga: 0, tKartica: 0, tRazlika: 0 };
|
15
6
|
}
|
16
|
-
export function preveriKnjizenjeZalogeArtikla(opts) {
|
7
|
+
export async function preveriKnjizenjeZalogeArtikla(opts) {
|
17
8
|
var _a;
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
|
50
|
-
niKnjizbePoInventuriSkupaj = 0;
|
51
|
-
}
|
52
|
-
else {
|
53
|
-
if (stanjeNaDan[naDan].inventuraK)
|
54
|
-
console.log("KONTROLA PO INVENTURI", zapis.datum);
|
55
|
-
skupaj.kartica += sprememba;
|
56
|
-
stanjeNaDan[naDan].kartica += sprememba;
|
57
|
-
stanjeNaDan[naDan].tKartica = skupaj.kartica;
|
58
|
-
}
|
59
|
-
;
|
60
|
-
if (sz.length >= 1) {
|
61
|
-
if (sz.length > 1)
|
62
|
-
console.log(`več kot ena spremembaZaloge za ${zapis.vrsta} ${naDan} ${zapis.dokument_id} ${zapis.kolicina}`);
|
63
|
-
zapis.id_spremembe_zaloge = sz[0]._id;
|
64
|
-
zapis.datum_spremembe_zaloge = naDan;
|
65
|
-
}
|
66
|
-
else if (sz.length === 0) {
|
67
|
-
console.log(`${++i} ni spremembaZaloge za ${zapis.vrsta} ${naDan} ${zapis.dokument_id} ${zapis.kolicina}`);
|
68
|
-
niKnjizbe.push(zapis);
|
69
|
-
niKnjizbePoInventuriSkupaj += sprememba;
|
70
|
-
}
|
71
|
-
stanjeNaDan[naDan].tekocaRazlika = niKnjizbePoInventuriSkupaj;
|
9
|
+
let kartica = await karticaArtikla(opts.artikel_id, opts.db, opts.vrsta_razknjizbe, [opts.skladisce_id]);
|
10
|
+
kartica = kartica.reverse();
|
11
|
+
let zaloga = await naloziSpremembeZaloge(opts.db, opts.artikel_id, opts.skladisce_id);
|
12
|
+
const dan = (d) => dayjs(d).format("YYYY-MM-DD");
|
13
|
+
console.log('***');
|
14
|
+
console.log(kartica.filter(k => dan(k.datum) === "2024-05-09"));
|
15
|
+
console.log('***');
|
16
|
+
if (opts.vrsta === "dobava")
|
17
|
+
kartica = kartica.filter(z => z.vrsta === "dobava");
|
18
|
+
if (opts.vrsta === "dobava")
|
19
|
+
zaloga = zaloga.filter(z => z.vrstaDogodka === "dobava");
|
20
|
+
console.log('kartica.length', kartica.length);
|
21
|
+
console.log('zaloga.length', zaloga.length);
|
22
|
+
let stanjeNaDan = {};
|
23
|
+
let skupaj = { zaloga: 0, kartica: 0, razlika: 0 };
|
24
|
+
let niKnjizbePoInventuriSkupaj = 0;
|
25
|
+
let niKnjizbe = [];
|
26
|
+
// za vsako vrstico kontrolne kartice poišči ustrezno spremembo zaloge
|
27
|
+
let i = 0;
|
28
|
+
for (let zapis of kartica) {
|
29
|
+
let naDan = dan(zapis.datum);
|
30
|
+
let smer = zapis.vrsta === "dobava" ? 1 : -1;
|
31
|
+
let sprememba = (zapis.kolicina * (zapis.enotaFaktor || 1) * smer);
|
32
|
+
stanjeNaDan[naDan] || (stanjeNaDan[naDan] = prazenDan(naDan));
|
33
|
+
let sz = zaloga.filter(z => { var _a, _b; return ((_a = z.dokument_id) === null || _a === void 0 ? void 0 : _a.toString()) === ((_b = zapis.dokument_id) === null || _b === void 0 ? void 0 : _b.toString()); });
|
34
|
+
if (zapis.vrsta === "inventura") {
|
35
|
+
stanjeNaDan[naDan].inventuraK = true;
|
36
|
+
stanjeNaDan[naDan].kartica = zapis.popisanaKolicina;
|
37
|
+
stanjeNaDan[naDan].tKartica = zapis.popisanaKolicina;
|
38
|
+
skupaj.kartica = zapis.popisanaKolicina;
|
39
|
+
niKnjizbe.forEach(z => z.predInventuro = true);
|
40
|
+
niKnjizbePoInventuriSkupaj = 0;
|
72
41
|
}
|
73
|
-
|
74
|
-
|
75
|
-
|
76
|
-
|
77
|
-
|
78
|
-
|
79
|
-
console.log(`več kot ena spremembaZaloge za ${zapis.vrstaDogodka} ${naDan} ${zapis.dokument_id} ${zapis.zaloga.sprememba}`);
|
80
|
-
zapis.id_kontrolne_kartice = (_a = sz[0].dokument_id) === null || _a === void 0 ? void 0 : _a.toString();
|
81
|
-
zapis.datum_kontrolne_kartice = naDan;
|
82
|
-
}
|
83
|
-
else if (sz.length === 0) {
|
84
|
-
console.log(`${++i} ni karticeZaloge za ${zapis.vrstaDogodka} ${naDan} ${zapis.dokument_id} ${zapis.zaloga.sprememba}`);
|
85
|
-
}
|
86
|
-
if (zapis.vrstaDogodka === "inventura") {
|
87
|
-
stanjeNaDan[naDan].inventuraZ = true;
|
88
|
-
skupaj.zaloga = zapis.zaloga.nova;
|
89
|
-
stanjeNaDan[naDan].zaloga = zapis.zaloga.nova;
|
90
|
-
stanjeNaDan[naDan].tZaloga = skupaj.zaloga;
|
91
|
-
}
|
92
|
-
else {
|
93
|
-
if (stanjeNaDan[naDan].inventuraZ)
|
94
|
-
console.warn("ZALOGA PO INVENTURI", zapis.datum, zapis.zaloga);
|
95
|
-
skupaj.zaloga += zapis.zaloga.sprememba;
|
96
|
-
stanjeNaDan[naDan].zaloga += zapis.zaloga.sprememba;
|
97
|
-
stanjeNaDan[naDan].tZaloga = skupaj.zaloga;
|
98
|
-
}
|
42
|
+
else {
|
43
|
+
if (stanjeNaDan[naDan].inventuraK)
|
44
|
+
console.log("KONTROLA PO INVENTURI", zapis.datum);
|
45
|
+
skupaj.kartica += sprememba;
|
46
|
+
stanjeNaDan[naDan].kartica += sprememba;
|
47
|
+
stanjeNaDan[naDan].tKartica = skupaj.kartica;
|
99
48
|
}
|
100
|
-
|
101
|
-
|
102
|
-
|
103
|
-
|
49
|
+
;
|
50
|
+
if (sz.length >= 1) {
|
51
|
+
if (sz.length > 1)
|
52
|
+
console.log(`več kot ena spremembaZaloge za ${zapis.vrsta} ${naDan} ${zapis.dokument_id} ${zapis.kolicina}`);
|
53
|
+
zapis.id_spremembe_zaloge = sz[0]._id;
|
54
|
+
zapis.datum_spremembe_zaloge = naDan;
|
104
55
|
}
|
105
|
-
|
106
|
-
|
107
|
-
|
108
|
-
|
109
|
-
|
110
|
-
|
111
|
-
|
112
|
-
|
113
|
-
|
114
|
-
|
56
|
+
else if (sz.length === 0) {
|
57
|
+
console.log(`${++i} ni spremembaZaloge za ${zapis.vrsta} ${naDan} ${zapis.dokument_id} ${zapis.kolicina}`);
|
58
|
+
niKnjizbe.push(zapis);
|
59
|
+
niKnjizbePoInventuriSkupaj += sprememba;
|
60
|
+
}
|
61
|
+
stanjeNaDan[naDan].tekocaRazlika = niKnjizbePoInventuriSkupaj;
|
62
|
+
}
|
63
|
+
for (let zapis of zaloga) {
|
64
|
+
let naDan = dan(zapis.datum);
|
65
|
+
stanjeNaDan[naDan] || (stanjeNaDan[naDan] = prazenDan(naDan));
|
66
|
+
let sz = kartica.filter(z => { var _a, _b; return ((_a = z.dokument_id) === null || _a === void 0 ? void 0 : _a.toString()) === ((_b = zapis.dokument_id) === null || _b === void 0 ? void 0 : _b.toString()); });
|
67
|
+
if (sz.length >= 1) {
|
68
|
+
if (sz.length > 1)
|
69
|
+
console.log(`več kot ena spremembaZaloge za ${zapis.vrstaDogodka} ${naDan} ${zapis.dokument_id} ${zapis.zaloga.sprememba}`);
|
70
|
+
zapis.id_kontrolne_kartice = (_a = sz[0].dokument_id) === null || _a === void 0 ? void 0 : _a.toString();
|
71
|
+
zapis.datum_kontrolne_kartice = naDan;
|
72
|
+
}
|
73
|
+
else if (sz.length === 0) {
|
74
|
+
console.log(`${++i} ni karticeZaloge za ${zapis.vrstaDogodka} ${naDan} ${zapis.dokument_id} ${zapis.zaloga.sprememba}`);
|
75
|
+
}
|
76
|
+
if (zapis.vrstaDogodka === "inventura") {
|
77
|
+
stanjeNaDan[naDan].inventuraZ = true;
|
78
|
+
skupaj.zaloga = zapis.zaloga.nova;
|
79
|
+
stanjeNaDan[naDan].zaloga = zapis.zaloga.nova;
|
80
|
+
stanjeNaDan[naDan].tZaloga = skupaj.zaloga;
|
81
|
+
}
|
82
|
+
else {
|
83
|
+
if (stanjeNaDan[naDan].inventuraZ)
|
84
|
+
console.warn("ZALOGA PO INVENTURI", zapis.datum, zapis.zaloga);
|
85
|
+
skupaj.zaloga += zapis.zaloga.sprememba;
|
86
|
+
stanjeNaDan[naDan].zaloga += zapis.zaloga.sprememba;
|
87
|
+
stanjeNaDan[naDan].tZaloga = skupaj.zaloga;
|
88
|
+
}
|
89
|
+
}
|
90
|
+
if (opts.samoPoZadnjiInventuri) {
|
91
|
+
let zadnjiDanZInventuro = Object.values(stanjeNaDan).reverse().find(d => d.inventuraZ && d.inventuraK);
|
92
|
+
for (let key of Object.keys(stanjeNaDan).filter(k => k < (zadnjiDanZInventuro === null || zadnjiDanZInventuro === void 0 ? void 0 : zadnjiDanZInventuro.dan)))
|
93
|
+
delete stanjeNaDan[key];
|
94
|
+
}
|
95
|
+
Object.values(stanjeNaDan).forEach(v => { v.razlika = v.zaloga - v.kartica; v.tRazlika = v.tZaloga - v.tKartica; });
|
96
|
+
skupaj.razlika = skupaj.zaloga - skupaj.kartica;
|
97
|
+
return {
|
98
|
+
stanjeNaDan,
|
99
|
+
niKnjizbe,
|
100
|
+
niKnjizbePoInventuri: niKnjizbe.filter(a => !a.predInventuro),
|
101
|
+
skupaj,
|
102
|
+
niKnjizbePoInventuriSkupaj,
|
103
|
+
};
|
115
104
|
}
|
116
|
-
function naloziSpremembeZaloge(db, artikel_id, skladisce_id) {
|
117
|
-
|
118
|
-
|
119
|
-
|
120
|
-
return data.sort((a, b) => a.datum.valueOf() - b.datum.valueOf());
|
121
|
-
});
|
105
|
+
async function naloziSpremembeZaloge(db, artikel_id, skladisce_id) {
|
106
|
+
let mongo = new Mongo(db);
|
107
|
+
let data = await mongo.find("spremembaZaloge", { artikel_id, skladisce_id });
|
108
|
+
return data.sort((a, b) => a.datum.valueOf() - b.datum.valueOf());
|
122
109
|
}
|
123
110
|
// (async function () {
|
124
111
|
// let res = await preveriKnjizenjeZalogeArtikla({
|