|
|
@@ -3810,7 +3810,7 @@ class Sale extends Base
|
|
|
$status = [0 => '待发货', 1 => '待库管发货', 2 => '已发货待收货', 3 => '已收货', 4 => '已全部退货'];
|
|
|
$list = Db::name("order_out")
|
|
|
->alias('a')
|
|
|
- ->field('"" as 序号,a.addtime as 创建时间,po.cgdNo as 采购单编号,po.status as 采购单状态,po.cgder as 采购员,b.orderCode as 确认单号,b.addtime as 确认单时间,b.good_code as 产品编号,b.good_name as 产品名称,"" as 规格,"" as 单位,wi.name as 供应商名称,s.code as 供应商编号,po.nake_fee as 裸价,a.post_fee as 物流费,b.send_type as 发货方式,po.good_price as 采购单价,b.remark as 确认单备注,po.good_num as 采购数量,po.total_fee as 采购货款,a.send_num 发货数量,oa.contactor as 收货人,oa.mobile as 联系方式,oa.addr as 收货地址,oa.arrive_time as 到货时间,a.outCode as 发货申请单号,po.order_type,b.platform_order 平台订单号,a.post_name 发货申请单物流公司,a.post_code 发货申请单物流单号,a.post_fee 发货申请单物流费用,a.remark 发货申请单备注')
|
|
|
+ ->field('"" as 序号,a.addtime as 创建时间,po.cgdNo as 采购单编号,po.status as 采购单状态,po.cgder as 采购员,b.orderCode as 确认单号,b.addtime as 确认单时间,b.good_code as 产品编号,b.good_name as 产品名称,"" as 规格,"" as 单位,wi.name as 供应商名称,s.code as 供应商编号,po.nake_fee as 裸价,a.post_fee as 物流费,b.send_type as 发货方式,po.good_price as 采购单价,b.remark as 确认单备注,po.good_num as 采购数量,po.total_fee as 采购货款,a.send_num 发货数量,oa.contactor as 收货人,oa.mobile as 联系方式,oa.addr as 收货地址,oa.arrive_time as 到货时间,a.outCode as 发货申请单号,po.order_type,b.platform_order 平台订单号,a.post_name 发货申请单物流公司,a.post_code 发货申请单物流单号,a.post_fee 发货申请单物流费用,a.remark 发货申请单备注,a.apply_name 申请人,b.cat_id 商品分类')
|
|
|
->whereIn('a.outCode', $outCodes)
|
|
|
->order("a.addtime desc")
|
|
|
->withAttr('序号', function () use (&$i) {
|
|
|
@@ -3819,7 +3819,7 @@ class Sale extends Base
|
|
|
return isset($status[$val]) ? $status[$val] : '';
|
|
|
})->withAttr('发货方式', function ($val) use ($send_type) {
|
|
|
return isset($send_type[$val]) ? $send_type[$val] : '';
|
|
|
- })->where("a.is_del","=",0)
|
|
|
+ })->where("a.is_del", "=", 0)
|
|
|
->leftJoin("sale b", "b.orderCode=a.orderCode")
|
|
|
->leftJoin("order_addr oa", "oa.id=a.addrid AND oa.is_del=0")
|
|
|
->leftJoin("warehouse_info wi", "wi.wsm_code=a.wsm_code AND wi.is_del=0")
|
|
|
@@ -3862,7 +3862,8 @@ class Sale extends Base
|
|
|
|
|
|
$value['规格'] = empty($speclist) ? '' : implode(',', $speclist);;
|
|
|
$value['单位'] = $good_unit ? Db::name('unit')->where(['id' => $good_unit, 'is_del' => 0])->value('unit', '') : '';
|
|
|
- $value['发货申请单物流单号']=' '.$value['发货申请单物流单号'];//添加空格防止将数字转为科学计数法(比如，韵达的韵达单号就是纯数字)
|
|
|
+ $value['商品分类'] = implode('/', array_column(made($value['商品分类']), 'name'));
|
|
|
+ $value['发货申请单物流单号'] = ' ' . $value['发货申请单物流单号'];//添加空格防止将数字转为科学计数法(比如，韵达的快递单号就是纯数字)
|
|
|
unset($value['order_type']);
|
|
|
}
|
|
|
|
