openstack in material master

This commit is contained in:
gandhimathi 2018-05-23 17:32:41 +05:30
parent 52fe1273e6
commit cdd24547c3
3 changed files with 150 additions and 4 deletions

View File

@ -160,6 +160,22 @@ 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))
{
$stackdate = NULL;
}
else
{
$stackdate = strtotime( $stackdate);
$stackdate = date("Y-m-d ", $stackdate);
}
$reorder = $this->input->post('reorder');
$chked = $this->input->post('isactive');
if($asset == '0')
@ -205,7 +221,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);
$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);
//print_r($RawMaterial);die();
$result = $this->rawmaterialdetails_model->addNewRawMaterial($RawMaterial);
@ -313,6 +329,20 @@ else
$cfuom = $this->input->post('conversionfactorUOM');
$HSN = $this->input->post('HSNcode');
$UpdatedBy = $this->session->userdata ('userId');
$stack = $this->input->post('openstack');
$reorder = $this->input->post('reorder');
$stackdate = $this->input->post('Date');
if (empty($stackdate))
{
$stackdate = NULL;
}
else
{
$stackdate = strtotime( $stackdate);
$stackdate = date("Y-m-d ", $stackdate);
}
$chked = $this->input->post('isactive');
if($asset == '0')
{
@ -357,7 +387,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);//,'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,'stack'=>$stack,'stackdate'=>$stackdate,'reorder'=>$reorder);//,'RMCode'=>$rmcode);
$result = $this->rawmaterialdetails_model->editRawmaterial($RawMaterial, $MaterialCode);

View File

@ -6,6 +6,17 @@
outline: 1px solid slategrey;
}
</style>
<script>
$(function() {
$("#Date").datepicker({
//minDate :'now',
//maxDate : 'now',
dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '-100:+1'
});
});
</script>
<script type="text/javascript" src="<?php echo base_url();?>assets/Autocomplete/jquery.autocomplete.js"></script>
<div class="content-wrapper" style="min-height: 537px;">
<!-- Content Header (Page header) -->
@ -169,6 +180,27 @@
<input type="text" class="form-control" id="HSNcode" onkeypress="return isNumberKey(event)" name="HSNcode" maxlength="8">
</div>
</div>
<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">
</div>
</div>
<div class="col-md-3">
<label>Open Stock Date</label>
<?php
$data = array('name' => 'Date','value' => set_value('Date',$CurrentDate),'id'=>'Date', 'class' => 'form-control' , 'onkeypress'=>'return false;');
echo form_input($data);
?>
</div>
<div class="col-md-3">
<div class="form-group">
<label for="conversionfactor">Reorder Level</label>
<input type="text" class="form-control" id="reorder" name="reorder" maxlength="255">
</div>
</div>
</div>
<div class="col-md-12">
<div class="col-md-6">
<div class="form-group">
<label for="remarks">Remarks</label>
@ -182,6 +214,7 @@
</div>
</div>
</div>
</div>
</div><!-- /.box-body -->

View File

@ -13,6 +13,9 @@ $conversionactor ='';
$RMCode = '';
$HSNcode = '';
$IsActive = '';
$openstack='';
$date='';
$reorder='';
if(!empty($materialDetails))
{
@ -30,7 +33,11 @@ if(!empty($materialDetails))
$conversionfactor = $MD->ConversionFactorUnit;
$conversionfactorUOM = $MD->ConversionFactorUOM;
$RMCode = $MD->RMCode;
$HSNcode = $MD->HSNCODE;
$HSNcode = $MD->HSNCODE;
$openstack=$MD->stack;
$date=$MD->stackdate;
$reorder=$MD->reorder;
$chk = $MD->IsActive;
if($chk == 1)
@ -46,6 +53,19 @@ if(!empty($materialDetails))
?>
<script>
$(function() {
$("#Date").datepicker({
//minDate :'now',
//maxDate : 'now',
dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '-100:+1'
});
});
</script>
<style>
.autocomplete-suggestion{
cursor:pointer;
@ -185,12 +205,75 @@ if(!empty($materialDetails))
<input type="text" class="form-control" id="HSNcode" name="HSNcode" maxlength="8" value="<?php echo $HSNcode; ?>" onkeypress="return isNumberKey(event)" >
</div>
</div>
<?php
if($openstack!="")
{
?>
<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">
</div>
</div>
<?php
} else
{
?>
<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">
</div>
</div>
<?php
}
?>
<?php
if($date!="")
{
?>
<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;');
echo form_input($data);
?>
</div>
<?php
} else
{
?>
<div class="col-md-3">
<label>Open Stock Date</label>
<?php
$data = array('name' => 'Date','id'=>'Date', 'class' => 'form-control' , 'onkeypress'=>'return false;');
echo form_input($data);
?>
</div>
<?php
}
?>
<div class="col-md-3">
<div class="form-group">
<label for="conversionfactor">Reorder Level</label>
<input type="text" class="form-control" id="reorder" value="<?php echo $reorder;?>" name="reorder" maxlength="255">
</div>
</div>
</div>
<div class="col-md-12">
<div class="col-md-6">
<div class="form-group">
<label for="remarks">Remarks</label>
<input type="text" class="form-control" id="remarks" name="remarks" maxlength="255" value="<?php echo $remarks;?>">
</div>
</div>
<div class="col-md-3">
<div class="form-group">
<label for="Active">IsActive</label> <br/>
@ -198,7 +281,7 @@ if(!empty($materialDetails))
</div>
</div>
</div>
</div>
</div>
</div><!-- /.box-body -->