|
|
@@ -2458,22 +2458,26 @@ class Sale extends Base
|
|
|
$list = Db::name('order_out')->alias('a')->join("sale b", "b.orderCode=a.orderCode", "left")
|
|
|
->join("customer_info v", "v.companyNo=b.customer_code", "left")
|
|
|
//->join("good n","n.good_code=b.good_code","left")
|
|
|
- ->field("a.*,b.good_name,b.good_code,b.supplierNo,b.customer_code,v.companyName,b.origin_price,b.sale_price,b.total_price")
|
|
|
+ ->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")
|
|
|
->where($where)->order("addtime desc")->page($page, $size)->select();
|
|
|
$data=[];
|
|
|
foreach ($list as $value) {
|
|
|
$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();
|
|
|
$addr = Db::name("order_addr")->where(["id" => $value['addrid']])->find();
|
|
|
- $good = Db::name("good_type")->alias("b")->join("good a", "a.good_code = b.good_code", "left")
|
|
|
- ->where(["type_code" => $value['good_code']])->field('cat_id')->find();
|
|
|
+ if($value['order_type']==3|| $value['order_type']==4){
|
|
|
+ $goon = Db::name("good_zixun")->where(["spuCode"=>$value['good_code'],"is_del"=>0])->find();
|
|
|
+ }else {
|
|
|
+ $goon = Db::name('good_platform')->alias('a')->join('good b', 'b.spuCode=a.spuCode', 'left')
|
|
|
+ ->where(['a.skuCode' => $value['skuCode']])->find();
|
|
|
+ }
|
|
|
$value['wsm_name'] = isset($wsmcode['wsm_name']) ? $wsmcode['wsm_name'] : "";
|
|
|
$value['wsm_supplier'] = isset($wsmcode['name']) ? $wsmcode['name'] : "";
|
|
|
$value['wsm_supplierNo'] = isset($wsmcode['code']) ? $wsmcode['code'] : "";
|
|
|
$value['addr'] = isset($addr['addr']) ? $addr['addr'] : "";
|
|
|
$value['contactor'] = isset($addr['contactor']) ? $addr['contactor'] : "";
|
|
|
$value['mobile'] = isset($addr['mobile']) ? $addr['mobile'] : "";
|
|
|
- $value['can'] = isset($good['cat_id']) && $good['cat_id'] != 0 ? made($good['cat_id']) : [];
|
|
|
+ $value['can'] = isset($goon['cat_id']) && $goon['cat_id'] != 0 ? made($goon['cat_id']) : [];
|
|
|
$data[] = $value;
|
|
|
}
|
|
|
return app_show(0, "获取成功", ['list' => $data, 'count' => $count]);
|
