Merge branch 'version1.5' into dev_wf

app/admin/controller/Goodup.php

@@ -522,6 +522,11 @@ class Goodup extends Base
         if($data==false){
             return error_show(1004,"未找到商品数据");
         }
+        $data = Db::name("good_platform")->where(["spuCode"=>$supcode,"is_del"=>0])->where("exam_status","<>",8)
+            ->find();
+        if($data!=false){
+            return error_show(1004,"存在未下线商品数据");
+        }
         $good_name= isset($this->post['good_name'])&&$this->post['good_name']!="" ? trim($this->post['good_name']):"";
         if($good_name==""){
             return error_show(1004,"商品名称不能为空");
@@ -774,6 +779,11 @@ class Goodup extends Base
         if($datas==false){
             return error_show(1004,"未找到商品数据");
         }
+        $is_down = Db::name("good_platform")->where(["spuCode"=>$supcode,"is_del"=>0])->where("exam_status","<>",8)
+            ->find();
+        if($is_down!=false){
+            return error_show(1004,"存在未下线商品数据");
+        }
         $cert_fee = isset($this->post['cert_fee'])&&$this->post['cert_fee']!==""? floatval($this->post['cert_fee']):"0";
         $packing_fee = isset($this->post['packing_fee'])&&$this->post['packing_fee']!==""? floatval($this->post['packing_fee']):"0";
         $cost_fee = isset($this->post['cost_fee'])&&$this->post['cost_fee']!==""? floatval($this->post['cost_fee']):"0";
@@ -1720,7 +1730,7 @@ class Goodup extends Base
                     "order_type" => 'SPCB',
                     "order_code" =>$newCode,//咨询单详情编号
                     "order_id" => Db::name("good_basic")->getLastInsID(),
-                    "order_status" =>7
+                    "order_status" =>7,"before_status"=>0
                 ]);
                 if(!empty($ladd)){
                     $na = Db::name("good_nake")->insertAll($ladd);
@@ -1758,6 +1768,11 @@ class Goodup extends Base
         if($data==false){
             return error_show(1004,"未找到商品数据");
         }
+        $is_down = Db::name("good_platform")->where(["spuCode"=>$supcode,"is_del"=>0])->where("exam_status","<>",8)
+            ->find();
+        if($is_down!=false){
+            return error_show(1004,"存在未下线商品数据");
+        }
         if ($data['status'] != 6 && $data['status'] != 7 && $data['status'] != 8) {
             return error_show(1004,"商品状态有误");
         }

app/admin/controller/Project.php

@@ -854,14 +854,16 @@ class Project extends Base
         try{
             $up = Db::name("project_plan")->where(["planNo"=>$planNos,'is_del'=>0,"status"=>0])->save(["status"=>1,"updatetime"=>date("Y-m-d H:i:s")]);
             if($up) {
+                foreach ($selec as $value){
+                    //修改状态，添加待办，只记录动作
+                    ActionLog::logAdd($this->post['token'], [
+                        "order_code" => $value['planNo'],//编码
+                        "status" => $value['status'],//这里的status是之前的值
+                        "action_remark" => '',//备注
+                        "action_type" => "edit"//新建create，编辑edit，更改状态status
+                    ], "PRO", 1, $value);
 
-                //修改状态，添加待办，只记录动作
-                ActionLog::logAdd($this->post['token'], [
-                    "order_code" => $planNos,//编码
-                    "status" => 0,//这里的status是之前的值
-                    "action_remark" => '',//备注
-                    "action_type" => "edit"//新建create，编辑edit，更改状态status
-                ], "PRO", 1, $selec);
+                }
 
                 $project = array_column($selec, "projectNo");
                 if (empty($project)) {

app/admin/controller/Version.php

@@ -405,13 +405,13 @@ class Version extends BaseController
                 if ($pro) {
 
                 ActionLog::logAdd(['id'=>0,"nickname"=>'客户'], [
-                    "order_code" => $project,//项目编码
+                    "order_code" => $pr['projectNo'],//项目编码
                     "status" =>4,//这里的status是之前的值
                     "action_remark" => '',//备注
                     "action_type" => "edit"//新建create，编辑edit更改状态status
                 ], "PRO", 5, ["status" => 5, "updatetime" => date("Y-m-d H:i:s")]);
 
-                $process = ["order_code" => $project, "order_id" => $pr['id'], "order_status" =>5, "order_type" => 'PRO',"before_status"=> $pr['status']];
+                $process = ["order_code" => $pr['projectNo'], "order_id" => $pr['id'], "order_status" =>5, "order_type" => 'PRO',"before_status"=> $pr['status']];
                 ProcessOrder::AddProcess(['id'=>0,"nickname"=>'客户'], $process);
                     Db::commit();
                     return app_show(0, "方案数据修改成功");
@@ -421,7 +421,7 @@ class Version extends BaseController
             return error_show(1004,"方案选择失败");
         }catch (\Exception $e){
             Db::rollback();
-            return error_show(1004,$e->getMessage());
+            return error_show(1004,$e->getMessage()."|".$e->getLine());
         }
 
     }

app/admin/route/app.php

@@ -462,7 +462,6 @@ Route::rule("projectorder","admin/Sale/projectCreate");
 
 Route::rule("aftersetwsm","admin/After/setWsm");
 Route::rule("setdelivery","admin/After/setdelivery");
-
 Route::rule("uselist","admin/Orderuse/list");
 Route::rule("usecreate","admin/Orderuse/create");
 Route::rule("useedit","admin/Orderuse/edit");