diff --git a/admin/controllers/items/Transfer.php b/admin/controllers/items/Transfer.php
index c5fce916..2f00defa 100644
--- a/admin/controllers/items/Transfer.php
+++ b/admin/controllers/items/Transfer.php
@@ -35,9 +35,6 @@ class Transfer extends HD_Controller
public function lists()
{
- $this->load->model('auto/auto_brand_model', 'mdAutoBrand');
- $this->load->model('auto/auto_series_model', 'mdAutoSeries');
- $this->load->model('auto/auto_attr_model', 'mdAutoAttr');
$params = $this->input->get();
$params['page'] = $params['page'] ? intval($params['page']) : 1;
$params['size'] = $params['size'] ? intval($params['size']) : 20;
@@ -813,7 +810,7 @@ class Transfer extends HD_Controller
//更新异常
$jsondata = $re_tr['jsondata'] ? json_decode($re_tr['jsondata'], true) : [];
$jsondata['abnormal']['note'] = $abnormal['note'] ? $abnormal['note'] : '';
- $abnor_imgs = '';
+ $abnor_imgs = '';
if ($abnormal['imgs']) {
foreach ($abnormal['imgs'] as $key => $value) {
$abnor_imgs[] = $value['value'];
@@ -913,11 +910,18 @@ class Transfer extends HD_Controller
public function del()
{
$id = $this->input->post('id');
+ if (!$id) {
+ return $this->show_json(SYS_CODE_FAIL, '参数错误！');
+ }
$re = $this->mdTransfer->get(array('id' => $id));
- if ($re && ($re['status'] <> -1)) {
- return $this->show_json(SYS_CODE_FAIL, '调拨已提交，不能删除');
+ if ($re && ($re['status'] > 0)) {
+ return $this->show_json(SYS_CODE_FAIL, '已发车或已接车，不能删除');
}
$this->mdTransfer->delete(['id' => $id]);
+ if ($re['status'] == 0) {//已调拨删除调拨记录
+ $this->mdTransferRemind->delete(['tran_id' => $id]);
+ $this->mdTransferAdmin->delete(['tran_id' => $id]);
+ }
return $this->show_json(SYS_CODE_SUCCESS, '删除成功！');
}
diff --git a/admin/views/items/goods/lists.php b/admin/views/items/goods/lists.php
index 9b1a51d0..4a109ab3 100644
--- a/admin/views/items/goods/lists.php
+++ b/admin/views/items/goods/lists.php
@@ -57,23 +57,7 @@
-
-
+
+
+
-
-