Merge branch 'dev_wf' of wugg/phpstock into version1.5

app/admin/controller/Goodup.php

@@ -1899,7 +1899,7 @@ class Goodup extends Base
             ->whereIn('spuCode', $param['codes'])
             ->find();
 
-        if (!empty($isonline)) return error_show(1005, '存在已上线商品' . $isonline['spuCode'].',请从系统商品库操作');
+        if (!empty($isonline)) return error_show(1005, '存在已上线商品' . $isonline['spuCode']);
 
         $user = GetUserInfo($param['token']);
         if (empty($user) || $user['code'] != 0) return error_show(1002, "用户数据不存在");
@@ -1921,10 +1921,13 @@ class Goodup extends Base
             ->whereIn('spuCode', $param['codes'])
             ->column('id', 'spuCode');
 
+        if(!empty($all_good)) return error_show(1004,'请从商品成本提交该商品上线');
+
         $all_good_basic = Db::name('good_basic')
             ->where('is_del', 0)
             ->whereIn('spuCode', $param['codes'])
             ->column('id', 'spuCode');
+        if(!empty($all_good_basic)) return error_show(1004,'请从商品成本提交该商品上线');
 
         foreach ($param['codes'] as $value) {