diff --git a/admin/controllers/items/Transfer.php b/admin/controllers/items/Transfer.php index e8954917..a6b71941 100644 --- a/admin/controllers/items/Transfer.php +++ b/admin/controllers/items/Transfer.php @@ -413,9 +413,10 @@ class Transfer extends HD_Controller if (!$re || empty($re)) { return $this->show_json(SYS_CODE_FAIL, '车辆调拨不存在!'); } - if ($re['status'] == 2) { + // 2022.12.20 原来 确认接车 的状态 不能再修改调拨单,现在需要把这个限制去掉,所有状态都允许修改 + /*if ($re['status'] == 2) { return $this->show_json(SYS_CODE_FAIL, '车辆已调拨完成,不能修改!'); - } + }*/ $item_id = $re['item_id'] ? $re['item_id'] : 0; $re_items = $this->mdItems->get(['id' => $item_id]); $jsondata = $re['jsondata'] ? json_decode($re['jsondata'], true) : []; @@ -529,6 +530,7 @@ class Transfer extends HD_Controller $trailer_fees = intval($info['trailer_fees']); $remind = $info['remind'];//1提交 $db_status = -1; + $db_status_not2_flag = true; if ($info['id']) {//修改调拨 $re_t = $this->mdTransfer->get(array('id' => $info['id'])); if (!$re_t || empty($re_t)) { @@ -536,12 +538,14 @@ class Transfer extends HD_Controller } $db_status = $re_t['status']; if ($db_status == 2) { - return $this->show_json(SYS_CODE_FAIL, '车辆已完成调拨,不能修改!'); + $db_status_not2_flag = false; // 2022.12.20 “确认接车”状态的数据,修改提交后:不改状态,不发短信 + #return $this->show_json(SYS_CODE_FAIL, '车辆已完成调拨,不能修改!'); } } if ($remind && $db_status == -1) {//提交且状态为-1时,状态设为0调拨 $db_status = 0; } + !$db_status_not2_flag && $db_status = 2; // 2022.12.20 “确认接车”状态的数据,修改提交后:不改状态,不发短信 if ($remind == 1) {//提交时加判断 if (!$info['arti_id']) { return $this->show_json(SYS_CODE_FAIL, '请选择随车物品'); @@ -681,22 +685,13 @@ class Transfer extends HD_Controller $this->mdTransferRemind->delete(['tran_id' => $id, 'type' => 2]);//删除已有备用提车人 } } - //接车人 - $results = $this->edit_remind_admin(['type' => 3, 'tran_id' => $id, 'c_time' => $c_time, 'db_status' => $db_status], $takeCar[3]); - if ($results['add'] == 1) { - if ($takeCar[3]['type'] == 2) { - $results['uid'] && $send_admins[] = $results['uid']; - $addAdmin[] = $results['addDate']; - } else { - $results['uid'] && $send_uids[] = $results['uid']; - $addRemind[] = $results['addDate']; - } - } - //备用接车人 - if ($info['in_bak'] == 1) { - $results = $this->edit_remind_admin(['type' => 4, 'tran_id' => $id, 'c_time' => $c_time, 'db_status' => $db_status], $takeCar[4]); + + // 2022.12.20 “确认接车”状态的数据,修改提交后:不改状态,不发短信 + if ($db_status_not2_flag){ + //接车人 + $results = $this->edit_remind_admin(['type' => 3, 'tran_id' => $id, 'c_time' => $c_time, 'db_status' => $db_status], $takeCar[3]); if ($results['add'] == 1) { - if ($takeCar[4]['type'] == 2) { + if ($takeCar[3]['type'] == 2) { $results['uid'] && $send_admins[] = $results['uid']; $addAdmin[] = $results['addDate']; } else { @@ -704,9 +699,22 @@ class Transfer extends HD_Controller $addRemind[] = $results['addDate']; } } - } else { - $this->mdTransferAdmin->delete(['tran_id' => $id, 'type' => 4]);//删除已有备用接车人 - $this->mdTransferRemind->delete(['tran_id' => $id, 'type' => 4]);//删除已有备用接车人 + //备用接车人 + if ($info['in_bak'] == 1) { + $results = $this->edit_remind_admin(['type' => 4, 'tran_id' => $id, 'c_time' => $c_time, 'db_status' => $db_status], $takeCar[4]); + if ($results['add'] == 1) { + if ($takeCar[4]['type'] == 2) { + $results['uid'] && $send_admins[] = $results['uid']; + $addAdmin[] = $results['addDate']; + } else { + $results['uid'] && $send_uids[] = $results['uid']; + $addRemind[] = $results['addDate']; + } + } + } else { + $this->mdTransferAdmin->delete(['tran_id' => $id, 'type' => 4]);//删除已有备用接车人 + $this->mdTransferRemind->delete(['tran_id' => $id, 'type' => 4]);//删除已有备用接车人 + } } } else {//新增提车人/接车人 //提车人 @@ -750,9 +758,9 @@ class Transfer extends HD_Controller } $item_info = $this->input->post('items_info'); //门店调拨短信提醒 - $this->send_alisms(['uids' => $send_uids, 'type' => 1, 'item_info' => $item_info, 'tran_id' => $id]); + $db_status_not2_flag && $this->send_alisms(['uids' => $send_uids, 'type' => 1, 'item_info' => $item_info, 'tran_id' => $id]); //信息员调拨短信提醒 - $this->send_alisms(['uids' => $send_admins, 'type' => 2, 'item_info' => $item_info]); + $db_status_not2_flag && $this->send_alisms(['uids' => $send_admins, 'type' => 2, 'item_info' => $item_info]); return $this->show_json(SYS_CODE_SUCCESS, '提交成功', "/items/transfer"); } diff --git a/admin/views/items/transfer/get_add.php b/admin/views/items/transfer/get_add.php index dfff0924..3f0cf08f 100644 --- a/admin/views/items/transfer/get_add.php +++ b/admin/views/items/transfer/get_add.php @@ -46,7 +46,7 @@
@@ -63,25 +63,25 @@
-
-
-
-