Merge branch 'version1.5' of wugg/phpstock into master-online

app/admin/controller/Cat.php

@@ -504,6 +504,29 @@ public function status(){
     if($status===""){
         return error_show(1002,"参数status不能为空");
     }
+    if($status==1){
+        if($stn['rate']===""){
+            return error_show(1003,"单品修改下限未设置");
+        }
+        if($stn['order_rate']===""){
+            return error_show(1003,"预算成本利率未设置");
+        }
+        if($stn['sale_rate']===""){
+            return error_show(1003,"分类成本售价利率未设置");
+        }
+        if($stn['lower_rate']===""){
+            return error_show(1003,"分类最低毛利率未设置");
+        }
+//        if($stn['money_rate']==""){
+//            return error_show(1003,"分类财务利率未设置");
+//        }
+//        if($stn['low_rate']==""){
+//            return error_show(1003,"分类最低毛利未设置");
+//        }
+        if($stn['fund_code']==""){
+            return error_show(1003,"分类核算码未设置");
+        }
+    }
     if ($stn['level']==3) {
         if($status==1){
             $can = made($stn['id']);

app/admin/controller/Consult.php

@@ -148,6 +148,7 @@ class Consult extends Base
         if($token==''){
             return error_show(105,"参数token不能为空");
         }
+
         $user =GetUserInfo($token);
         if(empty($user)||$user['code']!=0){
             return error_show(102,"用户数据不存在");
@@ -201,7 +202,7 @@ class Consult extends Base
                         "brand_id"=>$value['brand_id'],
                         "arrival_time"=>$value['arrival_time'],
                         "specinfo"=>empty($specinfo)?"" : json_encode($specinfo),
-                        "cost_desc"=>$value['cost_desc'],
+                        "cost_desc" => isset($value['cost_desc']) ? $value['cost_desc'] : '',
                         "is_addrs"=>$value['is_addrs'],
                         "is_custom"=>$value['is_custom'],
                         "metal_id"=>$value['metal_id'],
@@ -219,7 +220,8 @@ class Consult extends Base
                         "status"=>1,
                         "is_del"=>0,
                         "addtime"=>date("Y-m-d H:i:s"),
-                        "updatetime"=>date("Y-m-d H:i:s")
+                        "updatetime"=>date("Y-m-d H:i:s"),
+                        'enclosure_file'=>isset($value['enclosure_file'])?$value['enclosure_file']:'',
                     ];
                     $up = Db::name("consult_info")->insert($info);
                     if(!$up){
@@ -329,6 +331,8 @@ class Consult extends Base
             return error_show(1004,"未找到信息数据");
         }
 
+        $enclosure_file =isset($this->post['enclosure_file'])&&$this->post['enclosure_file']!=""?trim($this->post['enclosure_file']):$zxinfo['enclosure_file'];
+
         $good_name= isset($this->post['good_name'])&&$this->post['good_name']!=""?trim($this->post['good_name']):"";
         if($good_name==""){
             return error_show(1003,"参数good_name不能为空");
@@ -359,9 +363,9 @@ class Consult extends Base
             return error_show(1003,"参数specinfo不能为空");
         }
         $cost_desc= isset($this->post['cost_desc'])&&$this->post['cost_desc']!=""?trim($this->post['cost_desc']):"";
-        if($cost_desc==""){
-            return error_show(1003,"参数cost_desc不能为空");
-        }
+//        if($cost_desc==""){
+//            return error_show(1003,"参数cost_desc不能为空");
+//        }
         $is_addrs= isset($this->post['is_addrs'])&&$this->post['is_addrs']!==""?intval($this->post['is_addrs']):"";
         if($is_addrs===""){
             return error_show(1003,"参数is_addrs不能为空");
@@ -469,7 +473,8 @@ class Consult extends Base
                 "is_del"=>0,
                 "addtime"=>date("Y-m-d H:i:s"),
                 "updatetime"=>date("Y-m-d H:i:s"),
-                'bargain_status'=>1
+                'bargain_status'=>1,
+                'enclosure_file'=>$enclosure_file
             ];
             $up = Db::name("consult_info")->insert($info);
             if($up){

app/admin/controller/Project.php

@@ -2,6 +2,7 @@
 
 
 namespace app\admin\controller;
+use app\admin\model\ProcessOrder;
 use think\App;
 use think\facade\Db;
 
@@ -110,6 +111,16 @@ class Project extends Base
                     }
                     $in = Db::name("project_info")->insertAll($la);
                     if($in>0){
+
+                        //项目创建成功之后，添加到待办列表中
+                        $process = [
+                            "order_code" => $projectNo,//把项目编码放到这儿
+                            //"order_id"=>0,//没有订单id，默认0
+                            "order_status" => 2,//2表示'流程中'
+                            "order_type" => 'PRO'//MLL表示'毛利率'
+                        ];
+                        ProcessOrder::AddProcess($this->post['token'], $process);
+
                         Db::commit();
                         return app_show(0,"项目新建成功",['projectNo'=>$projectNo]);
                     }
@@ -749,6 +760,17 @@ class Project extends Base
                 }
                 $pro = Db::name("project")->where(["projectNo" => $project, "status" => 4])->save(["status" => 5, "updatetime" => date("Y-m-d H:i:s")]);
                 if ($pro) {
+
+                    //把待办事项改为结束
+                    Db::name('workflow')->where([
+                        "order_code" => $project,//项目编码
+                        "order_status" => 2,//2表示'流程中'
+                        "order_type" => 'PRO'//PRO表示'项目'
+                    ])->update([
+                        "order_status" => 3,//3表示'完成'
+                        'updatetime'=>date('Y-m-d H:i:s')
+                    ]);
+
                     Db::commit();
                     return app_show(0, "方案数据修改成功");
                 }