Browse Source

发货申请到导出优化

wufeng 2 years ago
parent
commit
503d676d33
1 changed files with 3 additions and 1 deletions
  1. 3 1
      app/admin/controller/Sale.php

+ 3 - 1
app/admin/controller/Sale.php

@@ -3689,7 +3689,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 采购货款,oa.contactor as 收货人,oa.mobile as 联系方式,oa.addr as 收货地址,oa.arrive_time as 到货时间,a.outCode as 发货申请单号,po.order_type,"" 物流单号,"" 物流费用,"" 备注')
+            ->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,"" 发货申请单物流单号,"" 发货申请单物流费用,"" 发货申请单备注')
             ->whereIn('a.outCode', $outCodes)
             ->order("a.addtime desc")
             ->withAttr('序号', function () use (&$i) {
@@ -3802,6 +3802,8 @@ class Sale extends Base
     //库管批量发货
     public function outSendBatchByImport()
     {
+        $s = get_logistics_information('YT6519260857319');
+        halt($s);
         $param = $this->request->only(['list', 'token'], 'post', 'trim');
 
         if (empty($param['list'])) return error_show(1005, 'list参数不能为空');