|
|
@@ -13,12 +13,14 @@ use app\api\validate\Worker as WorkerValidate;
|
|
|
use think\facade\Cache;
|
|
|
use think\facade\Db;
|
|
|
use think\Response;
|
|
|
+use app\common\model\ShopDelivery as ShopDeliveryModel;
|
|
|
|
|
|
/**
|
|
|
* 打包工人相关接口
|
|
|
*/
|
|
|
class Worker extends Base
|
|
|
{
|
|
|
+ protected $shopDeliveryModel = null;
|
|
|
|
|
|
/**
|
|
|
* 判断权限
|
|
|
@@ -27,7 +29,8 @@ class Worker extends Base
|
|
|
protected function _initialize()
|
|
|
{
|
|
|
parent::_initialize();
|
|
|
- if(!str_contains($this->userinfo['role'], "4")){
|
|
|
+ $this->shopDeliveryModel = new ShopDeliveryModel();
|
|
|
+ if (!str_contains($this->userinfo['role'], "4")) {
|
|
|
$this->error(__('没有权限' . $this->userinfo['role']));
|
|
|
}
|
|
|
}
|
|
|
@@ -51,16 +54,51 @@ class Worker extends Base
|
|
|
validate(WorkerValidate::class)->scene('scan')->check($data);
|
|
|
|
|
|
//$resData = $stockService::setGoOutStock($this->userinfo['id'], $data);
|
|
|
-
|
|
|
+ $time = time();
|
|
|
$insert_data = [
|
|
|
- 'user_id' => $this->userinfo['id'],
|
|
|
+ 'user_id' => $this->userinfo['id'],
|
|
|
'code' => $data['code'],
|
|
|
'order_status' => 0,
|
|
|
'remark' => '未找到单号',
|
|
|
+ 'order_data' => [],
|
|
|
+ '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'] = '录入成功';
|
|
|
+ } 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']);
|
|
|
+ }
|
|
|
+ switch ($sql_data['incubator']) {
|
|
|
+ case 1:
|
|
|
+ $sql_data['incubator_title']='单层保温';
|
|
|
+ break;
|
|
|
+ case 2:
|
|
|
+ $sql_data['incubator_title']='双层保温';
|
|
|
+ break;
|
|
|
+ default:
|
|
|
+ $sql_data['incubator_title']='不是保温箱';
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ $sql_data['entry_time']=$entry_time;
|
|
|
+ $insert_data['order_data']=$sql_data;
|
|
|
+ }
|
|
|
$result = $scanLog->save($insert_data);
|
|
|
+
|
|
|
Db::commit();
|
|
|
- }catch (ValidateException $e) {
|
|
|
+ } catch (ValidateException $e) {
|
|
|
return $this->error($e->getError());
|
|
|
} catch (\Exception $e) {
|
|
|
Db::rollback();
|
|
|
@@ -78,10 +116,10 @@ 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($time)){
|
|
|
+ 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])];
|
|
|
@@ -92,7 +130,4 @@ class Worker extends Base
|
|
|
->paginate($limit);
|
|
|
$this->success('ok', $list);
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-}
|
|
|
+}
|
dong025