@hitsoft/uretim-yonetimi 1.0.13 → 1.0.15

package/fesm2020/hitsoft-uretim-yonetimi.mjs

@@ -121,42 +121,47 @@ class HitHelper {
             .map((err, index) => `${index + 1}. ${err}`)
             .join('\n');
     }
-    static parseQR(code) {
-        const aiRegexMap = {
-            '240': /^240(.+?)10/,
-            '10': /10(.+?)17/,
-            '17': /17(\d{6})/,
-            '3103': /3103(\d{6})/,
-            '21': /21([A-Z]{2}\d{8})$/,
-        };
-        const chemicalCodeMatch = code.match(aiRegexMap['240']);
-        const lotNumberMatch = code.match(aiRegexMap['10']);
-        const expDateMatch = code.match(aiRegexMap['17']);
-        const weightMatch = code.match(aiRegexMap['3103']);
-        const terminalCodeMatch = code.match(aiRegexMap['21']);
+    static parseQR(barkod) {
+        debugger;
+        const elTerminalKoduStartIndex = barkod.lastIndexOf("KM");
+        const elTerminalKodu = barkod.substring(elTerminalKoduStartIndex);
+        const sabit21Index = elTerminalKoduStartIndex - 2;
+        const tartimMiktar = barkod.substring(sabit21Index - 6, sabit21Index);
+        const sabit3103Index = sabit21Index - 6 - 4;
+        const sonKullanmaTarihi = barkod.substring(sabit3103Index - 6, sabit3103Index);
+        const sabit17Index = sabit3103Index - 6 - 2;
+        const kimyasalKoduStartIndex = 3;
+        const kimyasalKodu = barkod.substring(kimyasalKoduStartIndex, kimyasalKoduStartIndex + 14);
+        const sabit10Index = kimyasalKoduStartIndex + 14;
+        const lotNo = barkod.substring(sabit10Index + 2, sabit17Index);
+        const chemicalCodeMatch = kimyasalKodu;
+        const lotNumberMatch = lotNo;
+        const expDateMatch = sonKullanmaTarihi;
+        const weightMatch = tartimMiktar;
+        const terminalCodeMatch = elTerminalKodu;
         if (!chemicalCodeMatch || !lotNumberMatch || !expDateMatch || !weightMatch || !terminalCodeMatch) {
             return null;
         }
-        var onMu = false;
-        while (!onMu) {
-            if (lotNumberMatch[1].substring(0, 2) == "10") {
-                chemicalCodeMatch[1] += "10";
-                lotNumberMatch[1] = lotNumberMatch[1].substring(2);
-            }
-            else {
-                onMu = true;
-            }
-        }
-        var onYediMi = false;
-        while (!onYediMi) {
-            if (expDateMatch[1].substring(0, 2) == "17") {
-                lotNumberMatch[1] += "10";
-                expDateMatch[1] = expDateMatch[1].substring(2);
-            }
-            else {
-                onYediMi = true;
-            }
-        }
+        // var onMu = false;
+        // while(!onMu){
+        //   if(lotNumberMatch[1].substring(0, 2) == "10"){
+        //     chemicalCodeMatch[1] += "10";
+        //     lotNumberMatch[1] = lotNumberMatch[1].substring(2);
+        //   }
+        //   else{
+        //     onMu = true;
+        //   }
+        // }
+        // var onYediMi = false;
+        // while(!onYediMi){
+        //   if(expDateMatch[1].substring(0, 2) == "17"){
+        //     lotNumberMatch[1] += "17";
+        //     expDateMatch[1] = expDateMatch[1].substring(2);
+        //   }
+        //   else{
+        //     onYediMi = true;
+        //   }
+        // }
         if (!chemicalCodeMatch || !lotNumberMatch || !expDateMatch || !weightMatch || !terminalCodeMatch) {
             return null;
         }
@@ -300,6 +305,7 @@ class HitProductionOrdersComponent {
     }
     patchProductionOrder() {
         this.isLoading = true;
+        this.isEmriBarkoduGecerliMi = false;
         const productionOrderLines = this.productionOrderList.ProductionOrderLines.map(productionLine => {
             return new ProductionOrderLine$1(productionLine.ItemCode, productionLine.WarehouseCode, productionLine.Quantity, productionLine.Quantity, productionLine.Quantity, '', productionLine.BaseEntry, 0, [new BatchNumber$1(productionLine.BatchNumber, productionLine.Quantity)]);
         });
@@ -308,11 +314,11 @@ class HitProductionOrdersComponent {
             next: result => {
                 if (result.isSuccessful) {
                     this.confirmation.success('', 'İşlem başarılı!', this.options).subscribe(() => {
-                        this.clearAll();
                     });
                 }
             },
         });
+        this.clearAll();
         this.isLoading = false;
     }
     clearAll() {
@@ -631,6 +637,7 @@ class HitReceiptFromProductionsComponent {
     }
     async postReceiptFromProductions() {
         this.isLoading = true;
+        this.isProductionOrderValid = false;
         this.receiptFromProductionsPostDtoDocumentLine.batchNumbers = [
             this.receiptFromProductionsPostDtoBatchNumber,
         ];
@@ -655,6 +662,7 @@ class HitReceiptFromProductionsComponent {
             },
             error: () => {
                 this.confirmation.status$.subscribe(() => {
+                    this.clearAll();
                     this.focusOnToplananMiktar();
                 });
             },
@@ -990,6 +998,7 @@ class HitIssuesForProductionsComponent {
             return;
         }
         this.isLoading = true;
+        this.isEmriBarkoduGecerliMi = false;
         this.issuesForProductionPost.DocumentLines.forEach((x) => {
             x.BaseEntry = this.productionOrder.absoluteEntry;
         });
@@ -1012,6 +1021,7 @@ class HitIssuesForProductionsComponent {
             error: (e) => {
                 this.confirmation.status$.subscribe({
                     next: () => {
+                        this.clearAll();
                         this.focusQRInput();
                     }
                 });