cry-klikvet-logic 0.10.210 → 0.10.212
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/maint/poknjiziVsoZgodovino.js +45 -44
- package/dist/maint/poknjiziVsoZgodovino.js.map +1 -1
- package/dist/preracunajZalogo.js +6 -6
- package/dist/preracunajZalogo.js.map +1 -1
- package/dist/smsCepljenjaNaDan.d.ts +2 -1
- package/dist/smsCepljenjaNaDan.d.ts.map +1 -1
- package/dist/smsCepljenjaNaDan.js +9 -3
- package/dist/smsCepljenjaNaDan.js.map +1 -1
- package/dist/smsNaroceniNaDan.d.ts +2 -1
- package/dist/smsNaroceniNaDan.d.ts.map +1 -1
- package/dist/smsNaroceniNaDan.js +13 -8
- package/dist/smsNaroceniNaDan.js.map +1 -1
- package/dist/types/cepljenje.d.ts +4 -0
- package/dist/types/cepljenje.d.ts.map +1 -1
- package/dist/types/narocen.d.ts +5 -1
- package/dist/types/narocen.d.ts.map +1 -1
- package/dist/types/zaloga.d.ts +5 -0
- package/dist/types/zaloga.d.ts.map +1 -1
- package/dist/zalogaNaDanIzracunana.js +1 -1
- package/dist/zalogaNaDanIzracunana.js.map +1 -1
- package/dist/zapisiZalogoPoDnevih.d.ts +1 -0
- package/dist/zapisiZalogoPoDnevih.d.ts.map +1 -1
- package/dist/zapisiZalogoPoDnevih.js +40 -69
- package/dist/zapisiZalogoPoDnevih.js.map +1 -1
- package/dist/zapisiZalogoPoDnevih_old.d.ts +6 -0
- package/dist/zapisiZalogoPoDnevih_old.d.ts.map +1 -0
- package/dist/zapisiZalogoPoDnevih_old.js +103 -0
- package/dist/zapisiZalogoPoDnevih_old.js.map +1 -0
- package/package.json +1 -1
- package/tsconfig.tsbuildinfo +1 -1
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"zapisiZalogoPoDnevih_old.d.ts","sourceRoot":"","sources":["../src/zapisiZalogoPoDnevih_old.ts"],"names":[],"mappings":"AASA,wBAAsB,oBAAoB,CAAC,IAAI,EAAE;IAC7C,MAAM,EAAE,MAAM,CAAC;IACf,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,QAAQ,CAAC,EAAE,MAAM,CAAA;CACpB,iBA4GA"}
|
@@ -0,0 +1,103 @@
|
|
1
|
+
import { Mongo } from "cry-db";
|
2
|
+
// import { idjiArtiklovKiImajoLahkoZalogo } from "./idjiArtiklovKiImajoLahkoZalogo";
|
3
|
+
import dayjs from "./dayjs.js";
|
4
|
+
import { collectionZalogeNaDan } from "./collectionZalogeNaDan.js";
|
5
|
+
const DAYS_BACK = 2;
|
6
|
+
export async function zapisiZalogoPoDnevih(spec) {
|
7
|
+
let mongo = new Mongo(spec.tenant);
|
8
|
+
// let mozni = await idjiArtiklovKiImajoLahkoZalogo(spec.tenant, spec.samoKonsignacija);
|
9
|
+
let collection = collectionZalogeNaDan(spec.samoKonsignacija);
|
10
|
+
let tekoce = {};
|
11
|
+
let zadnjiDatumSkladisca = {};
|
12
|
+
await mongo.hardDelete(collection, { datum: { $gte: dayjs().add(-(spec.dniNazaj || DAYS_BACK), "day").toDate() } });
|
13
|
+
// najdi zadnji datum, ko imamo zalogo za vsa skladišča
|
14
|
+
let zadnjiDatumi = [];
|
15
|
+
let skladisca = await mongo.findAll("skladisca", {});
|
16
|
+
for await (let skladisce of skladisca) {
|
17
|
+
let zadnji = await mongo.aggregate(collection, [
|
18
|
+
{ $match: { skladisce_id: skladisce._id } },
|
19
|
+
{ $sort: { datum: -1 } },
|
20
|
+
{ $limit: 1 }
|
21
|
+
]);
|
22
|
+
if (zadnji?.length) {
|
23
|
+
tekoce[zadnji[0].skladisce_id] = zadnji[0].vrednost - zadnji[0].sprememba;
|
24
|
+
zadnjiDatumi.push(new Date(zadnji[0].datum.valueOf()));
|
25
|
+
zadnjiDatumSkladisca[zadnji[0].skladisce_id] = zadnji[0].datum;
|
26
|
+
}
|
27
|
+
}
|
28
|
+
let minDate = zadnjiDatumi.length ? new Date(Math.min(...zadnjiDatumi.map(d => d.valueOf()))) : new Date("2001-01-01");
|
29
|
+
let spremembeZaloge = await mongo.findAll("spremembaZaloge", {
|
30
|
+
datum: { $gte: minDate, },
|
31
|
+
// artikel_id: { $in: mozni }
|
32
|
+
}, {
|
33
|
+
sort: { datum: 1 },
|
34
|
+
project: {
|
35
|
+
artikel_id: 1, skladisce_id: 1, vrednostZaloge: 1,
|
36
|
+
_id: 1, vrstaDogodka: 1, datum: 1, dokument_id: 1,
|
37
|
+
},
|
38
|
+
});
|
39
|
+
// let zadnjaZalogaArtikla: Record<string, number> = {};
|
40
|
+
let zadnjaZalogaSkladiscaPoSpremembah = tekoce;
|
41
|
+
// let zadnjaZalogaSkladiscaPoSumah : Record<string,number> = tekoce;
|
42
|
+
// console.log('id\tdatum\tdoc\tartikel\tstara\tsprememba\tnova\tsspre\tssum\tdiff');
|
43
|
+
let spremembePoDnevih = {};
|
44
|
+
skladisca.forEach(s => spremembePoDnevih[s._id] = {});
|
45
|
+
// let lastDiff = 0;
|
46
|
+
for (let spremembaZaloge of spremembeZaloge) {
|
47
|
+
if (zadnjiDatumSkladisca[spremembaZaloge.skladisce_id]?.valueOf() >= new Date(spremembaZaloge.datum).valueOf())
|
48
|
+
continue;
|
49
|
+
let zadnjaZalogaPoSpremembi = zadnjaZalogaSkladiscaPoSpremembah[spremembaZaloge.skladisce_id] || 0;
|
50
|
+
let novaZalogaPoSpremembi = zadnjaZalogaPoSpremembi + spremembaZaloge.vrednostZaloge.sprememba;
|
51
|
+
zadnjaZalogaSkladiscaPoSpremembah[spremembaZaloge.skladisce_id] = novaZalogaPoSpremembi;
|
52
|
+
// console.log( zadnjaZalogaPoSpremembi,novaZalogaPoSpremembi);
|
53
|
+
// let zadnjaZalogaPoSumi = zadnjaZalogaSkladiscaPoSumah[spremembaZaloge.skladisce_id]|| 0;
|
54
|
+
// let kljuc = spremembaZaloge.skladisce_id + spremembaZaloge.artikel_id;
|
55
|
+
// let prejsnjaZalogaArtikla = zadnjaZalogaArtikla[kljuc] || 0;
|
56
|
+
// let novaZalogaPoSumah = zadnjaZalogaPoSumi - prejsnjaZalogaArtikla + spremembaZaloge.vrednostZaloge.nova;
|
57
|
+
// zadnjaZalogaArtikla[kljuc] = spremembaZaloge.vrednostZaloge.nova;
|
58
|
+
// zadnjaZalogaSkladiscaPoSumah[spremembaZaloge.skladisce_id] = novaZalogaPoSumah;
|
59
|
+
// dodaj med sprememebe po skladiščih in dnevih
|
60
|
+
let datum = dayjs(spremembaZaloge.datum).startOf("day");
|
61
|
+
let datumStr = datum.format("YYYY-MM-DD");
|
62
|
+
spremembePoDnevih[spremembaZaloge.skladisce_id][datumStr] = spremembePoDnevih[spremembaZaloge.skladisce_id][datumStr] ||
|
63
|
+
{ skladisce_id: spremembaZaloge.skladisce_id, datum: datum.toDate(), vrednost: 0, sprememba: 0, datumStr };
|
64
|
+
spremembePoDnevih[spremembaZaloge.skladisce_id][datumStr].vrednost = novaZalogaPoSpremembi;
|
65
|
+
spremembePoDnevih[spremembaZaloge.skladisce_id][datumStr].sprememba += spremembaZaloge.vrednostZaloge.sprememba;
|
66
|
+
// let newDiff = Math.round( novaZalogaPoSpremembi - novaZalogaPoSumah)
|
67
|
+
// if ( Math.abs(newDiff)>1 && lastDiff!==newDiff)
|
68
|
+
// console.log(
|
69
|
+
// spremembaZaloge._id, "\t",
|
70
|
+
// spremembaZaloge.datum, "\t",
|
71
|
+
// spremembaZaloge.vrstaDogodka, "\t",
|
72
|
+
// spremembaZaloge.dokument_id, "\t",
|
73
|
+
// spremembaZaloge.artikel_id, "\t",
|
74
|
+
// spremembaZaloge.vrednostZaloge.stara.toFixed(0), "\t",
|
75
|
+
// spremembaZaloge.vrednostZaloge.sprememba.toFixed(0), "\t",
|
76
|
+
// spremembaZaloge.vrednostZaloge.nova.toFixed(0), "\t",
|
77
|
+
// novaZalogaPoSpremembi.toFixed(0), "\t",
|
78
|
+
// novaZalogaPoSumah.toFixed(0), "\t",
|
79
|
+
// newDiff.toFixed(0), "\t",
|
80
|
+
// )
|
81
|
+
// lastDiff = newDiff;
|
82
|
+
}
|
83
|
+
for await (let skladisce of Object.values(spremembePoDnevih)) {
|
84
|
+
for await (let sprememba of Object.values(skladisce)) {
|
85
|
+
await mongo.upsert(collection, {
|
86
|
+
datum: sprememba.datum,
|
87
|
+
skladisce_id: sprememba.skladisce_id
|
88
|
+
}, sprememba);
|
89
|
+
}
|
90
|
+
}
|
91
|
+
await mongo.close();
|
92
|
+
// console.log('zadnjaZalogaSkladiscaPoSpremembah', zadnjaZalogaSkladiscaPoSpremembah);
|
93
|
+
// console.log('zadnjaZalogaSkladiscaPoSumah', zadnjaZalogaSkladiscaPoSumah);
|
94
|
+
}
|
95
|
+
(async function go() {
|
96
|
+
await zapisiZalogoPoDnevih({
|
97
|
+
tenant: "lax",
|
98
|
+
dniNazaj: 10000,
|
99
|
+
});
|
100
|
+
console.log('konec');
|
101
|
+
process.exit(0);
|
102
|
+
})();
|
103
|
+
//# sourceMappingURL=zapisiZalogoPoDnevih_old.js.map
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"zapisiZalogoPoDnevih_old.js","sourceRoot":"","sources":["../src/zapisiZalogoPoDnevih_old.ts"],"names":[],"mappings":"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"}
|