Merge branch 'master-new-wgg' of wugg/phpstock into master-new

app/admin/controller/Allot.php

@@ -280,19 +280,19 @@ class Allot extends Base
         if(empty($str)){
             return error_show(1003,"未找到调拨数据");
         }
-        $stv = Db::name('warehouse_info')->where(['wsm_code'=>$str['wsm_out'],'is_del'=>0])->field('supplierNo,wsm_code,name')->find();
+        $stv = Db::name('warehouse_info')->where(['wsm_code'=>$str['wsm_out'],'is_del'=>0])->field('companyNo,wsm_code,name')->find();
         if(empty($stv)){
             return error_show(1002,"未找到仓库数据");
         }
-        $st = Db::name('warehouse_info')->where(['wsm_code'=>$str['wsm_in'],'is_del'=>0])->field('supplierNo,wsm_code,name')->find();
+        $st = Db::name('warehouse_info')->where(['wsm_code'=>$str['wsm_in'],'is_del'=>0])->field('companyNo,wsm_code,name')->find();
         if(empty($st)){
             return error_show(1003,"未找到仓库数据");
         }
 		$user = new \app\admin\common\User();
-        $supplie=$user->handle("getCodeAndName",["code"=>[$stv['supplierNo'],$st['supplierNo']]]);
+        $supplie=$user->handle("getCodeAndName",["code"=>[$stv['companyNo'],$st['companyNo']]]);
 		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 = ["name"=>$supplie['data'][$stv['companyNo']],"code"=>$stv['companyNo']];
+		$var = ["name"=>$supplie['data'][$st['companyNo']],"code"=>$st['companyNo']];
 //        $vr = Db::name('supplier')->where(['code'=>$stv['supplierNo'],'is_del'=>0])->field('name,code as rcode')->find();
 //        if(empty($vr)){
 //            return error_show(1001,"未找到供应商数据");