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

status

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2017-08-09 11:51:14 +05:30
parent 811d10f49e
commit 335f043b39
7 changed files with 96 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
application/controllers/MRIRcontroller.php
View File

@ -322,14 +322,42 @@ public function viewmMaterialDistributionList()
$MaterialCode = trim($Values[1]);
$ReqNumber = trim($Values[2]);
$Remarks = trim($Values[3]);
$ReqQuantity=trim($Values[4]);
$UpdatedBy = $this->session->userdata ( 'userId' );
$dt = new DateTime('now', new DateTimeZone('Asia/Kolkata'));
$updatedDt = $dt->format('Y-m-d H:i:s');
$ReqDetails = array('Status'=>$StatusCode,'remarks'=>$Remarks,'UpdatedBy'=>$UpdatedBy,'UpdatedOn'=>$updatedDt);
$dt = new DateTime('now', new DateTimeZone('Asia/Kolkata'));
$updatedDt = $dt->format('Y-m-d H:i:s');
$getAvailableqty = $this->mrir_model->getItemQuantityFromStock($MaterialCode);
//print_r($getAvailableqty);
$avlQty = 0;
if(count($getAvailableqty)>0)
{
$avlQty = $getAvailableqty[0]['Quantity'];
}
$BalanceQty=0;
$BalanceQty=$avlQty-$ReqQuantity;
//echo $avlQty;
//die();
$ReqDetails = array('Status'=>$StatusCode,'remarks'=>$Remarks,'UpdatedBy'=>$UpdatedBy,'UpdatedOn'=>$updatedDt,'DeliveredQuantity'=>$ReqQuantity);
//print_r($ReqDetails);
$this->requistion_model->UpdateRequistionLineItem($ReqDetails,$ReqNumber,$MaterialCode);
//die();
$this->requistion_model->UpdateRequistionLineItem($ReqDetails,$ReqNumber,$MaterialCode);
$Remark=array('Remarks'=>$Remarks);
$this->requistion_model->UpdateStoreRemark($Remark,$MaterialCode);
$BalanceQuantity=array('Quantity'=>$BalanceQty);
$this->requistion_model->UpdateAvlQty($BalanceQuantity,$MaterialCode);
echo "Successfully Updated the Requistion No: ".$ReqNumber;
}

2
application/controllers/storestatus.php
View File

@ -47,6 +47,8 @@ class storestatus extends BaseController
$this->global['pageTitle'] = 'Siddharth Industries : Store Status';
//viewStock
$data['Stock'] = $this->store_model->viewStock();
// print_r($data['Stock']);
$data['MaterialList'] = $this->store_model->GetAllMaterialList();
$data['StockStatus'] = $this->store_model->GetConfigValue('C021');
$this->loadViews("storestatus", $this->global, $data,null);

3
application/models/mrir_model.php
View File

@ -273,6 +273,9 @@ TMD.QuantityRejected,ST.StatusName,TMD.Remarks,AdvanceAmount ');
function getItemQuantityFromStock($MaterialCode)
{
// echo $MaterialCode;
// die();
$subQuery = 'select Quantity from T_Store_Stockdetails where MaterialCode=?';
$query = $this->db->query($subQuery,array($MaterialCode));
return $query->result_array();

19
application/models/requistion_model.php
View File

@ -433,6 +433,25 @@ class requistion_model extends CI_Model
return TRUE;
}
function UpdateStoreRemark($Remark,$MaterialCode)
{
// echo 'fsd';
// die();
$this->db->where('MaterialCode',$MaterialCode);
$this->db->update('T_Store_Stockdetails',$Remark);
return TRUE;
}
function UpdateAvlQty($BalanceQuantity,$MaterialCode)
{
$this->db->where('MaterialCode',$MaterialCode);
$this->db->update('T_Store_Stockdetails',$BalanceQuantity);
return TRUE;
}
/**
* This function is used to update the details into Database

22
application/models/store_model.php
View File

@ -2,8 +2,8 @@
class store_model extends CI_Model
{
function viewStock()
function viewStock()
{
$this->db->select('st.*,st.Remarks as storeremarks,MM.*');
@ -12,10 +12,26 @@ class store_model extends CI_Model
$query = $this->db->get();
//print_r($this->db->last_query());
$result = $query->result();
return $result;
}
// function viewStock()
// {
// $this->db->distinct();
// $this->db->select('st.*,st.Remarks as storeremarks,MM.*,RDet.DeliveredQuantity');
// $this->db->from('T_Store_Stockdetails st ');
// $this->db->join('T_MaterialMaster MM','st.MaterialCode=MM.MaterialCode');
// $this->db->join('T_Requestion_Details RDet','st.MaterialCode=RDet.MaterialCode and MM.MaterialCode=RDet.MaterialCode');
// $query = $this->db->get();
// $result = $query->result();
// //print_r($this->db->last_query());
// return $result;
// }
function GetAllMaterialList()
{

20
application/views/MaterialIssueList.php
View File

@ -157,15 +157,31 @@
var id = $('#Remarks'+Index).val();
var StatusCode = $('#status'+Index).val();
var Remarks = $('#Remarks'+Index).val();
var Remarks = $('#Remarks'+Index).val();
var AcceptedQty=cellval[10].innerHTML;
var RequestedQty=cellval[8].innerHTML;
var MaterialCode = cellval[5].innerHTML;
var ReqNo = cellval[1].innerHTML;
if(StatusCode=='ST050' &&(RequestedQty>AcceptedQty))
{
var ReqQuantity=cellval[10].innerHTML;
}
if(StatusCode=='ST050' &&(RequestedQty<AcceptedQty))
{
var ReqQuantity=cellval[8].innerHTML;
}
if (StatusCode!='ST050')
{
var ReqQuantity=0;
}
var Sendvalues = [];
Sendvalues[0] = StatusCode;
Sendvalues[1] = MaterialCode;
Sendvalues[2] = ReqNo;
Sendvalues[3] = Remarks;
Sendvalues[4]= ReqQuantity;
//alert(MaterialCode);
//alert(StatusCode);
$('#content').loader('show');

2
application/views/storestatus.php
View File

@ -266,7 +266,7 @@
<td align="left"><a data-toggle="modal" data-target="#EditItemModel" data-id="<%=index%>" data-userid="<?php echo $index ?>" > <u><?php echo $record->MaterialCode ?></u></a></td>
<td align="left"><?php echo $record->MaterialName ; ?></td>
<td align="left"><?php echo $record->UOM ; ?></td>
<td align="right"><?php echo $record->Quantity ; ?>
<td align="right"><?php echo $record->Quantity; ?>
</td>