SIA/siddharth_application
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

stock alert correction

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2018-12-03 13:20:15 +05:30
parent 6e6dee4013
commit 464edac1fd
6 changed files with 134 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
application/helpers/cias_helper.php
View File

@ -64,7 +64,72 @@ if(!function_exists('verifyHashedPassword'))
$CI->load->database();
$CI->db->reconnect();
$subQuery='SELECT * from T_MaterialMaster where Current_stock < reorder?';
//$subQuery='SELECT * from T_MaterialMaster where Current_stock < reorder?';
$today= date("Y-m-d");
$today_month = date('F', strtotime($today));
$today_year = date('Y', strtotime($today));
$pre_year = $today_year -1;
$Fin_year ='';
if($today_month <=3)
{
$Fin_year = '01-04-'.$pre_year;
}
else
{
$Fin_year = '01-04-'.$today_year;
}
// $subQuery="SELECT DISTINCT(p.MaterialCode),mm.MaterialName,opens.OpeningStock
// FROM T_Material_stock_history AS p
// left join T_MaterialMaster mm on mm.MaterialCode = p.MaterialCode
// left join (select StockId,pp.MaterialCode mc,
// SUM((IF(pp.Transaction_type='Add',Quantity,0))-(IF(pp.Transaction_type='Reduce',Quantity,0)))
// AS OpeningStock
// FROM T_Material_stock_history AS pp
// GROUP BY pp.MaterialCode
// ) as opens on opens.mc = p.MaterialCode
// where OpeningStock<reorder" ;
$subQuery ="SELECT DISTINCT(p.MaterialCode),mm.MaterialName,opens.CurrentStock,OpeningStock
FROM T_Material_stock_history AS p
left join T_MaterialMaster mm on mm.MaterialCode = p.MaterialCode
left join
(select StockId,pp.MaterialCode mc,
SUM((IF(pp.Transaction_type='Add',Quantity,0))-(IF(pp.Transaction_type='Reduce',Quantity,0)))
AS CurrentStock,
SUM(
CASE WHEN date(stockdate) > '".$Fin_year."'
THEN stock
ELSE 0
END
) as OpeningStock
FROM T_Material_stock_history AS pp
left join T_MaterialMaster mm on mm.MaterialCode = pp.MaterialCode
GROUP BY pp.MaterialCode
) as opens on opens.mc = p.MaterialCode
where (CurrentStock+OpeningStock)<reorder";
$query=$CI->db->query($subQuery,array());
//print_r($this->db->last_query());

49
application/models/rawmaterialdetails_model.php
View File

@ -279,7 +279,54 @@ WHERE MaterialCode=? AND CreatedOn >=? AND CreatedOn <=? ";
function reOrderListing()
{
$subQuery='SELECT * from T_MaterialMaster where Current_stock < reorder?';
//$subQuery='SELECT * from T_MaterialMaster where Current_stock < reorder?';
$today= date("Y-m-d");
$today_month = date('F', strtotime($today));
$today_year = date('Y', strtotime($today));
$pre_year = $today_year -1;
$Fin_year ='';
if($today_month <=3)
{
$Fin_year = '01-04-'.$pre_year;
}
else
{
$Fin_year = '01-04-'.$today_year;
}
$subQuery ="SELECT DISTINCT(p.MaterialCode),mm.MaterialName,opens.CurrentStock,OpeningStock,mm.reorder
FROM T_Material_stock_history AS p
left join T_MaterialMaster mm on mm.MaterialCode = p.MaterialCode
left join
(select StockId,pp.MaterialCode mc,
SUM((IF(pp.Transaction_type='Add',Quantity,0))-(IF(pp.Transaction_type='Reduce',Quantity,0)))
AS CurrentStock,
SUM(
CASE WHEN date(stockdate) > '".$Fin_year."'
THEN stock
ELSE 0
END
) as OpeningStock
FROM T_Material_stock_history AS pp
left join T_MaterialMaster mm on mm.MaterialCode = pp.MaterialCode
GROUP BY pp.MaterialCode
) as opens on opens.mc = p.MaterialCode
where (CurrentStock+OpeningStock)<reorder";
$query=$this->db->query($subQuery,array());
//print_r($this->db->last_query());

12
application/views/FinalProduct.php
View File

@ -1004,7 +1004,7 @@ $(function() {
<table class="table table-bordered" style="border:1px solid #333">
<div align="right" style="padding-right:10px">
<div align="right">
<a type="button" class="btn btn-primary btn-md" data-toggle="modal" data-target="#Coproduct">Add Products</a>
<a type="button" class="btn btn-primary btn-md" data-toggle="modal" data-target="#Coproduct">Add Re-Clamation Materials</a>
<!-- Add line Item -->
<div class="modal fade" id="Coproduct" role="dialog">
<div class="modal-dialog">
@ -1352,6 +1352,8 @@ var stock = <?php echo json_encode($stock_value, JSON_PRETTY_PRINT) ?>;
var lowstock =<?php echo json_encode($Records, JSON_PRETTY_PRINT) ?>;
console.log(lowstock);
var rawsupplier =<?php echo json_encode($rawsupplier, JSON_PRETTY_PRINT)?>;
@ -2032,7 +2034,9 @@ function lowqtycheck(type,Supplier)
$.each(lowstock, function(id, obj) {
if(obj.MaterialCode == materialcode)
{
alert('Stock is running Low !! available Stock'+obj.Current_stock);
var availablestock = parseFloat(obj.CurrentStock)+parseFloat(obj.OpeningStock);
alert('Stock is running Low !! available Stock'+availablestock);
}
});
@ -2605,7 +2609,9 @@ function Editlowqtycheck(type)
$.each(lowstock, function(id, obj) {
if(obj.MaterialCode == materialcode)
{
alert('Stock is running Low !! available Stock is '+obj.Current_stock);
var availablestock = parseFloat(obj.CurrentStock)+parseFloat(obj.OpeningStock);
alert('Stock is running Low !! available Stock is '+availablestock);
}
});

8
application/views/editFinalProduct.php
View File

@ -2140,7 +2140,9 @@ function lowqtycheck(type)
$.each(lowstock, function(id, obj) {
if(obj.MaterialCode == materialcode)
{
alert('Stock is running Low !! available Stock'+obj.Current_stock);
var availablestock = parseFloat(obj.CurrentStock)+parseFloat(obj.OpeningStock);
alert('Stock is running Low !! available Stock'+availablestock);
}
});
@ -2671,7 +2673,9 @@ function Editlowqtycheck(type)
$.each(lowstock, function(id, obj) {
if(obj.MaterialCode == materialcode)
{
alert('Stock is running Low !! available Stock is '+obj.Current_stock);
var availablestock = parseFloat(obj.CurrentStock)+parseFloat(obj.OpeningStock);
alert('Stock is running Low !! available Stock is '+availablestock);
}
});

5
application/views/editOldRawmaterial.php
View File

@ -311,7 +311,10 @@ $("#Date").datepicker({
<div class="col-md-3">
<label>Open Stock Date</label>
<?php
$data = array('name' => 'Date','value' => set_value('Date',$date), 'class' => 'form-control','readonly'=>'true', 'onkeypress'=>'return false;');
// $data = array('name' => 'Date','value' => set_value('Date',$date), 'class' => 'form-control','readonly'=>'true', 'onkeypress'=>'return false;');
$data = array('name' => 'Date','id'=>'Date','value' => set_value('Date',$date), 'class' => 'form-control', 'onkeypress'=>'return false;');
echo form_input($data);
?>
</div>

2
application/views/shortagematerialListing.php
View File

@ -40,7 +40,7 @@
<td align="left"><?php echo $index ; ?></td>
<td style="text-align:center"><span><?php echo $re->MaterialCode;?></span></td>
<td style="text-align:center"><span><?php echo $re->MaterialName;?></span></td>
<td style="text-align:center"><span><?php echo $re->Current_stock;?></span></td>
<td style="text-align:center"><span><?php echo ($re->CurrentStock)+($re->OpeningStock);?></span></td>
<td style="text-align:center"><span><?php echo $re->reorder;?></span></td>
</tr>
<?php