|
@@ -41,7 +41,7 @@ class WaybillPriceModelsImport implements ToCollection,WithHeadingRow
|
|
|
$sum=2;
|
|
$sum=2;
|
|
|
if ($endIs) {
|
|
if ($endIs) {
|
|
|
foreach ($collection as $row) {
|
|
foreach ($collection as $row) {
|
|
|
- if ($row['承运商'] && $row['计数单位'] && $row['省份'] && $row['单价']==='') {
|
|
|
|
|
|
|
+ if ($row['承运商'] && $row['计数单位'] && $row['省份'] && $row['单价']!=='') {
|
|
|
if (strstr($row['省份'], '省')){$row['省份']=str_replace('省','',$row['省份']);};
|
|
if (strstr($row['省份'], '省')){$row['省份']=str_replace('省','',$row['省份']);};
|
|
|
$logistic = Logistic::query()->where('name', $row['承运商'])->first();
|
|
$logistic = Logistic::query()->where('name', $row['承运商'])->first();
|
|
|
$unit = Unit::query()->where('name', $row['计数单位'])->first();
|
|
$unit = Unit::query()->where('name', $row['计数单位'])->first();
|
Zhouzhendong