|
|
@@ -82,12 +82,12 @@ class WaybillController extends Controller
|
|
|
if (isset($warehouseWeight)){
|
|
|
$waybill->warehouse_weight=$warehouseWeight;
|
|
|
$unit=Unit::where('name','m³')->first();
|
|
|
- if ($unit)$waybill->warehouse_weight_unit=$unit->id;
|
|
|
+ if ($unit)$waybill->warehouse_weight_unit_id=$unit->id;
|
|
|
}
|
|
|
if (isset($warehouseWeightOther)){
|
|
|
$waybill->warehouse_weight_other=$warehouseWeightOther;
|
|
|
$unit=Unit::where('name','kg')->first();
|
|
|
- if ($unit)$waybill->warehouse_weight_unit_other=$unit->id;
|
|
|
+ if ($unit)$waybill->warehouse_weight_unit_other_id=$unit->id;
|
|
|
}
|
|
|
$waybill->save();
|
|
|
if ($waybill->type=='直发车'){
|
|
|
@@ -100,7 +100,7 @@ class WaybillController extends Controller
|
|
|
$waybill->update();
|
|
|
}
|
|
|
//回传FLUX
|
|
|
- $this->accomplishToWMS($waybill);
|
|
|
+ //$this->accomplishToWMS($waybill);
|
|
|
}
|
|
|
return response()->json(['response'=>['return'=>['returnFlag'=>'1','returnCode'=>'0000','returnDesc'=>'正确接收','resultInfo'=>'']]])
|
|
|
->setEncodingOptions(JSON_UNESCAPED_UNICODE);
|