From 587a4974ac4e5676a8212fb440833eaa3ac96eb5 Mon Sep 17 00:00:00 2001
From: dengbw <dengbw@shengshi.com.cn>
Date: Tue, 13 Sep 2022 15:44:02 +0800
Subject: [PATCH] inventory_913_2

---
 admin/controllers/items/Inventory.php | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/admin/controllers/items/Inventory.php b/admin/controllers/items/Inventory.php
index 4138866b..9ad2e044 100644
--- a/admin/controllers/items/Inventory.php
+++ b/admin/controllers/items/Inventory.php
@@ -69,17 +69,17 @@ class Inventory extends HD_Controller
         if (!$re || empty($re)) {
             return $this->show_json(SYS_CODE_FAIL, '车辆盘点不存在！');
         }
-        $lists = $where = [];
+        $lists = [];
+        $where['lc_items_inventory_log.inve_id'] = $params['inve_id'];
         if (strlen($params['status'])) {
             $where['lc_items_inventory_log.status'] = $params['status'];
         } else {
-            $params['lc_items_inventory_log.status in(0,1)'] = null;
+            $where['lc_items_inventory_log.status in(0,1)'] = null;
             $params['status'] = '-99';
         }
-        if ($params['biz_id']) {
+        if ($params['biz_id'] > 0) {
             $where['lc_items_inventory_log.biz_id'] = $params['biz_id'];
-        }
-        if ($params['biz_id'] == -1 && $params['addr_id']) {
+        } else if ($params['biz_id'] == -1 && $params['addr_id']) {
             $where['lc_items_inventory_log.addr_id'] = $params['addr_id'];
         } else if ($params['city_id']) {
             $where_biz['status'] = 1;
@@ -106,6 +106,10 @@ class Inventory extends HD_Controller
             $params['addr_id'] = '';
             $params['biz_id'] = '';
         }
+        $params['brand_id'] && $where['lc_items.brand_id'] = $params['brand_id'];
+        $params['s_id'] && $where['lc_items.s_id'] = $params['s_id'];
+        $params['v_id'] && $where['lc_items.v_id'] = $params['v_id'];
+        $params['cor_id'] && $where['lc_items.cor_id'] = $params['cor_id'];
         if ($params['item_status']) {
             if ($params['item_status'] == 3) {
                 $where["lc_items.bill_time<>"] = '0000-00-00 00:00:00';
@@ -281,4 +285,4 @@ class Inventory extends HD_Controller
     public function export()
     {
     }
-}
\ No newline at end of file
+}