Prechádzať zdrojové kódy

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

wugg 3 rokov pred
rodič
commit
ed541cbe23
2 zmenil súbory, kde vykonal 102 pridanie a 18 odobranie
  1. 52 18
      app/admin/controller/Purch.php
  2. 50 0
      app/admin/controller/Sale.php

+ 52 - 18
app/admin/controller/Purch.php

@@ -152,9 +152,58 @@ class Purch extends Base
         }
         //$var = Db::name('purchease_in')->where(['cgdNo'=>$data['cgdNo'],'is_del'=>0])->select();
         $dom = Db::name("purchease_diff")->where(['cgdNo'=>$data['cgdNo'],'is_del'=>0])->find();
-        $goon = Db::name('good')->where(['good_code'=>$data['good_code']])->field("cat_id")->find();
+        $goon = Db::name('good')->where(['spuCode'=>$data['spuCode']])->find();
         if(empty($goon)){
             return error_show(1002,"未找到商品数据");
+        }else{
+            $goon['exclusive']=makeExcluse($goon['is_exclusive']);
+            $unit =Db::name("unit")->where(["id"=>$goon['good_unit']])->find();
+            $goon['unit'] = isset($unit['unit'])?$unit['unit']:'';
+            $spec = Db::name("good_spec")->where(["spuCode"=>$goon['spuCode'],"is_del"=>0])->select()->toArray();
+            $speclist=[];
+            if(!empty($spec)){
+                foreach ($spec as $value){
+                    $temp=[];
+                    $temp['id']=$value['id'];
+                    $temp['spuCode']=$value['spuCode'];
+                    $temp['spec_id']=$value['spec_id'];
+                    $temp['spec_value_id']=$value['spec_value_id'];
+                    $temp['is_del']=$value['is_del'];
+                    $sp = Db::name("specs")->where(["id"=>$value['spec_id']])->find();
+                    $temp['spec_name']=isset($sp["spec_name"]) ? $sp["spec_name"]:"";
+                    $spv = Db::name("spec_value")->where(["id"=>$value['spec_value_id']])->find();
+                    $temp['spec_value']=isset($spv["spec_value"]) ? $spv["spec_value"]:"";
+                    $speclist[]=$temp;
+                }
+            }
+            $goon["speclist"]=empty($speclist)?[]:$speclist;
+            $proof =Db::name("good_proof")->where(["spuCode"=>$goon['spuCode'],"is_del"=>0])->order("updatetime desc")->field("id,proof_type,proof_url")->find();
+            $goon['proof'] = isset($proof)&&$proof!=false? $proof:[];
+            $goon['origin_place_cn']="";
+            $goon['delivery_place_cn']="";
+            if($goon['delivery_place']!==""){
+                $place = ["provice_code"=>"","city_code"=>"","area_code"=>""];
+                list($place['provice_code'],$place['city_code'],$place['area_code'])=explode(",",$goon['delivery_place']);
+                $goon['delivery_place_cn']=GetAddr(json_encode($place));
+            }
+            if($goon['origin_place']!==""){
+                $place = ["provice_code"=>"","city_code"=>"","area_code"=>""];
+                list($place['provice_code'],$place['city_code'],$place['area_code'])=explode(",",$goon['origin_place']);
+                $goon['origin_place_cn']=GetAddr(json_encode($place));
+            }
+            if($goon['brand_id']!=0){
+                $brand=Db::name("brand")->where(["id"=>$goon['brand_id']])->find();
+                $goon["brand_name"]=isset($brand['brand_name'])?$brand['brand_name']:"";
+            }else{
+                $goon["brand_name"]="";
+                $goon["brand_id"]="";
+            }
+
+            $supplier = Db::name("supplier")->where(["code"=>$goon['supplierNo']])->find();
+            $goon['supplierName'] = isset($supplier['name'])?$supplier['name']:"";
+            $goon['noble_name']=isset($goon['noble_metal'])&&$goon['noble_metal']!=0?$this->noble[$goon['noble_metal']] :"";
+            $company = Db::name("business")->where(["companyNo"=>$goon['companyNo']])->find();
+            $goon['company'] = isset($company['company'])?$company['company']:"";
         }
         $int= isset($goon['cat_id']) && $goon['cat_id'] !=0 ? made($goon['cat_id']):[];
         $data['wsm_name']="";
@@ -174,24 +223,9 @@ class Purch extends Base
             $inorder= Db::name("purchease_in")->where(['cgdNo'=>$data['cgdNo'],"is_del"=>0])->select();
             $data['child']=empty($inorder)? [] : $inorder;
         }
-        $feed = Db::name("purchease_feedback")->where(['bkcode'=>$data['bkcode'],'is_del'=>0])->find();
-        $data['feedback'] = [];
-        if(!empty($feed)){
-            $feed['wsm_name']="";
-            if($feed['warehouse']!=""){
-                $wsmcode = Db::name("warehouse_info")->alias("a")->leftJoin("supplier b","a.supplierNo=b.code")
-                    ->where(["a.wsm_code"=>$feed['warehouse']])->field("a.name as wsm_name,b.name,b.code")->find();
-                $feed['wsm_name'] =isset($wsmcode['wsm_name']) ? $wsmcode['wsm_name']:"";
-                $feed['wsm_supplier'] =isset($wsmcode['name']) ? $wsmcode['name']:"";
-                $feed['wsm_supplierNo'] =isset($wsmcode['code']) ? $wsmcode['code']:"";
-            }
-            if($feed['supplier']!=""){
-                $supplie = Db::name("supplier")->where(['code'=>$feed['supplier'],"is_del"=>0])->find();
-                $feed['supplier_name'] =isset($supplie['name']) ? $supplie['name']:"";
-            }
-            $data['feedback'] = $feed;
-        }
+
         $data['can'] = $int;
+        $data['goodinfo'] = $goon;
         $data['purcheasediff'] = $dom;
         //$data['info'] = $var;
         $data['purcheaseback'] = $var;

+ 50 - 0
app/admin/controller/Sale.php

@@ -1535,6 +1535,55 @@ class Sale extends Base
         }
         if ($goon==false) {
             return error_show(1003, "未找到商品数据");
+        }else{
+            $goon['exclusive']=makeExcluse($goon['is_exclusive']);
+            $unit =Db::name("unit")->where(["id"=>$goon['good_unit']])->find();
+            $goon['unit'] = isset($unit['unit'])?$unit['unit']:'';
+            $spec = Db::name("good_spec")->where(["spuCode"=>$goon['spuCode'],"is_del"=>0])->select()->toArray();
+            $speclist=[];
+            if(!empty($spec)){
+                foreach ($spec as $value){
+                    $temp=[];
+                    $temp['id']=$value['id'];
+                    $temp['spuCode']=$value['spuCode'];
+                    $temp['spec_id']=$value['spec_id'];
+                    $temp['spec_value_id']=$value['spec_value_id'];
+                    $temp['is_del']=$value['is_del'];
+                    $sp = Db::name("specs")->where(["id"=>$value['spec_id']])->find();
+                    $temp['spec_name']=isset($sp["spec_name"]) ? $sp["spec_name"]:"";
+                    $spv = Db::name("spec_value")->where(["id"=>$value['spec_value_id']])->find();
+                    $temp['spec_value']=isset($spv["spec_value"]) ? $spv["spec_value"]:"";
+                    $speclist[]=$temp;
+                }
+            }
+            $goon["speclist"]=empty($speclist)?[]:$speclist;
+            $proof =Db::name("good_proof")->where(["spuCode"=>$goon['spuCode'],"is_del"=>0])->order("updatetime desc")->field("id,proof_type,proof_url")->find();
+            $goon['proof'] = isset($proof)&&$proof!=false? $proof:[];
+            $goon['origin_place_cn']="";
+            $goon['delivery_place_cn']="";
+            if($goon['delivery_place']!==""){
+                $place = ["provice_code"=>"","city_code"=>"","area_code"=>""];
+                list($place['provice_code'],$place['city_code'],$place['area_code'])=explode(",",$goon['delivery_place']);
+                $goon['delivery_place_cn']=GetAddr(json_encode($place));
+            }
+            if($goon['origin_place']!==""){
+                $place = ["provice_code"=>"","city_code"=>"","area_code"=>""];
+                list($place['provice_code'],$place['city_code'],$place['area_code'])=explode(",",$goon['origin_place']);
+                $goon['origin_place_cn']=GetAddr(json_encode($place));
+            }
+            if($goon['brand_id']!=0){
+                $brand=Db::name("brand")->where(["id"=>$goon['brand_id']])->find();
+                $goon["brand_name"]=isset($brand['brand_name'])?$brand['brand_name']:"";
+            }else{
+                $goon["brand_name"]="";
+                $goon["brand_id"]="";
+            }
+
+            $supplier = Db::name("supplier")->where(["code"=>$goon['supplierNo']])->find();
+            $goon['supplierName'] = isset($supplier['name'])?$supplier['name']:"";
+            $goon['noble_name']=isset($goon['noble_metal'])&&$goon['noble_metal']!=0?$this->noble[$goon['noble_metal']] :"";
+            $company = Db::name("business")->where(["companyNo"=>$goon['companyNo']])->find();
+            $goon['company'] = isset($company['company'])?$company['company']:"";
         }
         $int = isset($goon['cat_id']) && $goon['cat_id'] != 0 ? made($goon['cat_id']) : [];
 
@@ -1618,6 +1667,7 @@ class Sale extends Base
         $einfo['addrs'] = $addrs;
        // $einfo['orderout'] = $ins;
         $einfo['can'] = $int;
+        $einfo['goodinfo'] = $goon;
 //        $einfo['salediff'] = $info;
 //        $einfo['orderreturn'] = $dm;
 //        $einfo['orderback'] = $dk;