Merge branch 'master' of http://121.41.102.225:3000/chenqp/queue_services

app/Http/Controllers/Api/DwyController.php

@@ -187,7 +187,6 @@ class DwyController extends BaseController
 //                ],
 //            ],
 //        ];
-//        dd(json_encode($param));
         $token = $param['token'];
         $list = $param['list'];
         $mac = $param['mac'];
@@ -198,6 +197,10 @@ class DwyController extends BaseController
         ];
         $data = $this->post_helper($url, '{"device_code":"'.$mac.'"}', $header);
         $data = json_decode($data, true);
+
+        usort($data, function ($a,$b){
+            return str_replace('CK','',$a['box_code']) - str_replace('CK','',$b['box_code']);
+        });
         foreach ($data as $k => &$v) {
 
             if (!isset($v['product_list'])) $v['product_list'] = [];
@@ -206,9 +209,10 @@ class DwyController extends BaseController
                 continue;
             }
 //            $v['use_qty'] = $v['qty'];
-//            if($v['box_code'] === 'CK00004'){
-//                $v['use_qty'] = 200;
-//                $v['qty'] = 200;
+//            if($v['box_code'] === 'CK00008'){
+//                $v['use_qty'] = 150;
+//                $v['qty'] = 150;
+////                $v['qty'] = 200;
 //                $v['in_stock_qty'] = 0;
 //            }
 
@@ -216,13 +220,10 @@ class DwyController extends BaseController
                 unset($data[$k]);
                 continue;
             }
-//            $key_list = [];
+            $v['use_qty'] = $v['qty'];
             if (!isset($v['send_qty'])) $v['send_qty'] = 0;
             foreach ($list as $kk => $vv) {
 
-                //写死的代码
-//                if($vv['num'] > 0 )  $vv['num'] = 200;
-                //end
 
                 if ($vv['num'] == 0) continue;
                 if ($v['material_code_show'] === $vv['title']) {
@@ -230,8 +231,10 @@ class DwyController extends BaseController
                     if (($v['qty'] - $v['send_qty']) > $vv['num']) {
                         $list[$kk]['num'] -= $vv['num'];
                         $v['send_qty'] += $vv['num'];
+                        $p_total = $vv['num'];
                     } else {
                         $list[$kk]['num'] -= ($v['qty'] - $v['send_qty']);
+                        $p_total = $vv['num'] - ($v['qty'] - $v['send_qty']);
                         $v['send_qty'] += ($v['qty'] - $v['send_qty']);
                     }
 
@@ -258,108 +261,22 @@ class DwyController extends BaseController
                         'color' => $vv['color'] ?? '',
                         'process_title_two' => $vv['process_title_two'] ?? '',
                         'color_two' => $vv['color_two'] ?? '',
-                        'send_qty' => $vv['num'],
+                        'send_qty' => $p_total,
+                        'fake_qty' => $p_total,
 //                        'send_qty' => 0,
                         'restock_qty' => $vv['restock_qty'] ?? 0,
                     ];
                     $v['product_list'][] = $key_arr;
                 }
-                //测试代码到时候注释掉就好了
-                //8,10
-//                if($v['box_code'] == 'CK00017'){
-//                    $v['box_code'] = 'CK00008';
-//                    $v['box_code_show'] = '商标五号仓';
-//                    $v['send_qty'] = '3';
-//                    $key_arr = [
-//                        'product_code' => $vv['product_code'] ?? '',
-//                        'product_code_show' => $vv['product_code_show'] ?? '',
-//                        'order_item_id' => $vv['order_item_id'] ?? '',
-//                        'order_item_id_show' => $vv['order_item_id_show'] ?? '',
-//                        'send_qty' => 3,
-//                        'restock_qty' => $vv['restock_qty'] ?? 0,
-//                    ];
-//                    $v['product_list'][] = $key_arr;
-//                }elseif($v['box_code'] == 'CK00013'){
-//                    $v['box_code'] = 'CK00010';
-//                    $v['box_code_show'] = '商标七号仓';
-//                    $v['send_qty'] = '3';
-//                    $key_arr = [
-//                        'product_code' => $vv['product_code'] ?? '',
-//                        'product_code_show' => $vv['product_code_show'] ?? '',
-//                        'order_item_id' => $vv['order_item_id'] ?? '',
-//                        'order_item_id_show' => $vv['order_item_id_show'] ?? '',
-//                        'send_qty' => 3,
-//                        'restock_qty' => $vv['restock_qty'] ?? 0,
-//                    ];
-//                    $v['product_list'][] = $key_arr;
-//                } else{
-//                    $v['send_qty'] = 0;
-//                }
+
 
 
             }
         }
-//        foreach ($data as $kk=>$vv){
-//            if($vv['box_code'] === 'CK00008'){
-////                $data[$kk]['box_code'] = 'CK00008';
-////                $data[$kk]['box_code_show'] = '商标五号仓';
-//
-//                $c = $vv;
-//                $c['box_code'] = 'CK00010';
-//                $c['box_code_show'] = '商标十三号仓';
-//                $c['restock_qty'] = '200';
-//                $c['send_qty'] = '200';
-//                $c['qty'] = '200';
-//                $c['use_qty'] = '200';
-//
-////
-//                $b = $vv;
-//                $b['restock_qty'] = '200';
-//                $b['send_qty'] = '200';
-//                $b['qty'] = '200';
-//                $b['use_qty'] = '200';
-//                $b['box_code'] = 'CK00013';
-//                $b['box_code_show'] = '商标十号仓';//
-//
-//
-//                $d = $vv;
-//                $d['box_code'] = 'CK00014';
-//                $d['box_code_show'] = '商标十一号仓';
-//
-////                $d = $vv;
-////                $d['box_code'] = 'CK00008';
-////                $d['box_code_show'] = '商标五号仓';
-//            }
-//
-//            if($vv['box_code'] === 'CK00008'||$vv['box_code'] === 'CK00007'||$vv['box_code'] === 'CK00004'||$vv['box_code'] === 'CK00010'||$vv['box_code'] === 'CK00015'||$vv['box_code'] === 'CK00016'||$vv['box_code'] === 'CK00013'){
-//
-//                unset($data[$kk]);
-//
-////                $c = $vv;
-////                $c['box_code'] = 'CK00009';
-////                $c['box_code_show'] = '商标六号仓';
-////                $data[] = $c;
-//            }
-//
-//            if($vv['box_code'] === 'CK00004'){
-//
-//                unset($data[$kk]);
-//
-////                $c = $vv;
-////                $c['box_code'] = 'CK00009';
-////                $c['box_code_show'] = '商标六号仓';
-////                $data[] = $c;
-//            }
-//
-//
-//        }
-//        if(isset($c))  {
-//            $data[] = $c;
-////            $data[] = $b;
-////            $data[] = $d;
-//        }
 
-        sort($data);
+        usort($data, function ($a,$b){
+            return str_replace('CK','',$a['box_code']) - str_replace('CK','',$b['box_code']);
+        });
         return ['status' => 200, 'data' => $data];
     }
 
@@ -381,16 +298,21 @@ class DwyController extends BaseController
 //            ],
 //        ];
 //        dd(json_encode($param));
-        $url = 'https://tm.dwycloud.com/jbl/api/module-data/brand_in_stock/brand_in_stock/diy/box_inventory';
+//        $url = 'https://tm.dwycloud.com/jbl/api/module-data/brand_in_stock/brand_in_stock/diy/box_inventory';
+        $url = 'https://tm.dwycloud.com/jbl/api/module-data/box_inventory_dtl_qr/page';
         $header = [
             'Content-Type:application/json',
             'Authorization: ' . $request->header('Authorization'),
         ];
-        $data = $this->post_helper($url, json_encode($param), $header);
+        $param = '{"direction":"DESC","property":"id","fromClientType":"pc","number":0,"sorts":[],"rules":[{"field":"box_inventory.device_code","option":"LIKE_ANYWHERE","values":["'.$param['device_code'].'"]}],"size":15,"specialConditions":[],"workflowSearchBean":{},"dynamicFormCode":"box_inventory","developmentSystemId":null,"debugFlag":true}';
+        $data = $this->post_helper($url, $param, $header);
+//        $data = $this->post_helper($url, json_encode($param), $header);
         $data = json_decode($data, true);
-        foreach ($data as $k => $v) {
-            if($v['box_code'] !== 'CK00001') unset($data[$k]);
-            if($v['qty'] == 0) unset($data[$k]);
+        $data = $data['content'] ?? [];
+        foreach ($data as $k => &$v) {
+            $v['material_code_show'] = $v['box_inventory']['material_code_show'];
+            $v['qty'] = $v['roll_qty'];
+            $v['use_qty'] = 0;
         }
         sort($data);
         return json_encode($data);

app/Http/Controllers/Api/ScreenController.php

@@ -282,6 +282,7 @@ class ScreenController extends BaseController
             $n++;
             $return[$n][] = $k;
             foreach ($v as $vv){
+                if($vv < 0) $vv = -$vv;
                 $return[$n][] = $vv;
             }
         }
@@ -375,10 +376,11 @@ class ScreenController extends BaseController
 
     public function gzEchart(){
 
-//        $start = time()-864000;
-//        $end = isset($request['start_time']) ? $request['start_time'] : time();
+        $start = time()-86400*150;
+        $end = isset($request['start_time']) ? $request['start_time'] : time();
         $key = DeviceSite::where('site',1)->wherein('title',['急停'])->groupBy('key')->pluck('key')->toArray();
         $list = DeviceData::wherein('dev_eui',$key)->where('happening_data',1)->select(DB::raw("DATE_FORMAT(FROM_UNIXTIME(crt_time), '%Y-%m-%d %H') as c") ,DB::raw("count(id) as s"),'device_name','happening_data')->groupBy('dev_eui')->groupBy(DB::raw("DATE_FORMAT(FROM_UNIXTIME(crt_time), '%Y-%m-%d %H')"));
+        $list = $list->where('crt_time','>=',$start);
         $list = $list->paginate(50, '', 'page', 1)->toArray();
         $list = $list['data'];
         $list_key = [];

app/Http/Controllers/Api/TestController.php

@@ -5,6 +5,7 @@ namespace App\Http\Controllers\Api;
 
 use App\Model\BoxDetail;
 use App\Service\Box\BoxHookService;
+use App\Service\DwyService;
 use App\Service\MeasureService;
 use Illuminate\Http\Request;
 
@@ -12,7 +13,7 @@ use Illuminate\Http\Request;
 class TestController extends BaseController
 {
     public function deviceCallback(Request $request){
-        echo 'ok';die;
+        $a = DwyService::getInstance()->setBoxData(1,2,3,4,1);
     }
 
 

routes/api.php

@@ -23,6 +23,7 @@ Route::any('getOpenCommand', 'Api\DwyController@getOpenCommand');
 Route::any('openDoor', 'Api\DwyController@openDoor');
 Route::any('setLb', 'Api\DwyController@setLb');
 Route::any('boxList', 'Api\DwyController@boxList');
+Route::any('ttttt', 'Api\TestController@deviceCallback');
 //Route::any('boxOut', 'Api\DwyController@boxOut');
 
 //贴标机