Merge branch 'new_theme' of bitbucket.org:venbainformationtechnology/ria into new_theme
This commit is contained in:
commit
2fbd31f4de
@ -6,7 +6,7 @@
|
||||
|
||||
// $routes->match(['GET', 'POST'], 'trpProductionDetails', 'StockController::trpProductionDetails');
|
||||
|
||||
# GET http://localhost/ci4/ria/trpProductionDetails
|
||||
GET http://localhost/ci4/ria/trpProductionDetails
|
||||
|
||||
|
||||
|
||||
|
||||
@ -496,7 +496,7 @@ class StockController extends BaseController
|
||||
} else {
|
||||
$updated = $this->incomingSilicaSandDetails_model
|
||||
->insert($dbData);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if ($updated) {
|
||||
@ -1383,7 +1383,7 @@ class StockController extends BaseController
|
||||
} else {
|
||||
|
||||
// $month = new DateTime('2024-10-01');
|
||||
// $month = $month->format('Y-m');
|
||||
// $month = $month->format('Y-m');
|
||||
|
||||
$month = date('Y-m');
|
||||
|
||||
@ -1409,7 +1409,9 @@ class StockController extends BaseController
|
||||
|
||||
$inserts = $this->generateDummyData($startDate, $endDate);
|
||||
|
||||
$data['trpProductionMaintenanceData'] = $this->updateTrpProductionDetails($inserts);
|
||||
$freshEntry = true ;
|
||||
|
||||
$data['trpProductionMaintenanceData'] = $this->updateTrpProductionDetails($inserts ,$freshEntry);
|
||||
|
||||
}
|
||||
|
||||
@ -1443,147 +1445,155 @@ class StockController extends BaseController
|
||||
|
||||
|
||||
|
||||
public function updateTrpProductionDetails($inserts) {
|
||||
|
||||
$postData = $this->request->getPost();
|
||||
|
||||
if(empty($postData['updateTrpProductionDetails'])){
|
||||
if(empty($inserts)){
|
||||
return $this->response->setJSON(['error' => 'No data found to update']);
|
||||
}else{
|
||||
$postData['updateTrpProductionDetails'] = $inserts;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
$updateTrpProductionDetails = $postData['updateTrpProductionDetails'];
|
||||
|
||||
$updateProduction = [];
|
||||
$updateMaintanence = [];
|
||||
$updateWaste = [];
|
||||
|
||||
$insertProduction = [];
|
||||
$insertMaintanence = [];
|
||||
$insertWaste = [];
|
||||
|
||||
foreach ($updateTrpProductionDetails as $data) {
|
||||
|
||||
$data['date'] = $this->convertToDateWithFlexibleFormats($data['Date'], ["d-m-Y", "Y-m-d", "m/d/Y", "m-d-Y"], "Y-m-d");
|
||||
|
||||
$date = $data['date'];
|
||||
|
||||
$dbDataTrpMaintenance = [
|
||||
'date' => $data['date'],
|
||||
'openingTime' => $data['openingTime'],
|
||||
'closingTime' => $data['closingTime'],
|
||||
'totalHours' => $data['totalHours'],
|
||||
'coldStart' => $data['coldStart'],
|
||||
'breakdownHours' => $data['breakdownHours'],
|
||||
'burnerFiringHours' => $data['burnerFiringHours'],
|
||||
'sandFeedingHours' => $data['sandFeedingHours'],
|
||||
'workingPersonEngineers' => $data['workingPersonEngineers'],
|
||||
'workingPersonSupervisiors' => $data['workingPersonSupervisiors'],
|
||||
'workingPersonOperators' => $data['workingPersonOperators'],
|
||||
'rollerDrivers' => $data['rollerDrivers'],
|
||||
'natureOfMaintenance' => $data['natureOfMaintenance'],
|
||||
'location' => $data['location'],
|
||||
'description' => $data['description']
|
||||
];
|
||||
|
||||
$dbDataTrpProduction = [
|
||||
'date' => $data['date'],
|
||||
'gasReceiptBg' => $data['gasReceiptBg'],
|
||||
'gasReceiptPg' => $data['gasReceiptPg'],
|
||||
'physicalGasConsumption'=> $data['physicalGasConsumption'],
|
||||
'trpPlusDrierGasConsumption'=> $data['trpPlusDrierGasConsumption'],
|
||||
'trpPhysicalGasPerTon' => $data['trpPhysicalGasPerTon'],
|
||||
'panelGasConsumption' => $data['panelGasConsumption'],
|
||||
'panelGasPerTon' => $data['panelGasPerTon'],
|
||||
'edRunningHours' => $data['edRunningHours'],
|
||||
'edProduction' => $data['edProduction'],
|
||||
'edUsage' => $data['edUsage'],
|
||||
'trpProduction' => $data['trpProduction'],
|
||||
'trpProductionPerHour' => $data['trpProductionPerHour'],
|
||||
'waterReceipt' => $data['waterReceipt'],
|
||||
'waterConsumption' => $data['waterConsumption'],
|
||||
'ebReading' => $data['ebReading'],
|
||||
'ebReadingPerUnitTon' => $data['ebReadingPerUnitTon'],
|
||||
];
|
||||
|
||||
$dbDataTrpWaste = [
|
||||
'date' => $data['date'],
|
||||
'msSeperation' => $data['msSeperation'],
|
||||
'edWaste' => $data['edWaste'],
|
||||
'coolerBags' => $data['coolerBags'],
|
||||
'edPlus20Waste' => $data['edPlus20Waste'],
|
||||
'cycloneWaste' => $data['cycloneWaste'],
|
||||
];
|
||||
|
||||
$trpMaintenanceResultExists = $this->TrpProductionMaintenance_model
|
||||
->where('date', $date)
|
||||
->first();
|
||||
|
||||
$trpProductionResultExists = $this->TrpProduction_model
|
||||
->where('date', $date)
|
||||
->first();
|
||||
|
||||
$trpWasteResultExists = $this->TrpProductionWaste_model
|
||||
->where('date', $date)
|
||||
->first();
|
||||
|
||||
if (empty($trpMaintenanceResultExists)) {
|
||||
$insertMaintanence[] = $dbDataTrpMaintenance;
|
||||
$insertProduction[] = $dbDataTrpProduction;
|
||||
$insertWaste[] = $dbDataTrpWaste;
|
||||
} else {
|
||||
$dbDataTrpMaintenance['id'] = $trpMaintenanceResultExists['id'];
|
||||
$dbDataTrpProduction['id'] = $trpProductionResultExists['id'];
|
||||
$dbDataTrpWaste['id'] = $trpWasteResultExists['id'];
|
||||
|
||||
$updateMaintanence[] = $dbDataTrpMaintenance;
|
||||
$updateProduction[] = $dbDataTrpProduction;
|
||||
$updateWaste[] = $dbDataTrpWaste;
|
||||
}
|
||||
}
|
||||
|
||||
// Start the transaction
|
||||
$this->db->transBegin();
|
||||
|
||||
try {
|
||||
if (!empty($insertMaintanence)) {
|
||||
$this->TrpProductionMaintenance_model->insertBatch($insertMaintanence);
|
||||
}
|
||||
|
||||
if (!empty($insertProduction)) {
|
||||
$this->TrpProduction_model->insertBatch($insertProduction);
|
||||
}
|
||||
|
||||
if (!empty($insertWaste)) {
|
||||
$this->TrpProductionWaste_model->insertBatch($insertWaste);
|
||||
}
|
||||
|
||||
if (!empty($updateMaintanence)) {
|
||||
$this->TrpProductionMaintenance_model->updateBatch($updateMaintanence, 'id');
|
||||
}
|
||||
|
||||
if (!empty($updateProduction)) {
|
||||
$this->TrpProduction_model->updateBatch($updateProduction, 'id');
|
||||
}
|
||||
|
||||
if (!empty($updateWaste)) {
|
||||
$this->TrpProductionWaste_model->updateBatch($updateWaste, 'id');
|
||||
}
|
||||
|
||||
// Commit the transaction if all operations are successful
|
||||
$this->db->transCommit();
|
||||
echo "Data Saved Successfully";
|
||||
|
||||
} catch (\Exception $error) {
|
||||
// Rollback the transaction in case of any errors
|
||||
$this->db->transRollback();
|
||||
echo "An error occurred: " . $error->getMessage();
|
||||
}
|
||||
}
|
||||
public function updateTrpProductionDetails($inserts, $freshEntry = false)
|
||||
{
|
||||
$postData = $this->request->getPost();
|
||||
|
||||
if (empty($postData['updateTrpProductionDetails'])) {
|
||||
if (empty($inserts)) {
|
||||
return $this->response->setJSON(['error' => 'No data found to update']);
|
||||
} else {
|
||||
$postData['updateTrpProductionDetails'] = $inserts;
|
||||
}
|
||||
}
|
||||
|
||||
$updateTrpProductionDetails = $postData['updateTrpProductionDetails'];
|
||||
|
||||
// Extract all dates from input data
|
||||
$dates = array_column($updateTrpProductionDetails, 'Date');
|
||||
$formattedDates = array_map(fn($date) => $this->convertToDateWithFlexibleFormats($date, ["d-m-Y", "Y-m-d", "m/d/Y", "m-d-Y"], "Y-m-d"), $dates);
|
||||
|
||||
// Fetch all existing records in a single query per table
|
||||
$existingMaintenance = $this->TrpProductionMaintenance_model->whereIn('date', $formattedDates)->findAll();
|
||||
$existingProduction = $this->TrpProduction_model->whereIn('date', $formattedDates)->findAll();
|
||||
$existingWaste = $this->TrpProductionWaste_model->whereIn('date', $formattedDates)->findAll();
|
||||
|
||||
// Map existing records by date for quick lookup
|
||||
$existingMaintenanceMap = array_column($existingMaintenance, null, 'date');
|
||||
$existingProductionMap = array_column($existingProduction, null, 'date');
|
||||
$existingWasteMap = array_column($existingWaste, null, 'date');
|
||||
|
||||
$insertMaintenance = [];
|
||||
$updateMaintenance = [];
|
||||
$insertProduction = [];
|
||||
$updateProduction = [];
|
||||
$insertWaste = [];
|
||||
$updateWaste = [];
|
||||
|
||||
foreach ($updateTrpProductionDetails as $data) {
|
||||
$date = $this->convertToDateWithFlexibleFormats($data['Date'], ["d-m-Y", "Y-m-d", "m/d/Y", "m-d-Y"], "Y-m-d");
|
||||
|
||||
// Data arrays
|
||||
$dbDataTrpMaintenance = [
|
||||
'date' => $date,
|
||||
'openingTime' => $data['openingTime'],
|
||||
'closingTime' => $data['closingTime'],
|
||||
'totalHours' => $data['totalHours'],
|
||||
'coldStart' => $data['coldStart'],
|
||||
'breakdownHours' => $data['breakdownHours'],
|
||||
'burnerFiringHours' => $data['burnerFiringHours'],
|
||||
'sandFeedingHours' => $data['sandFeedingHours'],
|
||||
'workingPersonEngineers' => $data['workingPersonEngineers'],
|
||||
'workingPersonSupervisiors' => $data['workingPersonSupervisiors'],
|
||||
'workingPersonOperators' => $data['workingPersonOperators'],
|
||||
'rollerDrivers' => $data['rollerDrivers'],
|
||||
'natureOfMaintenance' => $data['natureOfMaintenance'],
|
||||
'location' => $data['location'],
|
||||
'description' => $data['description']
|
||||
];
|
||||
|
||||
$dbDataTrpProduction = [
|
||||
'date' => $date,
|
||||
'gasReceiptBg' => $data['gasReceiptBg'],
|
||||
'gasReceiptPg' => $data['gasReceiptPg'],
|
||||
'physicalGasConsumption' => $data['physicalGasConsumption'],
|
||||
'trpPlusDrierGasConsumption' => $data['trpPlusDrierGasConsumption'],
|
||||
'trpPhysicalGasPerTon' => $data['trpPhysicalGasPerTon'],
|
||||
'panelGasConsumption' => $data['panelGasConsumption'],
|
||||
'panelGasPerTon' => $data['panelGasPerTon'],
|
||||
'edRunningHours' => $data['edRunningHours'],
|
||||
'edProduction' => $data['edProduction'],
|
||||
'edUsage' => $data['edUsage'],
|
||||
'trpProduction' => $data['trpProduction'],
|
||||
'trpProductionPerHour' => $data['trpProductionPerHour'],
|
||||
'waterReceipt' => $data['waterReceipt'],
|
||||
'waterConsumption' => $data['waterConsumption'],
|
||||
'ebReading' => $data['ebReading'],
|
||||
'ebReadingPerUnitTon' => $data['ebReadingPerUnitTon'],
|
||||
];
|
||||
|
||||
$dbDataTrpWaste = [
|
||||
'date' => $date,
|
||||
'msSeperation' => $data['msSeperation'],
|
||||
'edWaste' => $data['edWaste'],
|
||||
'coolerBags' => $data['coolerBags'],
|
||||
'edPlus20Waste' => $data['edPlus20Waste'],
|
||||
'cycloneWaste' => $data['cycloneWaste'],
|
||||
];
|
||||
|
||||
// Check if data already exists
|
||||
if (isset($existingMaintenanceMap[$date])) {
|
||||
$dbDataTrpMaintenance['id'] = $existingMaintenanceMap[$date]['id'];
|
||||
$updateMaintenance[] = $dbDataTrpMaintenance;
|
||||
} else {
|
||||
$insertMaintenance[] = $dbDataTrpMaintenance;
|
||||
}
|
||||
|
||||
if (isset($existingProductionMap[$date])) {
|
||||
$dbDataTrpProduction['id'] = $existingProductionMap[$date]['id'];
|
||||
$updateProduction[] = $dbDataTrpProduction;
|
||||
} else {
|
||||
$insertProduction[] = $dbDataTrpProduction;
|
||||
}
|
||||
|
||||
if (isset($existingWasteMap[$date])) {
|
||||
$dbDataTrpWaste['id'] = $existingWasteMap[$date]['id'];
|
||||
$updateWaste[] = $dbDataTrpWaste;
|
||||
} else {
|
||||
$insertWaste[] = $dbDataTrpWaste;
|
||||
}
|
||||
}
|
||||
|
||||
// Start transaction
|
||||
$this->db->transBegin();
|
||||
|
||||
try {
|
||||
// Insert new records in batch
|
||||
if (!empty($insertMaintenance)) {
|
||||
$this->TrpProductionMaintenance_model->insertBatch($insertMaintenance);
|
||||
}
|
||||
if (!empty($insertProduction)) {
|
||||
$this->TrpProduction_model->insertBatch($insertProduction);
|
||||
}
|
||||
if (!empty($insertWaste)) {
|
||||
$this->TrpProductionWaste_model->insertBatch($insertWaste);
|
||||
}
|
||||
|
||||
// Update existing records in batch
|
||||
if (!empty($updateMaintenance)) {
|
||||
$this->TrpProductionMaintenance_model->updateBatch($updateMaintenance, 'id');
|
||||
}
|
||||
if (!empty($updateProduction)) {
|
||||
$this->TrpProduction_model->updateBatch($updateProduction, 'id');
|
||||
}
|
||||
if (!empty($updateWaste)) {
|
||||
$this->TrpProductionWaste_model->updateBatch($updateWaste, 'id');
|
||||
}
|
||||
|
||||
// Commit transaction if successful
|
||||
$this->db->transCommit();
|
||||
|
||||
if (!$freshEntry) {
|
||||
echo "Data Saved Successfully";
|
||||
}
|
||||
} catch (\Exception $error) {
|
||||
// Rollback transaction on error
|
||||
$this->db->transRollback();
|
||||
echo "An error occurred: " . $error->getMessage();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@ -1592,10 +1602,10 @@ class StockController extends BaseController
|
||||
$datesInMonth = [];
|
||||
$inserts = [];
|
||||
|
||||
$period = new DatePeriod(
|
||||
new DateTime($startDate),
|
||||
new DateInterval('P1D'),
|
||||
(new DateTime($endDate))->modify('+1 day')
|
||||
$period = new DatePeriod(
|
||||
new DateTime($startDate),
|
||||
new DateInterval('P1D'),
|
||||
(new DateTime($endDate))->modify('+1 day')
|
||||
);
|
||||
|
||||
foreach ($period as $day) {
|
||||
@ -1606,41 +1616,41 @@ class StockController extends BaseController
|
||||
|
||||
$inserts[] = [
|
||||
'Date' => $dateInMonth,
|
||||
'openingTime' => '00:00',
|
||||
'closingTime' => '00:00',
|
||||
'totalHours' => '00:00',
|
||||
'coldStart' => '00:00',
|
||||
'breakdownHours' => '00:00',
|
||||
'burnerFiringHours' => '00:00',
|
||||
'sandFeedingHours' => '00:00',
|
||||
'workingPersonEngineers' => 0,
|
||||
'workingPersonSupervisiors' => 0,
|
||||
'workingPersonOperators' => 0,
|
||||
'rollerDrivers' => 0,
|
||||
'openingTime' => " ",
|
||||
'closingTime' => " ",
|
||||
'totalHours' => " ",
|
||||
'coldStart' => " ",
|
||||
'breakdownHours' => " ",
|
||||
'burnerFiringHours' => " ",
|
||||
'sandFeedingHours' => " ",
|
||||
'workingPersonEngineers' => " ",
|
||||
'workingPersonSupervisiors' => " ",
|
||||
'workingPersonOperators' => " ",
|
||||
'rollerDrivers' => " ",
|
||||
'natureOfMaintenance' => '',
|
||||
'location' => '',
|
||||
'description' => '',
|
||||
'gasReceiptBg' => 0,
|
||||
'gasReceiptPg' => 0,
|
||||
'physicalGasConsumption' => 0,
|
||||
'trpPlusDrierGasConsumption' => 0,
|
||||
'trpPhysicalGasPerTon' => 0,
|
||||
'panelGasConsumption' => 0,
|
||||
'panelGasPerTon' => 0,
|
||||
'edRunningHours' => 0,
|
||||
'edProduction' => 0,
|
||||
'edUsage' => 0,
|
||||
'trpProduction' => 0,
|
||||
'trpProductionPerHour' => 0,
|
||||
'waterReceipt' => 0,
|
||||
'waterConsumption' => 0,
|
||||
'ebReading' => 0,
|
||||
'ebReadingPerUnitTon' => 0,
|
||||
'msSeperation' => 0,
|
||||
'edWaste' => 0,
|
||||
'coolerBags' => 0,
|
||||
'edPlus20Waste' => 0,
|
||||
'cycloneWaste' => 0
|
||||
'gasReceiptBg' => " ",
|
||||
'gasReceiptPg' => " ",
|
||||
'physicalGasConsumption' => " ",
|
||||
'trpPlusDrierGasConsumption' => " ",
|
||||
'trpPhysicalGasPerTon' => " ",
|
||||
'panelGasConsumption' => " ",
|
||||
'panelGasPerTon' => " ",
|
||||
'edRunningHours' => " ",
|
||||
'edProduction' => " ",
|
||||
'edUsage' => " ",
|
||||
'trpProduction' => " ",
|
||||
'trpProductionPerHour' => " ",
|
||||
'waterReceipt' => " ",
|
||||
'waterConsumption' => " ",
|
||||
'ebReading' =>" ",
|
||||
'ebReadingPerUnitTon' =>" ",
|
||||
'msSeperation' => " ",
|
||||
'edWaste' => " ",
|
||||
'coolerBags' =>" ",
|
||||
'edPlus20Waste' => " ",
|
||||
'cycloneWaste' => " "
|
||||
];
|
||||
}
|
||||
|
||||
|
||||
@ -372,18 +372,42 @@ class Inwardgateregister_model extends Model
|
||||
|
||||
function ViewigrListing($fromDate,$toDate)
|
||||
{
|
||||
$subQuery = $this->db->table('t_igr_remarkes')
|
||||
->select('COUNT(id)')
|
||||
->where('igr_no = igr.IGRNo')
|
||||
->getCompiledSelect();
|
||||
$subQuery1 = $this->db->table('t_igr_remarkes')
|
||||
->select('COUNT(id)')
|
||||
->where('igr_no = igr.IGRNo')
|
||||
->getCompiledSelect();
|
||||
|
||||
// Build subQuery2 dynamically for rate and tax based on POType
|
||||
$subQuery2 = "(CASE
|
||||
WHEN PO.POType = 'revenue' THEN (
|
||||
SELECT JSON_OBJECT('total_rate', SUM(POL.Rate), 'total_tax', AVG(tax.CGST + tax.SGST + tax.IGST))
|
||||
FROM t_igr_details IGRD
|
||||
LEFT JOIN t_purchaseorder_lineitem POL ON PONO = POL.PONO AND IGRD.MaterialCode = POL.MaterialCode
|
||||
LEFT JOIN t_revenue_tax tax ON tax.LineItemNo = POL.LineItemNo
|
||||
WHERE IGRD.IGRNO = igr.IGRNO
|
||||
)
|
||||
WHEN PO.POType = 'service' THEN (
|
||||
SELECT JSON_OBJECT('total_rate', SUM(POL.Rate), 'total_tax', AVG(tax.CGST + tax.SGST + tax.IGST))
|
||||
FROM t_igr_details IGRD
|
||||
LEFT JOIN t_purchaseorder_lineitem POL ON PONO = POL.PONO AND IGRD.MaterialCode = POL.MaterialCode
|
||||
LEFT JOIN t_service_tax tax ON tax.LineItemNo = POL.LineItemNo
|
||||
WHERE IGRD.IGRNO = igr.IGRNO
|
||||
)
|
||||
|
||||
ELSE NULL
|
||||
END)";
|
||||
|
||||
|
||||
// Main query
|
||||
$builder = $this->db->table('t_igr_master igr')
|
||||
->select("igr.*, PO.IsOpenOrder, PO.DeliveryDate, sup.SupplierName, PO.POType,
|
||||
trans.name as TransporterName,
|
||||
SUM(IGRD.QuantityAsPerInvoice) as ReceivedQuantity,
|
||||
SUM(IGRD.NetWeight) as NetWeight,
|
||||
COUNT(IGRD.IGRNo) as itemCount,
|
||||
COALESCE(($subQuery), 0) as remark_count") // COALESCE to handle no matches
|
||||
COALESCE(($subQuery1), 0) as remark_count,
|
||||
JSON_EXTRACT(($subQuery2), '$.total_rate') as total_rate,
|
||||
JSON_EXTRACT(($subQuery2), '$.total_tax') as total_tax")
|
||||
->join('t_purchaseorder_master PO', 'igr.PONO = PO.PONO')
|
||||
->join('t_supplierdetailsn sup', 'PO.SupplierID = sup.SupplierID')
|
||||
->join('t_transporter trans', 'igr.TransporterId = trans.id', 'left')
|
||||
@ -391,13 +415,15 @@ class Inwardgateregister_model extends Model
|
||||
->where('igr.IGRStatus !=', MRIR_CREATED)
|
||||
->where('Date(igr.CreatedDate) >=', "$fromDate")
|
||||
->where('Date(igr.CreatedDate) <=', "$toDate")
|
||||
// ->where('igr.IGRNo', "IGRNO-1627")
|
||||
->groupBy('IGRD.IGRNo')
|
||||
->orderBy('igr.CreatedDate', 'desc');
|
||||
|
||||
$query = $builder->get();
|
||||
$result = $query->getResult();
|
||||
|
||||
|
||||
$query = $builder->get();
|
||||
$result = $query->getResult();
|
||||
|
||||
|
||||
// echo $this->db->getLastQuery()->getQuery();die;
|
||||
// dd($result);
|
||||
|
||||
|
||||
// old - issue in t_igr_remarkes join
|
||||
|
||||
@ -68,6 +68,8 @@ class TrpProductionModel extends Model
|
||||
|
||||
// Convert the array of material codes to a comma-separated string
|
||||
$materialCodesString = "'" . implode("','", $materialCodes) . "'";
|
||||
|
||||
// dd($materialCodes);
|
||||
|
||||
|
||||
$sql = "SELECT
|
||||
@ -190,9 +192,9 @@ class TrpProductionModel extends Model
|
||||
|
||||
tigrd.CreatedDate ,
|
||||
|
||||
SUM(CASE WHEN ts.SupplierName = 'ASHOK LEYLAND LIMITED FOUNDRY DIVN - SPU' THEN tigrd.QuantityAsPerInvoice ELSE 0 END) AS
|
||||
SUM(CASE WHEN ts.SupplierName = 'Ashok leyland limited foundry divn-SPU' THEN tigrd.QuantityAsPerInvoice ELSE 0 END) AS
|
||||
`ALs_wcs`,
|
||||
SUM(CASE WHEN ts.SupplierName = 'ASHOK LEYLAND LIMITED FOUNDRY DIVN - ENU' THEN tigrd.QuantityAsPerInvoice ELSE 0 END) AS
|
||||
SUM(CASE WHEN ts.SupplierName = 'Ashok leyland limited foundry divn-ENU' THEN tigrd.QuantityAsPerInvoice ELSE 0 END) AS
|
||||
`ALe_wcs`,
|
||||
SUM(CASE WHEN ts.SupplierName = 'MADRAS ENGINEERING INDUSTRIES PRIVATE LIMITED' THEN tigrd.QuantityAsPerInvoice ELSE 0 END) AS
|
||||
`ME_wcs`,
|
||||
@ -202,7 +204,7 @@ class TrpProductionModel extends Model
|
||||
`caparo_wcs`,
|
||||
SUM(CASE WHEN ts.SupplierName = 'NEMAK ALUMINIUM CASTING INDIA PVT LTD' THEN tigrd.QuantityAsPerInvoice ELSE 0 END) AS
|
||||
`Nemak_wcs`,
|
||||
SUM(CASE WHEN ts.SupplierName = 'DR AXION INDIA PRIVATE LIMITED' THEN tigrd.QuantityAsPerInvoice ELSE 0 END) AS
|
||||
SUM(CASE WHEN ts.SupplierName = 'DR Axion India Private Limited' THEN tigrd.QuantityAsPerInvoice ELSE 0 END) AS
|
||||
`DR_wcs`
|
||||
|
||||
from t_igr_details tigrd
|
||||
|
||||
@ -444,9 +444,9 @@ foreach ($period as $day) {
|
||||
$summary['balanceStock'] = 0 ;
|
||||
}
|
||||
|
||||
$summary['totalPurchaseDiesel'] += $totalDiesel[$groupedDieselMachineStockDetailsIndex]['purchase_diesel'] == '-' ? 0 : $totalDiesel[$groupedDieselMachineStockDetailsIndex]['purchase_diesel'] ;
|
||||
$summary['totalFillingDiesel'] += $totalDiesel[$groupedDieselMachineStockDetailsIndex]['total_filling_diesel'] == '-' ? 0 : $totalDiesel[$groupedDieselMachineStockDetailsIndex]['total_filling_diesel'] ;
|
||||
$summary['balanceStock'] = $totalDiesel[$groupedDieselMachineStockDetailsIndex]['balance_stock'] == '-' ? 0 : $totalDiesel[$groupedDieselMachineStockDetailsIndex]['balance_stock'] ;
|
||||
$summary['totalPurchaseDiesel'] += is_numeric($totalDiesel[$groupedDieselMachineStockDetailsIndex]['purchase_diesel'] ) ? $totalDiesel[$groupedDieselMachineStockDetailsIndex]['purchase_diesel'] : 0 ;
|
||||
$summary['totalFillingDiesel'] += is_numeric($totalDiesel[$groupedDieselMachineStockDetailsIndex]['total_filling_diesel']) ? $totalDiesel[$groupedDieselMachineStockDetailsIndex]['total_filling_diesel'] : 0 ;
|
||||
$summary['balanceStock'] = is_numeric($totalDiesel[$groupedDieselMachineStockDetailsIndex]['balance_stock']) ? $totalDiesel[$groupedDieselMachineStockDetailsIndex]['balance_stock'] : 0 ;
|
||||
|
||||
?>
|
||||
|
||||
|
||||
@ -570,7 +570,7 @@
|
||||
<!-- td:eq(11) -->
|
||||
<td class="celda_normal trpProductionStock"
|
||||
data-id="">
|
||||
<?= $trpProductionDetail['drierGasConsumption'] ?>
|
||||
<?= $trpProductionDetail['drierGasConsumption'] == 0 ? " " : $trpProductionDetail['drierGasConsumption'] ?>
|
||||
</td>
|
||||
|
||||
<!-- coatingGasConsumption -->
|
||||
@ -612,18 +612,19 @@
|
||||
<?= $trpProductionDetail['panelGasPerTon'] ?>
|
||||
</td>
|
||||
|
||||
|
||||
<!-- AL(S) -->
|
||||
<!-- td:eq(17) -->
|
||||
<td class="celda_normal trpProductionStock"
|
||||
data-id="">
|
||||
<?= $trpProductionDetail['ALs_wcs'] ?>
|
||||
<?= $trpProductionDetail['ALs_wcs'] == 0 ? " " : $trpProductionDetail['ALs_wcs'] ?>
|
||||
</td>
|
||||
|
||||
<!-- AL(E) -->
|
||||
<!-- td:eq(18) -->
|
||||
<td class="celda_normal trpProductionStock"
|
||||
data-id="">
|
||||
<?= $trpProductionDetail['ALe_wcs'] ?>
|
||||
<?= $trpProductionDetail['ALe_wcs'] == 0 ? " " : $trpProductionDetail['ALe_wcs'] ?>
|
||||
</td>
|
||||
|
||||
<!-- ME -->
|
||||
@ -631,21 +632,21 @@
|
||||
<td class="celda_normal trpProductionStock"
|
||||
data-id=""
|
||||
contenteditable="true">
|
||||
<?= $trpProductionDetail['ME_wcs'] ?>
|
||||
<?= $trpProductionDetail['ME_wcs'] == 0 ? " " : $trpProductionDetail['ME_wcs'] ?>
|
||||
</td>
|
||||
|
||||
<!-- SI -->
|
||||
<!-- td:eq(20) -->
|
||||
<td class="celda_normal trpProductionStock"
|
||||
data-id="">
|
||||
<?= $trpProductionDetail['SI_wcs'] ?>
|
||||
<?= $trpProductionDetail['SI_wcs'] == 0 ? " " : $trpProductionDetail['SI_wcs'] ?>
|
||||
</td>
|
||||
|
||||
<!-- Caparo -->
|
||||
<!-- td:eq(21) -->
|
||||
<td class="celda_normal trpProductionStock"
|
||||
data-id="">
|
||||
<? $trpProductionDetail['caparo_wcs'] ?>
|
||||
<?= $trpProductionDetail['caparo_wcs'] == 0 ? " " : $trpProductionDetail['caparo_wcs'] ?>
|
||||
</td>
|
||||
|
||||
|
||||
@ -653,14 +654,14 @@
|
||||
<!-- td:eq(22) -->
|
||||
<td class="celda_normal trpProductionStock"
|
||||
data-id="">
|
||||
<?= $trpProductionDetail['Nemak_wcs'] ?>
|
||||
<?= $trpProductionDetail['Nemak_wcs'] == 0 ? " " : $trpProductionDetail['Nemak_wcs'] ?>
|
||||
</td>
|
||||
|
||||
<!-- DR -->
|
||||
<!-- td:eq(23) -->
|
||||
<td class="celda_normal trpProductionStock"
|
||||
data-id="">
|
||||
<?= $trpProductionDetail['DR_wcs'] ?>
|
||||
<?= $trpProductionDetail['DR_wcs'] == 0 ? " " : $trpProductionDetail['DR_wcs'] ?>
|
||||
</td>
|
||||
|
||||
<!-- edRunningHours -->
|
||||
@ -668,7 +669,7 @@
|
||||
<td class="celda_normal trpProductionStock"
|
||||
data-id=""
|
||||
contenteditable="true">
|
||||
<?= $trpProductionDetail['edRunningHours'] ?>
|
||||
<?= $trpProductionDetail['edRunningHours'] ?>
|
||||
</td>
|
||||
|
||||
|
||||
@ -709,42 +710,42 @@
|
||||
<!-- td:eq(29) -->
|
||||
<td class="celda_normal trpProductionStock"
|
||||
data-id="">
|
||||
<?= $trpProductionDetail['coating'] ?>
|
||||
<?= $trpProductionDetail['coating'] == 0 ? " " : $trpProductionDetail['coating'] ?>
|
||||
</td>
|
||||
|
||||
<!-- Hindhuja -->
|
||||
<!-- td:eq(30) -->
|
||||
<td class="celda_normal trpProductionStock"
|
||||
data-id="">
|
||||
<?= $trpProductionDetail['ALs_crs'] ?>
|
||||
<?= $trpProductionDetail['ALs_crs'] == 0 ? " " : $trpProductionDetail['ALs_crs'] ?>
|
||||
</td>
|
||||
|
||||
<!-- Nemak -->
|
||||
<!-- td:eq(31) -->
|
||||
<td class="celda_normal trpProductionStock"
|
||||
data-id="">
|
||||
<?= $trpProductionDetail['Nemak_crs'] ?>
|
||||
<?= $trpProductionDetail['Nemak_crs'] == 0 ? " " : $trpProductionDetail['Nemak_crs'] ?>
|
||||
</td>
|
||||
<!-- ME -->
|
||||
<!-- td:eq(32) -->
|
||||
<td class="celda_normal trpProductionStock"
|
||||
data-id=""
|
||||
contenteditable="true">
|
||||
<?= $trpProductionDetail['ME_crs'] ?>
|
||||
<?= $trpProductionDetail['ME_crs'] == 0 ? " " : $trpProductionDetail['ME_crs'] ?>
|
||||
</td>
|
||||
<!-- BI -->
|
||||
<!-- td:eq(33) -->
|
||||
<td class="celda_normal trpProductionStock"
|
||||
data-id=""
|
||||
contenteditable="true">
|
||||
<?= $trpProductionDetail['BI_crs'] ?>
|
||||
<?= $trpProductionDetail['BI_crs'] == 0 ? " " : $trpProductionDetail['BI_crs'] ?>
|
||||
</td>
|
||||
<!-- Karmen -->
|
||||
<!-- td:eq(34) -->
|
||||
<td class="celda_normal trpProductionStock"
|
||||
data-id=""
|
||||
contenteditable="true">
|
||||
<?= $trpProductionDetail['Karmen_crs'] ?>
|
||||
<?= $trpProductionDetail['Karmen_crs'] == 0 ? " " : $trpProductionDetail['Karmen_crs'] ?>
|
||||
</td>
|
||||
|
||||
<!-- waterReceipt -->
|
||||
@ -752,7 +753,7 @@
|
||||
<td class="celda_normal trpProductionStock"
|
||||
data-id=""
|
||||
contenteditable="true">
|
||||
<?= $trpProductionDetail['waterReceipt'] ?>
|
||||
<?= $trpProductionDetail['waterReceipt'] ?>
|
||||
</td>
|
||||
|
||||
<!-- waterConsumption -->
|
||||
@ -1051,7 +1052,7 @@
|
||||
|
||||
//table to json function
|
||||
|
||||
var updateResinStockDetails = tableToJson();
|
||||
var updateTrpProductionDetails = tableToJson();
|
||||
|
||||
|
||||
alert('Updation may take a while, And we appreciate your patience..!!');
|
||||
@ -1062,7 +1063,7 @@
|
||||
updateResinStockDetails
|
||||
},
|
||||
type: "POST",
|
||||
url: "<?php echo base_url() ?>updateResinStockDetails",
|
||||
url: "<?php echo base_url() ?>updateTrpProductionDetails",
|
||||
|
||||
success: function (data) {
|
||||
if (data) {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user