@hitsoft/uretim-yonetimi 1.0.14 → 1.0.16
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/esm2020/lib/hit-proxy/models.mjs +40 -35
- package/fesm2015/hitsoft-uretim-yonetimi.mjs +39 -34
- package/fesm2015/hitsoft-uretim-yonetimi.mjs.map +1 -1
- package/fesm2020/hitsoft-uretim-yonetimi.mjs +39 -34
- package/fesm2020/hitsoft-uretim-yonetimi.mjs.map +1 -1
- package/lib/hit-proxy/models.d.ts +1 -1
- package/package.json +1 -1
|
@@ -23,48 +23,53 @@ export class HitHelper {
|
|
|
23
23
|
.map((err, index) => `${index + 1}. ${err}`)
|
|
24
24
|
.join('\n');
|
|
25
25
|
}
|
|
26
|
-
static parseQR(
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
const
|
|
35
|
-
const
|
|
36
|
-
const
|
|
37
|
-
const
|
|
38
|
-
const
|
|
26
|
+
static parseQR(barkod) {
|
|
27
|
+
debugger;
|
|
28
|
+
const elTerminalKoduStartIndex = barkod.lastIndexOf("KM");
|
|
29
|
+
const elTerminalKodu = barkod.substring(elTerminalKoduStartIndex);
|
|
30
|
+
const sabit21Index = elTerminalKoduStartIndex - 2;
|
|
31
|
+
const tartimMiktar = barkod.substring(sabit21Index - 6, sabit21Index);
|
|
32
|
+
const sabit3103Index = sabit21Index - 6 - 4;
|
|
33
|
+
const sonKullanmaTarihi = barkod.substring(sabit3103Index - 6, sabit3103Index);
|
|
34
|
+
const sabit17Index = sabit3103Index - 6 - 2;
|
|
35
|
+
const kimyasalKoduStartIndex = 3;
|
|
36
|
+
const kimyasalKodu = barkod.substring(kimyasalKoduStartIndex, kimyasalKoduStartIndex + 14);
|
|
37
|
+
const sabit10Index = kimyasalKoduStartIndex + 14;
|
|
38
|
+
const lotNo = barkod.substring(sabit10Index + 2, sabit17Index);
|
|
39
|
+
const chemicalCodeMatch = kimyasalKodu;
|
|
40
|
+
const lotNumberMatch = lotNo;
|
|
41
|
+
const expDateMatch = sonKullanmaTarihi;
|
|
42
|
+
const weightMatch = tartimMiktar;
|
|
43
|
+
const terminalCodeMatch = elTerminalKodu;
|
|
39
44
|
if (!chemicalCodeMatch || !lotNumberMatch || !expDateMatch || !weightMatch || !terminalCodeMatch) {
|
|
40
45
|
return null;
|
|
41
46
|
}
|
|
42
|
-
var onMu = false;
|
|
43
|
-
while
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
}
|
|
52
|
-
var onYediMi = false;
|
|
53
|
-
while
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
}
|
|
47
|
+
// var onMu = false;
|
|
48
|
+
// while(!onMu){
|
|
49
|
+
// if(lotNumberMatch[1].substring(0, 2) == "10"){
|
|
50
|
+
// chemicalCodeMatch[1] += "10";
|
|
51
|
+
// lotNumberMatch[1] = lotNumberMatch[1].substring(2);
|
|
52
|
+
// }
|
|
53
|
+
// else{
|
|
54
|
+
// onMu = true;
|
|
55
|
+
// }
|
|
56
|
+
// }
|
|
57
|
+
// var onYediMi = false;
|
|
58
|
+
// while(!onYediMi){
|
|
59
|
+
// if(expDateMatch[1].substring(0, 2) == "17"){
|
|
60
|
+
// lotNumberMatch[1] += "17";
|
|
61
|
+
// expDateMatch[1] = expDateMatch[1].substring(2);
|
|
62
|
+
// }
|
|
63
|
+
// else{
|
|
64
|
+
// onYediMi = true;
|
|
65
|
+
// }
|
|
66
|
+
// }
|
|
62
67
|
if (!chemicalCodeMatch || !lotNumberMatch || !expDateMatch || !weightMatch || !terminalCodeMatch) {
|
|
63
68
|
return null;
|
|
64
69
|
}
|
|
65
70
|
const expDateRaw = expDateMatch[1]; // YYMMDD
|
|
66
71
|
const expirationDate = `20${expDateRaw.slice(0, 2)}-${expDateRaw.slice(2, 4)}-${expDateRaw.slice(4, 6)}`;
|
|
67
|
-
return new Hammadde(chemicalCodeMatch
|
|
72
|
+
return new Hammadde(chemicalCodeMatch, lotNumberMatch, expirationDate, parseInt(weightMatch), terminalCodeMatch);
|
|
68
73
|
}
|
|
69
74
|
}
|
|
70
75
|
export class Hammadde {
|
|
@@ -77,4 +82,4 @@ export class Hammadde {
|
|
|
77
82
|
this.terminalCode = terminalCode;
|
|
78
83
|
}
|
|
79
84
|
}
|
|
80
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
85
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"models.js","sourceRoot":"","sources":["../../../../../projects/uretim-yonetimi/src/lib/hit-proxy/models.ts"],"names":[],"mappings":"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","sourcesContent":["export class ResultBase<T> {\r\n  items: T;\r\n  totalCount: number;\r\n  isSuccessful: boolean;\r\n  errors: string[];\r\n}\r\n\r\nexport class HitHelper {\r\n  public static getMeasurementFormatted(suffix: string): string {\r\n    return suffix ? '#,##0.00 ' + suffix : '#,##0.00';\r\n  }\r\n\r\n  public static getMeasurementFormattedWithLocalization(value: number, unit: string): string {\r\n    const locale = navigator.language || 'tr-TR';\r\n\r\n    const formatted = new Intl.NumberFormat(locale, {\r\n      minimumFractionDigits: 2,\r\n      maximumFractionDigits: 2,\r\n    }).format(value);\r\n\r\n    return unit ? `${formatted} ${unit}` : formatted;\r\n  }\r\n\r\n  static getFormattedErrors(errors: string[]): string {\r\n    if (!errors?.length) {\r\n      return '';\r\n    }\r\n\r\n    if (errors.length === 1) {\r\n      return errors[0];\r\n    }\r\n\r\n    return errors\r\n      .map((err: string, index: number) => `${index + 1}. ${err}`)\r\n      .join('\\n');\r\n  }\r\n\r\n  static parseQR(barkod: string): Hammadde | null {\r\n    debugger;\r\n    \r\n  const elTerminalKoduStartIndex = barkod.lastIndexOf(\"KM\");\r\n  const elTerminalKodu = barkod.substring(elTerminalKoduStartIndex);\r\n\r\n  const sabit21Index = elTerminalKoduStartIndex - 2;\r\n  const tartimMiktar = barkod.substring(sabit21Index - 6, sabit21Index);\r\n\r\n  const sabit3103Index = sabit21Index - 6 - 4;\r\n  const sonKullanmaTarihi = barkod.substring(sabit3103Index - 6, sabit3103Index);\r\n\r\n  const sabit17Index = sabit3103Index - 6 - 2;\r\n\r\n  const kimyasalKoduStartIndex = 3;\r\n  const kimyasalKodu = barkod.substring(kimyasalKoduStartIndex, kimyasalKoduStartIndex + 14);\r\n\r\n  const sabit10Index = kimyasalKoduStartIndex + 14;\r\n  const lotNo = barkod.substring(sabit10Index + 2, sabit17Index);\r\n\r\n  const chemicalCodeMatch = kimyasalKodu;\r\n  const lotNumberMatch = lotNo;\r\n  const expDateMatch = sonKullanmaTarihi;\r\n  const weightMatch = tartimMiktar;\r\n  const terminalCodeMatch = elTerminalKodu;\r\n\r\n    if (!chemicalCodeMatch || !lotNumberMatch || !expDateMatch || !weightMatch || !terminalCodeMatch) {\r\n      return null;\r\n    }\r\n\r\n    // var onMu = false;\r\n    // while(!onMu){\r\n    //   if(lotNumberMatch[1].substring(0, 2) == \"10\"){\r\n    //     chemicalCodeMatch[1] += \"10\";\r\n    //     lotNumberMatch[1] = lotNumberMatch[1].substring(2);\r\n    //   }\r\n    //   else{\r\n    //     onMu = true;\r\n    //   }\r\n    // }\r\n\r\n    // var onYediMi = false;\r\n    // while(!onYediMi){\r\n    //   if(expDateMatch[1].substring(0, 2) == \"17\"){\r\n    //     lotNumberMatch[1] += \"17\";\r\n    //     expDateMatch[1] = expDateMatch[1].substring(2);\r\n    //   }\r\n    //   else{\r\n    //     onYediMi = true;\r\n    //   }\r\n    // }\r\n\r\n    if (!chemicalCodeMatch || !lotNumberMatch || !expDateMatch || !weightMatch || !terminalCodeMatch) {\r\n      return null;\r\n    }\r\n\r\n    const expDateRaw = expDateMatch[1]; // YYMMDD\r\n    const expirationDate = `20${expDateRaw.slice(0, 2)}-${expDateRaw.slice(2, 4)}-${expDateRaw.slice(4, 6)}`;\r\n    return new Hammadde(chemicalCodeMatch, lotNumberMatch, expirationDate, parseInt(weightMatch), terminalCodeMatch);\r\n  }\r\n}\r\n\r\nexport class Hammadde {\r\n  chemicalCode: string;\r\n  lotNumber: string;\r\n  expirationDate: string;\r\n  weightGr: number;\r\n  weightKg: number;\r\n  terminalCode: string;\r\n\r\n  constructor(chemicalCode: string, lotNumber: string, expirationDate: string, weight: number, terminalCode: string) {\r\n    this.chemicalCode = chemicalCode;\r\n    this.lotNumber = lotNumber;\r\n    this.expirationDate = expirationDate;\r\n    this.weightGr = weight; // Gram cinsinden\r\n    this.weightKg = weight ? weight / 1000 : 0; // Kilogram cinsine dönüştürülmüş hali\r\n    this.terminalCode = terminalCode;\r\n  }\r\n}\r\n"]}
|
|
@@ -122,48 +122,53 @@ class HitHelper {
|
|
|
122
122
|
.map((err, index) => `${index + 1}. ${err}`)
|
|
123
123
|
.join('\n');
|
|
124
124
|
}
|
|
125
|
-
static parseQR(
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
const
|
|
134
|
-
const
|
|
135
|
-
const
|
|
136
|
-
const
|
|
137
|
-
const
|
|
125
|
+
static parseQR(barkod) {
|
|
126
|
+
debugger;
|
|
127
|
+
const elTerminalKoduStartIndex = barkod.lastIndexOf("KM");
|
|
128
|
+
const elTerminalKodu = barkod.substring(elTerminalKoduStartIndex);
|
|
129
|
+
const sabit21Index = elTerminalKoduStartIndex - 2;
|
|
130
|
+
const tartimMiktar = barkod.substring(sabit21Index - 6, sabit21Index);
|
|
131
|
+
const sabit3103Index = sabit21Index - 6 - 4;
|
|
132
|
+
const sonKullanmaTarihi = barkod.substring(sabit3103Index - 6, sabit3103Index);
|
|
133
|
+
const sabit17Index = sabit3103Index - 6 - 2;
|
|
134
|
+
const kimyasalKoduStartIndex = 3;
|
|
135
|
+
const kimyasalKodu = barkod.substring(kimyasalKoduStartIndex, kimyasalKoduStartIndex + 14);
|
|
136
|
+
const sabit10Index = kimyasalKoduStartIndex + 14;
|
|
137
|
+
const lotNo = barkod.substring(sabit10Index + 2, sabit17Index);
|
|
138
|
+
const chemicalCodeMatch = kimyasalKodu;
|
|
139
|
+
const lotNumberMatch = lotNo;
|
|
140
|
+
const expDateMatch = sonKullanmaTarihi;
|
|
141
|
+
const weightMatch = tartimMiktar;
|
|
142
|
+
const terminalCodeMatch = elTerminalKodu;
|
|
138
143
|
if (!chemicalCodeMatch || !lotNumberMatch || !expDateMatch || !weightMatch || !terminalCodeMatch) {
|
|
139
144
|
return null;
|
|
140
145
|
}
|
|
141
|
-
var onMu = false;
|
|
142
|
-
while
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
}
|
|
151
|
-
var onYediMi = false;
|
|
152
|
-
while
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
}
|
|
146
|
+
// var onMu = false;
|
|
147
|
+
// while(!onMu){
|
|
148
|
+
// if(lotNumberMatch[1].substring(0, 2) == "10"){
|
|
149
|
+
// chemicalCodeMatch[1] += "10";
|
|
150
|
+
// lotNumberMatch[1] = lotNumberMatch[1].substring(2);
|
|
151
|
+
// }
|
|
152
|
+
// else{
|
|
153
|
+
// onMu = true;
|
|
154
|
+
// }
|
|
155
|
+
// }
|
|
156
|
+
// var onYediMi = false;
|
|
157
|
+
// while(!onYediMi){
|
|
158
|
+
// if(expDateMatch[1].substring(0, 2) == "17"){
|
|
159
|
+
// lotNumberMatch[1] += "17";
|
|
160
|
+
// expDateMatch[1] = expDateMatch[1].substring(2);
|
|
161
|
+
// }
|
|
162
|
+
// else{
|
|
163
|
+
// onYediMi = true;
|
|
164
|
+
// }
|
|
165
|
+
// }
|
|
161
166
|
if (!chemicalCodeMatch || !lotNumberMatch || !expDateMatch || !weightMatch || !terminalCodeMatch) {
|
|
162
167
|
return null;
|
|
163
168
|
}
|
|
164
169
|
const expDateRaw = expDateMatch[1]; // YYMMDD
|
|
165
170
|
const expirationDate = `20${expDateRaw.slice(0, 2)}-${expDateRaw.slice(2, 4)}-${expDateRaw.slice(4, 6)}`;
|
|
166
|
-
return new Hammadde(chemicalCodeMatch
|
|
171
|
+
return new Hammadde(chemicalCodeMatch, lotNumberMatch, expirationDate, parseInt(weightMatch), terminalCodeMatch);
|
|
167
172
|
}
|
|
168
173
|
}
|
|
169
174
|
class Hammadde {
|