ad

app/admin/controller/Consult.php

@@ -438,10 +438,35 @@ class Consult extends BaseController
             return error_show(1004,"未找到咨询信息数据");
         }
         $zxinfo['can']= isset($zxinfo['cat_id']) && $zxinfo['cat_id'] !=0 ? made($zxinfo['cat_id'],[]):[];
-        $zxorder['khname']="";
+        $zxinfo['khname']="";
+        $zxinfo['khNo']="";
+        $zxinfo['companyNo']=isset($zxorder['companyNo'])?$zxorder['companyNo']:"";
+        $zxinfo['projectNo']=isset($zxorder['projectNo'])?$zxorder['projectNo']:"";
+        $zxinfo['is_project']=isset($zxorder['is_project'])?$zxorder['is_project']:"";
+        $zxinfo['company']="";
+        $zxinfo['endtime']=isset($zxorder['endtime'])?$zxorder['endtime']:"";
+        $zxinfo['platform_code'] =isset($zxorder['platform_code'])?$zxorder['platform_code']:"";
+        $zxinfo['salesman'] =isset($zxorder['salesman'])?$zxorder['salesman']:"";
+        $zxinfo['saleid'] =isset($zxorder['saleid'])?$zxorder['saleid']:"";
+        $zxinfo['depart'] =isset($zxorder['depart'])?$zxorder['depart']:"";
+
         if($zxorder['khNo']!==""){
             $kh=Db::name("customer_info")->where(['companyNo'=>$zxorder['khNo']])->find();
-            $zxorder['khname']= isset($kh['companyName'])?$kh['companyName']:"";
+            $zxinfo['khname']= isset($kh['companyName'])?$kh['companyName']:"";
+            $zxinfo['khNo']= $zxorder['khNo'];
+        }
+        if($zxorder['companyNo']!==""){
+            $kh=Db::name("business")->where(['companyNo'=>$zxorder['companyNo']])->find();
+            $zxinfo['company']= isset($kh['company'])?$kh['company']:"";
+        }
+        if($zxorder['is_project']==1 && $zxorder['projectNo']!==""){
+            $project = Db::name("project")->where(["projectNo"=>$zxorder['projectNo'],"is_del"=>0])->find();
+            $zxinfo['project_name']=isset($project['project_name'])?$project['project_name']:"";
+            $zxinfo['budget_total']=isset($project['budget_total'])?$project['budget_total']:"";
+            $zxinfo['use_desc']=isset($project['use_desc'])?$project['use_desc']:"";
+        }
+        if($zxorder['depart']>0){
+            $zxinfo['departinfo']=GetPart($zxorder['depart']);
         }
         return app_show(0,"获取成功",$zxinfo);
     }

app/admin/controller/Sale.php

@@ -27,8 +27,8 @@ class Sale extends BaseController
         if ($good_code == "") {
             return error_show(1002, "商品code不能为空");
         }
-        $ct = Db::name('good')->alias('a')->join('good_type b', 'b.good_code=a.good_code', 'left')
-            ->where(['b.type_code' => $good_code])->find();
+        $ct = Db::name('good_platform')->alias('a')->join('good b', 'b.spuCode=a.spuCode', 'left')
+            ->where(['a.skuCode' => $good_code])->find();
         if ($ct == "") {
             return error_show(1002, "未找到商品数据");
         }
@@ -62,7 +62,7 @@ class Sale extends BaseController
         }
         $vi = isset($this->post['good_stock']) && $this->post['good_stock'] !== "" ? $this->post['good_stock'] : "";
         if ($vi == "") {
-            return error_show(1002, "参数good_stock不能为空");
+            return error_show(1002, "参数 good_stock 不能为空");
         }
         $good_num = intval(array_sum(array_column($vi, "num")));
         Db::startTrans();

app/admin/controller/Salezx.php

@@ -112,6 +112,7 @@ class Salezx extends \app\BaseController
                 "send_type"=>$sendtype,
                 "supplierNo"=>$supplierNo,
                 "is_del"=>0,
+                "zxNo"=>$zxinfoNo,
                 "platform_order"=>$platform_order,
                 "platform_id"=>$platform_id,
                 "remark"=>$remark,
@@ -431,9 +432,9 @@ class Salezx extends \app\BaseController
         if(empty($order)){
             return error_show(1002,"未找到咨询订单信息");
         }
-        $stock= Db::name("good_stock")->where(["good_type_code"=>$order['good_code'],"wsm_code"=>$der['wsm_code']])
+        $stock= Db::name("good_stock")->where(["spuCode"=>$order['good_code'],"wsm_code"=>$der['wsm_code']])
             ->find();
-       // echo Db::name("good_stock")->getLastSql();
+
         if(empty($stock)){
             return error_show(1002,"未找到仓库库存信息");
         }
@@ -484,7 +485,8 @@ class Salezx extends \app\BaseController
 //                        Db::rollback();
 //                        return error_show(1003,"更新失败");
 //                    }
-                    $str = Db::name('good_stock')->where(['wsm_code' => $der['wsm_code'],'good_type_code'=>$order['good_code']])->find();
+                    $str = Db::name('good_stock')->where(['wsm_code' => $der['wsm_code'],'spuCode'=>$order['good_code']])
+                        ->find();
                     if ($str == false) {
                         Db::rollback();
                         return error_show(1002, "商品数据未找到");
@@ -652,7 +654,6 @@ class Salezx extends \app\BaseController
                 $der['updatetime'] = date("Y-m-d H:i:s");
                 $si = Db::name('sale')->save($der);
                 if($si==false){
-
                     Db::rollback();
                     return error_show(1003,"创建失败");
                 }

app/common.php

@@ -349,6 +349,24 @@ function crea($data,$vio=0)
     }
     return $data;
 }
+
+function GetPart($id,$data=[]){
+    $db = Db::name("company_item")->where(['id'=>$id,'is_del'=>0])->find();
+    if($db==false){
+        return [];
+    }
+    $tem=[];
+    $tem['id']=$db['id'];
+    $tem['name']=$db['name'];
+    array_unshift($data,$tem);
+    if($db['pid']==0){
+        // krsort($data);
+        return $data;
+    }else{
+        return GetPart($db['pid'],$data);
+    }
+}
+
 function stro($data){
     $db=Db::name('cat')->where(['pid'=>$data['id']])->select()->toArray();
     if(empty($db)){