|
|
@@ -96,13 +96,10 @@ class Worker extends Base
|
|
|
'createtime' => date('Y-m-d H:i:s', $time)
|
|
|
];
|
|
|
$sql_data = $this->shopDeliveryModel->where('waybill_no', $data['code'])->find();
|
|
|
- $repeat=false;
|
|
|
if (!empty($sql_data)) {
|
|
|
if (!empty($sql_data['user_id']) && $sql_data['user_id'] != 0) {
|
|
|
$insert_data['order_status'] = 2;
|
|
|
$insert_data['remark'] = '请勿重复录入';
|
|
|
- $repeat=true;
|
|
|
- $result=true;
|
|
|
} else {
|
|
|
$result = $sql_data->save([
|
|
|
'user_id' => $this->userinfo['id'],
|
|
|
@@ -138,9 +135,7 @@ class Worker extends Base
|
|
|
$sql_data['entry_time'] = $entry_time;
|
|
|
$insert_data['order_data'] = $sql_data;
|
|
|
}
|
|
|
- if(!$repeat){
|
|
|
- $result = $scanLog->save($insert_data);
|
|
|
- }
|
|
|
+ $result = $scanLog->save($insert_data);
|
|
|
|
|
|
|
|
|
Db::commit();
|