Lot, Serial, ExpiryDate
This commit is contained in:
@@ -42,25 +42,45 @@
|
||||
|
||||
} else {
|
||||
|
||||
// Upsert md_lot if lot_number + expiry_date provided
|
||||
$lot_number = $data["lot_number"] ?: null;
|
||||
$expiry_date = $data["expiry_date"] ?: null;
|
||||
|
||||
if ($lot_number && $expiry_date) {
|
||||
$sth = $pdo->prepare("
|
||||
INSERT INTO md_lot (company_id, product_sku, lot_number, expiry_date)
|
||||
VALUES (:company_id, :product_sku, :lot_number, :expiry_date)
|
||||
ON DUPLICATE KEY UPDATE expiry_date = expiry_date
|
||||
");
|
||||
$sth->execute([
|
||||
":company_id" => $company_id,
|
||||
":product_sku" => $data["product_sku"],
|
||||
":lot_number" => $lot_number,
|
||||
":expiry_date" => $expiry_date,
|
||||
]);
|
||||
}
|
||||
|
||||
// INSERT new stock_in record
|
||||
$sql = "INSERT INTO `$table`
|
||||
(uuid, company_id, `date`, product_sku, `in`, zone, aisle, rack, contact_id, `description`, `log`, `type`)
|
||||
(uuid, company_id, `date`, product_sku, `in`, zone, aisle, rack, contact_id, `description`, `log`, `type`, `lot_number`, `serial_number`)
|
||||
VALUES
|
||||
(:uuid, :company_id, :date, :product_sku, :quantity, :zone, :aisle, :rack, :contact_id, :description, :log, 'in')";
|
||||
(:uuid, :company_id, :date, :product_sku, :quantity, :zone, :aisle, :rack, :contact_id, :description, :log, 'in', :lot_number, :serial_number)";
|
||||
|
||||
$sth = $pdo->prepare($sql);
|
||||
$sth->execute([
|
||||
":uuid" => $uuid,
|
||||
":company_id" => $company_id,
|
||||
":date" => date('Y-m-d H:i:s'),
|
||||
":product_sku" => $data["product_sku"],
|
||||
":quantity" => $data["quantity"],
|
||||
":zone" => $data["zone"],
|
||||
":aisle" => $data["aisle"],
|
||||
":rack" => $data["rack"],
|
||||
":contact_id" => (int)$data["contact_id"],
|
||||
":description" => $data["description"],
|
||||
":log" => json_encode($table_log),
|
||||
":uuid" => $uuid,
|
||||
":company_id" => $company_id,
|
||||
":date" => date('Y-m-d H:i:s'),
|
||||
":product_sku" => $data["product_sku"],
|
||||
":quantity" => $data["quantity"],
|
||||
":zone" => $data["zone"],
|
||||
":aisle" => $data["aisle"],
|
||||
":rack" => $data["rack"],
|
||||
":contact_id" => (int)$data["contact_id"],
|
||||
":description" => $data["description"],
|
||||
":log" => json_encode($table_log),
|
||||
":lot_number" => $lot_number,
|
||||
":serial_number" => $data["serial_number"] ?: null,
|
||||
]);
|
||||
|
||||
// Grab the newly-generated ID to link the rack
|
||||
|
||||
@@ -54,41 +54,60 @@
|
||||
);
|
||||
}
|
||||
|
||||
// Defensive check — UI cascade should already prevent mismatches
|
||||
// Defensive checks — UI cascade should already prevent mismatches
|
||||
if ($source_stock['product_sku'] !== $data["product_sku"]) {
|
||||
throw new Exception(
|
||||
"Rack holds {$source_stock['product_sku']}, not {$data['product_sku']}."
|
||||
);
|
||||
}
|
||||
|
||||
// If user selected a specific lot, verify it matches the rack's stock
|
||||
if (!empty($data["lot_number"]) && $source_stock['lot_number'] !== $data["lot_number"]) {
|
||||
throw new Exception(
|
||||
"Rack holds lot '{$source_stock['lot_number']}', not '{$data['lot_number']}'."
|
||||
);
|
||||
}
|
||||
|
||||
// If user selected a specific serial, verify it matches the rack's stock
|
||||
if (!empty($data["serial_number"]) && $source_stock['serial_number'] !== $data["serial_number"]) {
|
||||
throw new Exception(
|
||||
"Rack holds serial '{$source_stock['serial_number']}', not '{$data['serial_number']}'."
|
||||
);
|
||||
}
|
||||
|
||||
// Quantity comes from the source stock_in row, NOT user input.
|
||||
// Under 1:1, taking from this rack = taking the full batch.
|
||||
$quantity = (int) $source_stock['in'];
|
||||
$ref_id = (int) $source_stock['id'];
|
||||
$quantity = (int) $source_stock['in'];
|
||||
$ref_id = (int) $source_stock['id'];
|
||||
$lot_number = $source_stock['lot_number'] ?? null;
|
||||
$serial_number = $source_stock['serial_number'] ?? null;
|
||||
|
||||
// INSERT new stock_out record.
|
||||
// lot_number and serial_number carried from source stock_in row.
|
||||
// ref_id links this stock_out row back to the stock_in batch it consumed.
|
||||
$sql = "INSERT INTO `$table`
|
||||
(uuid, company_id, `date`, product_sku, `out`, zone, aisle, rack,
|
||||
contact_id, `description`, `log`, `type`, ref_id)
|
||||
contact_id, `description`, `log`, `type`, ref_id, lot_number, serial_number)
|
||||
VALUES
|
||||
(:uuid, :company_id, :date, :product_sku, :quantity, :zone, :aisle, :rack,
|
||||
:contact_id, :description, :log, 'out', :ref_id)";
|
||||
:contact_id, :description, :log, 'out', :ref_id, :lot_number, :serial_number)";
|
||||
|
||||
$sth = $pdo->prepare($sql);
|
||||
$sth->execute([
|
||||
":uuid" => $uuid,
|
||||
":company_id" => $company_id,
|
||||
":date" => date('Y-m-d H:i:s'),
|
||||
":product_sku" => $data["product_sku"],
|
||||
":quantity" => $quantity,
|
||||
":zone" => $data["zone"],
|
||||
":aisle" => $data["aisle"],
|
||||
":rack" => $data["rack"],
|
||||
":contact_id" => (int)$data["contact_id"],
|
||||
":description" => $data["description"],
|
||||
":log" => json_encode($table_log),
|
||||
":ref_id" => $ref_id,
|
||||
":uuid" => $uuid,
|
||||
":company_id" => $company_id,
|
||||
":date" => date('Y-m-d H:i:s'),
|
||||
":product_sku" => $data["product_sku"],
|
||||
":quantity" => $quantity,
|
||||
":zone" => $data["zone"],
|
||||
":aisle" => $data["aisle"],
|
||||
":rack" => $data["rack"],
|
||||
":contact_id" => (int)$data["contact_id"],
|
||||
":description" => $data["description"],
|
||||
":log" => json_encode($table_log),
|
||||
":ref_id" => $ref_id,
|
||||
":lot_number" => $lot_number,
|
||||
":serial_number" => $serial_number,
|
||||
]);
|
||||
|
||||
// Release the rack — stock is now gone from this location.
|
||||
|
||||
@@ -117,7 +117,21 @@
|
||||
);
|
||||
}
|
||||
|
||||
$quantity = (int) $source_stock['in'];
|
||||
// Defensive lot/serial checks
|
||||
if (!empty($data["lot_number"]) && $source_stock['lot_number'] !== $data["lot_number"]) {
|
||||
throw new Exception(
|
||||
"Source rack holds lot '{$source_stock['lot_number']}', not '{$data['lot_number']}'."
|
||||
);
|
||||
}
|
||||
if (!empty($data["serial_number"]) && $source_stock['serial_number'] !== $data["serial_number"]) {
|
||||
throw new Exception(
|
||||
"Source rack holds serial '{$source_stock['serial_number']}', not '{$data['serial_number']}'."
|
||||
);
|
||||
}
|
||||
|
||||
$quantity = (int) $source_stock['in'];
|
||||
$lot_number = $source_stock['lot_number'] ?? null;
|
||||
$serial_number = $source_stock['serial_number'] ?? null;
|
||||
|
||||
// Resolve both td_stock_<wh> tables
|
||||
$from_ctx = $whMgmt->getStockContext($from_warehouse, 0);
|
||||
@@ -134,11 +148,11 @@
|
||||
$sql = "INSERT INTO `$from_table`
|
||||
(uuid, company_id, `date`, product_sku, `out`,
|
||||
ref_warehouse, zone, aisle, rack,
|
||||
contact_id, `description`, `log`, `type`)
|
||||
contact_id, `description`, `log`, `type`, lot_number, serial_number)
|
||||
VALUES
|
||||
(:uuid, :company_id, :date, :product_sku, :quantity,
|
||||
:ref_warehouse, :zone, :aisle, :rack,
|
||||
:contact_id, :description, :log, 'transfer')";
|
||||
:contact_id, :description, :log, 'transfer', :lot_number, :serial_number)";
|
||||
$pdo->prepare($sql)->execute([
|
||||
":uuid" => $transfer_uuid,
|
||||
":company_id" => $company_id,
|
||||
@@ -152,6 +166,8 @@
|
||||
":contact_id" => $contact_id,
|
||||
":description" => $description,
|
||||
":log" => json_encode($table_log),
|
||||
":lot_number" => $lot_number,
|
||||
":serial_number" => $serial_number,
|
||||
]);
|
||||
$from_stock_id = (int) $pdo->lastInsertId();
|
||||
|
||||
@@ -159,11 +175,11 @@
|
||||
$sql = "INSERT INTO `$to_table`
|
||||
(uuid, company_id, `date`, product_sku, `in`,
|
||||
ref_warehouse, ref_id, zone, aisle, rack,
|
||||
contact_id, `description`, `log`, `type`)
|
||||
contact_id, `description`, `log`, `type`, lot_number, serial_number)
|
||||
VALUES
|
||||
(:uuid, :company_id, :date, :product_sku, :quantity,
|
||||
:ref_warehouse, :ref_id, :zone, :aisle, :rack,
|
||||
:contact_id, :description, :log, 'transfer')";
|
||||
:contact_id, :description, :log, 'transfer', :lot_number, :serial_number)";
|
||||
$pdo->prepare($sql)->execute([
|
||||
":uuid" => $transfer_uuid,
|
||||
":company_id" => $company_id,
|
||||
@@ -178,6 +194,8 @@
|
||||
":contact_id" => $contact_id,
|
||||
":description" => $description,
|
||||
":log" => json_encode($table_log),
|
||||
":lot_number" => $lot_number,
|
||||
":serial_number" => $serial_number,
|
||||
]);
|
||||
$to_stock_id = (int) $pdo->lastInsertId();
|
||||
|
||||
|
||||
@@ -0,0 +1,64 @@
|
||||
<?php
|
||||
session_start();
|
||||
require '../../../assets/utils/db_auth.php';
|
||||
require '../../../assets/utils/classes/WarehouseManager.php';
|
||||
|
||||
// Returns active lots for a given product_sku
|
||||
// "Active" = EXISTS in an occupied md_rack (product_sku IS NOT NULL)
|
||||
$product_sku = $data['product_sku'] ?? '';
|
||||
|
||||
if (empty($product_sku)) {
|
||||
$answer['output'] = [];
|
||||
$answer['success'] = 1;
|
||||
exit(json_encode($answer));
|
||||
}
|
||||
|
||||
// Discover all warehouses
|
||||
$sth = $pdo2->prepare(
|
||||
"SELECT id, warehouse_name FROM md_warehouse
|
||||
WHERE company_id = :company_id AND status = 1"
|
||||
);
|
||||
$sth->execute([':company_id' => $company_id]);
|
||||
$warehouses = $sth->fetchAll(PDO::FETCH_ASSOC);
|
||||
|
||||
$active_lots = [];
|
||||
|
||||
foreach ($warehouses as $wh) {
|
||||
$safe = preg_replace('/[^a-zA-Z0-9_]/', '', $wh['warehouse_name']);
|
||||
$table = "td_stock_{$safe}";
|
||||
|
||||
$sth = $pdo2->prepare(
|
||||
"SELECT DISTINCT s.lot_number, l.expiry_date
|
||||
FROM `{$table}` s
|
||||
LEFT JOIN md_lot l
|
||||
ON l.company_id = s.company_id
|
||||
AND l.product_sku = s.product_sku
|
||||
AND l.lot_number = s.lot_number
|
||||
WHERE s.company_id = :company_id
|
||||
AND s.product_sku = :product_sku
|
||||
AND s.type = 'in'
|
||||
AND s.lot_number IS NOT NULL
|
||||
AND EXISTS (
|
||||
SELECT 1 FROM md_rack r
|
||||
WHERE r.company_id = s.company_id
|
||||
AND r.td_stock_id = s.id
|
||||
AND r.product_sku IS NOT NULL
|
||||
)"
|
||||
);
|
||||
$sth->execute([
|
||||
':company_id' => $company_id,
|
||||
':product_sku' => $product_sku,
|
||||
]);
|
||||
|
||||
foreach ($sth->fetchAll(PDO::FETCH_ASSOC) as $row) {
|
||||
$key = $row['lot_number'];
|
||||
if (!isset($active_lots[$key])) {
|
||||
$active_lots[$key] = $row;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$answer['output'] = array_values($active_lots);
|
||||
$answer['success'] = 1;
|
||||
exit(json_encode($answer));
|
||||
?>
|
||||
@@ -0,0 +1,64 @@
|
||||
<?php
|
||||
session_start();
|
||||
require '../../../assets/utils/db_auth.php';
|
||||
|
||||
// Returns active serials for a given product_sku + optional lot_number
|
||||
// "Active" = EXISTS in an occupied md_rack
|
||||
$product_sku = $data['product_sku'] ?? '';
|
||||
$lot_number = $data['lot_number'] ?? '';
|
||||
|
||||
if (empty($product_sku)) {
|
||||
$answer['output'] = [];
|
||||
$answer['success'] = 1;
|
||||
exit(json_encode($answer));
|
||||
}
|
||||
|
||||
// Discover all warehouses
|
||||
$sth = $pdo2->prepare(
|
||||
"SELECT id, warehouse_name FROM md_warehouse
|
||||
WHERE company_id = :company_id AND status = 1"
|
||||
);
|
||||
$sth->execute([':company_id' => $company_id]);
|
||||
$warehouses = $sth->fetchAll(PDO::FETCH_ASSOC);
|
||||
|
||||
$active_serials = [];
|
||||
|
||||
foreach ($warehouses as $wh) {
|
||||
$safe = preg_replace('/[^a-zA-Z0-9_]/', '', $wh['warehouse_name']);
|
||||
$table = "td_stock_{$safe}";
|
||||
|
||||
$sql = "SELECT DISTINCT s.serial_number
|
||||
FROM `{$table}` s
|
||||
WHERE s.company_id = :company_id
|
||||
AND s.product_sku = :product_sku
|
||||
AND s.type = 'in'
|
||||
AND s.serial_number IS NOT NULL
|
||||
AND EXISTS (
|
||||
SELECT 1 FROM md_rack r
|
||||
WHERE r.company_id = s.company_id
|
||||
AND r.td_stock_id = s.id
|
||||
AND r.product_sku IS NOT NULL
|
||||
)";
|
||||
|
||||
$params = [
|
||||
':company_id' => $company_id,
|
||||
':product_sku' => $product_sku,
|
||||
];
|
||||
|
||||
if (!empty($lot_number)) {
|
||||
$sql .= " AND s.lot_number = :lot_number";
|
||||
$params[':lot_number'] = $lot_number;
|
||||
}
|
||||
|
||||
$sth = $pdo2->prepare($sql);
|
||||
$sth->execute($params);
|
||||
|
||||
foreach ($sth->fetchAll(PDO::FETCH_ASSOC) as $row) {
|
||||
$active_serials[$row['serial_number']] = $row['serial_number'];
|
||||
}
|
||||
}
|
||||
|
||||
$answer['output'] = array_values($active_serials);
|
||||
$answer['success'] = 1;
|
||||
exit(json_encode($answer));
|
||||
?>
|
||||
@@ -1,64 +1,51 @@
|
||||
<?php
|
||||
<?php
|
||||
session_start();
|
||||
require '../../../assets/utils/db_auth.php';
|
||||
require '../../../assets/utils/classes/WarehouseManager.php';
|
||||
|
||||
// Get warehouse and zone from the form
|
||||
$warehouse = isset($data['warehouse']) ? (int)$data['warehouse'] : 0;
|
||||
$zone = isset($data['zone']) ? $data['zone'] : '';
|
||||
|
||||
if (isset($data['warehouse_from']) && $data['type'] == "from") {
|
||||
$warehouse = (int)$data['warehouse_from'];
|
||||
$zone = $data['zone_from'];
|
||||
}
|
||||
if (isset($data['warehouse_to']) && $data['type'] == "to") {
|
||||
$warehouse = (int)$data['warehouse_to'];
|
||||
$zone = $data['zone_to'];
|
||||
$type = $data['type'] ?? '';
|
||||
$whMgmt = new WarehouseManager($pdo2, $company_id);
|
||||
|
||||
// Resolve warehouse and zone
|
||||
$warehouse = (int)($data['warehouse'] ?? 0);
|
||||
$zone = $data['zone'] ?? '';
|
||||
if (isset($data['warehouse_from']) && $type === 'from') { $warehouse = (int)$data['warehouse_from']; $zone = $data['zone_from'] ?? $zone; }
|
||||
if (isset($data['warehouse_to']) && $type === 'to') { $warehouse = (int)$data['warehouse_to']; $zone = $data['zone_to'] ?? $zone; }
|
||||
|
||||
if ($type === 'to') {
|
||||
$output = $whMgmt->getAislesIn($warehouse, $zone);
|
||||
|
||||
} elseif ($type === 'from') {
|
||||
$output = $whMgmt->getAislesOut(
|
||||
$warehouse,
|
||||
$zone,
|
||||
$data['product_sku'] ?? '',
|
||||
$data['lot_number'] ?? null,
|
||||
$data['serial_number'] ?? null
|
||||
);
|
||||
|
||||
} else {
|
||||
$sth = $pdo2->prepare(
|
||||
"SELECT DISTINCT aisle FROM md_rack
|
||||
WHERE company_id = :company_id AND warehouse = :warehouse AND zone = :zone
|
||||
ORDER BY CAST(aisle AS UNSIGNED), aisle"
|
||||
);
|
||||
$sth->execute([':company_id' => $company_id, ':warehouse' => $warehouse, ':zone' => $zone]);
|
||||
$output = array_column($sth->fetchAll(PDO::FETCH_ASSOC), 'aisle');
|
||||
}
|
||||
|
||||
// Filter aisles by operation type and optional SKU:
|
||||
// 'to' = destination → aisles with at least one empty rack
|
||||
// 'from' + sku → aisles currently holding that specific SKU
|
||||
// 'from' (no sku) → aisles with any occupied rack
|
||||
// other = all aisles in the zone (admin / read-only pages)
|
||||
$product_sku_filter = "";
|
||||
$params = [
|
||||
":company_id" => $company_id,
|
||||
":warehouse" => $warehouse,
|
||||
":zone" => $zone,
|
||||
];
|
||||
|
||||
if ($data["type"] == "to") {
|
||||
$product_sku_filter = "AND product_sku IS NULL";
|
||||
|
||||
} elseif ($data["type"] == "from") {
|
||||
if (!empty($data["product_sku"])) {
|
||||
$product_sku_filter = "AND product_sku = :product_sku";
|
||||
$params[":product_sku"] = $data["product_sku"];
|
||||
} else {
|
||||
$product_sku_filter = "AND product_sku IS NOT NULL";
|
||||
}
|
||||
// Edit mode
|
||||
if (!empty($data['id'])) {
|
||||
$sth = $pdo2->prepare(
|
||||
"SELECT DISTINCT aisle FROM md_rack
|
||||
WHERE company_id = :company_id AND warehouse = :warehouse AND zone = :zone
|
||||
ORDER BY CAST(aisle AS UNSIGNED), aisle"
|
||||
);
|
||||
$sth->execute([':company_id' => $company_id, ':warehouse' => $warehouse, ':zone' => $zone]);
|
||||
$output = array_column($sth->fetchAll(PDO::FETCH_ASSOC), 'aisle');
|
||||
}
|
||||
|
||||
if(!empty($data["id"])){
|
||||
$product_sku_filter = "";
|
||||
unset($params[":product_sku"]);
|
||||
}
|
||||
|
||||
$sql = "SELECT DISTINCT aisle
|
||||
FROM md_rack
|
||||
WHERE
|
||||
company_id = :company_id AND
|
||||
warehouse = :warehouse AND
|
||||
`zone` = :zone
|
||||
$product_sku_filter
|
||||
ORDER BY CAST(aisle AS UNSIGNED), aisle";
|
||||
|
||||
$sth = $pdo2->prepare($sql);
|
||||
$sth->execute($params);
|
||||
db_check($sth, $answer);
|
||||
|
||||
// Return flat array (matches original response shape for the frontend)
|
||||
$answer["output"] = array_column($sth->fetchAll(PDO::FETCH_ASSOC), 'aisle');
|
||||
$answer["success"] = 1;
|
||||
$answer['output'] = $output;
|
||||
$answer['success'] = 1;
|
||||
exit(json_encode($answer));
|
||||
?>
|
||||
@@ -0,0 +1,26 @@
|
||||
<?php
|
||||
session_start();
|
||||
|
||||
require '../../../assets/utils/db_auth.php';
|
||||
|
||||
$sql = "SELECT *
|
||||
FROM md_lot
|
||||
WHERE
|
||||
company_id = :company_id AND
|
||||
product_sku = :product_sku AND
|
||||
lot_number LIKE :keyword
|
||||
ORDER BY lot_number ASC
|
||||
LIMIT 50";
|
||||
|
||||
$sth = $pdo2->prepare($sql);
|
||||
$sth->execute([
|
||||
":company_id" => $company_id,
|
||||
":product_sku" => $data["product_sku"] ?? '',
|
||||
":keyword" => '%'.$data["keyword"].'%'
|
||||
]);
|
||||
db_check($sth, $answer);
|
||||
|
||||
$answer["result"] = $sth->fetchAll(PDO::FETCH_ASSOC);
|
||||
$answer["success"] = 1;
|
||||
exit(json_encode($answer));
|
||||
?>
|
||||
@@ -1,69 +1,53 @@
|
||||
<?php
|
||||
<?php
|
||||
session_start();
|
||||
require '../../../assets/utils/db_auth.php';
|
||||
require '../../../assets/utils/classes/WarehouseManager.php';
|
||||
|
||||
// Get warehouse, zone, and aisle from the form
|
||||
$warehouse = (int)$data['warehouse'];
|
||||
$zone = $data['zone'];
|
||||
$aisle = $data['aisle'];
|
||||
$type = $data['type'] ?? '';
|
||||
$whMgmt = new WarehouseManager($pdo2, $company_id);
|
||||
|
||||
if (isset($data['warehouse_from']) && $data['type'] == "from") {
|
||||
$warehouse = (int)$data['warehouse_from'];
|
||||
$zone = $data['zone_from'];
|
||||
$aisle = $data['aisle_from'];
|
||||
}
|
||||
if (isset($data['warehouse_to']) && $data['type'] == "to") {
|
||||
$warehouse = (int)$data['warehouse_to'];
|
||||
$zone = $data['zone_to'];
|
||||
$aisle = $data['aisle_to'];
|
||||
// Resolve warehouse, zone and aisle
|
||||
$warehouse = (int)($data['warehouse'] ?? 0);
|
||||
$zone = $data['zone'] ?? '';
|
||||
$aisle = $data['aisle'] ?? '';
|
||||
if (isset($data['warehouse_from']) && $type === 'from') { $warehouse = (int)$data['warehouse_from']; $zone = $data['zone_from'] ?? $zone; $aisle = $data['aisle_from'] ?? $aisle; }
|
||||
if (isset($data['warehouse_to']) && $type === 'to') { $warehouse = (int)$data['warehouse_to']; $zone = $data['zone_to'] ?? $zone; $aisle = $data['aisle_to'] ?? $aisle; }
|
||||
|
||||
if ($type === 'to') {
|
||||
$output = $whMgmt->getRacksIn($warehouse, $zone, $aisle);
|
||||
|
||||
} elseif ($type === 'from') {
|
||||
$output = $whMgmt->getRacksOut(
|
||||
$warehouse,
|
||||
$zone,
|
||||
$aisle,
|
||||
$data['product_sku'] ?? '',
|
||||
$data['lot_number'] ?? null,
|
||||
$data['serial_number'] ?? null
|
||||
);
|
||||
|
||||
} else {
|
||||
$sth = $pdo2->prepare(
|
||||
"SELECT DISTINCT rack FROM md_rack
|
||||
WHERE company_id = :company_id AND warehouse = :warehouse AND zone = :zone AND aisle = :aisle
|
||||
ORDER BY CAST(rack AS UNSIGNED), rack"
|
||||
);
|
||||
$sth->execute([':company_id' => $company_id, ':warehouse' => $warehouse, ':zone' => $zone, ':aisle' => $aisle]);
|
||||
$output = array_column($sth->fetchAll(PDO::FETCH_ASSOC), 'rack');
|
||||
}
|
||||
|
||||
// Filter racks by operation type and optional SKU:
|
||||
// 'to' = destination → empty racks only (product_sku IS NULL)
|
||||
// 'from' + sku → racks currently holding that specific SKU
|
||||
// 'from' (no sku) → any occupied rack (product_sku IS NOT NULL)
|
||||
// other = all racks in the aisle (admin / read-only pages)
|
||||
$product_sku_filter = "";
|
||||
$params = [
|
||||
":company_id" => $company_id,
|
||||
":warehouse" => $warehouse,
|
||||
":zone" => $zone,
|
||||
":aisle" => $aisle,
|
||||
];
|
||||
|
||||
if ($data["type"] == "to") {
|
||||
$product_sku_filter = "AND product_sku IS NULL";
|
||||
|
||||
} elseif ($data["type"] == "from") {
|
||||
if (!empty($data["product_sku"])) {
|
||||
$product_sku_filter = "AND product_sku = :product_sku";
|
||||
$params[":product_sku"] = $data["product_sku"];
|
||||
} else {
|
||||
$product_sku_filter = "AND product_sku IS NOT NULL";
|
||||
}
|
||||
// Edit mode
|
||||
if (!empty($data['id'])) {
|
||||
$sth = $pdo2->prepare(
|
||||
"SELECT DISTINCT rack FROM md_rack
|
||||
WHERE company_id = :company_id AND warehouse = :warehouse AND zone = :zone AND aisle = :aisle
|
||||
ORDER BY CAST(rack AS UNSIGNED), rack"
|
||||
);
|
||||
$sth->execute([':company_id' => $company_id, ':warehouse' => $warehouse, ':zone' => $zone, ':aisle' => $aisle]);
|
||||
$output = array_column($sth->fetchAll(PDO::FETCH_ASSOC), 'rack');
|
||||
}
|
||||
|
||||
if(!empty($data["id"])){
|
||||
$product_sku_filter = "";
|
||||
unset($params[":product_sku"]);
|
||||
}
|
||||
|
||||
$sql = "SELECT DISTINCT rack
|
||||
FROM md_rack
|
||||
WHERE
|
||||
company_id = :company_id AND
|
||||
warehouse = :warehouse AND
|
||||
`zone` = :zone AND
|
||||
aisle = :aisle
|
||||
$product_sku_filter
|
||||
ORDER BY CAST(rack AS UNSIGNED), rack";
|
||||
|
||||
$sth = $pdo2->prepare($sql);
|
||||
$sth->execute($params);
|
||||
db_check($sth, $answer);
|
||||
|
||||
// Return flat array (matches original response shape for the frontend)
|
||||
$answer["output"] = array_column($sth->fetchAll(PDO::FETCH_ASSOC), 'rack');
|
||||
$answer["success"] = 1;
|
||||
$answer['output'] = $output;
|
||||
$answer['success'] = 1;
|
||||
exit(json_encode($answer));
|
||||
?>
|
||||
@@ -25,7 +25,7 @@
|
||||
|
||||
$table = "td_stock_" . $warehouse;
|
||||
|
||||
$sql = "SELECT a.* , a.in as quantity, b.contact_name, c.product_name
|
||||
$sql = "SELECT a.* , a.in as quantity, b.contact_name, c.product_name, d.expiry_date
|
||||
FROM `{$table}` a
|
||||
LEFT JOIN md_contact b ON
|
||||
a.company_id = b.company_id and
|
||||
@@ -33,6 +33,10 @@
|
||||
LEFT JOIN md_product c ON
|
||||
a.company_id = c.company_id and
|
||||
a.product_sku = c.sku
|
||||
LEFT JOIN md_lot d ON
|
||||
a.company_id = d.company_id and
|
||||
a.product_sku = d.product_sku and
|
||||
a.lot_number = d.lot_number
|
||||
WHERE
|
||||
a.company_id = :company_id and
|
||||
a.id = :id ";
|
||||
|
||||
@@ -1,59 +1,52 @@
|
||||
<?php
|
||||
<?php
|
||||
session_start();
|
||||
require '../../../assets/utils/db_auth.php';
|
||||
require '../../../assets/utils/classes/WarehouseManager.php';
|
||||
|
||||
// Get warehouse from the form
|
||||
$warehouse = (int)$data['warehouse'];
|
||||
$type = $data['type'] ?? '';
|
||||
$whMgmt = new WarehouseManager($pdo2, $company_id);
|
||||
|
||||
if(isset($data['warehouse_from'])&&$data['type']=="from"){
|
||||
$warehouse = (int)$data['warehouse_from'];
|
||||
}
|
||||
if(isset($data['warehouse_to'])&&$data['type']=="to"){
|
||||
$warehouse = (int)$data['warehouse_to'];
|
||||
// Resolve warehouse — supports warehouse, warehouse_from, warehouse_to
|
||||
$warehouse = (int)($data['warehouse'] ?? 0);
|
||||
if (isset($data['warehouse_from']) && $type === 'from') $warehouse = (int)$data['warehouse_from'];
|
||||
if (isset($data['warehouse_to']) && $type === 'to') $warehouse = (int)$data['warehouse_to'];
|
||||
|
||||
if ($type === 'to') {
|
||||
// Stock_in destination — empty racks only
|
||||
$output = $whMgmt->getZonesIn($warehouse);
|
||||
|
||||
} elseif ($type === 'from') {
|
||||
// Stock_out source — filter by sku + lot + serial
|
||||
$output = $whMgmt->getZonesOut(
|
||||
$warehouse,
|
||||
$data['product_sku'] ?? '',
|
||||
$data['lot_number'] ?? null,
|
||||
$data['serial_number'] ?? null
|
||||
);
|
||||
|
||||
} else {
|
||||
// Admin / read-only — all zones in the warehouse
|
||||
$sth = $pdo2->prepare(
|
||||
"SELECT DISTINCT zone FROM md_rack
|
||||
WHERE company_id = :company_id AND warehouse = :warehouse
|
||||
ORDER BY CAST(zone AS UNSIGNED), zone"
|
||||
);
|
||||
$sth->execute([':company_id' => $company_id, ':warehouse' => $warehouse]);
|
||||
$output = $sth->fetchAll(PDO::FETCH_ASSOC);
|
||||
}
|
||||
|
||||
// Filter zones by operation type and optional SKU:
|
||||
// 'to' = destination → zones with at least one empty rack
|
||||
// 'from' + sku → zones currently holding that specific SKU
|
||||
// 'from' (no sku) → zones with any occupied rack
|
||||
// other = all zones in the warehouse (admin / read-only pages)
|
||||
$product_sku_filter = "";
|
||||
$params = [
|
||||
":company_id" => $company_id,
|
||||
":warehouse" => $warehouse,
|
||||
];
|
||||
|
||||
if ($data["type"] == "to") {
|
||||
$product_sku_filter = "AND product_sku IS NULL";
|
||||
|
||||
} elseif ($data["type"] == "from") {
|
||||
if (!empty($data["product_sku"])) {
|
||||
$product_sku_filter = "AND product_sku = :product_sku";
|
||||
$params[":product_sku"] = $data["product_sku"];
|
||||
} else {
|
||||
$product_sku_filter = "AND product_sku IS NOT NULL";
|
||||
}
|
||||
// Edit mode — return all zones regardless of occupancy
|
||||
if (!empty($data['id'])) {
|
||||
$sth = $pdo2->prepare(
|
||||
"SELECT DISTINCT zone FROM md_rack
|
||||
WHERE company_id = :company_id AND warehouse = :warehouse
|
||||
ORDER BY CAST(zone AS UNSIGNED), zone"
|
||||
);
|
||||
$sth->execute([':company_id' => $company_id, ':warehouse' => $warehouse]);
|
||||
$output = $sth->fetchAll(PDO::FETCH_ASSOC);
|
||||
}
|
||||
|
||||
if(!empty($data["id"])){
|
||||
$product_sku_filter = "";
|
||||
unset($params[":product_sku"]);
|
||||
}
|
||||
|
||||
$sql = "SELECT DISTINCT zone
|
||||
FROM md_rack
|
||||
WHERE
|
||||
company_id = :company_id AND
|
||||
warehouse = :warehouse
|
||||
$product_sku_filter
|
||||
ORDER BY CAST(zone AS UNSIGNED), zone";
|
||||
|
||||
$sth = $pdo2->prepare($sql);
|
||||
$sth->execute($params);
|
||||
db_check($sth, $answer);
|
||||
|
||||
// Frontend expects objects with a `zone` property — keep that shape.
|
||||
$answer["output"] = $sth->fetchAll(PDO::FETCH_ASSOC);
|
||||
$answer["success"] = 1;
|
||||
$answer['output'] = $output;
|
||||
$answer['success'] = 1;
|
||||
exit(json_encode($answer));
|
||||
?>
|
||||
@@ -0,0 +1,32 @@
|
||||
<?php
|
||||
session_start();
|
||||
|
||||
require '../../../assets/utils/db_auth.php';
|
||||
require '../../../assets/utils/classes/Reports.php';
|
||||
|
||||
$report = new Reports($pdo2, $company_id);
|
||||
|
||||
$items = $report->getExpiredStock();
|
||||
|
||||
$expired = 0;
|
||||
$critical = 0;
|
||||
$warning = 0;
|
||||
$caution = 0;
|
||||
|
||||
foreach ($items as $item) {
|
||||
if ($item['status'] === 'expired') { $expired++; }
|
||||
if ($item['status'] === 'critical') { $critical++; }
|
||||
if ($item['status'] === 'warning') { $warning++; }
|
||||
if ($item['status'] === 'caution') { $caution++; }
|
||||
}
|
||||
|
||||
$answer['output'] = [
|
||||
'items' => $items,
|
||||
'expired' => $expired,
|
||||
'critical' => $critical,
|
||||
'warning' => $warning,
|
||||
'caution' => $caution,
|
||||
];
|
||||
$answer['success'] = 1;
|
||||
exit(json_encode($answer));
|
||||
?>
|
||||
@@ -0,0 +1,30 @@
|
||||
<?php
|
||||
session_start();
|
||||
|
||||
require '../../../assets/utils/db_auth.php';
|
||||
require '../../../assets/utils/classes/Reports.php';
|
||||
|
||||
$warehouse_id = (int)($data['warehouse'] ?? 0);
|
||||
|
||||
if (!$warehouse_id) {
|
||||
$answer['success'] = 0;
|
||||
$answer['message'] = 'Warehouse is required';
|
||||
exit(json_encode($answer));
|
||||
}
|
||||
|
||||
$report = new Reports($pdo2, $company_id);
|
||||
$balance = $report->getWarehouseBalance($warehouse_id);
|
||||
|
||||
$answer['output'] = [
|
||||
'total_capacity' => $report->getWarehouseCapacity($warehouse_id),
|
||||
'space_used' => $report->getWarehouseSpaceUsed($warehouse_id),
|
||||
'total_in' => $balance['total_in'],
|
||||
'total_out' => $balance['total_out'],
|
||||
'low_stock' => $report->getWarehouseLowStockCount($warehouse_id),
|
||||
'stock_movement' => $report->getWarehouseStockMovement($warehouse_id),
|
||||
'stock_trend' => $report->getWarehouseStockTrend($warehouse_id),
|
||||
'activities' => $report->getWarehouseActivity($warehouse_id),
|
||||
];
|
||||
$answer['success'] = 1;
|
||||
exit(json_encode($answer));
|
||||
?>
|
||||
Reference in New Issue
Block a user