|
|
@@ -25,7 +25,7 @@ class MeasureMonitorController extends Controller
|
|
|
if ($measuring_machine_id){
|
|
|
$package=OrderPackage::with(['order'=>function($query){
|
|
|
$query->with('owner','logistic');
|
|
|
- },'paperBox','measuringMachine'])->where('measuring_machine_id',$measuring_machine_id)->orderBy('id','DESC')->first();
|
|
|
+ },'paperBox','measuringMachine'])->where('measuring_machine_id',$measuring_machine_id)->orderByDesc('weighed_at')->first();
|
|
|
if (!$package){
|
|
|
$measuringMachine=MeasuringMachine::query()->where('id',$measuring_machine_id)->first();
|
|
|
$package=new OrderPackage();
|