|
|
@@ -103,8 +103,7 @@ class Purchin extends Base
|
|
|
->where($where)
|
|
|
->where($condition)
|
|
|
->page($page,$size)
|
|
|
- ->field("a.apply_name,a.sendtime,b.order_type,b.order_source,a.status,a.cgdNo,a.wsm_in_code,a.send_num,a.wsm_code,b.good_name,b.spuCode,
|
|
|
- a.post_company,a.post_code,a.post_fee,a.apply_id,a.wsm_num,a.error_num,a.wait_num,a.status,a.check_name,a.checkid,b.bkcode,b.supplierNo,u.itemid")
|
|
|
+ ->field("a.apply_name,a.sendtime,b.order_type,b.order_source,a.status,a.cgdNo,a.wsm_in_code,a.send_num,a.wsm_code,b.good_name,b.spuCode,a.post_company,a.post_code,a.post_fee,a.apply_id,a.wsm_num,a.error_num,a.wait_num,a.status,a.check_name,a.checkid,b.bkcode,b.supplierNo,u.itemid,b.cgderid,b.cgder,b.good_createrid,b.good_creater")
|
|
|
->order("a.addtime desc")
|
|
|
->cursor();
|
|
|
$data=[];
|
|
|
@@ -151,8 +150,7 @@ class Purchin extends Base
|
|
|
}
|
|
|
|
|
|
|
|
|
- $wsmcode = Db::name("warehouse_info")->alias("k")->leftJoin("supplier c","k.supplierNo=c.code")
|
|
|
- ->where(["k.wsm_code"=>$value['wsm_code']])->field("k.name as wsm_name,c.name,c.code")->find();
|
|
|
+ $wsmcode = Db::name("warehouse_info")->alias("k")->leftJoin("supplier c","k.supplierNo=c.code")->where(["k.wsm_code"=>$value['wsm_code']])->field("k.name as wsm_name,c.name,c.code")->find();
|
|
|
$value['wsm_name'] = $wsmcode['wsm_name'];
|
|
|
$value['wsm_supplier'] = $wsmcode['name'];
|
|
|
$value['wsm_supplierNo'] = $wsmcode['code'];
|
