ad

app/admin/controller/Consult.php

@@ -224,6 +224,16 @@ class Consult extends Base
         if($zx){
             foreach ($ladder as $value){
                 $infoNo=makeNo("INF");
+                $specinfo=[];
+                if(isset($value['specinfo']) &&!empty($value['specinfo'])){
+                    foreach ($value["specinfo"] as $v){
+                        $spec =Db::name("specs")->where(["id"=>$v['specid']])->find();
+                        $spec_value =Db::name("spec_value")->where(["id"=>$v['spec_value_id']])->find();
+                        $v['spec_name']=$spec['spec_name'];
+                        $v['spec_value_name']=$spec_value['spec_value'];
+                        $specinfo[]=$v;
+                    }
+                }
                 $info=[
                     "infoNo"=>$infoNo,
                     "zxNo"=>$zxNo,
@@ -234,9 +244,7 @@ class Consult extends Base
                     "unit"=>$value['unit'],
                     "brand_id"=>$value['brand_id'],
                     "arrival_time"=>$value['arrival_time'],
-                    "model"=>$value['model'],
-                    "color"=>$value['color'],
-                    "material"=>$value['material'],
+                    "specinfo"=>empty($specinfo)?"" : json_encode($specinfo),
                     "cost_desc"=>$value['cost_desc'],
                     "is_addrs"=>$value['is_addrs'],
                     "is_custom"=>$value['is_custom'],
@@ -449,6 +457,7 @@ class Consult extends Base
         $zxinfo['budget_total']="";
         $zxinfo['departinfo']=[];
         $zxinfo['unit_name']="";
+        $zxinfo['specinfo']=json_decode($zxinfo['specinfo'],true);
         if($zxorder['khNo']!==""){
             $kh=Db::name("customer_info")->where(['companyNo'=>$zxorder['khNo']])->find();
             $zxinfo['khname']= isset($kh['companyName'])?$kh['companyName']:"";
@@ -519,18 +528,18 @@ class Consult extends Base
         if($arrival_time==""){
             return error_show(1003,"参数arrival_time不能为空");
         }
-        $model= isset($this->post['model'])&&$this->post['model']!=""?trim($this->post['model']):"";
-        if($model==""){
-            return error_show(1003,"参数model不能为空");
-        }
-        $color= isset($this->post['color'])&&$this->post['color']!=""?trim($this->post['color']):"";
-        if($color==""){
-            return error_show(1003,"参数color不能为空");
-        }
-        $material= isset($this->post['material'])&&$this->post['material']!=""?trim($this->post['material']):"";
-        if($material==""){
-            return error_show(1003,"参数material不能为空");
+        $specin= isset($this->post['specinfo'])&&!empty($this->post['specinfo'])?$this->post['specinfo']:"";
+        if($specin==""){
+            return error_show(1003,"参数specinfo不能为空");
         }
+//        $color= isset($this->post['color'])&&$this->post['color']!=""?trim($this->post['color']):"";
+//        if($color==""){
+//            return error_show(1003,"参数color不能为空");
+//        }
+//        $material= isset($this->post['material'])&&$this->post['material']!=""?trim($this->post['material']):"";
+//        if($material==""){
+//            return error_show(1003,"参数material不能为空");
+//        }
         $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不能为空");
@@ -591,6 +600,14 @@ class Consult extends Base
         if(empty($user)||$user['code']!=0){
             return error_show(105,"用户数据不存在");
         }
+        $specinfo=[];
+        foreach ($specin as $v){
+            $spec =Db::name("specs")->where(["id"=>$v['specid']])->find();
+            $spec_value =Db::name("spec_value")->where(["id"=>$v['spec_value_id']])->find();
+            $v['spec_name']=isset($spec['spec_name'])?$spec['spec_name']:"";
+            $v['spec_value_name']=isset($spec_value['spec_value'])?$spec_value['spec_value']:"";
+            $specinfo[]=$v;
+        }
         $createrid= isset($user["data"]['id']) ?  $user["data"]['id'] : "";
         $creater= isset($user["data"]['nickname']) ?  $user["data"]['nickname'] : "";
         $bidlist = Db::name("consult_bids")->where(["infoNo"=>$zxinfo['infoNo'],"is_del"=>0])->select();
@@ -606,9 +623,9 @@ class Consult extends Base
                 "unit"=>$unit,
                 "brand_id"=>$brand_id,
                 "arrival_time"=>$arrival_time,
-                "model"=>$model,
-                "color"=>$color,
-                "material"=>$material,
+                "specinfo"=>json_encode($specinfo),
+//                "color"=>$color,
+//                "material"=>$material,
                 "cost_desc"=>$cost_desc,
                 "is_addrs"=>$is_addrs,
                 "is_custom"=>$is_custom,
@@ -712,10 +729,22 @@ class Consult extends Base
         if($cat_id==""){
             return error_show(1002,"参数cat_id不能为空");
         }
-        $model = isset($this->post['model'])&&$this->post['model']!=""? trim($this->post['model']):"";
-        //$unit = isset($this->post['model'])&&$this->post['model']!=""? trim($this->post['model']):"";
-        $material = isset($this->post['material'])&&$this->post['material']!=""? trim($this->post['material']):"";
-        $color = isset($this->post['color'])&&$this->post['color']!=""? trim($this->post['color']):"";
+        $specin= isset($this->post['specinfo'])&&!empty($this->post['specinfo'])?$this->post['specinfo']:"";
+        if($specin==""){
+            return error_show(1003,"参数specinfo不能为空");
+        }
+        $specinfo=[];
+        foreach ($specin as $v){
+            $spec =Db::name("specs")->where(["id"=>$v['specid']])->find();
+            $spec_value =Db::name("spec_value")->where(["id"=>$v['spec_value_id']])->find();
+            $v['spec_name']=isset($spec['spec_name'])?$spec['spec_name']:"";
+            $v['spec_value_name']=isset($spec_value['spec_value'])?$spec_value['spec_value']:"";
+            $specinfo[]=$v;
+        }
+//        $model = isset($this->post['model'])&&$this->post['model']!=""? trim($this->post['model']):"";
+//        //$unit = isset($this->post['model'])&&$this->post['model']!=""? trim($this->post['model']):"";
+//        $material = isset($this->post['material'])&&$this->post['material']!=""? trim($this->post['material']):"";
+//        $color = isset($this->post['color'])&&$this->post['color']!=""? trim($this->post['color']):"";
         $unit_id = isset($this->post['unit_id'])&&$this->post['unit_id']!=""? intval($this->post['unit_id']):"";
         $cost_desc = isset($this->post['cost_desc'])&&$this->post['cost_desc']!=""? trim($this->post['cost_desc']):"";
         $work_day = isset($this->post['work_day'])&&$this->post['work_day']!=""? intval($this->post['work_day']):"";
@@ -765,9 +794,9 @@ class Consult extends Base
             "good_name"=>$pname,
             "brand_id"=>$brandid,
             "cat_id"=>$cat_id,
-            "model"=>$model,
-            "color"=>$color,
-            "material"=>$material,
+            "specinfo"=>json_encode($specinfo),
+//            "color"=>$color,
+//            "material"=>$material,
             "unit_id"=>$unit_id,
             "cost_desc"=>$cost_desc,
             "work_day"=>$work_day,
@@ -890,6 +919,7 @@ class Consult extends Base
         }else{
             $price = GoodPrice($god, $budget/100);
         }
+        $info['specinfo'] = json_decode($info['specinfo'],true);
         $info['sale_price'] =round($price,2);
         $bargain =Db::name("bargain_order")->where(['bidsNo'=>$bidNo,"is_del"=>0])->find();
         $info['bargain'] =$bargain;
@@ -926,9 +956,18 @@ class Consult extends Base
         if($cat_id==""){
             return error_show(1002,"参数cat_id不能为空");
         }
-        $model = isset($this->post['model'])&&$this->post['model']!=""? trim($this->post['model']):"";
-        //$unit = isset($this->post['model'])&&$this->post['model']!=""? trim($this->post['model']):"";
-        $material = isset($this->post['material'])&&$this->post['material']!=""? trim($this->post['material']):"";
+        $specin= isset($this->post['specinfo'])&&!empty($this->post['specinfo'])?$this->post['specinfo']:"";
+        if($specin==""){
+            return error_show(1003,"参数specinfo不能为空");
+        }
+        $specinfo=[];
+        foreach ($specin as $v){
+            $spec =Db::name("specs")->where(["id"=>$v['specid']])->find();
+            $spec_value =Db::name("spec_value")->where(["id"=>$v['spec_value_id']])->find();
+            $v['spec_name']=isset($spec['spec_name'])?$spec['spec_name']:"";
+            $v['spec_value_name']=isset($spec_value['spec_value'])?$spec_value['spec_value']:"";
+            $specinfo[]=$v;
+        }
         $unit_id = isset($this->post['unit_id'])&&$this->post['unit_id']!=""? intval($this->post['unit_id']):"";
         $cost_desc = isset($this->post['cost_desc'])&&$this->post['cost_desc']!=""? trim($this->post['cost_desc']):"";
         $work_day = isset($this->post['work_day'])&&$this->post['work_day']!=""? intval($this->post['work_day']):"";
@@ -961,8 +1000,8 @@ class Consult extends Base
             "good_name"=>$pname,
             "brand_id"=>$brandid,
             "cat_id"=>$cat_id,
-            "model"=>$model,
-            "material"=>$material,
+            "specinfo"=>json_encode($specinfo),
+//            "material"=>$material,
             "unit_id"=>$unit_id,
             "cost_desc"=>$cost_desc,
             "work_day"=>$work_day,
@@ -1193,6 +1232,8 @@ class Consult extends Base
             }else{
                 $price = GoodPrice($god, $budget/100);
             }
+            $value['specinfo'] = json_decode($value['specinfo'],true);
+
             $value['sale_price'] =round($price,2);
             $value['bargain_status']=$bidinfo['bargain_status'];
             $data[]=$value;
@@ -1269,6 +1310,7 @@ class Consult extends Base
                 $price = GoodPrice($god, $budget/100);
             }
             $value['sale_price'] =round($price,2);
+            $value['specinfo'] = json_decode($value['specinfo'],true);
             $value['bargain_status']=$bidinfo['bargain_status'];
             $data[]=$value;
         }

app/admin/controller/Resign.php

@@ -146,7 +146,7 @@ class Resign extends BaseController
         $userinfo = $data['data'];
         $bk_code=makeNo("BK");
         $info = [
-            "spuCode"=>$good_code,
+            "spuCode"=>$good['spuCode'],
             "good_name"=>$good['good_name'],
             "good_num"=>$good_num,
             "skuCode"=>$good['skuCode'],
@@ -717,5 +717,52 @@ class Resign extends BaseController
         if($info['wsm_code']==""){
             return error_show(1002,'备库仓库不能为空');
         }
+        $good =Db::name("good")->alias("a")->leftJoin("good b","a.spuCod=b.spuCode")->where([["a.skuCode","=",
+            $info['skuCode']],["a.is_del","=",0]])->find();
+        if($good==false){
+            return error_show(1004,"未找到商品数据");
+        }
+        $supplier=Db::name("supplier")->where(["code"=>$info['supplierNo'],"is_del"=>0])->find();
+        if($supplier==false){
+            return error_show(1004,"未找到供应商数据");
+        }
+        $cgdCode = makeNo("CG");
+        $cg =["cgdNo"=>$cgdCode,
+            "bkcode"=>"",
+            "wsm_code"=>$info['wsm_code'],
+            "cgder"=>$supplier['person'],
+            "cgder_id"=>$supplier['personid'],
+            "good_code"=>$info['spuCode'],
+            "good_name"=>$info['good_name'],
+            "good_num"=>$info['good_num'],
+            "good_price"=>$good['sale_price'],
+            "total_fee"=>$good['total_fee'],
+            "pakge_fee"=>$good['packing_fee'],
+            "cert_fee"=>$good['cert_fee'],
+            "open_fee"=>$good['open_fee'],
+            "delivery_fee"=>0,
+            "mark_fee"=>$good['mark_fee'],
+            "teach_fee"=>$good['cost_fee'],
+            "demo_fee"=>$good['demo_fee'],
+            #"weight"=>$data['weight'],
+            "diff_weight"=>"0",
+            "diff_fee"=>"0",
+            "gold_price"=>"0",
+            "supplierNo"=>$info['supplierNo'],
+            "supplier_name"=>$supplier['name'],
+            "companyNo"=>$info['companyNo'],
+            "send_status"=>1,
+            "send_num"=>"0",
+            "wsend_num"=>$info['good_num'],
+            "remark"=>"",
+            "status"=>0,
+            "lasttime"=>date("Y-m-d H:i:s"),
+            "is_del"=>0,
+            "order_type"=>1,
+            "good_type"=>1,
+            "addtime"=>date("Y-m-d H:i:s"),
+            "updatetime"=>date("Y-m-d H:i:s")
+        ];
+        $up =Db::name("purchease_order")->insert($cg);
     }
 }

app/admin/controller/Sale.php

@@ -84,6 +84,7 @@ class Sale extends BaseController
                 "supplierNo"=>$goodinfo['supplierNo'],
                 "companyNo"=>$supplierNo,
                 "spuCode"=>$good_code,
+                "skuCode"=>$skuCode,
                 "orderCode"=>$orderCode,
                 "good_name"=>$goodinfo['good_name'],
                 "sale_price"=>$goodinfo['sale_price'],
@@ -91,7 +92,7 @@ class Sale extends BaseController
                 "pakge_fee"=>$goodinfo['pakge_fee'],
                 "cert_fee"=>$goodinfo['cert_fee'],
                 "open_fee"=>$goodinfo['open_fee'],
-                "delivery_fee"=>$goodinfo['delivery_fee'],
+                "cost_fee"=>$goodinfo['cost_fee'],
                 "mark_fee"=>$goodinfo['mark_fee'],
                 "demo_fee"=>$goodinfo['demo_fee'],
                 "good_num"=>$good_num,
@@ -113,13 +114,14 @@ class Sale extends BaseController
                 "companyNo"=>$supplierNo,
                 "orderCode"=>$orderCode,
                 "spuCode"=>$ct['spuCode'],
+                "skuCode"=>$ct['skuCode'],
                 "good_name"=>$ct['good_name'],
                 "sale_price"=>$ct['sale_price'],
                 "total_fee"=>$ct['total_fee'],
-                "pakge_fee"=>$ct['pakge_fee'],
+                "pakge_fee"=>$ct['packing_fee'],
                 "cert_fee"=>$ct['cert_fee'],
                 "open_fee"=>$ct['open_fee'],
-                "delivery_fee"=>$ct['delivery_fee'],
+                "cost_fee"=>$ct['cost_fee'],
                 "mark_fee"=>$ct['mark_fee'],
                 "demo_fee"=>$ct['demo_fee'],
                 "good_num"=>$good_num,
@@ -163,7 +165,7 @@ class Sale extends BaseController
             $data=[
                 "orderCode"=>$orderCode,
                 "good_code"=>$spuCode,
-                "sku_code"=>$skuCode,
+                "skuCode"=>$skuCode,
                 "customer_code"=>$customer_code,
                 "good_name"=>isset($goodinfo['good_name'])&&$goodinfo['good_name']!==''?$goodinfo['good_name']:'',
                 "good_num"=>$good_num,
@@ -195,12 +197,13 @@ class Sale extends BaseController
             if($datainfo>0){
                 if($is_stock==0){
                     $bol=$this->createCgd($cgd);
+                    if($bol==false){
+                        Db::rollback();
+                        return error_show(1002,"咨询订单创建失败");
+                    }
                 }
 
-                if($bol==false){
-                    Db::rollback();
-                    return error_show(1002,"咨询订单创建失败");
-                }
+
                 if($order_type==3|| $order_type==4){
                     $limt=[
                         "spuCode"=>$goodinfo['spuCode'],
@@ -302,6 +305,7 @@ class Sale extends BaseController
     public function createCgd($data){
         $cgdCode = makeNo("CG");
         $supplier=Db::name("supplier")->where(["code"=>$data['supplierNo'],"is_del"=>0])->find();
+        //echo Db::name("supplier")->getLastSql();
         if($supplier==false){
             return false;
         }
@@ -337,7 +341,8 @@ class Sale extends BaseController
             "wsm_code"=>$wsm_code,
             "cgder"=>$supplier['person'],
             "cgder_id"=>$supplier['personid'],
-            "good_code"=>$data['spuCode'],
+            "spuCode"=>$data['spuCode'],
+            "skuCode"=>$data['skuCode'],
             "good_name"=>$data['good_name'],
             "good_num"=>$data['good_num'],
             "good_price"=>$data['sale_price'],
@@ -345,7 +350,7 @@ class Sale extends BaseController
             "pakge_fee"=>$data['pakge_fee'],
             "cert_fee"=>$data['cert_fee'],
             "open_fee"=>$data['open_fee'],
-            "delivery_fee"=>$data['delivery_fee'],
+            "teach_fee"=>$data['cost_fee'],
             "mark_fee"=>$data['mark_fee'],
             "demo_fee"=>$data['demo_fee'],
             #"weight"=>$data['weight'],
@@ -354,6 +359,7 @@ class Sale extends BaseController
             "gold_price"=>"0",
             "supplierNo"=>$data['supplierNo'],
             "supplier_name"=>$supplier['name'],
+            "companyNo"=>$data['companyNo'],
             "send_status"=>1,
             "send_num"=>"0",
             "wsend_num"=>$data['good_num'],