stock change

This commit is contained in:
gandhimathi 2018-05-23 18:26:33 +05:30
parent cdd24547c3
commit 9ea2111bd3
3 changed files with 23 additions and 26 deletions

View File

@ -160,21 +160,18 @@ else
$cfuom = $this->input->post('conversionfactorUOM');
$HSN = $this->input->post('HSNcode');
$CreatedBy = $this->session->userdata('userId');
$stack = $this->input->post('openstack');
$stackdate = $this->input->post('Date');
if (empty($stackdate))
$stock = $this->input->post('openstock');
$reorder = $this->input->post('reorder');
$stockdate = $this->input->post('Date');
if (empty($stockdate))
{
$stackdate = NULL;
$stockdate = NULL;
}
else
{
$stackdate = strtotime( $stackdate);
$stackdate = date("Y-m-d ", $stackdate);
}
$reorder = $this->input->post('reorder');
$stockdate = strtotime( $stockdate);
$stockdate = date("Y-m-d ", $stockdate);
}
$chked = $this->input->post('isactive');
@ -221,7 +218,7 @@ else
$IsActive = '0';
}
$RawMaterial = array('MaterialName'=>$MaterialName, 'MaterialType'=>$MaterialType, 'UOM'=>$UOM,'Category'=>$MaterialCategory, 'CreatedBy'=>$CreatedBy,'IsActive' => $IsActive,'assetcode'=>$AssetCode,'CostCenterCode'=>$CostCenterCode,'ConversionFactorUnit'=>$ConversionFactor,'ConversionFactorUOM'=>$ConversionFactorUOM,'Remarks'=>$Remarks,'HSNCODE'=>$HSNcode ,'stack'=>$stack,'Stackdate'=>$stackdate,'reorder'=>$reorder);
$RawMaterial = array('MaterialName'=>$MaterialName, 'MaterialType'=>$MaterialType, 'UOM'=>$UOM,'Category'=>$MaterialCategory, 'CreatedBy'=>$CreatedBy,'IsActive' => $IsActive,'assetcode'=>$AssetCode,'CostCenterCode'=>$CostCenterCode,'ConversionFactorUnit'=>$ConversionFactor,'ConversionFactorUOM'=>$ConversionFactorUOM,'Remarks'=>$Remarks,'HSNCODE'=>$HSNcode ,'stock'=>$stock,'stockdate'=>$stockdate,'reorder'=>$reorder);
//print_r($RawMaterial);die();
$result = $this->rawmaterialdetails_model->addNewRawMaterial($RawMaterial);
@ -329,17 +326,17 @@ else
$cfuom = $this->input->post('conversionfactorUOM');
$HSN = $this->input->post('HSNcode');
$UpdatedBy = $this->session->userdata ('userId');
$stack = $this->input->post('openstack');
$stock = $this->input->post('openstock');
$reorder = $this->input->post('reorder');
$stackdate = $this->input->post('Date');
if (empty($stackdate))
$stockdate = $this->input->post('Date');
if (empty($stockdate))
{
$stackdate = NULL;
$stockdate = NULL;
}
else
{
$stackdate = strtotime( $stackdate);
$stackdate = date("Y-m-d ", $stackdate);
$stockdate = strtotime( $stockdate);
$stockdate = date("Y-m-d ", $stockdate);
}
@ -387,7 +384,7 @@ else
}
$RawMaterial = array();
$RawMaterial = array('MaterialName'=>$MaterialName,'MaterialType'=>$MaterialType,'UpdatedBy'=>$UpdatedBy, 'UOM'=>$UOM,'IsActive' => $IsActive,'Category'=>$MaterialCategory,'ConversionFactorUnit'=>$ConversionFactor,'ConversionFactorUOM'=>$ConversionFactorUOM,'Remarks'=>$Remarks,'assetcode'=>$AssetCode,'CostCenterCode'=>$CostCenterCode,'HSNCODE'=>$HSNcode,'stack'=>$stack,'stackdate'=>$stackdate,'reorder'=>$reorder);//,'RMCode'=>$rmcode);
$RawMaterial = array('MaterialName'=>$MaterialName,'MaterialType'=>$MaterialType,'UpdatedBy'=>$UpdatedBy, 'UOM'=>$UOM,'IsActive' => $IsActive,'Category'=>$MaterialCategory,'ConversionFactorUnit'=>$ConversionFactor,'ConversionFactorUOM'=>$ConversionFactorUOM,'Remarks'=>$Remarks,'assetcode'=>$AssetCode,'CostCenterCode'=>$CostCenterCode,'HSNCODE'=>$HSNcode,'stock'=>$stock,'stockdate'=>$stockdate,'reorder'=>$reorder);//,'RMCode'=>$rmcode);
$result = $this->rawmaterialdetails_model->editRawmaterial($RawMaterial, $MaterialCode);

View File

@ -183,7 +183,7 @@ $(function() {
<div class="col-md-3">
<div class="form-group">
<label for="conversionfactor">Open Stock</label>
<input type="text" class="form-control" id="openstack" name="openstack" maxlength="255">
<input type="text" class="form-control" id="openstock" name="openstock" maxlength="255">
</div>
</div>
<div class="col-md-3">

View File

@ -13,7 +13,7 @@ $conversionactor ='';
$RMCode = '';
$HSNcode = '';
$IsActive = '';
$openstack='';
$openstock='';
$date='';
$reorder='';
@ -34,8 +34,8 @@ if(!empty($materialDetails))
$conversionfactorUOM = $MD->ConversionFactorUOM;
$RMCode = $MD->RMCode;
$HSNcode = $MD->HSNCODE;
$openstack=$MD->stack;
$date=$MD->stackdate;
$openstock=$MD->stock;
$date=$MD->stockdate;
$reorder=$MD->reorder;
$chk = $MD->IsActive;
@ -206,13 +206,13 @@ $("#Date").datepicker({
</div>
</div>
<?php
if($openstack!="")
if($openstock!="")
{
?>
<div class="col-md-3">
<div class="form-group autoSearch" id="mc">
<label for="Matcate">Open Stock</label>
<input type="text" class="form-control required " id="openstack" disabled="disbled" name="openstack" value="<?php echo $openstack;?>" maxlength="255">
<input type="text" class="form-control required " id="openstock" disabled="disbled" name="openstock" value="<?php echo $openstock;?>" maxlength="255">
</div>
</div>
@ -224,7 +224,7 @@ $("#Date").datepicker({
<div class="col-md-3">
<div class="form-group">
<label for="conversionfactor">Open Stock</label>
<input type="text" class="form-control" id="openstack" name="openstack" maxlength="255">
<input type="text" class="form-control" id="openstock" name="openstock" maxlength="255">
</div>
</div>
<?php