wugg 11 months ago
parent
commit
e386623642
3 changed files with 14 additions and 23 deletions
  1. 5 0
      app/admin/controller/Good.php
  2. 0 22
      app/admin/controller/Purch.php
  3. 9 1
      app/admin/model/GoodCombind.php

+ 5 - 0
app/admin/controller/Good.php

@@ -1364,4 +1364,9 @@ class Good extends Base
 
     }
 
+    public function getCombind(){
+        $param= $this->request->param(['spuCode'=>'',"isZx"=>""],'post','trim');
+		$list = (new GoodCombind())->with([$param['isZx']==1?"goodZx":"goodBasic"])->where('spuCode',$param['spuCode'])->select();
+		$this->success('获取成功',$list);
+    }
 }

+ 0 - 22
app/admin/controller/Purch.php

@@ -468,31 +468,9 @@ class Purch extends Base
 
         $data['company'] = '';
         if (isset($data['companyNo']) && $data['companyNo'] != "") {
-//            $company = Db::name("business")->where(["companyNo"=>$data['companyNo']])->find();
             $data['company'] = $tmp['data'][$data['companyNo']] ?? '';
         }
-        //$data['company'] = isset($company['company'])?$company['company']:"";
-        //$data['info'] = $var;
         $data['purcheaseback'] = $var;
-
-        //补充orderCode
-//        $data['orderCode'] = Db::name('order_num')
-//            ->where('cgdNo', $data['cgdNo'])
-//            ->value('orderCode', '');
-
-//        //补充收货地址
-//        $addr = Db::name('order_addr')
-//            ->field('id,addr,addr_code,contactor,mobile,receipt_quantity')
-//            ->where(['orderCode' => $data['orderCode'], 'is_del' => 0])
-//            ->select()
-//            ->toArray();
-//        if (!empty($addr)) {
-//             foreach ($addr as &$vv){
-//                $temp = explode(',', $vv['addr_code']);
-//                $temp_ = GetAddr(json_encode(['provice_code' => isset($temp[0]) ? $temp[0] : '', 'city_code' => isset($temp[1]) ? $temp[1] : '', 'area_code' => isset($temp[2]) ? $temp[2] : '']));
-//                $vv['addr_code'] = $temp_ . $vv['addr'];
-//            }
-//        }else
         $addr = [];
         $data['addr_info'] = $addr;
 

+ 9 - 1
app/admin/model/GoodCombind.php

@@ -15,11 +15,19 @@ class GoodCombind extends Model
 	protected $append=["usable_stock"];
 	  // 定义全局的查询范围
     protected $globalScope = ['is_del'];
-
+    
+    
     public function scopeIsDel($query)
     {
         $query->where('is_del',0);
     }
+    
+    public function GoodZx(){
+    	return $this->belongsTo(GoodZixun::class,"childCode","spuCode");
+    }
+    public function GoodBasic(){
+    	return $this->belongsTo(GoodBasic::class,'childCode','spuCode');
+    }
 	public function getUsableStockAttr($v,$row){
 		return (new GoodStock())->withJoin(['wsminfo'] , 'left')
 		                 ->where(['spuCode'=>$row['childCode'] , 'wsm_type'=>[2 , 5]])