update net_weight

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@97333 ce508802-f39f-4f6c-b175-0d175dae99d5

webitm-mfg/ibase/webitm/ejb/mfg/QCTransferConf.java

@@ -709,6 +709,7 @@ QCTransferConfLocal, QCTransferConfRemote
 						{
 							stockUpd.put("tare_weight", tareWtPerArt *  Double.parseDouble(stockUpd.get("no_art").toString()));
 						}
+					
 						stockUpd.put("gross_weight", ( Double.parseDouble(stockUpd.get("net_weight").toString()) + Double.parseDouble(stockUpd.get("tare_weight").toString())) );
 					}//end if
 					// ls_errcode = nvo_dis.gbf_update_stock(lstr_stkupd)
@@ -753,9 +754,28 @@ QCTransferConfLocal, QCTransferConfRemote
 					stockUpd.put("no_art", Math.ceil( Double.parseDouble(stockUpd.get("qty_stduom").toString()) / qtyPerArt));		
 
 					if ( stockQty != 0 )
+					{
+						//stockUpd.put("net_weight",stkNetWt / stockQty *  Double.parseDouble(stockUpd.get("qty_stduom").toString()));
+						//stockUpd.put("tare_weight", tareWtPerArt *  Double.parseDouble(stockUpd.get("no_art").toString()));
+						 // commented above lines and below logic added as per instruction on 23/02/15
+						if( netWeightQCTransfer > 0 )    // for net_weight
+					    {
+					    	stockUpd.put("net_weight", netWeightQCTransfer );
+					    }
+					    else
 					    {
 					    	stockUpd.put("net_weight",stkNetWt / stockQty *  Double.parseDouble(stockUpd.get("qty_stduom").toString()));
+					    }
+						
+						if( noArtQCTransfer > 0 )     // for tare_weight
+					    {
+					    	stockUpd.put("tare_weight", tareWtPerArt *  noArtQCTransfer );
+					    }
+					    else
+					    {
 					    	stockUpd.put("tare_weight", tareWtPerArt *  Double.parseDouble(stockUpd.get("no_art").toString()));
+					    }
+						
 						stockUpd.put("gross_weight", ( Double.parseDouble(stockUpd.get("net_weight").toString()) +  Double.parseDouble(stockUpd.get("tare_weight").toString())));
 					}//end if
 					//ls_errcode = nvo_dis.gbf_update_stock(lstr_stkupd)