From 1bd5871a20fd0ceffc9a4052e9b5ccfa7d8d7fb7 Mon Sep 17 00:00:00 2001
From: dengbw <dengbw@shengshi.com.cn>
Date: Tue, 13 Sep 2022 15:23:58 +0800
Subject: [PATCH] inventory_913

---
 admin/controllers/items/Inventory.php | 27 ++++++++++++++++++++++-----
 admin/controllers/receiver/Clues.php  |  2 +-
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/admin/controllers/items/Inventory.php b/admin/controllers/items/Inventory.php
index 4138866b..8b676764 100644
--- a/admin/controllers/items/Inventory.php
+++ b/admin/controllers/items/Inventory.php
@@ -76,14 +76,13 @@ class Inventory extends HD_Controller
             $params['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;
-            $params['city_id'] && $where_biz['city_id'] = $params['city_id'];
+            $where_biz['city_id'] = $params['city_id'];
             $params['county_id'] && $where_biz['county_id'] = $params['county_id'];
             $res_biz = $this->mdBiz->select($where_biz, 'id desc', 0, 0, 'id');
             $res_addr = $this->addr_model->select($where_biz, 'id desc', 0, 0, 'id');
@@ -106,6 +105,24 @@ 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['brand_id'] || $params['s_id'] || $params['v_id'] || $params['cor_id']) {
+//            $where_item['status>'] = 0;
+//            $params['brand_id'] && $where_item['brand_id'] = $params['brand_id'];
+//            $params['s_id'] && $where_item['s_id'] = $params['s_id'];
+//            $params['v_id'] && $where_item['v_id'] = $params['v_id'];
+//            $params['cor_id'] && $where_item['cor_id'] = $params['cor_id'];
+//            $res_item = $this->mdItems->select($where_item, 'id desc', 0, 0, 'id');
+//            if ($res_item) {
+//                $str_item_ids = implode(',', array_column($res_item, 'id'));
+//                $where["lc_items_inventory_log.item_id in ({$str_item_ids})"] = null;
+//            } else {
+//                $where['lc_items_inventory_log.item_id'] = -1;
+//            }
+//        }
         if ($params['item_status']) {
             if ($params['item_status'] == 3) {
                 $where["lc_items.bill_time<>"] = '0000-00-00 00:00:00';
@@ -121,7 +138,7 @@ class Inventory extends HD_Controller
             $autoList[2] = $this->mdAutoSeries->select(array('status' => 1, 'brand_id' => $params['brand_id']), 'id desc', 0, 0, 'id,name');
         }
         if ($params['s_id']) {
-            $autoList[3] = $this->mdAutoAttr->select(array('status' => 1,'type' => 1, 's_id' => $params['s_id']), 'id desc', 0, 0, 'id,title as name');
+            $autoList[3] = $this->mdAutoAttr->select(array('status' => 1, 'type' => 1, 's_id' => $params['s_id']), 'id desc', 0, 0, 'id,title as name');
         }
         $statusAry = $this->mdInventoryLog->statusAry();
         $carImgAry = $this->mdInventoryLog->carImgAry();
diff --git a/admin/controllers/receiver/Clues.php b/admin/controllers/receiver/Clues.php
index 1c7cca25..127f1339 100644
--- a/admin/controllers/receiver/Clues.php
+++ b/admin/controllers/receiver/Clues.php
@@ -603,7 +603,7 @@ class Clues extends HD_Controller
                     'biz_id' => $biz_id,
                     'city_id' => $biz['city_id'],
                     'county_id' => $biz['county_id'],
-                    'brand_id' => $clues_row['brand_id'],
+                    'brand_id' => 0,
                     's_id' => $clues_row['s_id'],
                     'if_driver' => $clues_row['if_driver'],
                     'cf_title' => '平台分配',