@hitsoft/uretim-yonetimi 1.0.14 → 1.0.15

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.
@@ -23,42 +23,47 @@ export class HitHelper {
23
23
  .map((err, index) => `${index + 1}. ${err}`)
24
24
  .join('\n');
25
25
  }
26
- static parseQR(code) {
27
- const aiRegexMap = {
28
- '240': /^240(.+?)10/,
29
- '10': /10(.+?)17/,
30
- '17': /17(\d{6})/,
31
- '3103': /3103(\d{6})/,
32
- '21': /21([A-Z]{2}\d{8})$/,
33
- };
34
- const chemicalCodeMatch = code.match(aiRegexMap['240']);
35
- const lotNumberMatch = code.match(aiRegexMap['10']);
36
- const expDateMatch = code.match(aiRegexMap['17']);
37
- const weightMatch = code.match(aiRegexMap['3103']);
38
- const terminalCodeMatch = code.match(aiRegexMap['21']);
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 (!onMu) {
44
- if (lotNumberMatch[1].substring(0, 2) == "10") {
45
- chemicalCodeMatch[1] += "10";
46
- lotNumberMatch[1] = lotNumberMatch[1].substring(2);
47
- }
48
- else {
49
- onMu = true;
50
- }
51
- }
52
- var onYediMi = false;
53
- while (!onYediMi) {
54
- if (expDateMatch[1].substring(0, 2) == "17") {
55
- lotNumberMatch[1] += "10";
56
- expDateMatch[1] = expDateMatch[1].substring(2);
57
- }
58
- else {
59
- onYediMi = true;
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
  }
@@ -77,4 +82,4 @@ export class Hammadde {
77
82
  this.terminalCode = terminalCode;
78
83
  }
79
84
  }
80
- //# 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(code: string): Hammadde | null {\r\n    const aiRegexMap: { [ai: string]: RegExp } = {\r\n      '240': /^240(.+?)10/,\r\n      '10': /10(.+?)17/,\r\n      '17': /17(\\d{6})/,\r\n      '3103': /3103(\\d{6})/,\r\n      '21': /21([A-Z]{2}\\d{8})$/,\r\n    };\r\n\r\n    const chemicalCodeMatch = code.match(aiRegexMap['240']);\r\n    const lotNumberMatch = code.match(aiRegexMap['10']);\r\n    const expDateMatch = code.match(aiRegexMap['17']);\r\n    const weightMatch = code.match(aiRegexMap['3103']);\r\n    const terminalCodeMatch = code.match(aiRegexMap['21']);\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] += \"10\";\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[1], lotNumberMatch[1], expirationDate, parseInt(weightMatch[1]), terminalCodeMatch[1]);\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"]}
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[1], lotNumberMatch[1], expirationDate, parseInt(weightMatch[1]), terminalCodeMatch[1]);\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,42 +122,47 @@ class HitHelper {
122
122
  .map((err, index) => `${index + 1}. ${err}`)
123
123
  .join('\n');
124
124
  }
125
- static parseQR(code) {
126
- const aiRegexMap = {
127
- '240': /^240(.+?)10/,
128
- '10': /10(.+?)17/,
129
- '17': /17(\d{6})/,
130
- '3103': /3103(\d{6})/,
131
- '21': /21([A-Z]{2}\d{8})$/,
132
- };
133
- const chemicalCodeMatch = code.match(aiRegexMap['240']);
134
- const lotNumberMatch = code.match(aiRegexMap['10']);
135
- const expDateMatch = code.match(aiRegexMap['17']);
136
- const weightMatch = code.match(aiRegexMap['3103']);
137
- const terminalCodeMatch = code.match(aiRegexMap['21']);
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 (!onMu) {
143
- if (lotNumberMatch[1].substring(0, 2) == "10") {
144
- chemicalCodeMatch[1] += "10";
145
- lotNumberMatch[1] = lotNumberMatch[1].substring(2);
146
- }
147
- else {
148
- onMu = true;
149
- }
150
- }
151
- var onYediMi = false;
152
- while (!onYediMi) {
153
- if (expDateMatch[1].substring(0, 2) == "17") {
154
- lotNumberMatch[1] += "10";
155
- expDateMatch[1] = expDateMatch[1].substring(2);
156
- }
157
- else {
158
- onYediMi = true;
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
  }