wugg преди 2 години
родител
ревизия
8274f06762
променени са 1 файла, в които са добавени 1 реда и са изтрити 1 реда
  1. 1 1
      app/admin/controller/Good.php

+ 1 - 1
app/admin/controller/Good.php

@@ -707,7 +707,7 @@ class Good extends Base
             ->where($condition)
             ->where('whi.wsm_type','<>',2)//2表示虚拟仓,虚拟仓不参与
             ->leftJoin('warehouse_info whi','whi.wsm_code=gs.wsm_code AND whi.is_del=0')
-            ->field("sum(gs.wait_in_stock) as wait_in_stock,sum(gs.wait_out_stock) as wait_out_stock ,sum(gs.usable_stock) as usable_stock,sum(gs.intra_stock) as intra_stock,sum(gs.total_stock) as total_stock,sum(gs.warn_stock) as warn_stock")
+            ->field("sum(gs.wait_in_stock) as wait_in_stock,sum(gs.wait_out_stock) as wait_out_stock ,sum(gs.usable_stock) as usable_stock,sum(gs.intra_stock) as intra_stock,sum(gs.usable_stock+gs.wait_out_stock) as total_stock,sum(gs.warn_stock) as warn_stock")
             ->find();
         return app_show(0,"获取成功",$statlist);
     }