修改

app/Service/ImportService.php

@@ -447,8 +447,8 @@ class ImportService extends Service
                 foreach ($value as $k => $v){
                     $value[$k] = trim($v);
                 }
-                $t = $value[0] . $value[1];
-                if(in_array($t,$array_clean)) return [false, '产品名称与编码不能重复'];
+                $t = $value[1];
+                if(in_array($t,$array_clean)) return [false, '产品编码:'. $value[1] .'在文件中重复出现'];
                 $array_clean[] = $t;
                 $array[$key] = $value;
                 $search .= "(binary code ='".$value[1]."') or";

app/Service/OaService.php

@@ -740,12 +740,13 @@ class OaService extends Service
     public function returnOa($order_no, $type, $opt_case)
     {
         $service = new CheckService();
-        $service->createRecordAndInventory([
+        list($bool, $msg) = $service->createRecordAndInventory([
             'order_number' => $order_no,
             'type' => $type,
             'opt_case' => $opt_case,
             'user_data' => $this->user,
         ]);
+        return [$bool, $msg];
     }