a

app/admin/controller/Allot.php

@@ -51,14 +51,15 @@ class Allot extends Base
 
         $out_supplierNo =isset($this->post['wsm_out_supplierNo']) &&$this->post['wsm_out_supplierNo'] !=="" ? trim($this->post['wsm_out_supplierNo']):"";
         if($out_supplierNo!=""){
-            $supplier = Db::name("supplier")->where(["code"=>$out_supplierNo])->find();
-            if(empty($supplier)){
-                return error_show(1004,"未找到出库供应商信息");
-            }
+//            $supplier = Db::name("supplier")->where(["code"=>$out_supplierNo])->find();
+//            if(empty($supplier)){
+//                return error_show(1004,"未找到出库供应商信息");
+//            }
             $wsmcode = Db::name("warehouse_info")->where(["is_del"=>0,"wsm_type"=>1,"supplierNo"=>$out_supplierNo])->column("wsm_code");
             //$condtion["a.c.wsm_code"] = $wsmcode;
             $where[]=['a.wsm_out',"in",$wsmcode];
         }
+
         $out_companyNo = isset($this->post['out_companyNo']) && $this->post['out_companyNo'] !== "" ? trim($this->post['out_companyNo']) : "";
         if ($out_companyNo !== "") {
 
@@ -71,10 +72,10 @@ class Allot extends Base
 
         $in_supplierNo =isset($this->post['wsm_in_supplierNo']) &&$this->post['wsm_in_supplierNo'] !=="" ? trim($this->post['wsm_in_supplierNo']):"";
         if($in_supplierNo!=""){
-            $supplier = Db::name("supplier")->where(["code"=>$in_supplierNo])->find();
-            if(empty($supplier)){
-                return error_show(1004,"未找到入库供应商信息");
-            }
+//            $supplier = Db::name("supplier")->where(["code"=>$in_supplierNo])->find();
+//            if(empty($supplier)){
+//                return error_show(1004,"未找到入库供应商信息");
+//            }
             $wsmcode = Db::name("warehouse_info")->where(["is_del"=>0,"wsm_type"=>1,"supplierNo"=>$in_supplierNo])->column("wsm_code");
             //$condtion["c.wsm_code"] = $wsmcode;
             $where[]=['a.wsm_in',"in",$wsmcode];
@@ -273,24 +274,29 @@ class Allot extends Base
         if(empty($stv)){
             return error_show(1002,"未找到仓库数据");
         }
-        $vr = Db::name('supplier')->where(['code'=>$stv['supplierNo'],'is_del'=>0])->field('name,code as rcode')->find();
-        if(empty($vr)){
-            return error_show(1001,"未找到供应商数据");
-        }
         $st = Db::name('warehouse_info')->where(['wsm_code'=>$str['wsm_in'],'is_del'=>0])->field('supplierNo,wsm_code,name')->find();
         if(empty($st)){
             return error_show(1003,"未找到仓库数据");
         }
-        $var = Db::name('supplier')->where(['code'=>$st['supplierNo'],'is_del'=>0])->field('name,code')->find();
-        if(empty($var)){
-            return error_show(1004,"未找到供应商数据");
-        }
+		$user = new \app\admin\common\User();
+        $supplie=$user->handle("getCodeAndName",["code"=>[$stv['supplierNo'],$st['supplierNo']]]);
+		if($supplie['code']!=0 || empty($supplie['data'])) return error_show(1001,"未找到供应商数据");
+		$vr = ["name"=>$supplie['data'][$stv['supplierNo']],"code"=>$stv['supplierNo']];
+		$var = ["name"=>$supplie['data'][$st['supplierNo']],"code"=>$st['supplierNo']];
+//        $vr = Db::name('supplier')->where(['code'=>$stv['supplierNo'],'is_del'=>0])->field('name,code as rcode')->find();
+//        if(empty($vr)){
+//            return error_show(1001,"未找到供应商数据");
+//        }
+//        $var = Db::name('supplier')->where(['code'=>$st['supplierNo'],'is_del'=>0])->field('name,code')->find();
+//        if(empty($var)){
+//            return error_show(1004,"未找到供应商数据");
+//        }
         // var_dump(Db::name('supplier')->getLastSql());
         $str ['wsm_out_name']=$vr['name'];
         $str ['wsm_in_name']=$var['name'];
         $str ['ckc_name']=$stv['name'];
         $str ['ckr_name']=$st['name'];
-        $str['out_code']=$vr['rcode'];
+        $str['out_code']=$vr['code'];
         $str['in_code']=$var['code'];
 //        $str = Db::name('allot_stock')->alias('a')->join('warehouse_info b',"b.wsm_code=a.wsm_out","left")
 //            ->join('supplier c',"c.code=b.supplierNo","left")->field("c.name,c.code,")
@@ -820,10 +826,10 @@ public function vesio(){
         }
         $supplierNo = isset($this->post['supplierNo']) && $this->post['supplierNo'] !== "" ? trim($this->post['supplierNo']) : "";
         if ($supplierNo != "") {
-            $supplier = Db::name("supplier")->where(["code" => $supplierNo])->find();
-            if (empty($supplier)) {
-                return error_show(1004, "未找到供应商信息");
-            }
+//            $supplier = Db::name("supplier")->where(["code" => $supplierNo])->find();
+//            if (empty($supplier)) {
+//                return error_show(1004, "未找到供应商信息");
+//            }
             $wsmcode = Db::name("warehouse_info")->where(["is_del" => 0, "supplierNo" => $supplierNo])->column("wsm_code");
             $condtion[] = ['c.wsm_code', "in", $wsmcode];
         }