|
|
@@ -499,15 +499,15 @@ class OrderIssueController extends Controller
|
|
|
/** @var OrderIssueService $service */
|
|
|
$service = app(OrderIssueService::class);
|
|
|
foreach ($array as $i => $str) {
|
|
|
- $items = explode("\t",$str);
|
|
|
- $head = '第'.($i+1).'行';
|
|
|
+ $string= preg_replace('/[\s,\,\,]+/','*++*',$str);
|
|
|
+ $items = explode('*++*',$string);
|
|
|
+ $head = '第'.($i+1).'行';
|
|
|
if(count($items)<count($rows)){
|
|
|
$errors[$head] = ['数据不完整'];
|
|
|
unset($items);
|
|
|
continue;
|
|
|
}
|
|
|
$map = [];
|
|
|
-
|
|
|
foreach ($rows as $index=>$row) {
|
|
|
if($row === '原始运单号'){
|
|
|
if(!$items[$index]){
|
|
|
@@ -546,6 +546,7 @@ class OrderIssueController extends Controller
|
|
|
}
|
|
|
if(count($map)!==0)$maps[] = $map;
|
|
|
}
|
|
|
+// if(count($errors)>0)dd($errors);
|
|
|
if(count($errors)>0) return ['success'=>false,'fail_info'=>$errors];
|
|
|
try {
|
|
|
foreach ($maps as $map) {
|