|
|
@@ -28,15 +28,11 @@ class Good extends \app\BaseController
|
|
|
$condtion=["a.is_del"=>0,"b.is_del"=>0,"c.is_del"=>0];
|
|
|
$wsmcode =isset($this->post['wsmcode']) &&$this->post['wsmcode'] !=="" ? trim($this->post['wsmcode']):"";
|
|
|
if($wsmcode!=""){
|
|
|
- $typecode = Db::name("good_stock")->where(["is_del"=>0,"wsm_code"=>$wsmcode])->column("good_type_code");
|
|
|
- if(empty($typecode)){
|
|
|
- return error_show(1004,"未找到供应商有关的商品信息");
|
|
|
- }
|
|
|
- $condtion["type_code"] = $typecode;
|
|
|
+ $condtion["c.wsm_code"] = $wsmcode;
|
|
|
}
|
|
|
$good_code =isset($this->post['type_code']) &&$this->post['type_code'] !=="" ? trim($this->post['type_code']):"";
|
|
|
if($good_code!=""){
|
|
|
- $condtion['type_code'] = $good_code;
|
|
|
+ $condtion['b.type_code'] = $good_code;
|
|
|
}
|
|
|
$supplierNo =isset($this->post['supplierNo']) &&$this->post['supplierNo'] !=="" ? trim($this->post['supplierNo']):"";
|
|
|
if($supplierNo!=""){
|
