Merge branch 'feature/fin' into develop

2025-10-31 10:17:52 +08:00
parent 58a38d1463 43fe263df1
commit 0e38f0f9bb
1 changed files with 5 additions and 0 deletions
@@ -5,6 +5,7 @@ namespace app\common\controller;
 use app\common\controller\BaseController;
 use app\common\model\Country;
 use app\common\model\FinPaymentStock;
+use app\common\model\StockOrders;
 use app\common\model\SysAccount;
 use app\common\model\SysCurrency;
 use app\common\model\SysDictItem;
@@ -84,11 +85,15 @@ class FinPaymentApplyController extends BaseController
        if (isset($data['id'])){
            $finPaymentStock = FinPaymentStock::where('payment_apply_id', $data['id'])->get();
            $stock = [];
+            $stock_order_no = [];
            foreach ($finPaymentStock as $v) {
                $stock[$v['pi_no']]['pi_no'] = $v['pi_no'];
                $stock[$v['pi_no']]['stock_id'][] = [$v['stock_id']];
+                $stockOrders = StockOrders::where('id', $v['stock_id'])->first();
+                $stock_order_no[] = $stockOrders['order_no'];
            }
            $data['stock'] = array_values($stock);
+            $data['stock_order_no'] = $stock_order_no;
        }
        
        return $data;