|
@@ -303,9 +303,9 @@ class DwyController extends BaseController
|
|
|
$c['box_code_show'] = '商标一号仓';
|
|
|
|
|
|
//
|
|
|
-// $b = $vv;
|
|
|
-// $b['box_code'] = 'CK00010';
|
|
|
-// $b['box_code_show'] = '商标七号仓';
|
|
|
+ $b = $vv;
|
|
|
+ $b['box_code'] = 'CK00010';
|
|
|
+ $b['box_code_show'] = '商标七号仓';
|
|
|
}
|
|
|
|
|
|
// if($vv['box_code'] === 'CK00008'){
|
|
@@ -332,7 +332,7 @@ class DwyController extends BaseController
|
|
|
}
|
|
|
if(isset($c)) {
|
|
|
$data[] = $c;
|
|
|
-// $data[] = $b;
|
|
|
+ $data[] = $b;
|
|
|
}
|
|
|
|
|
|
sort($data);
|
|
@@ -447,7 +447,10 @@ class DwyController extends BaseController
|
|
|
$detail = [];
|
|
|
foreach ($box_nos as $v){
|
|
|
// var_dump(file_get_contents('/'.$dv.'_'.$box_nos.'.txt'));die;
|
|
|
- $detail[$v] = json_decode(file_get_contents(''.$dv.'_'.$v.'.txt'),true);
|
|
|
+ $detail[] = [
|
|
|
+ 'detail'=>json_decode(file_get_contents(''.$dv.'_'.$v.'.txt'),true),
|
|
|
+ 'code'=>$v,
|
|
|
+ ];
|
|
|
}
|
|
|
|
|
|
return ['status'=>200, 'data' => $detail];
|