Merge branch 'master' of http://101.133.135.193:20080/huhao/baoshi-was

app/Services/StoreService.php

@@ -30,7 +30,7 @@ class StoreService
     protected $modelClass=Store::class;
     private function conditionQuery(array $params)
     {
-        $stores = Store::query()->with(['storeItems.store', 'warehouse', 'owner'])->where('is_fast_stored', '无')->orderBy('id', 'DESC');
+        $stores = Store::query()->with(['storeItems.commodity.barcodes', 'warehouse', 'owner'])->where('is_fast_stored', '无')->orderBy('id', 'DESC');
         $columnQueryRules = [
             'asn_code' => ['batch' => ''],
             'remark' => ['batch' => '','timeLimit' => 15],

resources/views/store/inStorage/index.blade.php

@@ -35,7 +35,8 @@
                                         <th>商品名称</th>
                                         <th>商品编码</th>
                                         <th>商品条码</th>
-                                        <th>数量</th>
+                                        <th>预期数量</th>
+                                        <th>收货数量</th>
                                         <th>质量</th>
                                         <th>状态</th>
                                         <th>创建时间</th>
@@ -44,7 +45,8 @@
                                         <td>@{{ storeItem.asn_line_code }}</td>
                                         <td>@{{ storeItem.name }}</td>
                                         <td>@{{ storeItem.sku }}</td>
-                                        <td>@{{ storeItem.barcode }}</td>
+                                        <td>@{{ storeItem.commodity.barcodes[0].code }}</td>
+                                        <td>@{{ storeItem.expected_amount }}</td>
                                         <td>@{{ storeItem.amount }}</td>
                                         <td>@{{ storeItem.quality }}</td>
                                         <td>@{{ storeItem.status }}</td>