入库详情表添加预期数量字段，并显示在预约管理列表中

app/Services/StoreItemService.php

@@ -127,6 +127,7 @@ class StoreItemService
                 'name' => $asnDetail->skudescrc,
                 'sku' => $asnDetail->sku,
                 'amount' => $asnDetail->receivedqty ?? 0,
+                'expected_amount' => $asnDetail->expectedqty ?? 0,
                 'quality' => $asnDetail->qualityStatus ? $asnDetail->qualityStatus->codename_c :'',
                 'status' => $status ? $status : $asnDetail->lineStatus->codename_c,
                 'created_at' => $asnDetail->addtime ?? null,
@@ -180,7 +181,7 @@ class StoreItemService
         $storeItems = $this->getByWms($asnDetails);
         $asnDetails_map = $dataHandlerService->dataHeader(['asnno', 'asnlineno','customerid','sku'], $asnDetails);
         $updateParams = [[
-            'id', 'store_id', 'asn_line_code', 'name', 'sku', 'barcode', 'amount', 'quality', 'status', 'created_at', 'updated_at'
+            'id', 'store_id', 'asn_line_code', 'name', 'sku', 'barcode', 'amount','expected_amount', 'quality', 'status', 'created_at', 'updated_at'
         ]];
         $delete_storeItems = [];
         foreach ($storeItems as $storeItem) {
@@ -203,6 +204,7 @@ class StoreItemService
                     'sku' => $asnDetail['sku'],
                     'barcode' => $asnDetail['basSku'] ? $asnDetail['basSku']['alternate_sku1'] : '',
                     'amount' => $asnDetail['receivedqty'] ?? 0,
+                    'expected_amount' => $asnDetail['expectedqty'] ?? 0,
                     'quality' => $asnDetail['qualityStatus'] ? $asnDetail['qualityStatus']['codename_c'] : '',
                     'status' => $status ? $status : $asnDetail['lineStatus']['codename_c'],
                     'created_at' => $asnDetail['addtime'] ?? null,

database/migrations/2021_06_17_173808_add_expect_amount_column_to_store_items.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddExpectAmountColumnToStoreItems extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('store_items', function (Blueprint $table) {
+            $table->integer('expected_amount')->default(0)->comment('预期数量');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('store_items', function (Blueprint $table) {
+            $table->dropColumn('expected_amount');
+        });
+    }
+}

resources/views/store/deliveryAppointment/list.blade.php

@@ -154,7 +154,7 @@
                             <div class="row" v-for="(detail,i) in info.details" v-if="i!==0">
                                 <div class="col-5 font-weight-bold text-overflow-warp">@{{ detail.commodity_id ? (detail.commodity ? detail.commodity.name : '') : detail.name }}</div>
                                 <div class="col-4 text-secondary text-overflow-warp">@{{ detail | getCommodity }}</div>
-                                <div class="col-2 text-secondary">@{{ detail.amount }}</div>
+                                <div class="col-2 text-secondary">@{{ detail.expected_amount }}</div>
                             </div>
                         </div>
                         <div class="text-center m-auto small cursor-pointer" v-if="info.details.length>1" @click="upAllDetail(info.id)">