|
|
@@ -3057,8 +3057,7 @@ class Sale extends Base
|
|
|
if(!empty($role['write']) && $this->uid!=""){
|
|
|
// $where[]=["a.apply_id","in",$role['write']];
|
|
|
$condition .=" (b.is_stock=1 and n.contactor = {$this->uid}) or (b.is_stock=0 and wpo.cgder_id = {$this->uid}) or a.apply_id in (".implode(',',
|
|
|
- $role['write'])
|
|
|
- .")";
|
|
|
+ $role['write']).")";
|
|
|
}
|
|
|
// if(!empty($role['platform']) ){
|
|
|
// $where[]=["b.platform_id","in",$role['platform']];
|
|
|
@@ -3073,7 +3072,7 @@ class Sale extends Base
|
|
|
->join("warehouse_info n","n.wsm_code=a.wsm_code","left")
|
|
|
->leftJoin("depart_user u", "u.uid=a.apply_id AND u.is_del=0")
|
|
|
->leftJoin("order_send os","os.outCode=a.outCode")
|
|
|
- ->leftJoin("purchease_order wpo","wpo.cgdNo=os.cgdNo")
|
|
|
+ ->leftJoin("purchease_order wpo","wpo.cgdNo=os.cgdNo")
|
|
|
->where($where)
|
|
|
->where($condition)
|
|
|
->count();
|
|
|
@@ -3082,10 +3081,10 @@ class Sale extends Base
|
|
|
$list = Db::name('order_out')
|
|
|
->alias('a')
|
|
|
->join("sale b", "b.orderCode=a.orderCode", "left")
|
|
|
- ->leftJoin("purchease_order wpo","wpo.cgdNo=os.cgdNo")
|
|
|
->join("customer_info v", "v.companyNo=b.customer_code", "left")
|
|
|
->join("warehouse_info n","n.wsm_code=a.wsm_code","left")
|
|
|
->leftJoin("order_send os","os.outCode=a.outCode")
|
|
|
+ ->leftJoin("purchease_order wpo","wpo.cgdNo=os.cgdNo")
|
|
|
->leftJoin("depart_user u", "u.uid=a.apply_id AND u.is_del=0")
|
|
|
->field("a.*,b.good_name,b.good_code,b.skuCode,b.supplierNo,b.customer_code,v.companyName,b.origin_price,b.sale_price,b.total_price,os.cgdNo,u.itemid")
|
|
|
->where($where)
|
