app/Http/Requests/Admin/Manage/StockVerifyRequest.php

@@ -81,8 +81,8 @@ public function withValidator(Validator $validator): void
                         continue;
                     }
 
-                    if (($good + $reject) > (int) $originalResult->cutting_result) {
+                    if (($good + $reject) !== (int) $originalResult->cutting_result) {
-                        $validator->errors()->add("results.{$index}.good", "Total jumlah (bagus + reject) tidak boleh melebihi hasil cutting asli ({$originalResult->cutting_result} pcs).");
+                        $validator->errors()->add("results.{$index}.good", "Total jumlah (bagus + reject) harus sama dengan hasil cutting asli ({$originalResult->cutting_result} pcs).");
                     }
                 }
             }

resources/js/pages/admin/manage/stocks/table/StockPendingApprovalSection.vue

@@ -98,9 +98,6 @@ function getGroupedMaterials(materials: any[]): GroupedCuttingMaterials[] {
                         <p v-if="cutting.submitted_by">
                             Diajukan oleh {{ cutting.submitted_by.profile?.full_name ?? cutting.submitted_by.username }}
                         </p>
-                        <p v-if="cutting.rejection?.reason">
-                            Catatan: {{ cutting.rejection.reason }}
-                        </p>
                     </div>
                     <div class="flex flex-wrap gap-x-4 gap-y-1 text-sm">
                         <span>Total Hasil Cutting <strong class="text-primary">{{ cutting.total_result_pieces ??
@@ -127,8 +124,7 @@ function getGroupedMaterials(materials: any[]): GroupedCuttingMaterials[] {
                                 </TableRow>
                             </TableHeader>
                             <TableBody>
-                                <template v-for="group in getGroupedMaterials(cutting.materials)"
+                                <template v-for="group in getGroupedMaterials(cutting.materials)" :key="group.rawMaterialId">
-                                    :key="group.rawMaterialId">
                                     <TableRow class="bg-muted/20 hover:bg-muted/20">
                                         <TableCell colspan="3" class="font-semibold text-foreground">
                                             <template v-if="group.isCombination">
@@ -144,8 +140,7 @@ function getGroupedMaterials(materials: any[]): GroupedCuttingMaterials[] {
                                             </template>
                                             <template v-else>
                                                 {{ group.rawMaterialName }}
-                                                <Badge v-if="group.unitLabel" variant="secondary"
+                                                <Badge v-if="group.unitLabel" variant="secondary" class="ml-2 font-normal">
-                                                    class="ml-2 font-normal">
                                                     {{ group.unitLabel }}
                                                 </Badge>
                                             </template>
@@ -159,8 +154,7 @@ function getGroupedMaterials(materials: any[]): GroupedCuttingMaterials[] {
                                             <MediaThumbnailCell :items="material.images ?? []" :max-visible="1" />
                                         </TableCell>
                                         <TableCell class="tabular-nums">
-                                            <template
+                                            <template v-if="!group.isCombination && material.material_result !== null && material.material_result !== undefined">
-                                                v-if="!group.isCombination && material.material_result !== null && material.material_result !== undefined">
                                                 {{ material.material_result }} pcs
                                             </template>
                                             <template v-else>
@@ -185,12 +179,11 @@ function getGroupedMaterials(materials: any[]): GroupedCuttingMaterials[] {
                                     <TableHead>Hasil</TableHead>
                                     <TableHead>Bagus</TableHead>
                                     <TableHead>Reject</TableHead>
-                                    <TableHead>Harga</TableHead>
                                 </TableRow>
                             </TableHeader>
                             <TableBody>
                                 <TableRow v-if="!cutting.results.length" :key="`${cutting.id}-result-empty`">
-                                    <TableCell colspan="6" class="text-muted-foreground">
+                                    <TableCell colspan="5" class="text-muted-foreground">
                                         Belum ada hasil verifikasi
                                     </TableCell>
                                 </TableRow>
@@ -199,8 +192,7 @@ function getGroupedMaterials(materials: any[]): GroupedCuttingMaterials[] {
                                         {{ result.product_variant?.product?.name }} ({{ result.product_variant?.name }})
                                     </TableCell>
                                     <TableCell>
-                                        <MediaThumbnailCell :items="result.product_variant?.images ?? []"
+                                        <MediaThumbnailCell :items="result.product_variant?.images ?? []" :max-visible="1" />
-                                            :max-visible="1" />
                                     </TableCell>
                                     <TableCell class="tabular-nums">
                                         {{ result.cutting_result }} pcs
@@ -211,22 +203,6 @@ function getGroupedMaterials(materials: any[]): GroupedCuttingMaterials[] {
                                     <TableCell class="tabular-nums">
                                         {{ result.original_outside_sample }} pcs
                                     </TableCell>
-                                    <TableCell>
-                                        <div v-if="cutting.result_prices?.filter(p => p.product_variant_id === result.product_variant?.id).length"
-                                            class="space-y-0.5 text-xs">
-                                            <div v-for="price in cutting.result_prices.filter(p => p.product_variant_id === result.product_variant?.id)"
-                                                :key="price.id"
-                                                class="flex items-center justify-between gap-3">
-                                                <span class="text-muted-foreground">
-                                                    {{ price.type_label }}
-                                                </span>
-                                                <span class="font-medium tabular-nums">
-                                                    {{ price.price_formatted }}
-                                                </span>
-                                            </div>
-                                        </div>
-                                        <span v-else class="text-xs text-muted-foreground">-</span>
-                                    </TableCell>
                                 </TableRow>
                             </TableBody>
                         </Table>

resources/js/pages/admin/manage/stocks/table/StockVerifyDialog.vue

@@ -87,16 +87,6 @@ interface VariantPriceRow {
     prices: Record<string, string>;
 }
 
-function onGoodChange(result: any, value: string | number) {
-    const val = Number(value) || 0;
-    result.good = val;
-}
-
-function onRejectChange(result: any, value: string | number) {
-    const val = Number(value) || 0;
-    result.reject = val;
-}
-
 const verifyForm = useForm({
     verification_note: '',
     results: props.cutting.results.map(res => ({
@@ -237,15 +227,13 @@ function submitVerify() {
                                         <label :for="`stock-good-${index}`"
                                             class="text-[10px] text-muted-foreground block mb-0.5">Bagus</label>
                                         <NumberInput :id="`stock-good-${index}`" :model-value="result.good"
-                                            class="h-7 w-20 px-1.5 text-xs text-center"
+                                            class="h-7 w-20 px-1.5 text-xs text-center" />
-                                            @update:model-value="val => onGoodChange(result, val)" />
                                     </div>
                                     <div class="text-center">
                                         <label :for="`stock-reject-${index}`"
                                             class="text-[10px] text-muted-foreground block mb-0.5">Reject</label>
                                         <NumberInput :id="`stock-reject-${index}`" :model-value="result.reject"
-                                            class="h-7 w-20 px-1.5 text-xs text-center"
+                                            class="h-7 w-20 px-1.5 text-xs text-center" />
-                                            @update:model-value="val => onRejectChange(result, val)" />
                                     </div>
                                 </div>
                             </div>

resources/js/types/cutting.ts

@@ -45,14 +45,6 @@ export type CuttingResultPriceItem = {
     cost_per_unit: number;
     cost_per_unit_formatted: string;
     type_label: string;
-    product_variant?: {
-        id: number;
-        name: string;
-        product?: {
-            id: number;
-            name: string;
-        };
-    };
 };
 
 export type CuttingResultListItem = {