feat: implement cutting verification workflow with stock adjustment and rejection notes
This commit is contained in:
Yoga Pangestu
parent
837c930c4f
commit
1805c64428
@ -33,9 +33,8 @@ public function canTransitionTo(self $status): bool
|
||||
{
|
||||
return match ($this) {
|
||||
self::IN_PROGRESS => $status === self::COMPLETED,
|
||||
self::COMPLETED => in_array($status, [self::VERIFIED, self::REJECTED], true),
|
||||
self::REJECTED => $status === self::IN_PROGRESS,
|
||||
self::VERIFIED => false,
|
||||
self::COMPLETED => $status === self::VERIFIED,
|
||||
default => false,
|
||||
};
|
||||
}
|
||||
|
||||
@ -73,22 +72,6 @@ public function availableActions(): array
|
||||
'permission' => Permission::CUTTINGS_VERIFY->value,
|
||||
'icon_only' => false,
|
||||
],
|
||||
[
|
||||
'status' => self::REJECTED->value,
|
||||
'label' => 'Tolak',
|
||||
'destructive' => true,
|
||||
'permission' => Permission::CUTTINGS_REJECT->value,
|
||||
'icon_only' => false,
|
||||
],
|
||||
],
|
||||
self::REJECTED => [
|
||||
[
|
||||
'status' => self::IN_PROGRESS->value,
|
||||
'label' => 'Perbaiki',
|
||||
'destructive' => false,
|
||||
'permission' => Permission::CUTTINGS_UPDATE->value,
|
||||
'icon_only' => false,
|
||||
],
|
||||
],
|
||||
default => [],
|
||||
};
|
||||
|
||||
@ -94,6 +94,8 @@ public function transitionStatus(CuttingStatusTransitionRequest $request, Cuttin
|
||||
$status,
|
||||
$request->user(),
|
||||
$request->validated('reason'),
|
||||
$request->validated('verification_note'),
|
||||
$request->validated('results'),
|
||||
);
|
||||
|
||||
$message = match ($status) {
|
||||
|
||||
@ -29,6 +29,11 @@ public function rules(): array
|
||||
return [
|
||||
'status' => ['required', Rule::enum(CuttingStatus::class)],
|
||||
'reason' => ['nullable', 'string', 'max:500'],
|
||||
'verification_note' => ['nullable', 'string', 'max:500'],
|
||||
'results' => ['nullable', 'array'],
|
||||
'results.*.product_variant_id' => ['required_with:results', 'integer', 'exists:product_variants,id'],
|
||||
'results.*.warehouse_stock' => ['required_with:results', 'integer', 'min:0'],
|
||||
'results.*.cutting_reject' => ['required_with:results', 'integer', 'min:0'],
|
||||
];
|
||||
}
|
||||
|
||||
@ -40,6 +45,7 @@ public function attributes(): array
|
||||
return [
|
||||
'status' => 'status',
|
||||
'reason' => 'alasan penolakan',
|
||||
'verification_note' => 'catatan verifikasi',
|
||||
];
|
||||
}
|
||||
|
||||
@ -61,6 +67,25 @@ public function withValidator(Validator $validator): void
|
||||
if ($status === CuttingStatus::REJECTED && trim((string) $this->input('reason')) === '') {
|
||||
$validator->errors()->add('reason', 'Alasan penolakan wajib diisi.');
|
||||
}
|
||||
|
||||
if ($status === CuttingStatus::VERIFIED && $this->has('results')) {
|
||||
$cuttingResults = $cutting->results->keyBy('product_variant_id');
|
||||
foreach ($this->input('results', []) as $index => $item) {
|
||||
$variantId = $item['product_variant_id'] ?? 0;
|
||||
$warehouseStock = (int) ($item['warehouse_stock'] ?? 0);
|
||||
$cuttingReject = (int) ($item['cutting_reject'] ?? 0);
|
||||
|
||||
$originalResult = $cuttingResults->get($variantId);
|
||||
if ($originalResult === null) {
|
||||
$validator->errors()->add("results.{$index}.product_variant_id", "Varian produk tidak ditemukan pada cutting ini.");
|
||||
continue;
|
||||
}
|
||||
|
||||
if (($warehouseStock + $cuttingReject) !== (int) $originalResult->cutting_result) {
|
||||
$validator->errors()->add("results.{$index}.warehouse_stock", "Total jumlah (diterima + reject) harus sama dengan hasil cutting asli ({$originalResult->cutting_result} pcs).");
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@ -296,31 +296,47 @@ public function delete(Cutting $cutting): void
|
||||
});
|
||||
}
|
||||
|
||||
public function transitionStatus(Cutting $cutting, CuttingStatus $status, User $user, ?string $reason = null): void
|
||||
{
|
||||
public function transitionStatus(
|
||||
Cutting $cutting,
|
||||
CuttingStatus $status,
|
||||
User $user,
|
||||
?string $reason = null,
|
||||
?string $verificationNote = null,
|
||||
?array $results = null
|
||||
): void {
|
||||
if (! $cutting->status->canTransitionTo($status)) {
|
||||
throw ValidationException::withMessages([
|
||||
'status' => 'Status proses potong tidak dapat diubah.',
|
||||
]);
|
||||
}
|
||||
|
||||
DB::transaction(function () use ($cutting, $status, $reason, $user): void {
|
||||
DB::transaction(function () use ($cutting, $status, $reason, $verificationNote, $results, $user): void {
|
||||
$cutting->load(['materials', 'results']);
|
||||
|
||||
if ($status === CuttingStatus::COMPLETED) {
|
||||
$this->applyRemainingMaterialStock($cutting);
|
||||
}
|
||||
|
||||
if ($status === CuttingStatus::VERIFIED) {
|
||||
if ($results !== null) {
|
||||
foreach ($results as $item) {
|
||||
$cutting->results()
|
||||
->where('product_variant_id', $item['product_variant_id'])
|
||||
->update([
|
||||
'warehouse_stock' => $item['warehouse_stock'],
|
||||
'cutting_reject' => $item['cutting_reject'],
|
||||
]);
|
||||
}
|
||||
$cutting->load('results');
|
||||
}
|
||||
$this->applyProductStockOnVerify($cutting);
|
||||
}
|
||||
|
||||
if ($status === CuttingStatus::REJECTED) {
|
||||
$this->reverseMaterialStock($cutting);
|
||||
$this->reverseProductStock($cutting);
|
||||
$this->storeRejection($cutting, $reason, $user);
|
||||
}
|
||||
|
||||
if ($status === CuttingStatus::IN_PROGRESS && $cutting->status === CuttingStatus::REJECTED) {
|
||||
$this->deductMaterialStock($cutting);
|
||||
$cutting->rejection()?->delete();
|
||||
if ($verificationNote !== null && trim($verificationNote) !== '') {
|
||||
$cutting->rejection()->create([
|
||||
'reason' => trim($verificationNote),
|
||||
'rejected_by_id' => $user->id,
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
||||
$cutting->status = $status;
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
<script setup lang="ts">
|
||||
import ConfirmDialog from '@/components/ConfirmDialog.vue';
|
||||
import { Badge } from '@/components/ui/badge';
|
||||
import { Button } from '@/components/ui/button';
|
||||
import {
|
||||
Dialog,
|
||||
@ -15,6 +16,7 @@ import {
|
||||
FieldLabel,
|
||||
FieldSet,
|
||||
} from '@/components/ui/field';
|
||||
import { Input } from '@/components/ui/input';
|
||||
import { Textarea } from '@/components/ui/textarea';
|
||||
import {
|
||||
Tooltip,
|
||||
@ -40,6 +42,7 @@ const deleteProcessing = ref(false);
|
||||
const statusConfirmOpen = ref(false);
|
||||
const statusProcessing = ref(false);
|
||||
const rejectDialogOpen = ref(false);
|
||||
const verifyDialogOpen = ref(false);
|
||||
const pendingAction = ref<CuttingStatusAction | null>(null);
|
||||
|
||||
const rejectForm = useForm({
|
||||
@ -47,6 +50,32 @@ const rejectForm = useForm({
|
||||
reason: '',
|
||||
});
|
||||
|
||||
const verifyForm = useForm({
|
||||
status: 'verified',
|
||||
verification_note: '',
|
||||
results: props.cutting.results.map(res => ({
|
||||
product_variant_id: res.product_variant?.id || 0,
|
||||
name: `${res.product_variant?.product?.name || ''} (${res.product_variant?.name || ''})`,
|
||||
cutting_result: res.cutting_result,
|
||||
warehouse_stock: res.warehouse_stock,
|
||||
cutting_reject: res.cutting_reject,
|
||||
})),
|
||||
});
|
||||
|
||||
watch(verifyDialogOpen, (isOpen) => {
|
||||
if (isOpen) {
|
||||
verifyForm.verification_note = '';
|
||||
verifyForm.results = props.cutting.results.map(res => ({
|
||||
product_variant_id: res.product_variant?.id || 0,
|
||||
name: `${res.product_variant?.product?.name || ''} (${res.product_variant?.name || ''})`,
|
||||
cutting_result: res.cutting_result,
|
||||
warehouse_stock: res.warehouse_stock,
|
||||
cutting_reject: res.cutting_reject,
|
||||
}));
|
||||
verifyForm.clearErrors();
|
||||
}
|
||||
});
|
||||
|
||||
const availableActions = computed(() => props.cutting.available_actions ?? []);
|
||||
|
||||
const canEdit = computed(
|
||||
@ -77,6 +106,11 @@ function statusConfirmDescription(action: CuttingStatusAction): string {
|
||||
}
|
||||
|
||||
function openStatusConfirm(action: CuttingStatusAction) {
|
||||
if (action.status === 'verified') {
|
||||
verifyDialogOpen.value = true;
|
||||
return;
|
||||
}
|
||||
|
||||
if (action.status === 'rejected') {
|
||||
rejectForm.reset();
|
||||
rejectForm.clearErrors();
|
||||
@ -89,6 +123,24 @@ function openStatusConfirm(action: CuttingStatusAction) {
|
||||
statusConfirmOpen.value = true;
|
||||
}
|
||||
|
||||
function submitVerify() {
|
||||
verifyForm.post(`/admin/manage/cuttings/${props.cutting.id}/status`, {
|
||||
preserveScroll: true,
|
||||
onSuccess: () => {
|
||||
verifyDialogOpen.value = false;
|
||||
},
|
||||
onError: (errors) => {
|
||||
const message = Object.values(errors)[0];
|
||||
|
||||
toast.error(
|
||||
typeof message === 'string'
|
||||
? message
|
||||
: 'Gagal memverifikasi cutting.',
|
||||
);
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
function transitionStatus() {
|
||||
if (!pendingAction.value) {
|
||||
return;
|
||||
@ -320,4 +372,82 @@ function actionIcon(status: string) {
|
||||
</form>
|
||||
</DialogContent>
|
||||
</Dialog>
|
||||
|
||||
<Dialog v-model:open="verifyDialogOpen">
|
||||
<DialogContent class="sm:max-w-lg">
|
||||
<DialogHeader>
|
||||
<DialogTitle>Verifikasi Hasil Cutting</DialogTitle>
|
||||
</DialogHeader>
|
||||
|
||||
<form @submit.prevent="submitVerify">
|
||||
<div class="space-y-4 max-h-[60vh] overflow-y-auto px-1 py-1">
|
||||
<p class="text-sm text-muted-foreground">
|
||||
Silakan verifikasi jumlah produk yang diterima di toko. Jika terdapat perbedaan/selisih, jumlah produk masuk gudang akan disesuaikan secara otomatis dan selisihnya akan dicatat sebagai reject.
|
||||
</p>
|
||||
|
||||
<div class="space-y-3">
|
||||
<div v-for="(result, index) in verifyForm.results" :key="result.product_variant_id" class="p-3 border rounded-lg space-y-2">
|
||||
<div class="font-medium text-sm">
|
||||
{{ result.name }}
|
||||
</div>
|
||||
<div class="grid grid-cols-3 gap-2 items-center text-xs">
|
||||
<div>
|
||||
<span class="text-muted-foreground block">Hasil Potong:</span>
|
||||
<span class="font-semibold">{{ result.cutting_result }} pcs</span>
|
||||
</div>
|
||||
<div>
|
||||
<label :for="`received-${index}`" class="text-muted-foreground block mb-0.5">Diterima:</label>
|
||||
<Input
|
||||
:id="`received-${index}`"
|
||||
type="number"
|
||||
v-model.number="result.warehouse_stock"
|
||||
min="0"
|
||||
:max="result.cutting_result"
|
||||
class="h-8 w-20 px-2 text-xs"
|
||||
@input="result.cutting_reject = result.cutting_result - result.warehouse_stock"
|
||||
/>
|
||||
</div>
|
||||
<div>
|
||||
<span class="text-muted-foreground block">Selisih (Reject):</span>
|
||||
<Badge variant="secondary" class="font-semibold">
|
||||
{{ result.cutting_reject }} pcs
|
||||
</Badge>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<Field>
|
||||
<FieldLabel for="verification-note">Catatan Verifikasi</FieldLabel>
|
||||
<Textarea
|
||||
id="verification-note"
|
||||
v-model="verifyForm.verification_note"
|
||||
placeholder="Contoh: Terdapat 1 barang cacat jahitan saat dihitung di toko"
|
||||
rows="3"
|
||||
/>
|
||||
<FieldError
|
||||
:errors="verifyForm.errors.verification_note ? [verifyForm.errors.verification_note] : []"
|
||||
/>
|
||||
</Field>
|
||||
</div>
|
||||
|
||||
<DialogFooter class="mt-6">
|
||||
<Button
|
||||
type="button"
|
||||
variant="outline"
|
||||
:disabled="verifyForm.processing"
|
||||
@click="verifyDialogOpen = false"
|
||||
>
|
||||
Batal
|
||||
</Button>
|
||||
<Button
|
||||
type="submit"
|
||||
:disabled="verifyForm.processing"
|
||||
>
|
||||
{{ verifyForm.processing ? 'Menyimpan...' : 'Verifikasi' }}
|
||||
</Button>
|
||||
</DialogFooter>
|
||||
</form>
|
||||
</DialogContent>
|
||||
</Dialog>
|
||||
</template>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user