推荐记录时标记本地时间

app/Http/Controllers/ReceiveRecordController.php

@@ -139,6 +139,7 @@ class ReceiveRecordController extends Controller
                 "logistic_number" => $logisticNumber,
                 "logistic_id" => $logisticId,
                 "record_at" => $dateTime,
+                "location_at" => \request("locationAt"),
                 "warehouse_id" => $warehouse,
                 "delayed" => 0,
             ]);

app/Http/Controllers/TestController.php

@@ -6,6 +6,7 @@ use App\Components\AsyncResponse;
 use App\Components\Database;
 use App\Components\ErrorPush;
 use App\DeliveryAppointment;
+use App\Logistic;
 use App\MaterialBox;
 use App\MaterialBoxModel;
 use App\OracleDOCASNHeader;
@@ -17,6 +18,7 @@ use App\RejectedBill;
 use App\Role;
 use App\Services\common\BatchUpdateService;
 use App\Services\DeliveryAppointmentService;
+use App\Services\LogisticService;
 use App\Services\ObligationService;
 use App\Services\OracleDocAsnHerderService;
 use App\Services\OrderRejectedBillRelationService;
@@ -59,6 +61,8 @@ class TestController extends Controller
             dd("方法不存在");
         }
     }
+    public function test(){
+    }
 
     public function test123()
     {

app/ReceiveRecord.php

@@ -15,6 +15,7 @@ class ReceiveRecord extends Model
         "logistic_number",
         "logistic_id",
         "record_at",
+        "location_at",
         "warehouse_id",
         "delayed",
     ];

app/Services/RejectedService.php

@@ -5,12 +5,10 @@ namespace App\Services;
 use App\Exports\RejectedExport;
 use App\OracleDOCASNHeader;
 use App\OracleDOCOrderHeader;
-use App\OrderIssue;
 use App\RejectedBill;
 use App\Services\common\QueryService;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
 use App\Traits\ServiceAppAop;
 
 
@@ -33,7 +31,7 @@ class RejectedService
         if (count($owners)==0){
             $owners[] = [''];
         }
-        $rejectedBills = RejectedBill::query()->with('user','owner', 'logistic', 'items.quality','record:logistic_number,record_at',
+        $rejectedBills = RejectedBill::query()->with('user','owner', 'logistic', 'items.quality','record:logistic_number,record_at,location_at',
             'items.packageImages','items.commodityImages','items.uploadFiles','orderIssueRejectedBill:logistic_number_return')
             ->orderBy('rejected_bills.id', 'desc')
             ->where(function ($query)use ($owners){

database/migrations/2022_02_23_172938_change_receive_records_add_column.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class ChangeReceiveRecordsAddColumn extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('receive_records', function (Blueprint $table) {
+            $table->timestamp("location_at")->nullable()->comment("本地时间");
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('receive_records', function (Blueprint $table) {
+            $table->dropColumn("location_at");
+        });
+    }
+}

resources/views/rejected/receiveRecord.blade.php

@@ -26,6 +26,7 @@
                 <td>@{{ record.logistic ? record.logistic.name : '未知' }}</td>
                 <td>@{{ record.warehouse ? record.warehouse.name : '未知' }}</td>
                 <td>@{{ record.record_at }}</td>
+                <td>@{{ record.location_at }}</td>
                 <td>@{{ delayed[record.delayed] }}</td>
             </tr>
         </table>
@@ -65,7 +66,8 @@
                 {name:'logistic_number',value: '快递单号', },
                 {name:'logistic_id', value: '快递公司'},
                 {name:'warehouse_id', value: '仓库'},
-                {name:'record_at', value: '记录时间'},
+                {name:'record_at', value: '上载时间'},
+                {name:'location_at', value: '本地时间'},
                 {name:'delayed',value: '延时标记', neglect: true},
             ];
             new Header({

resources/views/rejected/record.blade.php

@@ -238,10 +238,20 @@
                     }
                 });
             },
+            _getToDay(){
+                let now = new Date();
+                let yy = now.getFullYear();
+                let mm = now.getMonth() + 1;
+                let dd = now.getDate();
+                let hh = now.getHours();
+                let m = now.getMinutes();
+                let ss = now.getSeconds();
+                return yy+'-'+(mm<10 ? '0'+mm : mm)+'-'+(dd<10 ? '0'+dd : dd)+" "+(hh<10 ? '0'+hh : hh)+":"+(m<10 ? '0'+m : m)+":"+(ss<10 ? '0'+ss : ss);
+            },
             failRetry(){
                 this.data.forEach(item=>{
                     if (!item.status){
-                        window.axios.post('{{url('record')}}',{logisticNumber:item.logisticNumber,warehouse:this.selected},{
+                        window.axios.post('{{url('record')}}',{logisticNumber:item.logisticNumber,locationAt:item.locationAt,warehouse:this.selected},{
                             headers: {
                                 "jwtToken" : this.jwtToken
                             }
@@ -266,7 +276,8 @@
                 });
             },
             submitRecord(logisticNumber,recordAt){
-                window.axios.post('{{url('record')}}',{logisticNumber:logisticNumber,warehouse:this.selected},{
+                let dateTime = this._getToDay();
+                window.axios.post('{{url('record')}}',{logisticNumber:logisticNumber,locationAt:dateTime,warehouse:this.selected},{
                     headers: {
                         "jwtToken" : this.jwtToken,
                     }
@@ -282,6 +293,7 @@
                     }
                     this.buildToast(status,logisticNumber);
                     this.data.unshift({
+                        locationAt:dateTime,
                         logisticNumber:logisticNumber,logistic:status ? res.data.logistic : "未知",recordAt:status ? res.data.recordAt : recordAt,status:status
                     });
                     if (!status)this.errorSum++;
@@ -290,6 +302,7 @@
                     this.playAudio('storage/networkError.mp3');
                     this.buildToast(false,logisticNumber);
                     this.data.unshift({
+                        locationAt:dateTime,
                         logisticNumber:logisticNumber,logistic:"未知",recordAt:recordAt,status:false
                     });
                     this.errorSum++;

resources/views/rejected/search/general.blade.php

@@ -77,7 +77,7 @@
                             </span>
                         </td>
                         <td class="text-muted"><span>@{{rejectedBill.created_at}}</span></td>
-                        <td class="text-muted"><span>@{{rejectedBill.record ? rejectedBill.record.record_at : ''}}</span></td>
+                        <td class="text-muted"><span>@{{rejectedBill.record ? (rejectedBill.record.location_at ? rejectedBill.record.location_at : rejectedBill.record.record_at) : ''}}</span></td>
                         <td><span v-if="rejectedBill.owner"><span>@{{rejectedBill.owner.name}}</span></span></td>
                         <td><span>@{{rejectedBill.logistic_number_return}}</span></td>
                         <td class="text-muted"><span v-if="rejectedBill.logistic"><span>@{{rejectedBill.logistic.name}}</span></span></td>