更新

app-ghs/controllers/StockInController.php

@@ -5,6 +5,7 @@ namespace ghs\controllers;
 use bizGhs\order\classes\StockInOrderClass;
 use bizGhs\order\classes\StockInOrderItemClass;
 use bizGhs\product\classes\ProductClass;
+use bizGhs\shop\classes\ShopClass;
 use bizGhs\stock\classes\StockInDayClass;
 use common\components\dateUtil;
 use common\components\util;
@@ -103,13 +104,17 @@ class StockInController extends BaseController
     public function actionGetFullInfo()
     {
         $orderSn = Yii::$app->request->get('orderSn', '');
-        $in = StockInOrderClass::getByCondition(['orderSn' => $orderSn], true);
+        $in = StockInOrderClass::getByCondition(['orderSn' => $orderSn]);
         if (empty($in)) {
             util::fail('没有找到入库记录');
         }
-        if ($in->inMainId != $this->mainId) {
+        if ($in['inMainId'] != $this->mainId) {
             util::fail('不是你的入库记录');
         }
+        $outShopId = $in['outShopId'];
+        $outShop = ShopClass::getById($outShopId, true);
+        $outShopName = $outShop->shopName ?? '';
+        $in['outShopName'] = $outShopName;
         $list = StockInOrderItemClass::getAllByCondition(['orderSn' => $orderSn], null, '*', null, null);
         $productInfo = [];
         if (!empty($list)) {
@@ -122,17 +127,17 @@ class StockInController extends BaseController
             $currentStock = $current['stock'] ?? 0;
             $currentStock = floatval($currentStock);
             $list[$key]['currentStock'] = $currentStock;
-            $itemNum = $item['itemNum']??0;
+            $itemNum = $item['itemNum'] ?? 0;
             $itemNum = floatval($itemNum);
             $list[$key]['itemNum'] = $itemNum;
             $itemInfo = $item['itemInfo'];
             $itemExt = json_decode($itemInfo, true);
-            $itemName = $itemExt['itemName']??'';
+            $itemName = $itemExt['itemName'] ?? '';
             $list[$key]['itemName'] = $itemName;
             //前端使用，勿删
-            if($currentStock >= $itemNum){
+            if ($currentStock >= $itemNum) {
                 $actPutNum = $itemNum;
-            }else{
+            } else {
                 $actPutNum = $currentStock;
             }
             $list[$key]['actPutNum'] = $actPutNum;