@hitsoft/uretim-yonetimi 1.0.38 → 1.0.39

package/fesm2020/hitsoft-uretim-yonetimi.mjs

@@ -125,12 +125,14 @@ class HitHelper {
             .join('\n');
     }
     static parseQR(barkod) {
-        // Yeni barkod yapısı: (240)itemcode(10)partiNo(17)sonKullanmaTarihi(3103)miktar(21)elTerminalKodu
+        // Barkod yapısı: (240)itemcode(10)partiNo(17)skt(91)tartimMiktari(21)elTerminalKodu(92)isEmriNo(93)tartimSiraNo
         const marker240 = '(240)';
         const marker10 = '(10)';
         const marker17 = '(17)';
-        const marker3103 = '(3103)';
+        const marker91 = '(91)';
         const marker21 = '(21)';
+        const marker92 = '(92)';
+        const marker93 = '(93)';
         // 240 ile başlıyor
         if (!barkod.startsWith(marker240))
             return null;
@@ -145,17 +147,36 @@ class HitHelper {
             return null;
         const lotNo = barkod.substring(pos, idx17);
         pos = idx17 + marker17.length;
-        const idx3103 = barkod.indexOf(marker3103, pos);
-        if (idx3103 === -1)
+        const idx91 = barkod.indexOf(marker91, pos);
+        if (idx91 === -1)
             return null;
-        const expDateRaw = barkod.substring(pos, idx3103);
-        pos = idx3103 + marker3103.length;
+        const expDateRaw = barkod.substring(pos, idx91);
+        pos = idx91 + marker91.length;
         const idx21 = barkod.indexOf(marker21, pos);
         if (idx21 === -1)
             return null;
         const weightRaw = barkod.substring(pos, idx21);
         pos = idx21 + marker21.length;
-        const terminalCode = barkod.substring(pos);
+        // (92) ve (93) opsiyonel — yoksa boş string
+        const idx92 = barkod.indexOf(marker92, pos);
+        let terminalCode;
+        let workOrderNo = '';
+        let weighingSequenceNo = '';
+        if (idx92 !== -1) {
+            terminalCode = barkod.substring(pos, idx92);
+            pos = idx92 + marker92.length;
+            const idx93 = barkod.indexOf(marker93, pos);
+            if (idx93 !== -1) {
+                workOrderNo = barkod.substring(pos, idx93);
+                weighingSequenceNo = barkod.substring(idx93 + marker93.length);
+            }
+            else {
+                workOrderNo = barkod.substring(pos);
+            }
+        }
+        else {
+            terminalCode = barkod.substring(pos);
+        }
         // Tarihi formatla: YYMMDD -> YYYY-MM-DD
         let expirationDate = '';
         if (/^\d{6}$/.test(expDateRaw)) {
@@ -164,18 +185,22 @@ class HitHelper {
         else {
             expirationDate = expDateRaw;
         }
-        const weight = parseInt(weightRaw, 10);
-        return new Hammadde(itemCode, lotNo, expirationDate, weight, terminalCode);
+        // Ham değer / 1.000.000 = gerçek gram değeri (son 6 hane ondalık)
+        const weightRawInt = parseInt(weightRaw, 10);
+        const weightGr = isNaN(weightRawInt) ? 0 : weightRawInt / 1000000;
+        return new Hammadde(itemCode, lotNo, expirationDate, weightGr, terminalCode, workOrderNo, weighingSequenceNo);
     }
 }
 class Hammadde {
-    constructor(chemicalCode, lotNumber, expirationDate, weight, terminalCode) {
+    constructor(chemicalCode, lotNumber, expirationDate, weightGr, terminalCode, workOrderNo = '', weighingSequenceNo = '') {
         this.chemicalCode = chemicalCode;
         this.lotNumber = lotNumber;
         this.expirationDate = expirationDate;
-        this.weightGr = weight; // Gram cinsinden
-        this.weightKg = weight ? weight / 1000 : 0; // Kilogram cinsine dönüştürülmüş hali
+        this.weightGr = weightGr;
+        this.weightKg = weightGr ? weightGr / 1000 : 0;
         this.terminalCode = terminalCode;
+        this.workOrderNo = workOrderNo;
+        this.weighingSequenceNo = weighingSequenceNo;
     }
 }
 
@@ -876,6 +901,7 @@ class HitIssuesForProductionsComponent {
         this.isEmriBarkoduGecerliMi = false;
         this.searcheBasildiMi = false;
         this.hammaddeQR = '';
+        this.scannedBarcodeKeys = new Set();
         this.warehouses = [];
         this.HitHelper = HitHelper;
     }
@@ -952,6 +978,21 @@ class HitIssuesForProductionsComponent {
             });
             return;
         }
+        // Mükerrer barkod kontrolü: aynı iş emri + tartım sıra no kombinasyonu tekrar okutulamaz
+        if (parsed.workOrderNo && parsed.weighingSequenceNo) {
+            const barcodeKey = `${parsed.workOrderNo}_${parsed.weighingSequenceNo}`;
+            if (this.scannedBarcodeKeys.has(barcodeKey)) {
+                this.confirmation.error('', 'Aynı barkod tekrar okutulamaz!', this.options).subscribe({
+                    next: () => {
+                        this.hammaddeQR = '';
+                        this.focusQRInput();
+                    }
+                });
+                this.isLoading = false;
+                return;
+            }
+            this.scannedBarcodeKeys.add(barcodeKey);
+        }
         this.service.get(parsed.chemicalCode, this.productionOrder.absoluteEntry.toString()).subscribe({
             next: (response) => {
                 if (response.isSuccessful) {
@@ -1040,6 +1081,7 @@ class HitIssuesForProductionsComponent {
         this.productionOrder = null;
         this.focusBarkodInput();
         this.unitOfMeasure = null;
+        this.scannedBarcodeKeys.clear();
     }
     getWarehouses() {
         this.isLoading = true;
@@ -1499,6 +1541,7 @@ class HitFillingControlComponent {
         this.qrCode = '';
         this.lines = [];
         this.isDataLoadedFromDb = false; // DB'den veri mi geldi yoksa yeni mi
+        this.scannedBarcodeKeys = new Set();
     }
     ngOnInit() {
         // Initialization logic
@@ -1570,6 +1613,21 @@ class HitFillingControlComponent {
             this.focusQRInput();
             return;
         }
+        // Mükerrer barkod kontrolü: aynı iş emri + tartım sıra no kombinasyonu tekrar okutulamaz
+        if (parsed.workOrderNo && parsed.weighingSequenceNo) {
+            const barcodeKey = `${parsed.workOrderNo}_${parsed.weighingSequenceNo}`;
+            if (this.scannedBarcodeKeys.has(barcodeKey)) {
+                this.confirmation.error('', 'Aynı barkod tekrar okutulamaz!', {
+                    hideYesBtn: true,
+                    cancelText: 'Kapat',
+                    dismissible: false,
+                });
+                this.qrCode = '';
+                this.focusQRInput();
+                return;
+            }
+            this.scannedBarcodeKeys.add(barcodeKey);
+        }
         // Grid'de bu item'ı bul
         const line = this.lines.find(x => x.itemCode === parsed.chemicalCode);
         if (!line) {
@@ -1742,6 +1800,7 @@ class HitFillingControlComponent {
         this.lines = [];
         this.isDataLoadedFromDb = false;
         this.isSaving = false;
+        this.scannedBarcodeKeys.clear();
         this.focusOnIsEmriNo();
     }
     get showKazanDegisimiButton() {
@@ -1786,6 +1845,7 @@ class HitFillingControlComponent {
                                 // Grid'i refresh et
                                 this.dataGrid.instance.refresh();
                                 this.isDataLoadedFromDb = false; // Artık yeni veri girilecek
+                                this.scannedBarcodeKeys.clear(); // Yeni kazan için okutulmuş barkodları sıfırla
                                 // QR input'a focus et
                                 this.focusOnQrCode();
                             }