stock : ps

This commit is contained in:
venbatechnologies@gmail.com 2019-01-19 12:38:31 +05:30
parent ef4bde3e57
commit edef9f89be
2 changed files with 217 additions and 30 deletions

View File

@ -95,7 +95,7 @@
</mat-form-field> </mat-form-field>
<mat-form-field style="width:30%"> <mat-form-field style="width:30%">
<!-- <mat-select placeholder="is the Goods is Observed ?" formControlName="goods_observed" > --> <!-- <mat-select placeholder="is the Goods is Observed ?" formControlName="goods_observed" > -->
<mat-select placeholder="Finished Goods" formControlName="goods_observed" > <mat-select placeholder="Stock" formControlName="goods_observed" >
<mat-option value="yes">Add Stock Details</mat-option> <mat-option value="yes">Add Stock Details</mat-option>
<mat-option value="no">No Stock Observed</mat-option> <mat-option value="no">No Stock Observed</mat-option>
</mat-select> </mat-select>
@ -166,7 +166,7 @@
<input matInput autocomplete="off" placeholder="Name" formControlName="traded_goods_name" > <input matInput autocomplete="off" placeholder="Name" formControlName="traded_goods_name" >
</mat-form-field> </mat-form-field>
<mat-form-field style="width:30%"> <mat-form-field style="width:30%">
<mat-select placeholder="Traded Goods" formControlName="traded_goods_observed" > <mat-select placeholder="Stock" formControlName="traded_goods_observed" >
<mat-option value="yes">Add Stock Details</mat-option> <mat-option value="yes">Add Stock Details</mat-option>
<mat-option value="no">No Stock Observed</mat-option> <mat-option value="no">No Stock Observed</mat-option>
</mat-select> </mat-select>
@ -250,7 +250,7 @@
<input matInput autocomplete="off" placeholder="Name" formControlName="goods_name" > <input matInput autocomplete="off" placeholder="Name" formControlName="goods_name" >
</mat-form-field> </mat-form-field>
<mat-form-field style="width:30%"> <mat-form-field style="width:30%">
<mat-select placeholder="Finished Goods" formControlName="goods_observed" > <mat-select placeholder="Stock" formControlName="goods_observed" >
<mat-option value="yes">Add Stock Details</mat-option> <mat-option value="yes">Add Stock Details</mat-option>
<mat-option value="no">No stock observed</mat-option> <mat-option value="no">No stock observed</mat-option>
</mat-select> </mat-select>
@ -322,7 +322,7 @@
<input matInput autocomplete="off" placeholder="Name" formControlName="traded_goods_name" > <input matInput autocomplete="off" placeholder="Name" formControlName="traded_goods_name" >
</mat-form-field> </mat-form-field>
<mat-form-field style="width:30%"> <mat-form-field style="width:30%">
<mat-select placeholder="Traded Goods" formControlName="traded_goods_observed" > <mat-select placeholder="Stock" formControlName="traded_goods_observed" >
<mat-option value="yes">Add Stock Details</mat-option> <mat-option value="yes">Add Stock Details</mat-option>
<mat-option value="no">No Stock Observed</mat-option> <mat-option value="no">No Stock Observed</mat-option>
</mat-select> </mat-select>
@ -407,7 +407,7 @@
<input matInput autocomplete="off" placeholder="Name" formControlName="goods_name" > <input matInput autocomplete="off" placeholder="Name" formControlName="goods_name" >
</mat-form-field> </mat-form-field>
<mat-form-field style="width:30%"> <mat-form-field style="width:30%">
<mat-select placeholder="Finished Goods" formControlName="goods_observed" > <mat-select placeholder="Stock" formControlName="goods_observed" >
<mat-option value="yes">Add Stock Details</mat-option> <mat-option value="yes">Add Stock Details</mat-option>
<mat-option value="no">No Stock Observed</mat-option> <mat-option value="no">No Stock Observed</mat-option>
</mat-select> </mat-select>
@ -481,7 +481,7 @@
<input matInput autocomplete="off" placeholder="Name" formControlName="traded_goods_name" > <input matInput autocomplete="off" placeholder="Name" formControlName="traded_goods_name" >
</mat-form-field> </mat-form-field>
<mat-form-field style="width:30%"> <mat-form-field style="width:30%">
<mat-select placeholder="Traded Goods" formControlName="traded_goods_observed" > <mat-select placeholder="Stock" formControlName="traded_goods_observed" >
<mat-option value="yes">Add Stock Details</mat-option> <mat-option value="yes">Add Stock Details</mat-option>
<mat-option value="no">No stock observed</mat-option> <mat-option value="no">No stock observed</mat-option>
</mat-select> </mat-select>

View File

@ -55,6 +55,8 @@ export class StockComponent implements OnInit {
noRecordsFound: Boolean = false; noRecordsFound: Boolean = false;
serviceProviderForm: Boolean = false; serviceProviderForm: Boolean = false;
suppliers_raw_materials : any = []; suppliers_raw_materials : any = [];
suppliers_trade_details : any = [];
suppliers_finished_goods : any =[];
constructor(notifier: NotifierService, private fb: FormBuilder, private route: ActivatedRoute, constructor(notifier: NotifierService, private fb: FormBuilder, private route: ActivatedRoute,
private router: Router, private router: Router,
@ -65,6 +67,7 @@ export class StockComponent implements OnInit {
this.company_id = this.pd_all_details.company_id this.company_id = this.pd_all_details.company_id
this.notifier = notifier; this.notifier = notifier;
} }
public viewerOptions: any = { public viewerOptions: any = {
navbar: false, navbar: false,
toolbar: { toolbar: {
@ -84,6 +87,7 @@ export class StockComponent implements OnInit {
flipVertical: 4, flipVertical: 4,
} }
}; };
ngOnInit() { ngOnInit() {
// this._pd.stockFormsAccess({pd_id:this.pdid}).subscribe(data => { // this._pd.stockFormsAccess({pd_id:this.pdid}).subscribe(data => {
@ -140,7 +144,7 @@ export class StockComponent implements OnInit {
trade_details: this.fb.array([this.tradingFormCreation(record)]), trade_details: this.fb.array([this.tradingFormCreation(record)]),
}); });
let arr = record.filter(data => data.type_of_activity_id == 1); let arr = record.filter(data => data.type_of_activity_id == 2);
if(arr.length > 0) { if(arr.length > 0) {
this._pd.retriveForm({pd_id:this.pdid,pd_form_id:1}).subscribe(value => { this._pd.retriveForm({pd_id:this.pdid,pd_form_id:1}).subscribe(value => {
// console.log('136',value); // console.log('136',value);
@ -201,7 +205,7 @@ export class StockComponent implements OnInit {
} }
let arr1 = record.filter(data => data.type_of_activity_id == 2); let arr1 = record.filter(data => data.type_of_activity_id == 3);
if(arr1.length > 0) { if(arr1.length > 0) {
// let retail_finished_goods; // let retail_finished_goods;
// let retail_traded_goods; // let retail_traded_goods;
@ -228,15 +232,34 @@ export class StockComponent implements OnInit {
// console.log(dataForm.retail_finished_goods); // console.log(dataForm.retail_finished_goods);
// console.log(dataForm.retail_traded_goods); // console.log(dataForm.retail_traded_goods);
this._pd.retriveForm({pd_id:this.pdid,pd_form_id:1}).subscribe(value => {
// console.log('136',value);
if(value.status == 200){
// this.suppliers_raw_materials = value.records.manufacturing_details[0].main_raw_materials;
this.suppliers_finished_goods = value.records.trade_details[0].trading_products;
// this.suppliers_trade_details = value.records.trade_details[0].trading_products;
let retail_temparr = []; let retail_temparr = [];
retail_temparr['retail_traded_goods'] = dataForm.retail_details[0].retail_traded_goods; retail_temparr['retail_traded_goods'] = dataForm.retail_details[0].retail_traded_goods;
retail_temparr['retail_finished_goods'] = dataForm.retail_details[0].retail_finished_goods; retail_temparr['retail_finished_goods'] = dataForm.retail_details[0].retail_finished_goods;
this.initRetailDetails(retail_temparr); this.initRetailDetails(retail_temparr);
}
else{
let retail_temparr = [];
retail_temparr['retail_traded_goods'] = dataForm.retail_details[0].retail_traded_goods;
retail_temparr['retail_finished_goods'] = dataForm.retail_details[0].retail_finished_goods;
this.initRetailDetails(retail_temparr);
}
});
// let retail_temparr = [];
// retail_temparr['retail_traded_goods'] = dataForm.retail_details[0].retail_traded_goods;
// retail_temparr['retail_finished_goods'] = dataForm.retail_details[0].retail_finished_goods;
// this.initRetailDetails(retail_temparr);
//this.initRetailDetails(dataForm); //this.initRetailDetails(dataForm);
//this.initRetailDetails(null); //this.initRetailDetails(null);
} }
let arr2 = record.filter(data => data.type_of_activity_id == 3); let arr2 = record.filter(data => data.type_of_activity_id == 4);
if(arr2.length > 0) { if(arr2.length > 0) {
// let trading_finished_goods; // let trading_finished_goods;
// let trading_traded_goods; // let trading_traded_goods;
@ -260,13 +283,33 @@ export class StockComponent implements OnInit {
// }) // })
// } // }
// let trading_temparr = [];
// trading_temparr['trading_finished_goods'] = dataForm.trade_details[0].trading_finished_goods;
// trading_temparr['trading_traded_goods'] = dataForm.trade_details[0].trading_traded_goods;
// //this.initTradingDetails(trading_temparr);
// this.initTradingDetails(trading_temparr);
this._pd.retriveForm({pd_id:this.pdid,pd_form_id:1}).subscribe(value => {
// console.log('136',value);
if(value.status == 200){
// this.suppliers_raw_materials = value.records.manufacturing_details[0].main_raw_materials;
this.suppliers_trade_details = value.records.trade_details[0].trading_products;
let trading_temparr = [];
trading_temparr['trading_finished_goods'] = dataForm.trade_details[0].trading_finished_goods;
trading_temparr['trading_traded_goods'] = dataForm.trade_details[0].trading_traded_goods;
this.initTradingDetails(trading_temparr);
}
else{
let trading_temparr = []; let trading_temparr = [];
trading_temparr['trading_finished_goods'] = dataForm.trade_details[0].trading_finished_goods; trading_temparr['trading_finished_goods'] = dataForm.trade_details[0].trading_finished_goods;
trading_temparr['trading_traded_goods'] = dataForm.trade_details[0].trading_traded_goods; trading_temparr['trading_traded_goods'] = dataForm.trade_details[0].trading_traded_goods;
//this.initTradingDetails(trading_temparr); //this.initTradingDetails(trading_temparr);
this.initTradingDetails(trading_temparr); this.initTradingDetails(trading_temparr);
} }
let arr3 = record.filter(data => data.type_of_activity_id == 4); });
}
let arr3 = record.filter(data => data.type_of_activity_id == 5);
if(arr3.length > 0) { if(arr3.length > 0) {
this.serviceProviderForm = true; this.serviceProviderForm = true;
} }
@ -298,12 +341,36 @@ export class StockComponent implements OnInit {
} }
let arr1 = record.filter(data => data.type_of_activity_id == 2); let arr1 = record.filter(data => data.type_of_activity_id == 2);
if(arr1.length > 0) { if(arr1.length > 0) {
this._pd.retriveForm({pd_id:this.pdid,pd_form_id:1}).subscribe(value => {
if(value.status == 200){
// this.suppliers_raw_materials = value.records.manufacturing_details[0].main_raw_materials;
this.suppliers_finished_goods = value.records.trade_details[0].trading_products;
//trade_product_name;
this.initRetailDetails(null); this.initRetailDetails(null);
}
else{
this.initRetailDetails(null);
}
});
} }
let arr2 = record.filter(data => data.type_of_activity_id == 3); let arr2 = record.filter(data => data.type_of_activity_id == 3);
if(arr2.length > 0) { if(arr2.length > 0) {
// this.initTradingDetails(null);
this._pd.retriveForm({pd_id:this.pdid,pd_form_id:1}).subscribe(value => {
if(value.status == 200){
// this.suppliers_raw_materials = value.records.manufacturing_details[0].main_raw_materials;
// this.suppliers_finished_goods
this.suppliers_trade_details = value.records.trade_details[0].trading_products;
this.initTradingDetails(null); this.initTradingDetails(null);
} }
else{
this.initTradingDetails(null);
}
});
}
let arr3 = record.filter(data => data.type_of_activity_id == 4); let arr3 = record.filter(data => data.type_of_activity_id == 4);
if(arr3.length > 0) { if(arr3.length > 0) {
this.serviceProviderForm = true; this.serviceProviderForm = true;
@ -331,16 +398,34 @@ export class StockComponent implements OnInit {
this.initManufacturingDetails(null); this.initManufacturingDetails(null);
} }
}); });
} }
let arr1 = record.filter(data => data.type_of_activity_id == 2); let arr1 = record.filter(data => data.type_of_activity_id == 2);
if(arr1.length > 0) { if(arr1.length > 0) {
this._pd.retriveForm({pd_id:this.pdid,pd_form_id:1}).subscribe(value => {
if(value.status == 200){
this.suppliers_finished_goods = value.records.trade_details[0].trading_products;
// value.records.manufacturing_details[0].main_raw_materials;
this.initRetailDetails(null); this.initRetailDetails(null);
}
else{
this.initRetailDetails(null);
}
});
} }
let arr2 = record.filter(data => data.type_of_activity_id == 3); let arr2 = record.filter(data => data.type_of_activity_id == 3);
if(arr2.length > 0) { if(arr2.length > 0) {
this._pd.retriveForm({pd_id:this.pdid,pd_form_id:1}).subscribe(value => {
if(value.status == 200){
this.suppliers_trade_details = value.records.trade_details[0].trading_products;
this.initTradingDetails(null); this.initTradingDetails(null);
} }
else{
this.initTradingDetails(null);
}
});
// this.initTradingDetails(null);
}
let arr3 = record.filter(data => data.type_of_activity_id == 4); let arr3 = record.filter(data => data.type_of_activity_id == 4);
if(arr3.length > 0) { if(arr3.length > 0) {
this.serviceProviderForm = true; this.serviceProviderForm = true;
@ -432,8 +517,42 @@ tradingFormCreation(val) {
else{ else{
rawMaterial.push(this.createRawmaterial(null)); rawMaterial.push(this.createRawmaterial(null));
} }
if(this.suppliers_finished_goods.length > 0){
for (let val of this.suppliers_finished_goods) {
let Ref_Finished_Goods : any = {'goods_name': val.trade_product_name,
'goods_observed': '',
'goods_quantity': '',
'goods_uom': '',
'goods_other_uom': '',
'goods_value': '',
'is_sufficiant_goods': '',
'finishedgoods_remarks':''};
finishedGoods.push(this.createGoods(Ref_Finished_Goods));
// finishedGoods.push(this.createGoods(null));
}
}
else{
finishedGoods.push(this.createGoods(null)); finishedGoods.push(this.createGoods(null));
}
if(this.suppliers_trade_details.length > 0){
for (let val of this.suppliers_trade_details) {
let Ref_Trade_Goods : any = {
'traded_goods_name': val.trade_product_name,
'traded_goods_observed': '',
'traded_goods_quantity': '',
'traded_goods_uom': '',
'traded_goods_other_uom': '',
'estimated_traded_goods_value': '',
'is_sufficiant_traded_goods': '',
'traded_goods_remarks':''};
tradedGoods.push(this.createTradedGoods(Ref_Trade_Goods));
}
}
else{
tradedGoods.push(this.createTradedGoods(null)); tradedGoods.push(this.createTradedGoods(null));
}
} else { } else {
// console.log(305,'else') // console.log(305,'else')
// console.log(377,datas); // console.log(377,datas);
@ -522,8 +641,42 @@ tradingFormCreation(val) {
if(datas === null){ if(datas === null){
// finishedGoods.push(this.createGoods(null));
if(this.suppliers_finished_goods.length > 0){
for (let val of this.suppliers_finished_goods) {
let Ref_Finished_Goods : any = {'goods_name': val.trade_product_name,
'goods_observed': '',
'goods_quantity': '',
'goods_uom': '',
'goods_other_uom': '',
'goods_value': '',
'is_sufficiant_goods': '',
'finishedgoods_remarks':''};
finishedGoods.push(this.createGoods(Ref_Finished_Goods));
}
}
else{
finishedGoods.push(this.createGoods(null)); finishedGoods.push(this.createGoods(null));
}
if(this.suppliers_trade_details.length > 0){
console.log(this.suppliers_trade_details);
for (let val of this.suppliers_trade_details) {
let Ref_Trade_Goods : any = {
'traded_goods_name': val.trade_product_name,
'traded_goods_observed': '',
'traded_goods_quantity': '',
'traded_goods_uom': '',
'traded_goods_other_uom': '',
'estimated_traded_goods_value': '',
'is_sufficiant_traded_goods': '',
'traded_goods_remarks':''};
tradedGoods.push(this.createTradedGoods(Ref_Trade_Goods));
}
}
else{
tradedGoods.push(this.createTradedGoods(null)); tradedGoods.push(this.createTradedGoods(null));
}
} else { } else {
//console.log(479,datas.retail_finished_goods); //console.log(479,datas.retail_finished_goods);
@ -624,8 +777,42 @@ tradingFormCreation(val) {
if(datas === null){ if(datas === null){
// finishedGoods.push(this.createGoods(null));
// tradedGoods.push(this.createTradedGoods(null));
if(this.suppliers_finished_goods.length > 0){
for (let val of this.suppliers_finished_goods) {
let Ref_Finished_Goods : any = {'goods_name': val.trade_product_name,
'goods_observed': '',
'goods_quantity': '',
'goods_uom': '',
'goods_other_uom': '',
'goods_value': '',
'is_sufficiant_goods': '',
'finishedgoods_remarks':''};
finishedGoods.push(this.createGoods(Ref_Finished_Goods));
}
}
else{
finishedGoods.push(this.createGoods(null)); finishedGoods.push(this.createGoods(null));
}
if(this.suppliers_trade_details.length > 0){
for (let val of this.suppliers_trade_details) {
let Ref_Trade_Goods : any = {
'traded_goods_name': val.trade_product_name,
'traded_goods_observed': '',
'traded_goods_quantity': '',
'traded_goods_uom': '',
'traded_goods_other_uom': '',
'estimated_traded_goods_value': '',
'is_sufficiant_traded_goods': '',
'traded_goods_remarks':''};
tradedGoods.push(this.createTradedGoods(Ref_Trade_Goods));
}
}
else{
tradedGoods.push(this.createTradedGoods(null)); tradedGoods.push(this.createTradedGoods(null));
}
} else { } else {
// for (let val of datas) { // for (let val of datas) {