Merge branch 'version1.5' of wugg/phpstock into master-online

app/admin/controller/SaleReport.php

@@ -1650,18 +1650,18 @@ class SaleReport extends Base
             ->leftJoin("company_item ci", "ci.id=u.itemid")
             ->where($where)
             ->group('a.id,a.orderCode,a.order_type,a.good_code,a.skuCode,good_name,a.good_num,a.send_num,a.wsend_num,a.status,u.nickname,ci.name,b.orderCode')
-            ->having('a.good_num > SUM(b.receipt_quantity) ')
+            ->having('a.good_num > SUM(IFNULL(b.receipt_quantity,0)) ')
             ->count('a.id');
 
         $data = Db::name('sale')
             ->alias('a')
-            ->field('a.id,a.orderCode,a.order_type,a.good_code,a.skuCode,good_name,a.good_num,a.send_num,a.wsend_num,a.status,u.nickname,ci.name,(a.good_num - SUM(b.receipt_quantity) ) as  not_addr_address_good_num')
+            ->field('a.id,a.orderCode,a.order_type,a.good_code,a.skuCode,good_name,a.good_num,a.send_num,a.wsend_num,a.status,u.nickname,ci.name,(a.good_num - SUM(IFNULL(b.receipt_quantity,0)) ) as  not_addr_address_good_num')
             ->leftJoin("order_addr b", "b.orderCode=a.orderCode AND b.is_del=0")
             ->leftJoin("depart_user u", "u.uid=a.apply_id AND u.is_del=0")
             ->leftJoin("company_item ci", "ci.id=u.itemid")
             ->where($where)
             ->group('a.id,a.orderCode,a.order_type,a.good_code,a.skuCode,good_name,a.good_num,a.send_num,a.wsend_num,a.status,u.nickname,ci.name,b.orderCode')
-            ->having('a.good_num > SUM(b.receipt_quantity) ')
+            ->having('not_addr_address_good_num > 0 ')
             ->page($param['page'], $param['size'])
             ->order("a.addtime desc")
             ->select()
@@ -1685,12 +1685,12 @@ class SaleReport extends Base
 
         $data = Db::name('sale')
             ->alias('a')
-            ->field('a.orderCode 订单编号,a.order_type 订单类型,a.good_code 商品成本编码,a.skuCode 商品上线编码,good_name 商品名称,a.good_num 购买数量,a.send_num 已发货数量,a.wsend_num 未发货数量,a.status 订单状态,u.nickname 申请人名称,ci.name 申请人所属部门,(a.good_num - SUM(b.receipt_quantity) ) as  无地址数量')
+            ->field('a.orderCode 订单编号,a.order_type 订单类型,a.good_code 商品成本编码,a.skuCode 商品上线编码,good_name 商品名称,a.good_num 购买数量,a.send_num 已发货数量,a.wsend_num 未发货数量,a.status 订单状态,u.nickname 申请人名称,ci.name 申请人所属部门,(a.good_num - SUM(IFNULL(b.receipt_quantity,0)) ) as  无地址数量')
             ->leftJoin("order_addr b", "b.orderCode=a.orderCode AND b.is_del=0")->leftJoin("depart_user u", "u.uid=a.apply_id AND u.is_del=0")
             ->leftJoin("company_item ci", "ci.id=u.itemid")
             ->where($where)
             ->group('a.id,a.orderCode,a.order_type,a.good_code,a.skuCode,good_name,a.good_num,a.send_num,a.wsend_num,a.status,u.nickname,ci.name,b.orderCode')
-            ->having('a.good_num > SUM(b.receipt_quantity) ')
+            ->having('无地址数量 > 0')
             ->order("a.addtime desc")
             ->cursor();