|
|
@@ -97,7 +97,7 @@ class Allot extends BaseController
|
|
|
->join("supplier b","b.code=a.supplierNo","left")
|
|
|
->join("business bus","bus.companyNo=a.companyNo","left")
|
|
|
->field("a.name,a.wsm_code,b.name rname,b.code,bus.company")
|
|
|
- ->where(['a.wsm_code'=>$value['wsm_out'],"a.wsm_type"=>1,'a.is_del'=>0])
|
|
|
+ ->where(['a.wsm_code'=>$value['wsm_out'],'a.is_del'=>0])
|
|
|
->find();
|
|
|
$value['name'] =isset($db['name']) ? $db['name']:"";
|
|
|
$value['wsm_code'] =isset($db['wsm_code']) ? $db['wsm_code']:"";
|
|
|
@@ -109,7 +109,7 @@ class Allot extends BaseController
|
|
|
->join("business bus","bus.companyNo=a.companyNo","left")
|
|
|
->join("supplier b","b.code=a.supplierNo","left")
|
|
|
->field("a.name,a.wsm_code,b.name tname,b.code,bus.company")
|
|
|
- ->where(['a.wsm_code'=>$value['wsm_in'],"a.wsm_type"=>1,'a.is_del'=>0])
|
|
|
+ ->where(['a.wsm_code'=>$value['wsm_in'],'a.is_del'=>0])
|
|
|
->find();
|
|
|
$value['wsm_in_name'] =isset($dc['name']) ? $dc['name']:"";
|
|
|
$value['wsm_in_code'] =isset($dc['wsm_code']) ? $dc['wsm_code']:"";
|
