|
|
@@ -32,7 +32,7 @@ class RejectedImport implements ToCollection, WithHeadingRow
|
|
|
{
|
|
|
foreach ($collections as $row)
|
|
|
{
|
|
|
- $logistic_number_return = trim($row['退回单号']??$row['快递单号']??$row['logistic_number_return']??'');
|
|
|
+ $logistic_number_return = trim($row['退回单号']??$row['退货单号']??$row['快递单号']??$row['logistic_number_return']??'');
|
|
|
$mobile_sender = trim($row['手机号']??$row['mobile_sender']??'');
|
|
|
$logistic_name = trim($row['快递公司']??$row['logistic_name']??'');
|
|
|
$barcode = trim($row['条码']??$row['barcode']??'');
|
|
|
@@ -41,12 +41,12 @@ class RejectedImport implements ToCollection, WithHeadingRow
|
|
|
$remark = trim($row['备注']??$row['remark']??'');
|
|
|
$owner=trim($row['货主']??$row['owner']??'');
|
|
|
|
|
|
- $lastReturnNumber = Session::get('jianshangLastImportedBill');
|
|
|
- if(!$logistic_number_return)$logistic_number_return=$lastReturnNumber;
|
|
|
- $lastMobile = Session::get('jianshangLastImportedMobile');
|
|
|
- if(!$mobile_sender)$mobile_sender=$lastMobile;
|
|
|
- $lastlogistic_name = Session::get('jianshangLastImportedLogisticName');
|
|
|
- if(!$logistic_name)$logistic_name=$lastlogistic_name;
|
|
|
+// $lastReturnNumber = Session::get('jianshangLastImportedBill');
|
|
|
+// if(!$logistic_number_return)$logistic_number_return=$lastReturnNumber;
|
|
|
+// $lastMobile = Session::get('jianshangLastImportedMobile');
|
|
|
+// if(!$mobile_sender)$mobile_sender=$lastMobile;
|
|
|
+// $lastlogistic_name = Session::get('jianshangLastImportedLogisticName');
|
|
|
+// if(!$logistic_name)$logistic_name=$lastlogistic_name;
|
|
|
|
|
|
|
|
|
$owner=Owner::query()->where('name','like',$owner.'%')->first();
|