ad

app/admin/controller/Filing.php

@@ -358,9 +358,9 @@ class Filing extends Base
             })
             ->findOrEmpty();
         if(!empty($rs['origin_place']))$origin = ["provice_code"=>$rs['origin_place'][0]??"","city_code"=>$rs['origin_place'][1]??'','area_code'=>$rs['origin_place'][2]??''];
-        $rs["origin_place_cn"] = GetAddr($origin);
+        $rs["origin_place_cn"] = GetAddr(json_encode($origin));
         if(!empty($rs['delivery_place']))$deliev = ['provice_code'=>$rs['delivery_place'][0]??'','city_code'=>$rs['delivery_place'][1]??'','area_code'=>$rs['delivery_place'][2]??''];
-        $rs['delivery_place_cn'] = GetAddr($deliev);
+        $rs['delivery_place_cn'] = GetAddr(json_encode($deliev));
         return json_show(0, '获取报备单详情成功', $rs);
 //        return FilingLogic::detail($param);
     }
@@ -370,7 +370,7 @@ class Filing extends Base
     {
         if ($this->level != 2) return json_show(1004, '业务公司账号不能审核');
 
-        $param = $this->request->only(['id', 'companyCode', 'plat_code' => '','platform_id',"remark"=>""], 'post');
+        $param = $this->request->only(['id', 'companyCode', 'plat_code' => '','platform_id',"remark"=>"",'is_check'=>''], 'post');
 
         $val = Validate::rule([
             'id' => 'require|number|gt:0',

app/admin/controller/SaleReport.php

@@ -2337,7 +2337,7 @@ class SaleReport extends Base
 	    $count_row = Db::name('sale')
 	               ->alias('a')
 	               ->where($where)
-	               ->field(" a.good_num-th_num - IFNULL((select sum('receipt_quantity') from wsm_order_addr where orderCode=a.orderCode and is_del=0),0)  not_addr_address_good_num,count(a.id) as count")
+	               ->field(" a.good_num-th_num - IFNULL((select sum(receipt_quantity) from wsm_order_addr where orderCode=a.orderCode and is_del=0),0)  not_addr_address_good_num,count(a.id) as count")
 	               ->having("not_addr_address_good_num>0")
 	               ->find();
 	    $data = Db::name('sale')
@@ -2353,7 +2353,7 @@ class SaleReport extends Base
             a.send_num,
             a.wsend_num,
             a.status,
-            a.good_num-a.th_num - IFNULL((select sum('receipt_quantity') from wsm_order_addr where orderCode=a.orderCode and is_del=0),0)  not_addr_address_good_num,
+            a.good_num-a.th_num - IFNULL((select sum(receipt_quantity) from wsm_order_addr where orderCode=a.orderCode and is_del=0),0)  not_addr_address_good_num,
             a.apply_name nickname,
             a.apply_id,
             a.addtime")
@@ -2404,7 +2404,7 @@ class SaleReport extends Base
             a.good_code 商品成本编码,a.skuCode 商品上线编码,a.good_name 商品名称,
             a.good_num 购买数量,a.send_num 已发货数量,a.wsend_num 未发货数量,a.status 订单状态,
             a.apply_name 申请人名称,a.apply_id 申请人所属部门, 
-            a.good_num-a.th_num - IFNULL((select sum('receipt_quantity') from wsm_order_addr where orderCode=a.orderCode and is_del=0),0) 无地址数量,
+            a.good_num-a.th_num - IFNULL((select sum(receipt_quantity) from wsm_order_addr where orderCode=a.orderCode and is_del=0),0) 无地址数量,
             '' 下单月份,
             a.addtime")
             ->where($where)