Changed logic in post api of process order
Some checks failed
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Has been cancelled
Some checks failed
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Has been cancelled
This commit is contained in:
@@ -627,7 +627,7 @@ class PdfController extends Controller
|
|||||||
// 'coil_number' => $proOrdAgPlant->coil_number ?? "",
|
// 'coil_number' => $proOrdAgPlant->coil_number ?? "",
|
||||||
// 'order_quantity' => (string)$proOrdAgPlant->order_quantity ?? "",
|
// 'order_quantity' => (string)$proOrdAgPlant->order_quantity ?? "",
|
||||||
'coil_number' => $currentCoil,
|
'coil_number' => $currentCoil,
|
||||||
'order_quantity' => (string) $lastRecord->order_quantity ?? '0.000',
|
'order_quantity' => (string) $lastRecord->updated_order_quantity ?? '0.000',
|
||||||
'ok_quantity' => (string) $okQty ?? '0',
|
'ok_quantity' => (string) $okQty ?? '0',
|
||||||
'not_ok_quantity' => (string) $notOkQty ?? '0',
|
'not_ok_quantity' => (string) $notOkQty ?? '0',
|
||||||
'received_quantity' => (string) (($totalReceivedQty == 0) ? '0.000' : $totalReceivedQty) ?? '0.000',
|
'received_quantity' => (string) (($totalReceivedQty == 0) ? '0.000' : $totalReceivedQty) ?? '0.000',
|
||||||
@@ -686,7 +686,7 @@ class PdfController extends Controller
|
|||||||
$itemCode = $data['item_code'] ?? '';
|
$itemCode = $data['item_code'] ?? '';
|
||||||
$lineName = $data['line_name'] ?? '';
|
$lineName = $data['line_name'] ?? '';
|
||||||
$coilNo = $data['coil_number'] ?? '';
|
$coilNo = $data['coil_number'] ?? '';
|
||||||
$orderQty = $data['order_quantity'] ?? 0;
|
$updatedOrderQty = $data['order_quantity'] ?? 0;
|
||||||
$receivedQty = $data['received_quantity'] ?? 0;
|
$receivedQty = $data['received_quantity'] ?? 0;
|
||||||
$scrapQty = $data['scrap_quantity'] ?? 0;
|
$scrapQty = $data['scrap_quantity'] ?? 0;
|
||||||
$sfgNo = $data['sfg_number'] ?? '';
|
$sfgNo = $data['sfg_number'] ?? '';
|
||||||
@@ -872,7 +872,8 @@ class PdfController extends Controller
|
|||||||
->where('item_id', $itemId)
|
->where('item_id', $itemId)
|
||||||
->sum('received_quantity');
|
->sum('received_quantity');
|
||||||
|
|
||||||
if ($orderQty == 0) {
|
$orderQty = 0;
|
||||||
|
if ($updatedOrderQty == 0) {
|
||||||
$orderExist = ProcessOrder::where('plant_id', $plantId)
|
$orderExist = ProcessOrder::where('plant_id', $plantId)
|
||||||
->where('process_order', $processOrder)
|
->where('process_order', $processOrder)
|
||||||
->where('item_id', $itemId)->latest()->first();
|
->where('item_id', $itemId)->latest()->first();
|
||||||
@@ -880,6 +881,7 @@ class PdfController extends Controller
|
|||||||
|
|
||||||
if ($orderExist) {
|
if ($orderExist) {
|
||||||
$orderQty = $orderExist->order_quantity ?? 0;
|
$orderQty = $orderExist->order_quantity ?? 0;
|
||||||
|
$updatedOrderQty = $orderExist->updated_order_quantity ?? 0;
|
||||||
} else {
|
} else {
|
||||||
return response()->json([
|
return response()->json([
|
||||||
'status_code' => 'ERROR',
|
'status_code' => 'ERROR',
|
||||||
@@ -893,9 +895,11 @@ class PdfController extends Controller
|
|||||||
// ->value('order_quantity') ?? 0;
|
// ->value('order_quantity') ?? 0;
|
||||||
|
|
||||||
if ($orderExist) {
|
if ($orderExist) {
|
||||||
$existOrderQty = $orderExist->order_quantity ?? 0;
|
// $existOrderQty = $orderExist->updated_order_quantity ?? 0;
|
||||||
|
$orderQty = $orderExist->order_quantity ?? 0;
|
||||||
|
$existUpdatedOrdQuan = $orderExist->updated_order_quantity ?? 0;
|
||||||
|
|
||||||
if ($existOrderQty != $orderQty) {
|
if ($existUpdatedOrdQuan != $updatedOrderQty) {
|
||||||
return response()->json([
|
return response()->json([
|
||||||
'status_code' => 'ERROR',
|
'status_code' => 'ERROR',
|
||||||
'status_description' => "Order quantity doesn't equal to exist process order '{$processOrder}'",
|
'status_description' => "Order quantity doesn't equal to exist process order '{$processOrder}'",
|
||||||
@@ -946,10 +950,10 @@ class PdfController extends Controller
|
|||||||
], 404);
|
], 404);
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($total > $orderQty) {
|
if ($total > $updatedOrderQty) {
|
||||||
return response()->json([
|
return response()->json([
|
||||||
'status_code' => 'ERROR',
|
'status_code' => 'ERROR',
|
||||||
'status_description' => "Rework received quantity should not exceed exist order quantity! Exist Order Qty = '{$orderQty}', Already Exist Total Received Qty = '{$alreadyReceived}', Trying to Insert Rework Received Qty = '{$receivedQty}'",
|
'status_description' => "Rework received quantity should not exceed exist order quantity! Exist Order Qty = '{$updatedOrderQty}', Already Exist Total Received Qty = '{$alreadyReceived}', Trying to Insert Rework Received Qty = '{$receivedQty}'",
|
||||||
], 404);
|
], 404);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -968,6 +972,7 @@ class PdfController extends Controller
|
|||||||
'item_id' => $itemId,
|
'item_id' => $itemId,
|
||||||
'coil_number' => $coilNo,
|
'coil_number' => $coilNo,
|
||||||
'order_quantity' => $orderQty,
|
'order_quantity' => $orderQty,
|
||||||
|
'updated_order_quantity' => $updatedOrderQty,
|
||||||
'received_quantity' => $receivedQty,
|
'received_quantity' => $receivedQty,
|
||||||
'scrap_quantity' => $scrapQty,
|
'scrap_quantity' => $scrapQty,
|
||||||
'sfg_number' => $sfgNo,
|
'sfg_number' => $sfgNo,
|
||||||
@@ -1102,10 +1107,10 @@ class PdfController extends Controller
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($total > $orderQty) {
|
if ($total > $updatedOrderQty) {
|
||||||
return response()->json([
|
return response()->json([
|
||||||
'status_code' => 'ERROR',
|
'status_code' => 'ERROR',
|
||||||
'status_description' => "Received quantity should not exceed exist order quantity! Exist Order Qty = '{$orderQty}', Already Exist Total Received Qty = '{$alreadyReceived}', Trying to Insert Received Qty = '{$receivedQty}'",
|
'status_description' => "Received quantity should not exceed exist order quantity! Exist Order Qty = '{$updatedOrderQty}', Already Exist Total Received Qty = '{$alreadyReceived}', Trying to Insert Received Qty = '{$receivedQty}'",
|
||||||
], 404);
|
], 404);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1117,6 +1122,7 @@ class PdfController extends Controller
|
|||||||
'item_id' => $itemId,
|
'item_id' => $itemId,
|
||||||
'coil_number' => $coilNo,
|
'coil_number' => $coilNo,
|
||||||
'order_quantity' => $orderQty,
|
'order_quantity' => $orderQty,
|
||||||
|
'updated_order_quantity' => $updatedOrderQty,
|
||||||
'received_quantity' => $receivedQty,
|
'received_quantity' => $receivedQty,
|
||||||
'scrap_quantity' => $scrapQty,
|
'scrap_quantity' => $scrapQty,
|
||||||
'sfg_number' => $sfgNo,
|
'sfg_number' => $sfgNo,
|
||||||
|
|||||||
Reference in New Issue
Block a user