更新提交

server/app/ImportExport/WuxiLab/Import/WuxiLabUpdateProductsImport.php

@@ -22,7 +22,7 @@ class WuxiLabUpdateProductsImport extends BaseImport
     public function getTitleHeader()
     {
         return [
-            'ProductId', 'CAS', 'MDL', 'MolecularFormula', 'MolecularWeight', 'ChemicalDissolveCas', 'SubCategory', 'UN', 'EnglishName', 'ChineseName', 'Brand', 'StorageCondition',
+            'ProductId', 'CAS', 'MDL', 'SMILES', 'MolecularFormula', 'MolecularWeight', 'ChemicalDissolveCas', 'SubCategory', 'UN', 'EnglishName', 'ChineseName', 'Brand', 'StorageCondition',
             'TransportationCondition', 'IsImported', 'LeadTimeMinDays', 'LeadTimeMaxDays', 'LeadTimeBackOrderDays', 'Purity', 'ProductCategory',
             'ShipsAdditionalDescription', 'Remark'
         ];

server/app/Services/ThirdPlatform/Api/WuxiApiNewService.php

@@ -125,7 +125,7 @@ class WuxiApiNewService extends PlatformAbstractService
                $tempData['storage_condition'] = $datas['product_extend']['storage_condition'];
                 //运输条件
                $tempData['transportation_condition'] = $datas['product_extend']['transportation_condition'];
-               $tempData['smiles'] = $datas['product_extend']['smiles'] ?? $datas['c_smiles'];
+               $tempData['smiles'] = $datas['c_smiles'];
                $tempData['sub_category'] = $datas['product_extend']['sub_category'] ?? '';
 
                $tempData['group_id'] = $datas['product_extend']['product_category'];

server/app/Services/ThirdPlatform/WuxiLabNewService.php

@@ -219,15 +219,26 @@ class WuxiLabNewService
             return false;
         }
         try{
-            /*$noSmiles = [];
+            $noSmiles = [];
             foreach($updateData['rawList'] as $data){
                 if(empty($data['c_smiles']) && !empty($data['c_cas'])){
                     $noSmiles[] = $data['c_cas'];
                 }
-            }*/
+            }
             $updateData['rawList'] = array_column($updateData['rawList'], null, 'c_cas');
             $productsIdsList = array_column($updateData['rawList'], 'r_code');
 
+            if(!empty($noSmiles)){
+                $noSmiles = array_unique($noSmiles);
+                $baikeMysql = DB::connection('baike_mysql');
+                $casResult = $baikeMysql->table('tp_mol_data')->whereIn('cas', $noSmiles)->get()->toArray();
+                if($casResult){
+                    foreach($casResult as $cas){
+                        $updateData['rawList'][$cas->cas]['c_smiles'] = $cas->smiles;
+                    }
+                }
+            }
+
             $productsList = app(WuxiLabUpdateProductsService::class)->getUpdateProductsListByProductIds($productsIdsList);
             if(!empty($productsList)){
                 $productsList = array_column($productsList, null, 'product_id');
@@ -240,17 +251,6 @@ class WuxiLabNewService
                 }
             }
 
-            /*if(!empty($noSmiles)){
-                $noSmiles = array_unique($noSmiles);
-                $baikeMysql = DB::connection('baike_mysql');
-                $casResult = $baikeMysql->table('tp_mol_data')->whereIn('cas', $noSmiles)->get()->toArray();
-                if($casResult){
-                    foreach($casResult as $cas){
-                        $updateData['rawList'][$cas->cas]['c_smiles'] = $cas->smiles;
-                    }
-                }
-            }*/
-
             $result = $this->apiService->pushBatchUpdateProduct($updateData, $this->getToken());
             $this->processApiResponse($result);