shish 5 سال پیش
والد
کامیت
03bf5bb875
2فایلهای تغییر یافته به همراه10 افزوده شده و 1 حذف شده
  1. 9 0
      biz-ghs/order/classes/StockInOrderClass.php
  2. 1 1
      biz-ghs/order/classes/StockOutOrderClass.php

+ 9 - 0
biz-ghs/order/classes/StockInOrderClass.php

@@ -40,6 +40,15 @@ class StockInOrderClass extends BaseClass
         if (empty($list)) {
         if (empty($list)) {
             return $data;
             return $data;
         }
         }
+
+        $ids = array_column($list, 'outShopId');
+        $ids = array_filter(array_unique($ids));
+        $shopInfo = ShopClass::getByIds($ids, null, 'id');
+        foreach ($list as $key => $val) {
+            $outShopId = $val['outShopId'] ?? 0;
+            $val['outShopName'] = $shopInfo[$outShopId]['shopName'] ?? '';
+        }
+
         $data['list'] = $list;
         $data['list'] = $list;
         $data['list'] = self::groupAdminList($list);
         $data['list'] = self::groupAdminList($list);
         $data['list'] = self::groupStatusName($data['list']);
         $data['list'] = self::groupStatusName($data['list']);

+ 1 - 1
biz-ghs/order/classes/StockOutOrderClass.php

@@ -181,7 +181,7 @@ class StockOutOrderClass extends BaseClass
         }
         }
         $ids = array_column($list, 'inShopId');
         $ids = array_column($list, 'inShopId');
         $ids = array_filter(array_unique($ids));
         $ids = array_filter(array_unique($ids));
-        $shopInfo = ShopClass::getByIds($ids, 'id');
+        $shopInfo = ShopClass::getByIds($ids, null, 'id');
         foreach ($list as $key => $val) {
         foreach ($list as $key => $val) {
             $inShopId = $val['inShopId'] ?? 0;
             $inShopId = $val['inShopId'] ?? 0;
             $val['inShopName'] = $shopInfo[$inShopId]['shopName'] ?? '';
             $val['inShopName'] = $shopInfo[$inShopId]['shopName'] ?? '';