@hitsoft/uretim-yonetimi 1.0.26 → 1.0.27
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/components/hit-filling-control/hit-filling-control.component.mjs +10 -7
- package/esm2020/lib/hit-proxy/hit-filling-control/hit-filling-control.service.mjs +3 -3
- package/fesm2015/hitsoft-uretim-yonetimi.mjs +11 -8
- package/fesm2015/hitsoft-uretim-yonetimi.mjs.map +1 -1
- package/fesm2020/hitsoft-uretim-yonetimi.mjs +11 -8
- package/fesm2020/hitsoft-uretim-yonetimi.mjs.map +1 -1
- package/lib/hit-proxy/hit-filling-control/hit-filling-control.service.d.ts +1 -1
- package/package.json +1 -1
|
@@ -1465,9 +1465,9 @@ class HitFillingControlService {
|
|
|
1465
1465
|
method: 'GET',
|
|
1466
1466
|
url: `${this.resourceEndpoint}/has-production-tree/${itemCode}/${workOrderNo}`,
|
|
1467
1467
|
}, { apiName: this.apiName });
|
|
1468
|
-
this.checkQualityStatus = (lotNumber, workOrderNo) => this.restService.request({
|
|
1468
|
+
this.checkQualityStatus = (lotNumber, workOrderNo, itemCode) => this.restService.request({
|
|
1469
1469
|
method: 'GET',
|
|
1470
|
-
url: `${this.resourceEndpoint}/check-quality/${lotNumber}/${workOrderNo}`,
|
|
1470
|
+
url: `${this.resourceEndpoint}/check-quality/${lotNumber}/${workOrderNo}/${itemCode}`,
|
|
1471
1471
|
}, { apiName: this.apiName });
|
|
1472
1472
|
this.resourceEndpoint = '/api/uretim-yonetimi/filling-control';
|
|
1473
1473
|
}
|
|
@@ -1540,6 +1540,7 @@ class HitFillingControlComponent {
|
|
|
1540
1540
|
if (!this.qrCode || this.qrCode.trim() === '') {
|
|
1541
1541
|
return;
|
|
1542
1542
|
}
|
|
1543
|
+
debugger;
|
|
1543
1544
|
const parsed = HitHelper.parseQR(this.qrCode);
|
|
1544
1545
|
if (!parsed) {
|
|
1545
1546
|
this.confirmation.error('', 'Geçersiz QR kod formatı!', {
|
|
@@ -1574,7 +1575,7 @@ class HitFillingControlComponent {
|
|
|
1574
1575
|
if (response?.isSuccessful && response.items === true) {
|
|
1575
1576
|
// Ürün ağacı var, kalite kontrolü yap
|
|
1576
1577
|
console.log('Ürün ağacı bulundu, kalite kontrolü yapılıyor');
|
|
1577
|
-
this.checkQualityAndProcess(line, parsed.lotNumber);
|
|
1578
|
+
this.checkQualityAndProcess(line, parsed.lotNumber, isFirstScan);
|
|
1578
1579
|
}
|
|
1579
1580
|
else {
|
|
1580
1581
|
// Ürün ağacı yok, hata göster
|
|
@@ -1606,16 +1607,16 @@ class HitFillingControlComponent {
|
|
|
1606
1607
|
this.processQrScan(line, parsed.lotNumber);
|
|
1607
1608
|
}
|
|
1608
1609
|
}
|
|
1609
|
-
checkQualityAndProcess(line, batchNumber) {
|
|
1610
|
+
checkQualityAndProcess(line, batchNumber, isFirstScan) {
|
|
1610
1611
|
// Kalite durumu kontrolü yap
|
|
1611
|
-
this.service.checkQualityStatus(batchNumber, this.isEmriNo).subscribe({
|
|
1612
|
+
this.service.checkQualityStatus(batchNumber, this.isEmriNo, line.itemCode).subscribe({
|
|
1612
1613
|
next: response => {
|
|
1613
1614
|
console.log('CheckQualityStatus response:', response);
|
|
1614
1615
|
if (response?.isSuccessful && response.items) {
|
|
1615
1616
|
if (response.items.isApproved) {
|
|
1616
1617
|
// Kalite onaylandı, okutmaya devam et
|
|
1617
1618
|
console.log('Kalite kontrolü onaylandı, okutmaya devam ediliyor');
|
|
1618
|
-
this.processQrScan(line, batchNumber);
|
|
1619
|
+
this.processQrScan(line, batchNumber, isFirstScan);
|
|
1619
1620
|
}
|
|
1620
1621
|
else {
|
|
1621
1622
|
// Kalite RED, hata göster
|
|
@@ -1653,10 +1654,12 @@ class HitFillingControlComponent {
|
|
|
1653
1654
|
},
|
|
1654
1655
|
});
|
|
1655
1656
|
}
|
|
1656
|
-
processQrScan(line, batchNumber) {
|
|
1657
|
+
processQrScan(line, batchNumber, isFirstScan = false) {
|
|
1657
1658
|
// Kontrol edildi olarak işaretle ve parti numarasını set et
|
|
1658
1659
|
line.isControlled = true;
|
|
1659
|
-
|
|
1660
|
+
if (isFirstScan) {
|
|
1661
|
+
line.batchNumber = batchNumber;
|
|
1662
|
+
}
|
|
1660
1663
|
// Grid'i refresh et
|
|
1661
1664
|
this.dataGrid.instance.refresh();
|
|
1662
1665
|
// QR input'u temizle ve focus et
|