Merge branch 'develop' of http://114.203.209.83:3000/SamProject/sam-api into develop
This commit is contained in:
@@ -6,6 +6,7 @@
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Http\Requests\Order\CreateFromQuoteRequest;
|
||||
use App\Http\Requests\Order\CreateProductionOrderRequest;
|
||||
use App\Http\Requests\Order\OrderBulkDeleteRequest;
|
||||
use App\Http\Requests\Order\StoreOrderRequest;
|
||||
use App\Http\Requests\Order\UpdateOrderRequest;
|
||||
use App\Http\Requests\Order\UpdateOrderStatusRequest;
|
||||
@@ -66,6 +67,21 @@ public function update(UpdateOrderRequest $request, int $id)
|
||||
}, __('message.order.updated'));
|
||||
}
|
||||
|
||||
/**
|
||||
* 일괄 삭제
|
||||
*/
|
||||
public function bulkDestroy(OrderBulkDeleteRequest $request)
|
||||
{
|
||||
return ApiResponse::handle(function () use ($request) {
|
||||
$validated = $request->validated();
|
||||
|
||||
return $this->service->bulkDestroy(
|
||||
$validated['ids'],
|
||||
$validated['force'] ?? false
|
||||
);
|
||||
}, __('message.order.bulk_deleted'));
|
||||
}
|
||||
|
||||
/**
|
||||
* 삭제
|
||||
*/
|
||||
@@ -119,12 +135,25 @@ public function revertOrderConfirmation(int $id)
|
||||
}
|
||||
|
||||
/**
|
||||
* 생산지시 되돌리기 (작업지시 및 관련 데이터 삭제)
|
||||
* 절곡 BOM 품목 재고 확인
|
||||
*/
|
||||
public function revertProductionOrder(int $id)
|
||||
public function checkBendingStock(int $id)
|
||||
{
|
||||
return ApiResponse::handle(function () use ($id) {
|
||||
return $this->service->revertProductionOrder($id);
|
||||
return $this->service->checkBendingStockForOrder($id);
|
||||
}, __('message.fetched'));
|
||||
}
|
||||
|
||||
/**
|
||||
* 생산지시 되돌리기 (작업지시 및 관련 데이터 삭제)
|
||||
*/
|
||||
public function revertProductionOrder(Request $request, int $id)
|
||||
{
|
||||
$force = $request->boolean('force', false);
|
||||
$reason = $request->input('reason');
|
||||
|
||||
return ApiResponse::handle(function () use ($id, $force, $reason) {
|
||||
return $this->service->revertProductionOrder($id, $force, $reason);
|
||||
}, __('message.order.production_order_reverted'));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -22,6 +22,7 @@ public function index(Request $request): JsonResponse
|
||||
$params = $request->only([
|
||||
'search',
|
||||
'item_type',
|
||||
'item_category',
|
||||
'status',
|
||||
'location',
|
||||
'sort_by',
|
||||
|
||||
Reference in New Issue
Block a user