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

app/admin/controller/Goodup.php

@@ -1413,10 +1413,10 @@ class Goodup extends Base
             if($good_code===""){
                 return error_show(1004,"参数plat_code不能为空");
             }
-            $issale=Db::name("sale")->where(["skuCode"=>$platform['skuCode'],"status"=>[0,1,2]])->find();
-            if($issale!=false &&$platform['plat_code']!=$good_code){
-                return error_show(1004,"商品已下单，平台商品编码不允许修改");
-            }
+//            $issale=Db::name("sale")->where(["skuCode"=>$platform['skuCode'],"status"=>[0,1,2]])->find();
+//            if($issale!=false &&$platform['plat_code']!=$good_code){
+//                return error_show(1004,"商品已下单，平台商品编码不允许修改");
+//            }
             $is_exit = Db::name("good_platform")
                 ->where(["plat_code" => $good_code, "platform_code" => $platform['platform_code'], "is_del" => 0, 'exam_status' => 6])//exam_status==6已上线
                 ->where("id", "<>", $platform['id'])
@@ -1424,7 +1424,7 @@ class Goodup extends Base
             if($is_exit==false){
                 $platform['plat_code']=$good_code;
             }else{
-                return error_show(1004,"平台订单号 {$good_code} 已存在");
+                return error_show(1004,"平台商品编码 {$good_code} 已存在");
             }
 
         }