|
@@ -660,11 +660,11 @@ class Good extends Base
|
|
|
if($wsm_code!==""){
|
|
|
$condition[]=["gs.wsm_code","=",$wsm_code];
|
|
|
}
|
|
|
- $suplierNo = isset($this->post['supplierNo']) &&$this->post['supplierNo'] !=="" ? trim($this->post['supplierNo']):"";
|
|
|
- if($suplierNo!==""){
|
|
|
- $wsmcode = Db::name("warehouse_info")->where(['supplierNo'=>$suplierNo,"is_del"=>0])->column("wsm_code");
|
|
|
- $condition[]=["gs.wsm_code","in",$wsmcode];
|
|
|
- }
|
|
|
+// $suplierNo = isset($this->post['supplierNo']) &&$this->post['supplierNo'] !=="" ? trim($this->post['supplierNo']):"";
|
|
|
+// if($suplierNo!==""){
|
|
|
+// $wsmcode = Db::name("warehouse_info")->where(['supplierNo'=>$suplierNo,"is_del"=>0])->column("wsm_code");
|
|
|
+// $condition[]=["gs.wsm_code","in",$wsmcode];
|
|
|
+// }
|
|
|
$companyNo = isset($this->post['companyNo']) && $this->post['companyNo'] !== "" ? trim($this->post['companyNo']) : "";
|
|
|
if ($companyNo !== "") {
|
|
|
$wsmcode = Db::name("warehouse_info")->where(['companyNo'=>$companyNo,"is_del"=>0])->column("wsm_code");
|
|
@@ -778,9 +778,13 @@ class Good extends Base
|
|
|
}
|
|
|
|
|
|
$relaComNo = isset($this->post['relaComNo']) && $this->post['relaComNo']!="" ? trim($this->post['relaComNo']):"";
|
|
|
- if($relaComNo!="") $where[]=['b.supplierNo','=', $relaComNo];
|
|
|
+ if($relaComNo!="") $where[]=['b.companyNo','=', $relaComNo];
|
|
|
|
|
|
- $count = Db::name("good")->alias("b")
|
|
|
+ $supplierNo = isset($this->post['supplierNo']) && $this->post['supplierNo']!="" ? trim($this->post['supplierNo']):"";
|
|
|
+ if($supplierNo!=="") $where[]=['b.supplierNo','=', $supplierNo];
|
|
|
+
|
|
|
+ $count = Db::name("good")
|
|
|
+ ->alias("b")
|
|
|
->join("good_stock c","c.spuCode = b.spuCode","left")
|
|
|
->leftJoin("warehouse_info a","a.wsm_code=c.wsm_code")
|
|
|
->where($condition)
|
|
@@ -875,11 +879,9 @@ class Good extends Base
|
|
|
//$condition["gs.wsm_code"] = $wsm_code;
|
|
|
$condition[]=["gs.wsm_code","=",$wsm_code];
|
|
|
}
|
|
|
-// $suplierNo = isset($this->post['supplierNo']) &&$this->post['supplierNo'] !=="" ? trim($this->post['supplierNo']) :"";
|
|
|
-// if($suplierNo!==""){
|
|
|
-// $wsmcode = Db::name("warehouse_info")->where(['supplierNo'=>$suplierNo,"is_del"=>0])->column("wsm_code");
|
|
|
-// $condition[]=["gs.wsm_code","in",$wsmcode];
|
|
|
-// }
|
|
|
+ $supplierNo = isset($this->post['supplierNo']) &&$this->post['supplierNo'] !=="" ? trim($this->post['supplierNo']) :"";
|
|
|
+ if($supplierNo!=="") $condition[]=["whi.supplierNo","=",$supplierNo];
|
|
|
+
|
|
|
// $companyNo = isset($this->post['companyNo']) && $this->post['companyNo'] !== "" ? trim($this->post['companyNo']) : "";
|
|
|
// if ($companyNo !== "") {
|
|
|
// // $where['khNo'] = $khNo;
|
|
@@ -890,7 +892,7 @@ class Good extends Base
|
|
|
$relaComNo = isset($this->post['relaComNo']) && $this->post['relaComNo']!="" ? trim($this->post['relaComNo']):"";
|
|
|
if($relaComNo!="") {
|
|
|
$wsmcode = Db::name("warehouse_info")
|
|
|
- ->where(['supplierNo|companyNo'=>$relaComNo,"is_del"=>0])
|
|
|
+ ->where(['companyNo'=>$relaComNo,"is_del"=>0])
|
|
|
->column("wsm_code");
|
|
|
$condition[]=["gs.wsm_code","in",$wsmcode];
|
|
|
}
|
|
@@ -967,10 +969,11 @@ class Good extends Base
|
|
|
|
|
|
// $supplierNo =isset($this->post['supplierNo']) &&$this->post['supplierNo'] !=="" ? trim($this->post['supplierNo']):"";
|
|
|
if($param['supplierNo']!=""){
|
|
|
- $supplier = Db::name("supplier")->where(["code"=>$param['supplierNo']])->find();
|
|
|
- if(empty($supplier)) return error_show(1004,"未找到供应商信息");
|
|
|
- $wsmcode = Db::name("warehouse_info")->where(["is_del"=>0,"supplierNo"=>$param['supplierNo']])->column("wsm_code");
|
|
|
- $where[]=['b.wsm_code',"in",$wsmcode];
|
|
|
+// $supplier = Db::name("supplier")->where(["code"=>$param['supplierNo']])->find();
|
|
|
+// if(empty($supplier)) return error_show(1004,"未找到供应商信息");
|
|
|
+// $wsmcode = Db::name("warehouse_info")->where(["is_del"=>0,"supplierNo"=>$param['supplierNo']])->column("wsm_code");
|
|
|
+// $where[]=['b.wsm_code',"in",$wsmcode];
|
|
|
+ $where[]=['c.supplierNo',"=",$param['supplierNo']];
|
|
|
}
|
|
|
// $companyNo = isset($this->post['companyNo']) && $this->post['companyNo'] !== "" ? trim($this->post['companyNo']) : "";
|
|
|
if ($param['companyNo'] !== "") {
|
|
@@ -980,7 +983,7 @@ class Good extends Base
|
|
|
|
|
|
if ($param['relaComNo'] != '') {
|
|
|
$wsmcode = Db::name("warehouse_info")
|
|
|
- ->where(['supplierNo|companyNo' => $param['relaComNo'], "is_del" => 0])
|
|
|
+ ->where(['companyNo' => $param['relaComNo'], "is_del" => 0])
|
|
|
->column("wsm_code");
|
|
|
$where[] = ["b.wsm_code", "in", $wsmcode];
|
|
|
}
|