扫描记录

app/api/controller/Worker.php

@@ -61,39 +61,46 @@ class Worker extends Base
                 'order_status' => 0,
                 'remark' => '未找到单号',
                 'order_data' => [],
-                'createtime'=>date('Y-m-d H:i:s',$time)
+                'createtime' => date('Y-m-d H:i:s', $time)
             ];
             $sql_data = $this->shopDeliveryModel->where('waybill_no', $data['code'])->find();
             if (!empty($sql_data)) {
-                
-                $result = $sql_data->save([
-                    'user_id'    =>   $this->userinfo['id'],
-                    'entry_time'    =>    $time,
-                    'updatetime' =>    $time
-                ]);
-                if ($result) {
-                    $insert_data['order_status'] = 1;
-                    $insert_data['remark'] = '录入成功';
+                if (!empty($sql_data['user_id']) && $sql_data['user_id'] != 0) {
+                    $insert_data['order_status'] = 0;
+                    $insert_data['remark'] = '请勿重复录入';
                 } else {
-                    $insert_data['remark'] = '录入失败';
+                    $result = $sql_data->save([
+                        'user_id'    =>   $this->userinfo['id'],
+                        'entry_time'    =>    $time,
+                        'updatetime' =>    $time
+                    ]);
+                    if ($result) {
+                        $insert_data['order_status'] = 1;
+                        $insert_data['remark'] = '录入成功';
+                    } else {
+                        $insert_data['remark'] = '录入失败';
+                    }
                 }
-                $entry_time=$sql_data['entry_time'];
-                if(!empty($sql_data['entry_time'])){
-                    $entry_time=date('Y-m-d H:i:s',$sql_data['entry_time']);
+
+
+
+                $entry_time = $sql_data['entry_time'];
+                if (!empty($sql_data['entry_time'])) {
+                    $entry_time = date('Y-m-d H:i:s', $sql_data['entry_time']);
                 }
                 switch ($sql_data['incubator']) {
                     case 1:
-                        $sql_data['incubator_title']='单层保温';
+                        $sql_data['incubator_title'] = '单层保温';
                         break;
                     case 2:
-                        $sql_data['incubator_title']='双层保温';
+                        $sql_data['incubator_title'] = '双层保温';
                         break;
                     default:
-                        $sql_data['incubator_title']='不是保温箱';
+                        $sql_data['incubator_title'] = '不是保温箱';
                         break;
                 }
-                $sql_data['entry_time']=$entry_time;
-                $insert_data['order_data']=$sql_data;
+                $sql_data['entry_time'] = $entry_time;
+                $insert_data['order_data'] = $sql_data;
             }
             $result = $scanLog->save($insert_data);
 
@@ -116,18 +123,40 @@ class Worker extends Base
         $where = [];
         $limit = $this->request->post('limit/d', 10);  //条数
         $time = $this->request->post('create_time/s'); //日期
-        if (!empty($type))    $where[] = ['a.type', '=', $type];
-        if (!empty($type_id)) $where[] = ['a.type_id', '=', $type_id];
-        if (!empty($spec_id)) $where[] = ['a.variety_id', '=', $spec_id];
+        // if (!empty($type))    $where[] = ['a.type', '=', $type];
+        // if (!empty($type_id)) $where[] = ['a.type_id', '=', $type_id];
+        // if (!empty($spec_id)) $where[] = ['a.variety_id', '=', $spec_id];
         if (!empty($time)) {
             $arr = explode(',', $time);
-            $where[] = ['a.createtime', '>=', strtotime($arr[0])];
-            $where[] = ['a.createtime', '<=', strtotime($arr[1])];
+            $where[] = ['sl.createtime', '>=', strtotime($arr[0])];
+            $where[] = ['sl.createtime', '<=', strtotime($arr[1])];
         }
-        $list = ScanLog::where('user_id', $this->userinfo['id'])
-            ->whereTime('createtime', 'today')
-            ->order('id desc')
-            ->paginate($limit);
+
+        $list = $scanLog
+            ->where('user_id', $this->userinfo['id'])
+            ->where($where)
+            ->order('createtime desc')
+            ->paginate($limit)
+            ->each(function ($item, $key) {
+                $order_data=$this->shopDeliveryModel->where('waybill_no', $item['code'])->find();
+                $item['order_data'] = [];
+                if (!empty($order_data['waybill_no'])) {
+                    $incubator_title = '不是保温箱';
+                    switch ($order_data['incubator']) {
+                        case 1:
+                            $incubator_title = '单层保温';
+                            break;
+                        case 2:
+                            $incubator_title = '双层保温';
+                            break;
+                    }
+                    $item['order_data']=$order_data;
+                    $item['order_data']['incubator_title']=$incubator_title;
+                    
+                
+                }
+                return $item;
+            });
         $this->success('ok', $list);
     }
 }