diff --git a/application/controllers/emergencypurchaseorder.php b/application/controllers/emergencypurchaseorder.php index 0f318597..bc026beb 100644 --- a/application/controllers/emergencypurchaseorder.php +++ b/application/controllers/emergencypurchaseorder.php @@ -609,10 +609,12 @@ $RequestedBy = $this->input->post('drpDepartment'); $IGRItemNo = $value->IGRItemNo; } - + + $MaterialstockHistoryadd= array('Ref_No'=>$IGRItemNo,'MaterialCode'=>$MaterialCode,'Transaction_type'=>'Add','Ref_Type'=>'IGR','SupplierID'=>$SupplierID,'Quantity'=>$QuantityAsPerInvoice,'ItemValue'=>$itemRate,'CreatedBy'=>$CreatedBy,'CreatedOn'=>$createddt); + $this->inwardgateregister_model->addMaterialStockHistory($MaterialstockHistoryadd); - $Recqty = $this->inwardgateregister_model->getPOLineItemReceivedQty($PONO,$MaterialCode); - $ReceivedQuantity = 0.00; + $Recqty = $this->inwardgateregister_model->getPOLineItemReceivedQty($PONO,$MaterialCode); + $ReceivedQuantity = 0.00; if(count($Recqty)>0) { foreach ($Recqty as $key ) { diff --git a/application/controllers/inwardgateregister.php b/application/controllers/inwardgateregister.php index 31a50735..666c53c1 100644 --- a/application/controllers/inwardgateregister.php +++ b/application/controllers/inwardgateregister.php @@ -171,6 +171,9 @@ class inwardgateregister extends BaseController $igrM = $this->inwardgateregister_model->addigrM($igr); + + $OGRStatus=IGR_CREATED; + $check_OGRPO= $this->inwardgateregister_model->update_OGR($PONO,$OGRStatus); $IGRNO = ''; if(count($igrM)>0) @@ -210,8 +213,33 @@ class inwardgateregister extends BaseController $igrDetails = array('IGRNO'=>$IGRNO,'MaterialCode'=>$MaterialCode,'QuantityAsPerInvoice'=>$QuantityAsPerInvoice,'Remarks'=>$Remarks,'IGRItemStatus'=>$IGRItemStatus,'CreatedBy'=>$CreatedBy,'CreatedDate'=>$createddt); $igrD = $this->inwardgateregister_model->addigrD($igrDetails); - $Recqty = $this->inwardgateregister_model->getPOLineItemReceivedQty($PONO,$MaterialCode); - $ReceivedQuantity = 0.00; + + $igrlineno =''; + + if(!empty($igrD)) + { + foreach($igrD as $ig) + { + $igrlineno = $ig->IGRItemNo; + } + } + + + $itemvalue=''; + $SupplierId=''; + $polineitemvalue = $this->inwardgateregister_model->getitemvalue($PONO,$MaterialCode); + + foreach($polineitemvalue as $it) + { + $itemvalue =$it->Rate; + $SupplierId =$it->SupplierID; + } + $historydetails = array('MaterialCode'=>$MaterialCode,'Transaction_type'=>"Add",'Ref_Type'=>"IGR",'Ref_No'=>$igrlineno,'Quantity'=>$QuantityAsPerInvoice,'CreatedBy'=>$CreatedBy,'CreatedOn'=>$createddt,'SupplierID'=>$SupplierId,'ItemValue'=>$itemvalue); + + $this->inwardgateregister_model->addmaterialhistory($historydetails); + + $Recqty = $this->inwardgateregister_model->getPOLineItemReceivedQty($PONO,$MaterialCode); + $ReceivedQuantity = 0.00; if(count($Recqty)>0) { @@ -284,8 +312,7 @@ class inwardgateregister extends BaseController $this->load->model('inwardgateregister_model'); $this->global['pageTitle'] = $this->CompanyName.' : Add Outward Gate Register'; - - $data['Customer'] = $this->inwardgateregister_model->getCustomer(); + //$data['Customer'] = $this->inwardgateregister_model->getCustomer(); $data['Supplier'] = $this->inwardgateregister_model->getSupplier(); $data['storedmaterialcode'] = $this->inwardgateregister_model->getstoredmaterialcode(); diff --git a/application/controllers/purchaseorder.php b/application/controllers/purchaseorder.php index 44a259c2..33e5cbdd 100644 --- a/application/controllers/purchaseorder.php +++ b/application/controllers/purchaseorder.php @@ -1299,14 +1299,14 @@ class purchaseorder extends BaseController $this->purchaseorder_model->updateIGR($IGRD[$j]['IGRItemNo'],$IGRDs); - // $MaterialstockHistoryupdate= array('SupplierID'=>$SupplierID,'Quantity'=>$Quantity,'ItemValue'=>$itemRate,'UpdateBY'=>$updatedBy,'UpdatedOn'=>$updateddt); + $MaterialstockHistoryupdate= array('SupplierID'=>$SupplierID,'Quantity'=>$Quantity,'ItemValue'=>$itemRate,'UpdatedBY'=>$updatedBy,'UpdatedOn'=>$updateddt); - // $itemNo = $IGRD[$j]['IGRItemNo']; + $itemNo = $IGRD[$j]['IGRItemNo']; - // $this->purchaseorder_model->updateMatStock($itemNo, - // $MaterialstockHistoryupdate); + $this->purchaseorder_model->updateMatStock($itemNo, + $MaterialstockHistoryupdate); diff --git a/application/models/inwardgateregister_model.php b/application/models/inwardgateregister_model.php index 885b4fa1..8e2c89bb 100644 --- a/application/models/inwardgateregister_model.php +++ b/application/models/inwardgateregister_model.php @@ -9,19 +9,19 @@ class inwardgateregister_model extends CI_Model // } function updatefile($bill,$Picture,$oldfile) -{ + { // if($oldfile != ''){ // //unlink("uploads/BillFiles/".$oldfile);//this deletes the file on particular folder too // } -$this->db->set('FilePath', $Picture); //value that used to update column -$this->db->where('BillNo', $bill); //which row want to upgrade -$this->db->update('T_Inwardgateregister_fileupload'); -$afftectedRows = $this->db->affected_rows(); -return $afftectedRows; + $this->db->set('FilePath', $Picture); //value that used to update column + $this->db->where('BillNo', $bill); //which row want to upgrade + $this->db->update('T_Inwardgateregister_fileupload'); + $afftectedRows = $this->db->affected_rows(); + return $afftectedRows; -} + } function getfies($igr) diff --git a/application/models/purchaseorder_model.php b/application/models/purchaseorder_model.php index bc68eb10..0e7cee61 100755 --- a/application/models/purchaseorder_model.php +++ b/application/models/purchaseorder_model.php @@ -38,7 +38,15 @@ class purchaseorder_model extends CI_Model return $query->result(); } - + function updateMatStock($itemNo,$MaterialstockHistoryupdate){ + + $this->db->where('Ref_No',$itemNo); + $this->db->update('T_Material_stock_history', $MaterialstockHistoryupdate); + $r = $this->db->affected_rows(); + return $r; + + } + function updateReqDetails($Reqnumber,$MaterialCode,$ReqDetail){ $this->db->where('ReqNo',$Reqnumber); $this->db->where('MaterialCode',$MaterialCode); diff --git a/application/views/editogr.php b/application/views/editogr.php index 5ea5c4e8..de862d17 100644 --- a/application/views/editogr.php +++ b/application/views/editogr.php @@ -168,8 +168,7 @@ if(!empty($OGR_Data))
-
-

Siddharth Industries - Outward Gate Register(OGR)Entry

+
@@ -216,8 +215,8 @@ if(!empty($OGR_Data))
@@ -329,8 +328,8 @@ if(!empty($OGR_Data))
'orderqty','value' => set_value('orderqty'),'id'=>'orderqty', 'class' => 'form-control'); - echo form_input($data); + //$data = array('name' => 'orderqty','value' => set_value('orderqty'),'id'=>'orderqty', 'class' => 'form-control'); + //echo form_input($data); ?>
@@ -342,8 +341,8 @@ if(!empty($OGR_Data))
'Rejectqty','value' => set_value('Rejectqty'),'id'=>'Rejectqty', 'class' => 'form-control'); - echo form_input($data); + //$data = array('name' => 'Rejectqty','value' => set_value('Rejectqty'),'id'=>'Rejectqty', 'class' => 'form-control'); + //echo form_input($data); ?>
@@ -368,8 +367,8 @@ if(!empty($OGR_Data))
'destination','value' => set_value('destination',$sup),'id'=>'destination', 'class' => 'form-control'); - echo form_input($data); + //$data = array('name' => 'destination','value' => set_value('destination',$sup),'id'=>'destination', 'class' => 'form-control'); + //echo form_input($data); ?> --> @@ -503,8 +502,8 @@ if(!empty($OGR_Data)) 'materialcode','value' => set_value('materialcode'),'id'=>'materialcode', 'class' => 'form-control'); - echo form_input($data); + //$data = array('name' => 'materialcode','value' => set_value('materialcode'),'id'=>'materialcode', 'class' => 'form-control'); + //echo form_input($data); ?> diff --git a/application/views/materialadjustmentlist.php b/application/views/materialadjustmentlist.php index 2f2c594a..d9beca6b 100644 --- a/application/views/materialadjustmentlist.php +++ b/application/views/materialadjustmentlist.php @@ -92,7 +92,8 @@
-

Material Adjustment Report

+ +

diff --git a/application/views/ogr.php b/application/views/ogr.php index 1efc52fb..138a0a68 100644 --- a/application/views/ogr.php +++ b/application/views/ogr.php @@ -163,6 +163,7 @@ $Value="₹"; 'Select'); //echo form_dropdown('sup', $options,set_value('sup'),'id="sup"' ,'required="true"' ,'class="form-control select2'); + ?>
--> @@ -568,20 +569,12 @@ $("#ogrtype").change(function() $('#saveinv').show(); $('#saveservice').hide(); //document.getElementById("sup").options.length = 0; - $('#sup').find('option:not(:first)').remove(); - var customer= ; - - $.each(customer, function(cu, cuobj) - - { - - $("#sup").append( $('').val(cuobj.client_id).html(cuobj.client_name)); - - }); - - - - + // $('#sup').find('option:not(:first)').remove(); + // var customer= ; + // $.each(customer, function(cu, cuobj) + // { + // $("#sup").append( $('').val(cuobj.client_id).html(cuobj.client_name)); + // }); } else if ($('#ogrtype').val()=="2") @@ -621,8 +614,7 @@ $("#ogrtype").change(function() - } - + } else { $('#mv').hide(); @@ -676,7 +668,6 @@ $("#sup").change(function() } - else if($('#ogrtype').val()=="2") { var supplier= $('#sup').val(); @@ -811,9 +802,9 @@ $("#mrirno").change(function() $("#pono").change(function() { - alert('onchange function entered'); +//alert('onchange function entered'); var PONO=$('#pono').val(); - alert(PONO); + // alert(PONO); $('#poappend').empty(); var row= $('#rowcount').val(); @@ -897,7 +888,7 @@ function addHidden(theForm, key, value) var materialcode=$('#materialcode').val(); var mrirno = $('#mrirno').val(); var PONO=$('#pono').val(); - alert(mrirno+''+materialcode+''+PONO); +// alert(mrirno+''+materialcode+''+PONO); var x = document.getElementById("potable").rows.length; for(var i=1;i<=x;i++) diff --git a/application/views/viewIGRDetails.php b/application/views/viewIGRDetails.php index 6125ed75..e9a7ceca 100644 --- a/application/views/viewIGRDetails.php +++ b/application/views/viewIGRDetails.php @@ -190,6 +190,16 @@ ?>
+ + 'SupplierName','value' => set_value('SupplierName'),'id'=>'Supplier', 'class' => 'form-control', 'required=>"true"' , 'readonly'=>'true' ); + + echo form_input($data); + ?> +
+
+
+
'DeliveryChallan/InvoiceNO','value' => set_value('DeliveryChallan/InvoiceNO'),'id'=>'Invoice_No', 'class' => 'form-control', 'required=>"true"' , 'readonly'=>'true' ); @@ -197,8 +207,6 @@ echo form_input($data); ?>
-
-
- + 'SupplierName','value' => set_value('SupplierName'),'id'=>'Supplier', 'class' => 'form-control', 'required=>"true"' , 'readonly'=>'true' ); + $data = array('name' => 'MaterialRcvdDate','value' => set_value('MaterialRcvdDate'),'id'=>'MaterialRcvdDate', 'class' => 'form-control' , 'readonly'=>'true' ); echo form_input($data); ?> @@ -223,7 +231,7 @@ - + @@ -336,6 +344,13 @@ $("#Igrshow").on("shown.bs.modal", function(e) { //alert(dcd.getDate()+ '.' + (dcd.getMonth() + 1)+ '.' + dcd.getFullYear()); var dcd2 = (dcd.getDate()+ '/' + (dcd.getMonth() + 1)+ '/' + dcd.getFullYear()); $("#Invoice_Date").val(dcd2); + if(item.MaterialRcvdDate === null) { + var Mat_rcv_date = ' '; } + else { + var MR_dt = new Date(item.MaterialRcvdDate); + var Mat_rcv_date = (MR_dt.getDate()+ '/' + (MR_dt.getMonth() + 1)+ '/' + MR_dt.getFullYear()); + } + $("#MaterialRcvdDate").val(Mat_rcv_date); $("#ser").val(item.ServiceDescription);
SNo Item Code Item Description UOM