From 0fd44c49a44050fed28d3dfba2187def1d6eb90d Mon Sep 17 00:00:00 2001 From: dengbw Date: Thu, 30 Dec 2021 14:44:08 +0800 Subject: [PATCH] transfer_1230_4 --- admin/controllers/items/Transfer.php | 7 +++++++ admin/controllers/items/goods/Goods.php | 25 +++++++++++++++++++++++- admin/views/items/goods/lists.php | 2 +- admin/views/items/transfer/lists.php | 12 +++++++----- www/admin/temp/goods.xlsx | Bin 10535 -> 9031 bytes 5 files changed, 39 insertions(+), 7 deletions(-) diff --git a/admin/controllers/items/Transfer.php b/admin/controllers/items/Transfer.php index 96fe6d48..15dc4cd5 100644 --- a/admin/controllers/items/Transfer.php +++ b/admin/controllers/items/Transfer.php @@ -717,6 +717,13 @@ class Transfer extends HD_Controller public function del() { + $id = $this->input->post('id'); + $re = $this->mdTransfer->get(array('id' => $id)); + if ($re && ($re['status'] <> -1)) { + return $this->show_json(SYS_CODE_FAIL, '调拨已提交，不能删除'); + } + $this->mdTransfer->delete(['id' => $id]); + return $this->show_json(SYS_CODE_SUCCESS, '删除成功！'); } public function batch() diff --git a/admin/controllers/items/goods/Goods.php b/admin/controllers/items/goods/Goods.php index be71d9dc..fd5356ec 100644 --- a/admin/controllers/items/goods/Goods.php +++ b/admin/controllers/items/goods/Goods.php @@ -456,7 +456,7 @@ class Goods extends HD_Controller $info['if_pack'] = $info['city_id'] = $info['county_id'] = $info['biz_id'] = $info['addr_id'] = ''; $info['status'] = 1; $autoList[2] = $autoList[3] = $autoList[4] = $autoList[5] = array(); - $comList = $this->sys_company_model->select(['status'=>1],'','','','id,short'); + $comList = $this->sys_company_model->select(['status' => 1], '', '', '', 'id,short'); if ($id > 0) { $re = $this->mdItems->get(array('id' => $id)); if (!$re || empty($re)) { @@ -715,6 +715,8 @@ class Goods extends HD_Controller $v_id = $objWorksheet->getCell('C' . $_row)->getValue(); //车型id $cor_id = $objWorksheet->getCell('D' . $_row)->getValue(); //车身颜色id $incor_id = $objWorksheet->getCell('E' . $_row)->getValue(); //内饰颜色id + $addr_name = $objWorksheet->getCell('G' . $_row)->getValue(); //存放地 + $company_name = $objWorksheet->getCell('H' . $_row)->getValue(); //归属公司 $re_b = $this->mdAutoBrand->get(array('name' => $brand_id)); $brand_id = $re_b ? $re_b['id'] : 0; $re_s = $this->mdAutoSeries->get(array('brand_id' => $brand_id, 'name' => $s_id)); @@ -725,6 +727,24 @@ class Goods extends HD_Controller $cor_id = $re_a0 ? $re_a0['id'] : 0; $re_a2 = $this->mdAutoAttr->get(array('s_id' => $s_id, 'type' => 2, 'title' => $incor_id)); $incor_id = $re_a2 ? $re_a2['id'] : 0; + $biz_id = $addr_id = $company_id = 0; + if ($addr_name) { + if (strstr($addr_name, '其它_')) {//其它地址 + $addr_name = str_replace("其它_", "", $addr_name); + $re_addr = $this->addr_model->get(['title' => $addr_name]); + if ($re_addr) { + $addr_id = $re_addr['id']; + $biz_id = -1; + } + } else {//门店地址 + $re_biz = $this->mdBiz->get(['biz_name' => $addr_name]); + $re_biz && $biz_id = $re_biz['id']; + } + } + if ($company_name) { + $re_company = $this->sys_company_model->get(array('short' => $company_name)); + $re_company && $company_id = $re_company['id']; + } $addData = array( 'brand_id' => $brand_id, 's_id' => $s_id, @@ -732,6 +752,9 @@ class Goods extends HD_Controller 'cor_id' => $cor_id, 'incor_id' => $incor_id, 'vin' => $vin ? $vin : '', + 'biz_id' => $biz_id, + 'addr_id' => $addr_id, + 'company_id' => $company_id, 'in_time' => date('Y-m-d H:i:s'), 'c_time' => time() ); diff --git a/admin/views/items/goods/lists.php b/admin/views/items/goods/lists.php index 7d8d3b87..77de1ddb 100644 --- a/admin/views/items/goods/lists.php +++ b/admin/views/items/goods/lists.php @@ -251,7 +251,7 @@

请上传Excel文件

Excel文件格式必须与模板保持一致，否则无法导入

- 查看模板 + 查看模板