Zhouzhendong 6 роки тому
батько
коміт
be97e6ebe9

+ 4 - 4
app/Http/Controllers/WeighExceptedController.php

@@ -21,10 +21,10 @@ class WeighExceptedController extends Controller
         $paginate=$request->input('paginate');
         if ($paginate){
             $weightExcepteds=Package::select('id','status','logistic_number','logistic_id','measuring_machine_id','created_at','weight','length','width','height','bulk','paper_box_id')->
-            where('status','上传异常')->orWhere('status','测量异常')->orWhere('status','记录异常')->orWhere('status','已上传异常')->orderBy('created_at','DESC')->paginate($paginate);
+            where('status','上传异常')->orWhere('status','测量异常')->orderBy('created_at','DESC')->paginate($paginate);
         }else{
             $weightExcepteds=Package::select('id','status','logistic_number','logistic_id','measuring_machine_id','created_at','weight','length','width','height','bulk','paper_box_id')->
-            where('status','上传异常')->orWhere('status','测量异常')->orWhere('status','记录异常')->orWhere('status','已上传异常')->orderBy('created_at','DESC')->paginate(50);
+            where('status','上传异常')->orWhere('status','测量异常')->orderBy('created_at','DESC')->paginate(50);
         };
         return view('weight.weightExcepted.index',['weightExcepteds'=>$weightExcepteds,'view'=>'indexCreate']);
     }
@@ -34,10 +34,10 @@ class WeighExceptedController extends Controller
         $paginate=$request->input('paginate');
         if ($paginate){
             $weightExcepteds=Package::select('id','owner_id','logistic_number','created_at','delivery_number','batch_number','batch_rule','recipient','recipient_mobile','logistic_id')->
-            where('status','下发异常')->orderBy('created_at','DESC')->paginate($paginate);
+            where('status','下发异常')->orWhere('status','记录异常')->orWhere('status','已上传异常')->orderBy('created_at','DESC')->paginate($paginate);
         }else{
             $weightExcepteds=Package::select('id','owner_id','logistic_number','created_at','delivery_number','batch_number','batch_rule','recipient','recipient_mobile','logistic_id')->
-            where('status','下发异常')->orderBy('created_at','DESC')->paginate(50);
+            where('status','下发异常')->orWhere('status','记录异常')->orWhere('status','已上传异常')->orderBy('created_at','DESC')->paginate(50);
         };
         return view('weight.weightExcepted.index',['weightExcepteds'=>$weightExcepteds,'view'=>'indexIssued']);
     }

+ 3 - 0
app/Http/Controllers/api/thirdPart/weight/PackageController.php

@@ -85,6 +85,7 @@ class PackageController extends Controller
                     $packageBatch->width=$centre;
                     $packageBatch->height=$min;
                     $packageBatch->bulk=$max*$centre*$min;
+                    $packageBatch->weighed_at=$reqDate;
                     if (isset($paperBox_id))$packageBatch->paper_box_id=$paperBox_id;
                     $packageBatch->status="未上传";
                     $packageBatch->save();
@@ -104,6 +105,7 @@ class PackageController extends Controller
                 $package->width=$centre;
                 $package->height=$min;
                 $package->bulk=$max*$centre*$min;
+                $package->weighed_at=$reqDate;
                 if (isset($paperBox_id))$package->paper_box_id=$paperBox_id;
                 $package->status="未上传";
                 $this->log(__METHOD__,'Batch_'.__FUNCTION__,json_encode($package),null);
@@ -142,6 +144,7 @@ class PackageController extends Controller
                 'width'=>$centre,
                 'height'=>$min,
                 'bulk'=>$max*$centre*$min,
+                'weighed_at'=>$reqDate,
                 'status'=>"未下发",
             ]);
             if ($logistic)$createPackage->logistic_id=$logistic->id;

+ 1 - 1
app/Package.php

@@ -8,7 +8,7 @@ class Package extends Model
 {
     protected $fillable=[
         'owner_id','logistic_number','delivery_number','batch_number','batch_rule','recipient','recipient_mobile','logistic_id',
-        'measuring_machine_id','weight','length','width','height','bulk','paper_box_id','status'
+        'measuring_machine_id','weight','length','width','height','bulk','paper_box_id','status','weighed_at'
     ];
     protected $appends=[
         'owner_name',