Commit 70d355c1 by 叶明星

格式化

parent 29143cfe
Showing with 31 additions and 32 deletions
...@@ -13,6 +13,7 @@ use App\Http\Model\Logic\PickTaskLogic; ...@@ -13,6 +13,7 @@ use App\Http\Model\Logic\PickTaskLogic;
use App\Http\Model\PickTaskDetailModel; use App\Http\Model\PickTaskDetailModel;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use App\Http\Model\Logic\OutStoreLogic; use App\Http\Model\Logic\OutStoreLogic;
class OutstoreController extends Controller class OutstoreController extends Controller
{ {
public function Entrance(Request $request, $id) public function Entrance(Request $request, $id)
...@@ -26,11 +27,11 @@ class OutstoreController extends Controller ...@@ -26,11 +27,11 @@ class OutstoreController extends Controller
public function createOutStore($request) public function createOutStore($request)
{ {
$data = $request->all(); $data = $request->all();
try{ try {
$inserData = OutStoreLogic::handleInsertData($data); $inserData = OutStoreLogic::handleInsertData($data);
$returnData = OutStoreLogic::insertData($inserData); $returnData = OutStoreLogic::insertData($inserData);
}catch (\Exception $exception){ } catch (\Exception $exception) {
return $this->apiReturn($exception->getMessage().'|jsondata='.json_encode($data)); return $this->apiReturn($exception->getMessage() . '|jsondata=' . json_encode($data));
} }
return $this->apiReturn($returnData); return $this->apiReturn($returnData);
} }
...@@ -39,26 +40,24 @@ class OutstoreController extends Controller ...@@ -39,26 +40,24 @@ class OutstoreController extends Controller
public function palletBoxList($request) public function palletBoxList($request)
{ {
$data = $request->all(); $data = $request->all();
try{ try {
$returnData = (new PalletLogic())->palletBoxList($data); $returnData = (new PalletLogic())->palletBoxList($data);
}catch (\Exception $exception){ } catch (\Exception $exception) {
if (empty(self::$errCode))self::$errCode=101; if (empty(self::$errCode)) self::$errCode = 101;
return $this->apiReturn($exception->getMessage()); return $this->apiReturn($exception->getMessage());
} }
return $this->apiReturn($returnData); return $this->apiReturn($returnData);
} }
//扫描出库列表 //扫描出库列表
public function scan_out_store_list($request) public function scan_out_store_list($request)
{ {
$data = $request->all(); $data = $request->all();
try{ try {
$returnData = (new PickTaskLogic())->getPickTaskDetailList($data); $returnData = (new PickTaskLogic())->getPickTaskDetailList($data);
}catch (\Exception $exception){ } catch (\Exception $exception) {
if (empty(self::$errCode))self::$errCode=101; if (empty(self::$errCode)) self::$errCode = 101;
return $this->apiReturn($exception->getMessage()); return $this->apiReturn($exception->getMessage());
} }
return $this->apiReturn($returnData); return $this->apiReturn($returnData);
...@@ -69,12 +68,12 @@ class OutstoreController extends Controller ...@@ -69,12 +68,12 @@ class OutstoreController extends Controller
public function confirm_out_store($request) public function confirm_out_store($request)
{ {
$data = $request->all(); $data = $request->all();
try{ try {
$outStoreDetailIdArr = PickTaskDetailModel::where('pick_task_detail_id',$data['pick_task_detail_id'])->pluck('out_store_detail_id'); $outStoreDetailIdArr = PickTaskDetailModel::where('pick_task_detail_id', $data['pick_task_detail_id'])->pluck('out_store_detail_id');
$data['out_store_detail_id_arr'] = $outStoreDetailIdArr; $data['out_store_detail_id_arr'] = $outStoreDetailIdArr;
$returnData = (new PalletLogic())->confirmOutStore($data); $returnData = (new PalletLogic())->confirmOutStore($data);
}catch (\Exception $exception){ } catch (\Exception $exception) {
if (empty(self::$errCode))self::$errCode=101; if (empty(self::$errCode)) self::$errCode = 101;
return $this->apiReturn($exception->getMessage()); return $this->apiReturn($exception->getMessage());
} }
return $this->apiReturn($returnData); return $this->apiReturn($returnData);
...@@ -84,13 +83,13 @@ class OutstoreController extends Controller ...@@ -84,13 +83,13 @@ class OutstoreController extends Controller
public function cancel_out_store($request) public function cancel_out_store($request)
{ {
$data = $request->all(); $data = $request->all();
try{ try {
//获取所有的out_store_detail_id //获取所有的out_store_detail_id
$outStoreDetailIdArr = PickTaskDetailModel::where('pick_task_detail_id',$data['pick_task_detail_id'])->pluck('out_store_detail_id'); $outStoreDetailIdArr = PickTaskDetailModel::where('pick_task_detail_id', $data['pick_task_detail_id'])->pluck('out_store_detail_id');
$data['out_store_detail_id_arr'] = $outStoreDetailIdArr; $data['out_store_detail_id_arr'] = $outStoreDetailIdArr;
$returnData = (new PalletLogic())->cancelOutStore($data); $returnData = (new PalletLogic())->cancelOutStore($data);
}catch (\Exception $exception){ } catch (\Exception $exception) {
if (empty(self::$errCode))self::$errCode=101; if (empty(self::$errCode)) self::$errCode = 101;
return $this->apiReturn($exception->getMessage()); return $this->apiReturn($exception->getMessage());
} }
return $this->apiReturn($returnData); return $this->apiReturn($returnData);
...@@ -100,11 +99,11 @@ class OutstoreController extends Controller ...@@ -100,11 +99,11 @@ class OutstoreController extends Controller
public function deliver_goods($request) public function deliver_goods($request)
{ {
$data = $request->all(); $data = $request->all();
try{ try {
$data['pick_task_detail_id_str'] = implode(',',$data['pick_task_detail_id']); $data['pick_task_detail_id_str'] = implode(',', $data['pick_task_detail_id']);
$returnData = (new PalletLogic())->deliverGoods($data); $returnData = (new PalletLogic())->deliverGoods($data);
}catch (\Exception $exception){ } catch (\Exception $exception) {
if (empty(self::$errCode))self::$errCode=101; if (empty(self::$errCode)) self::$errCode = 101;
return $this->apiReturn($exception->getMessage()); return $this->apiReturn($exception->getMessage());
} }
return $this->apiReturn($returnData); return $this->apiReturn($returnData);
...@@ -114,10 +113,10 @@ class OutstoreController extends Controller ...@@ -114,10 +113,10 @@ class OutstoreController extends Controller
public function palletActive($request) public function palletActive($request)
{ {
$data = $request->all(); $data = $request->all();
try{ try {
$returnData = (new PalletLogic())->palletActive($data); $returnData = (new PalletLogic())->palletActive($data);
}catch (\Exception $exception){ } catch (\Exception $exception) {
if (empty(self::$errCode))self::$errCode=101; if (empty(self::$errCode)) self::$errCode = 101;
return $this->apiReturn($exception->getMessage()); return $this->apiReturn($exception->getMessage());
} }
return $this->apiReturn($returnData); return $this->apiReturn($returnData);
...@@ -127,10 +126,10 @@ class OutstoreController extends Controller ...@@ -127,10 +126,10 @@ class OutstoreController extends Controller
public function get_box_info($request) public function get_box_info($request)
{ {
$data = $request->all(); $data = $request->all();
try{ try {
$returnData = (new PalletLogic())->getBoxInfo($data); $returnData = (new PalletLogic())->getBoxInfo($data);
}catch (\Exception $exception){ } catch (\Exception $exception) {
if (empty(self::$errCode))self::$errCode=101; if (empty(self::$errCode)) self::$errCode = 101;
return $this->apiReturn($exception->getMessage()); return $this->apiReturn($exception->getMessage());
} }
return $this->apiReturn($returnData); return $this->apiReturn($returnData);
...@@ -140,10 +139,10 @@ class OutstoreController extends Controller ...@@ -140,10 +139,10 @@ class OutstoreController extends Controller
public function get_pallet_info($request) public function get_pallet_info($request)
{ {
$data = $request->all(); $data = $request->all();
try{ try {
$returnData = (new PalletLogic())->getPalletInfo($data); $returnData = (new PalletLogic())->getPalletInfo($data);
}catch (\Exception $exception){ } catch (\Exception $exception) {
if (empty(self::$errCode))self::$errCode=101; if (empty(self::$errCode)) self::$errCode = 101;
return $this->apiReturn($exception->getMessage()); return $this->apiReturn($exception->getMessage());
} }
return $this->apiReturn($returnData); return $this->apiReturn($returnData);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment