已经导入过了

biz-ghs/order/classes/StockOutOrderClass.php

@@ -69,7 +69,6 @@ class StockOutOrderClass extends BaseClass
         $orderData['mainId'] = $outMainId;
         $itemInfo = $orderData['itemInfo'] ?? [];
         if (empty($itemInfo)) {
-            $transaction->rollBack();
             util::fail("订单异常");
         }
         //写流水

biz-ghs/product/classes/ProductClass.php

@@ -1099,7 +1099,7 @@ class ProductClass extends BaseClass
                 //从平台导入花材
                 $has = self::getByCondition(['mainId' => $mainId, 'itemId' => $data['itemId']], true);
                 if (!empty($has)) {
-                    util::fail('已经导入过了');
+                    util::fail('已经导入过了哦');
                 }
             }
 

biz-hd/item/classes/ItemClass.php

@@ -246,7 +246,7 @@ class ItemClass extends BaseClass
                 //从平台导入花材
                 $has = self::getByCondition(['mainId' => $mainId, 'itemId' => $data['itemId']], true);
                 if (!empty($has)) {
-                    util::fail('已经导入过了');
+                    util::fail('已经导入过了哈');
                 }
             }