Merge pull request #80 from diepxuan/feat/use-stored-procedure-classes

feat: Convert GlCt stored procedure calls to use stored procedure classes

Author: caothu159

src/Models/GlCt.php

@@ -14,6 +14,8 @@
 namespace Diepxuan\Simba\Models;
 
 use Diepxuan\Simba\SModel\GlCt as Model;
+use Diepxuan\Simba\StoredProcedures\AsCARptTMNH01;
+use Diepxuan\Simba\StoredProcedures\AsGLRptNKC03;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
@@ -70,42 +72,28 @@ public function arDmKh()
      */
     public static function getCARptTMNH01(array $params): Collection
     {
-        return collect(DB::connection((new static())->getConnectionName())->select('EXEC asCARptTMNH01
-            @pMa_Cty = :pMa_Cty,
-            @pNgay_Ct1 = :pNgay_Ct1,
-            @pNgay_Ct2 = :pNgay_Ct2,
-            @pTk = :pTk,
-            @pMa_Nt = :pMa_Nt
-        ', [
-            'pMa_Cty'   => $params['pMa_Cty'],
-            'pTk'       => $params['pTk'],
-            'pNgay_Ct1' => $params['pNgay_Ct1'],
-            'pNgay_Ct2' => $params['pNgay_Ct2'],
+        return AsCARptTMNH01::call([
+            'pMa_Cty'   => $params['pMa_Cty'] ?? '',
+            'pTk'       => $params['pTk'] ?? '',
+            'pNgay_Ct1' => $params['pNgay_Ct1'] ?? '',
+            'pNgay_ct2' => $params['pNgay_Ct2'] ?? '',
             'pMa_Nt'    => $params['ma_Nt'] ?? 'VND',
-        ]));
+        ]);
     }
 
     /**
      * Gọi stored procedure asGLRptNKC03 để lấy dữ liệu sổ nhật ký thu/chi.
      */
     public static function getGLRptNKC03(array $params): Collection
     {
-        return collect(DB::connection((new static())->getConnectionName())->select('EXEC asGLRptNKC03
-            @pMa_Cty = :pMa_Cty,
-            @pNgay_Ct1 = :pNgay_Ct1,
-            @pNgay_Ct2 = :pNgay_Ct2,
-            @pTk_List = :pTk_List,
-            @pTkdu_List = :pTkdu_List,
-            @pMa_Bp = :pMa_Bp,
-            @pMa_Nt = :pMa_Nt
-        ', [
+        return AsGLRptNKC03::call([
             'pMa_Cty'    => $params['pMa_Cty'] ?? '',
             'pNgay_Ct1'  => $params['pNgay_Ct1'] ?? '2025-05-01',
             'pNgay_Ct2'  => $params['pNgay_Ct2'] ?? now(),
             'pTk_List'   => $params['pTk_List'] ?? '',
             'pTkdu_List' => $params['pTkdu_List'] ?? '',
             'pMa_Bp'     => $params['pMa_Bp'] ?? '',
             'pMa_Nt'     => $params['pMa_Nt'] ?? 'VND',
-        ]));
+        ]);
     }
 }

src/StoredProcedures/AsCARptTMNH01.php

@@ -23,7 +23,11 @@ public static function call(array $params): Collection
         $connection = (new SModel())->getConnectionName();
 
         return ProcedureCaller::call('asCARptTMNH01', [
-
+            'pMa_Cty'   => $params['pMa_Cty'] ?? SModel::CTY,
+            'pTk'       => $params['pTk'] ?? '111',
+            'pNgay_Ct1' => $params['pNgay_Ct1'] ?? '2015-10-01',
+            'pNgay_ct2' => $params['pNgay_ct2'] ?? '2015-10-31',
+            'pMa_Nt'    => $params['pMa_Nt'] ?? '',
         ], $connection);
     }
 }

src/StoredProcedures/AsPostCaph3_glct.php

@@ -20,6 +20,9 @@ class AsPostCaph3_glct
 {
     /**
      * Call stored procedure asPostCaph3_glct
+     * 
+     * Note: Stored procedure chỉ có 2 tham số (@pMa_cty, @pStt_rec)
+     * Các tham số khác được tính toán bên trong stored procedure
      *
      * @param array $params Procedure parameters
      * @return Collection
@@ -29,14 +32,8 @@ public static function call(array $params): Collection
         $connection = (new SModel())->getConnectionName();
 
         return ProcedureCaller::call('asPostCaph3_glct', [
-            'pMa_cty' => $params['pMa_cty'] ?? null,
+            'pMa_cty' => $params['pMa_cty'] ?? SModel::CTY,
             'pStt_rec' => $params['pStt_rec'] ?? null,
-            'pNamTC' => $params['pNamTC'] ?? null,
-            'pThangTC' => $params['pThangTC'] ?? null,
-            'pNgay_ct' => $params['pNgay_ct'] ?? null,
-            'pNgay_ks' => $params['pNgay_ks'] ?? null,
-            'pMa_nt0' => $params['pMa_nt0'] ?? null,
-            'pma_cty' => $params['pma_cty'] ?? null
         ], $connection);
     }
 
@@ -45,25 +42,13 @@ public static function call(array $params): Collection
      *
      * @param string $Ma_cty
      * @param string $Stt_rec
-     * @param int $NamTC
-     * @param int $ThangTC
-     * @param string $Ngay_ct
-     * @param string $Ngay_ks
-     * @param mixed $Ma_nt0
-     * @param mixed $ma_cty
      * @return Collection
      */
-    public static function callWithParams(string $Ma_cty = null, string $Stt_rec = null, int $NamTC = null, int $ThangTC = null, string $Ngay_ct = null, string $Ngay_ks = null, mixed $Ma_nt0 = null, mixed $ma_cty = null): Collection
+    public static function callWithParams(string $Ma_cty = null, string $Stt_rec = null): Collection
     {
         $params = [
             'pMa_cty' => $Ma_cty,
             'pStt_rec' => $Stt_rec,
-            'pNamTC' => $NamTC,
-            'pThangTC' => $ThangTC,
-            'pNgay_ct' => $Ngay_ct,
-            'pNgay_ks' => $Ngay_ks,
-            'pMa_nt0' => $Ma_nt0,
-            'pma_cty' => $ma_cty
         ];
 
         return self::call($params);