poc/pds
1
0
Fork 1
Code Issues Pull Requests 12 Actions Packages Projects Releases Wiki Activity

Merge pull request 'corrected logic pallet print controller' (#804) from ranjith-dev into master
All checks were successful
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Successful in 46s
Details

Browse Source 
Reviewed-on: #804
This commit was merged in pull request #804.
This commit is contained in:
jothi
2026-07-06 06:59:04 +00:00
parent d31a392c21 56656264c0
commit cb3d43deb2
1 changed files with 14 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
app/Http/Controllers/PalletPrintController.php
View File

@@ -163,16 +163,11 @@ class PalletPrintController extends Controller
public function print(Request $request, $pallet, $plant) public function print(Request $request, $pallet, $plant)
{ {
$customerPo = $request->query('customer'); // $customerPo = $request->query('customer');
$itemId = WireMasterPacking::where('plant_id', $plant) $customerPoMasterId = WireMasterPacking::where('plant_id', $plant)
->where('wire_packing_number', $pallet) ->where('wire_packing_number', $pallet)
->value('item_id'); ->value('customer_po_master_id');
$customerPoIds = CustomerPoMaster::where('plant_id', $plant)
->where('customer_po', $customerPo)
->where('item_id', $itemId)
->pluck('id');
$items = WireMasterPacking::with('item') $items = WireMasterPacking::with('item')
->where('plant_id', $plant) ->where('plant_id', $plant)
@@ -187,27 +182,13 @@ class PalletPrintController extends Controller
]; ];
}); });
$masterBox = WireMasterPacking::where('plant_id', $plant) $customer = CustomerPoMaster::find($customerPoMasterId);
->where('wire_packing_number', $pallet)
->value('customer_po_master_id');
$customer = CustomerPoMaster::find($masterBox);
$customerCode = $customer->customer_po ?? ''; $customerCode = $customer->customer_po ?? '';
$customerName = $customer->customer_name ?? ''; $customerName = $customer->customer_name ?? '';
// $totalBoxes = WireMasterPacking::where('plant_id', $plant)
// ->where('customer_po_master_id', $customerId)
// ->distinct('wire_packing_number')
// ->count('wire_packing_number');
// $totalBoxes = WireMasterPacking::where('plant_id', $plant)
// ->whereIn('customer_po_master_id', $customerPoIds)
// ->distinct('wire_packing_number')
// ->count('wire_packing_number');
$totalBoxes = WireMasterPacking::where('plant_id', $plant) $totalBoxes = WireMasterPacking::where('plant_id', $plant)
->whereIn('customer_po_master_id', $customerPoIds) ->where('customer_po_master_id', $customerPoMasterId)
->select('wire_packing_number') ->select('wire_packing_number')
->groupBy('wire_packing_number') ->groupBy('wire_packing_number')
->havingRaw( ->havingRaw(
@@ -216,20 +197,8 @@ class PalletPrintController extends Controller
) )
->count(); ->count();
// $completedPallets = WireMasterPacking::where('plant_id', $plant)
// ->where('customer_po_master_id', $customerId)
// ->select('wire_packing_number')
// ->groupBy('wire_packing_number')
// ->havingRaw(
// 'COUNT(*) = COUNT(CASE WHEN wire_packing_status = ? THEN 1 END)',
// ['Completed']
// )
// ->orderBy('wire_packing_number')
// ->pluck('wire_packing_number')
// ->values();
$completedPallets = WireMasterPacking::where('plant_id', $plant) $completedPallets = WireMasterPacking::where('plant_id', $plant)
->whereIn('customer_po_master_id', $customerPoIds) ->where('customer_po_master_id', $customerPoMasterId)
->select('wire_packing_number') ->select('wire_packing_number')
->groupBy('wire_packing_number') ->groupBy('wire_packing_number')
->havingRaw( ->havingRaw(