|
|
@@ -113,7 +113,8 @@ class PackageController
|
|
|
public function updateOrderPackage(&$orderPackage,$params,$measuringMachine) //更新包裹信息 前往处理活动波次
|
|
|
{
|
|
|
$edges=$this->getEdges($params);
|
|
|
- $req_date=$params['time']??Carbon::now();
|
|
|
+// $req_date=$params['time']??Carbon::now();
|
|
|
+ $req_date=Carbon::now();
|
|
|
$orderPackage->weight=$params['weight'];
|
|
|
$orderPackage->measuring_machine_id=$measuringMachine->id;
|
|
|
$orderPackage->length=$edges[0];
|
|
|
@@ -244,7 +245,8 @@ class PackageController
|
|
|
*/
|
|
|
public function getOrderPackage($requestInput,$measuringMachine,$order)
|
|
|
{
|
|
|
- $weighed_at =$requestInput['time']??Carbon::now();
|
|
|
+// $weighed_at =$requestInput['time']??Carbon::now();
|
|
|
+ $weighed_at =Carbon::now();
|
|
|
$edges=$this->getEdges($requestInput);
|
|
|
OrderPackage::query()->create([
|
|
|
'order_id'=>$order->id,
|