From 9830c827706cdc39bae17995accad99b9589a589 Mon Sep 17 00:00:00 2001 From: dengbw Date: Tue, 13 Sep 2022 15:44:02 +0800 Subject: [PATCH] inventory_913_2 --- admin/controllers/items/Inventory.php | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/admin/controllers/items/Inventory.php b/admin/controllers/items/Inventory.php index 8b676764..588616ce 100644 --- a/admin/controllers/items/Inventory.php +++ b/admin/controllers/items/Inventory.php @@ -69,11 +69,12 @@ 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'] > 0) { @@ -109,20 +110,6 @@ class Inventory extends HD_Controller $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';