|
|
@@ -149,7 +149,8 @@ class OrderOutChild extends Base
|
|
|
|
|
|
$list = Db::name('order_out_child')
|
|
|
->alias('a')
|
|
|
- ->field('a.*,c.supplierNo wsm_supplierNo,c.supplierName wsm_supplierName,c.name wsm_name,c.contactor_name,p.use_type,m.cgdNo,d.remark')
|
|
|
+ ->field('a.*,c.supplierNo wsm_supplierNo,c.supplierName wsm_supplierName,c.name wsm_name,
|
|
|
+ c.contactor_name,p.use_type,m.cgdNo,d.remark,d.platform_order')
|
|
|
->leftJoin('warehouse_info c', 'c.wsm_code=a.wsm_code AND c.is_del=0')
|
|
|
->leftJoin('sale d', 'd.orderCode=a.orderCode AND d.is_del=0')
|
|
|
->leftJoin('platform p', 'p.id=d.platform_id AND p.is_del=0')
|
|
|
@@ -273,6 +274,7 @@ class OrderOutChild extends Base
|
|
|
->field('a.outChildCode 发货工单号,
|
|
|
a.outCode 发货单编号,
|
|
|
a.orderCode 销售订单编号,
|
|
|
+ d.platform_order 平台订单号,
|
|
|
"" 供应商端,
|
|
|
case a.status when 1 then "待发货" when 2 then "发货完成" when 3 then "已收货" when 4 then "已全部退货" end "状态" ,
|
|
|
case a.order_type when 1 then "备库" when 2 then "非库存" when 3 then "咨询商品" when 4 then "报备商品" end "商品类型",
|
|
|
@@ -285,7 +287,8 @@ class OrderOutChild extends Base
|
|
|
a.supplierName 供应商名称,a.addtime 下单时间,
|
|
|
a.apply_name 申请人,
|
|
|
case p.use_type when 0 then "无" when 1 then "to B" when 2 then "to C" end 对接类型,
|
|
|
- a.post_name 物流公司,a.post_code 物流单号,a.post_fee 物流费用,e.addr 收货地址,e.addr_code,e.contactor 收货联系人,e.mobile 联系方式,m.cgdNo 采购单号,d.remark 备注')
|
|
|
+ a.post_name 物流公司,a.post_code 物流单号,a.post_fee 物流费用,e.addr 收货地址,e.addr_code,e.contactor 收货联系人,
|
|
|
+ e.mobile 联系方式,m.cgdNo 采购单号,d.remark 备注')
|
|
|
->leftJoin('warehouse_info c', 'c.wsm_code=a.wsm_code AND c.is_del=0')
|
|
|
->leftJoin('order_addr e', 'a.addrid=e.id')
|
|
|
->leftJoin('order_send m', 'a.outCode=m.outCode')
|
