@hitsoft/abp.kadooglu 1.0.10 → 1.0.12

package/lib/hit-components/hit-entry-weighing/hit-entry-weighing-form/hit-entry-weighing-form.component.d.ts

@@ -6,12 +6,20 @@ import { Observable } from 'rxjs';
 import { ScaleSignalRService } from '../../../services/scale-signalr.service';
 import { HitEntryWeighingService } from '../../../hit-proxy/hit-entry-weighing/hit-entry-weighing.service';
 import { HitStockTransferService } from '../../../hit-proxy/hit-stock-transfer/hit-stock-transfer.service';
-import { StockTransfer } from '../../../hit-proxy/hit-stock-transfer/models';
+import { HitPurchaseDeliveryNoteService } from '../../../hit-proxy/hit-purchase-delivery-note/hit-purchase-delivery-note.service';
+import { HitCarrierPersonService } from '../../../hit-proxy/hit-carrier-person/hit-carrier-person.service';
+import { HitUserGateService } from '../../../hit-proxy/hit-user-gate/hit-user-gate.service';
+import { HitGateService } from '../../../hit-proxy/hit-gate/hit-gate.service';
+import { LookupTab } from '../../../shared/hit-modal/hit-modal.component';
 import { EntryWeighing, EntryWeighingAccount, EntryWeighingDocument, EntryWeighingDriver, EntryWeighingGate, EntryWeighingScale, EntryWeighingStockItem, EntryWeighingTrailerPlate, EntryWeighingTruckPlate, EntryWeighingVehicleType } from '../../../hit-proxy/hit-entry-weighing/models';
 import * as i0 from "@angular/core";
 export declare class HitEntryWeighingFormComponent implements OnInit, OnDestroy {
     private service;
     private stockTransferService;
+    private purchaseDeliveryNoteService;
+    private carrierPersonService;
+    private userGateService;
+    private gateService;
     private confirmation;
     private toaster;
     private route;
@@ -29,9 +37,7 @@ export declare class HitEntryWeighingFormComponent implements OnInit, OnDestroy
     loadDrivers: () => Observable<EntryWeighingDriver[]>;
     loadAccounts: () => Observable<EntryWeighingAccount[]>;
     loadStockItems: () => Observable<EntryWeighingStockItem[]>;
-    waybillDefaultDateFrom: Date;
-    waybillDefaultDateTo: Date;
-    loadWaybills: (params?: any) => Observable<StockTransfer[]>;
+    waybillTabs: LookupTab[];
     loadGates: () => Observable<EntryWeighingGate[]>;
     loadVehicleTypes: () => Observable<EntryWeighingVehicleType[]>;
     documentColumns: any[];
@@ -41,7 +47,6 @@ export declare class HitEntryWeighingFormComponent implements OnInit, OnDestroy
     driverColumns: any[];
     accountColumns: any[];
     stockItemColumns: any[];
-    waybillColumns: any[];
     gateColumns: any[];
     vehicleTypeColumns: any[];
     documentCode: string;
@@ -82,6 +87,7 @@ export declare class HitEntryWeighingFormComponent implements OnInit, OnDestroy
     fixedScaleValue: number | null;
     isSaving: boolean;
     isWeighing: boolean;
+    isWaybillLoading: boolean;
     entryTypeTrtmYpilck: boolean;
     entryTypeMalGC: boolean;
     isDoingGoodsMovement: boolean;
@@ -93,7 +99,7 @@ export declare class HitEntryWeighingFormComponent implements OnInit, OnDestroy
     private readonly scaleId;
     /** SAP response camelCase/PascalCase farkını handle eder */
     private getDocEntry;
-    constructor(service: HitEntryWeighingService, stockTransferService: HitStockTransferService, confirmation: ConfirmationService, toaster: ToasterService, route: ActivatedRoute, router: Router, localizationService: LocalizationService, scaleSignalRService: ScaleSignalRService);
+    constructor(service: HitEntryWeighingService, stockTransferService: HitStockTransferService, purchaseDeliveryNoteService: HitPurchaseDeliveryNoteService, carrierPersonService: HitCarrierPersonService, userGateService: HitUserGateService, gateService: HitGateService, confirmation: ConfirmationService, toaster: ToasterService, route: ActivatedRoute, router: Router, localizationService: LocalizationService, scaleSignalRService: ScaleSignalRService);
     ngOnInit(): void;
     get weighingStep(): number;
     /** İlk tartım yapıldıysa (step >= 2) detay alanlarını kilitle */
@@ -118,17 +124,24 @@ export declare class HitEntryWeighingFormComponent implements OnInit, OnDestroy
     onStockItemSelected(e: EntryWeighingStockItem): void;
     onGateSelected(e: EntryWeighingGate): void;
     onVehicleTypeSelected(e: EntryWeighingVehicleType): void;
-    onWaybillSelected(e: StockTransfer): void;
+    onWaybillSelected(e: any): void;
+    /** İrsaliye detayından Araç & Sürücü bilgilerini otomatik doldurur */
+    private applyWaybillAutoFill;
     /** Phase 1 → Phase 2 geçişi */
     ileriGit(): void;
     /** Phase 2 → Phase 1 geri dön */
     geriGitPhase(): void;
     save(): void;
     doGoodsMovement(): void;
+    barkodYazdir(): void;
     sabitle(): void;
     ngOnDestroy(): void;
     private _startScale;
     private _stopScale;
+    /** Yeni kayıt için giriş tarihini şu anki tarih/saat ile doldurur */
+    private setDefaultEntryDateTime;
+    /** Yeni kayıt için kullanıcının varsayılan kapısını yükler */
+    private loadDefaultGate;
     goBack(): void;
     private validateTCKN;
     static ɵfac: i0.ɵɵFactoryDeclaration<HitEntryWeighingFormComponent, never>;

package/lib/hit-components/hit-entry-weighing/hit-entry-weighing-list/hit-entry-weighing-list.component.d.ts

@@ -8,6 +8,7 @@ import { EntryWeighing } from '../../../hit-proxy/hit-entry-weighing/models';
 import { VehicleType } from '../../../hit-proxy/hit-vehicle-type/models';
 import { HitGateService } from '../../../hit-proxy/hit-gate/hit-gate.service';
 import { Gate } from '../../../hit-proxy/hit-gate/models';
+import { DomSanitizer, SafeResourceUrl } from '@angular/platform-browser';
 import * as i0 from "@angular/core";
 export declare class HitEntryWeighingListComponent implements OnInit {
     private service;
@@ -15,6 +16,7 @@ export declare class HitEntryWeighingListComponent implements OnInit {
     private router;
     private localizationService;
     private gateService;
+    private sanitizer;
     dataGrid: DxDataGridComponent;
     allData: EntryWeighing[];
     filteredData: EntryWeighing[];
@@ -28,7 +30,10 @@ export declare class HitEntryWeighingListComponent implements OnInit {
         text: string;
         value: string;
     }[];
-    constructor(service: HitEntryWeighingService, confirmation: ConfirmationService, router: Router, localizationService: LocalizationService, gateService: HitGateService);
+    printModalVisible: boolean;
+    safePrintUrl: SafeResourceUrl | null;
+    private printBlobUrl;
+    constructor(service: HitEntryWeighingService, confirmation: ConfirmationService, router: Router, localizationService: LocalizationService, gateService: HitGateService, sanitizer: DomSanitizer);
     ngOnInit(): void;
     loadList(): void;
     setFilter(mode: 'all' | 'pending'): void;
@@ -46,6 +51,9 @@ export declare class HitEntryWeighingListComponent implements OnInit {
     getStatusLabel(status: string | null): string;
     getStatusClass(status: string | null): string;
     malGcYap(row: EntryWeighing): void;
+    barkodYazdir(row: EntryWeighing): void;
+    doPrint(): void;
+    closePrintModal(): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<HitEntryWeighingListComponent, never>;
     static ɵcmp: i0.ɵɵComponentDeclaration<HitEntryWeighingListComponent, "lib-hit-entry-weighing-list", never, {}, {}, never, never, false>;
 }

package/lib/hit-components/hit-factory-entry/hit-factory-entry-form/hit-factory-entry-form.component.d.ts

@@ -13,6 +13,9 @@ import { HitBusinessPartnerService } from '../../../hit-proxy/hit-business-partn
 import { BusinessPartner } from '../../../hit-proxy/hit-business-partner/models';
 import { HitUserGateService } from '../../../hit-proxy/hit-user-gate/hit-user-gate.service';
 import { Gate } from '../../../hit-proxy/hit-gate/models';
+import { HitStockTransferService } from '../../../hit-proxy/hit-stock-transfer/hit-stock-transfer.service';
+import { HitPurchaseDeliveryNoteService } from '../../../hit-proxy/hit-purchase-delivery-note/hit-purchase-delivery-note.service';
+import { LookupTab } from '../../../shared/hit-modal/hit-modal.component';
 import * as i0 from "@angular/core";
 export declare class HitFactoryEntryFormComponent implements OnInit, OnChanges {
     private confirmation;
@@ -23,6 +26,8 @@ export declare class HitFactoryEntryFormComponent implements OnInit, OnChanges {
     private businessPartnerService;
     private userGateService;
     private localizationService;
+    private stockTransferService;
+    private purchaseDeliveryNoteService;
     visible: boolean;
     visibleChange: EventEmitter<boolean>;
     record: FactoryEntry | null;
@@ -75,6 +80,7 @@ export declare class HitFactoryEntryFormComponent implements OnInit, OnChanges {
     exitDateTime: Date | null;
     selectedTypeCode: string;
     selectedTypeName: string;
+    selectedType: VehicleType | null;
     selectedPlateNo: string;
     tcNo: string;
     selectedCarrierName: string;
@@ -95,12 +101,27 @@ export declare class HitFactoryEntryFormComponent implements OnInit, OnChanges {
     newCarrierTel: string;
     isTcCitizen: boolean;
     isLoading: boolean;
-    constructor(confirmation: ConfirmationService, service: HitFactoryEntryService, carrierPersonService: HitCarrierPersonService, plateService: HitPlateService, vehicleTypeService: HitVehicleTypeService, businessPartnerService: HitBusinessPartnerService, userGateService: HitUserGateService, localizationService: LocalizationService);
+    waybillTabs: LookupTab[];
+    waybillNo: string;
+    waybillDocEntry: number | null;
+    waybillIrsaliyeNo: string;
+    waybillAutoPlate: string;
+    waybillAutoDorsePlate: string;
+    waybillAutoTcNo: string;
+    waybillAutoDriverFirstname: string;
+    waybillAutoDriverLastname: string;
+    waybillAutoDriverName: string;
+    waybillAutoCardCode: string;
+    waybillSourceType: 'stockTransfer' | 'purchaseDelivery' | null;
+    isWaybillLoading: boolean;
+    constructor(confirmation: ConfirmationService, service: HitFactoryEntryService, carrierPersonService: HitCarrierPersonService, plateService: HitPlateService, vehicleTypeService: HitVehicleTypeService, businessPartnerService: HitBusinessPartnerService, userGateService: HitUserGateService, localizationService: LocalizationService, stockTransferService: HitStockTransferService, purchaseDeliveryNoteService: HitPurchaseDeliveryNoteService);
     ngOnInit(): void;
     ngOnChanges(changes: SimpleChanges): void;
     private initForm;
     private buildDateTime;
     onTypeSelected(e: VehicleType): void;
+    get isGoodsType(): boolean;
+    get showExtraFields(): boolean;
     onPlateSelected(e: Plate): void;
     onTrailerPlateSelected(e: Plate): void;
     onManualPlateFocusOut(): void;
@@ -109,6 +130,8 @@ export declare class HitFactoryEntryFormComponent implements OnInit, OnChanges {
     formatPlate(value: string): string;
     onCarrierLookupSelected(e: CarrierPerson): void;
     onBusinessPartnerSelected(e: BusinessPartner): void;
+    onWaybillSelected(e: any): void;
+    private applyWaybillAutoFill;
     queryCarrierByTcNo(): void;
     save(): void;
     onModalVisibleChange(val: boolean): void;

package/lib/hit-proxy/hit-carrier-person/models.d.ts

@@ -8,6 +8,7 @@ export interface CarrierPerson {
     u_Active: string;
     u_DefBP: string;
     u_CarrierFirm: string;
+    u_TcVtndsiMi?: string;
 }
 export interface SaveCarrierPersonDto {
     code: string;
@@ -19,4 +20,5 @@ export interface SaveCarrierPersonDto {
     u_Active: string;
     u_DefBP: string;
     u_CarrierFirm: string;
+    u_TcVtndsiMi?: string;
 }

package/lib/hit-proxy/hit-entry-weighing/hit-entry-weighing.service.d.ts

@@ -44,6 +44,9 @@ export declare class HitEntryWeighingService {
     getGates(): Observable<EntryWeighingGate[]>;
     getVehicleTypes(): Observable<EntryWeighingVehicleType[]>;
     doGoodsMovement(docEntry: number): Observable<EntryWeighing>;
+    getWeighingSlip(docEntry: number): Observable<{
+        base64: string;
+    }>;
     static ɵfac: i0.ɵɵFactoryDeclaration<HitEntryWeighingService, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<HitEntryWeighingService>;
 }

package/lib/hit-proxy/hit-entry-weighing/models.d.ts

@@ -17,6 +17,7 @@ export interface EntryWeighingTrailerPlate {
 export interface EntryWeighingDriver {
     code: string;
     name: string;
+    u_TcVtndsiMi?: string;
 }
 export interface EntryWeighingAccount {
     code: string;

package/lib/hit-proxy/hit-factory-entry/models.d.ts

@@ -19,16 +19,18 @@ export interface FactoryEntry {
     u_Status?: string;
     u_AbpUsername?: string;
     u_GateCode?: string;
+    u_DespatchAdviceNo?: string;
+    u_DespatchExist?: string;
 }
 export interface SaveFactoryEntryDto {
     u_GateCode?: string;
     u_EntryType: string;
-    u_Plate: string;
+    u_Plate?: string;
     u_DorsePlate?: string;
-    u_TcNo: string;
+    u_TcNo?: string;
     u_Driver?: string;
-    u_CardCode: string;
-    u_Description: string;
+    u_CardCode?: string;
+    u_Description?: string;
     u_EntryDate?: string;
     u_EntryTime?: number;
     u_ExitDate?: string;
@@ -37,4 +39,7 @@ export interface SaveFactoryEntryDto {
     u_DriverFirstname?: string;
     u_DriverLastname?: string;
     u_DriverTel?: string;
+    u_TcVtndsiMi?: string;
+    u_WaybillDocEntry?: number;
+    u_WaybillSourceType?: string;
 }

package/lib/hit-proxy/hit-purchase-delivery-note/hit-purchase-delivery-note.service.d.ts

@@ -8,6 +8,7 @@ export declare class HitPurchaseDeliveryNoteService {
     baseUrl: string;
     constructor(restService: RestService);
     getList(params?: any): Observable<PurchaseDeliveryNote[]>;
+    get(docEntry: number): Observable<PurchaseDeliveryNote>;
     static ɵfac: i0.ɵɵFactoryDeclaration<HitPurchaseDeliveryNoteService, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<HitPurchaseDeliveryNoteService>;
 }

package/lib/hit-proxy/hit-purchase-delivery-note/models.d.ts

@@ -6,4 +6,10 @@ export interface PurchaseDeliveryNote {
     docDate: string;
     docTotal: number;
     comments: string;
+    u_EFATNO?: string;
+    u_AracPlakasi?: string;
+    u_DorsePlakalar?: string;
+    u_SoforAd?: string;
+    u_SoforSoyadi?: string;
+    u_SoforKimlik?: string;
 }

package/lib/hit-proxy/hit-stock-transfer/hit-stock-transfer.service.d.ts

@@ -8,6 +8,7 @@ export declare class HitStockTransferService {
     baseUrl: string;
     constructor(restService: RestService);
     getList(params?: any): Observable<StockTransfer[]>;
+    get(docEntry: number): Observable<StockTransfer>;
     static ɵfac: i0.ɵɵFactoryDeclaration<HitStockTransferService, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<HitStockTransferService>;
 }

package/lib/hit-proxy/hit-stock-transfer/models.d.ts

@@ -15,5 +15,7 @@ export interface StockTransfer {
     u_SoforAd?: string;
     u_SoforSoyadi?: string;
     u_AracPlakasi?: string;
+    u_DorsePlakalar?: string;
+    u_SoforKimlik?: string;
     stockTransferLines?: StockTransferLine[];
 }

package/lib/services/scale-signalr.service.d.ts

@@ -7,9 +7,11 @@ export declare class ScaleSignalRService implements OnDestroy {
     private readonly _weight$;
     private readonly _connectionLost$;
     private readonly _reconnecting$;
+    private readonly _reconnected$;
     readonly weight$: Observable<number | null>;
     readonly connectionLost$: Observable<void>;
     readonly reconnecting$: Observable<void>;
+    readonly reconnected$: Observable<void>;
     /**
      * SignalR bağlantısını başlatır ve ilgili kantar grubuna abone olur.
      * Zaten bağlıysa sadece gruba abone olur.

package/lib/shared/hit-modal/hit-modal.component.d.ts

@@ -3,6 +3,23 @@ import { LocalizationService } from '@abp/ng.core';
 import { DxDataGridComponent } from 'devextreme-angular';
 import { Observable } from 'rxjs';
 import * as i0 from "@angular/core";
+export interface LookupTab {
+    title: string;
+    loadFn: (params?: any) => Observable<any[]>;
+    columns: any[];
+    keyExpr?: string;
+    displayName: string;
+    showDateFilter?: boolean;
+    defaultDateFrom?: Date | null;
+    defaultDateTo?: Date | null;
+}
+interface LookupTabState {
+    data: any[];
+    isLoading: boolean;
+    isLoaded: boolean;
+    filterDateFrom: Date | null;
+    filterDateTo: Date | null;
+}
 export declare class HitModalComponent {
     private localizationService;
     dxdataInstance: DxDataGridComponent;
@@ -21,6 +38,7 @@ export declare class HitModalComponent {
     showDateFilter: boolean;
     defaultDateFrom: Date | null;
     defaultDateTo: Date | null;
+    tabs: LookupTab[];
     /** Pre-populate display text (e.g. in edit mode). Setter ensures reactive updates. */
     set editingData(val: any);
     selected: EventEmitter<any>;
@@ -30,14 +48,19 @@ export declare class HitModalComponent {
     textDisplay: string;
     filterDateFrom: Date | null;
     filterDateTo: Date | null;
+    activeTabIndex: number;
+    tabStates: LookupTabState[];
     clickForOpenModal(): void;
+    onTabClick(index: number): void;
+    private loadTabData;
     loadData(): void;
     onDateFilterChanged(): void;
-    onToolbarPreparing(e: any): void;
+    onToolbarPreparing(e: any, tabIndex?: number): void;
     private toDateStr;
     setTitle(): void;
     setTitleOnDoubleClick(e: any): void;
     clearValue(): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<HitModalComponent, never>;
-    static ɵcmp: i0.ɵɵComponentDeclaration<HitModalComponent, "hit-lookup-select", never, { "displayName": "displayName"; "keyExpr": "keyExpr"; "modalSize": "modalSize"; "getFn": "getFn"; "loadFn": "loadFn"; "columns": "columns"; "isVisible": "isVisible"; "disabled": "disabled"; "readOnly": "readOnly"; "showDateFilter": "showDateFilter"; "defaultDateFrom": "defaultDateFrom"; "defaultDateTo": "defaultDateTo"; "editingData": "editingData"; }, { "selected": "selected"; }, never, never, false>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<HitModalComponent, "hit-lookup-select", never, { "displayName": "displayName"; "keyExpr": "keyExpr"; "modalSize": "modalSize"; "getFn": "getFn"; "loadFn": "loadFn"; "columns": "columns"; "isVisible": "isVisible"; "disabled": "disabled"; "readOnly": "readOnly"; "showDateFilter": "showDateFilter"; "defaultDateFrom": "defaultDateFrom"; "defaultDateTo": "defaultDateTo"; "tabs": "tabs"; "editingData": "editingData"; }, { "selected": "selected"; }, never, never, false>;
 }
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hitsoft/abp.kadooglu",
-  "version": "1.0.10",
+  "version": "1.0.12",
   "peerDependencies": {
     "@angular/common": ">=9",
     "@angular/core": ">=9",