Changed by Dhanraj -calculate wt uing filler and tare wt for master pack

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

webitm-wms/ibase/webitm/ejb/wms/ConsolidatToDoc.java

@@ -1907,8 +1907,12 @@ public class ConsolidatToDoc {
 		ResultSet rSet = null ;
 		try
 		{
+			//Changed by dhanraj on 29-SEP-14 as per pragyan sir tare and filler wt sum of status 'M' and 'A'.
+//			sql = " SELECT SUM(NVL(FILLER_WEIGHT,0)) FILLER_WEIGHT , SUM(NVL(TARE_WEIGHT,0)) TARE_WEIGHT  FROM CARTON_MASTER "
+//				+" WHERE PTCN = ? AND CARTON_TYPE = 'M'  AND STATUS <> 'R' ";
+			
 			sql = " SELECT SUM(NVL(FILLER_WEIGHT,0)) FILLER_WEIGHT , SUM(NVL(TARE_WEIGHT,0)) TARE_WEIGHT  FROM CARTON_MASTER "
-				+" WHERE PTCN = ? AND CARTON_TYPE = 'M' AND STATUS <> 'R' ";
+					+" WHERE PTCN = ? AND (CARTON_TYPE = 'M' OR CARTON_TYPE = 'A') AND STATUS <> 'R' ";
 			pstmt = conn.prepareStatement(sql);
 			pstmt.setString(1,ptcn);
 		    rSet = pstmt.executeQuery();

webitm-wms/ibase/webitm/ejb/wms/DeallocArtConf.java

@@ -1197,8 +1197,9 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo
 					}
 					rs1.close(); rs1 = null;
 					pstmt1.close(); pstmt1 = null;
-					
-					sql = "UPDATE  DESPATCH SET  GROSS_WEIGHT = ?, TARE_WEIGHT = ? ,NETT_WEIGHT = ?, NO_ART = ?   WHERE DESP_ID = ? ";
+					//Changed by Dhanraj on 29-SEP-14 For update proper tare_wt
+					//sql = "UPDATE  DESPATCH SET  GROSS_WEIGHT = ?, TARE_WEIGHT = ? ,NETT_WEIGHT = ?, NO_ART = ?   WHERE DESP_ID = ? ";
+					sql = "UPDATE  DESPATCH SET  GROSS_WEIGHT = ?, TARE_WEIGHT = TARE_WEIGHT + ? ,NETT_WEIGHT = ?, NO_ART = ?   WHERE DESP_ID = ? ";
 					pstmt1 = conn.prepareStatement(sql);
 					pstmt1.setDouble(1, totalGrossWeight);
 					pstmt1.setDouble(2, totalTareWeight);
@@ -4108,7 +4109,7 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo
 					pstmt = null;
 				}
 				
-				sql = " UPDATE DESPATCH SET TARE_WEIGHT= TARE_WEIGHT - ? ,FILLER_WEIGHT= FILLER_WEIGHT - ? WHERE PTCN= ?";
+				sql = " UPDATE DESPATCH SET TARE_WEIGHT = TARE_WEIGHT - ? ,FILLER_WEIGHT= FILLER_WEIGHT - ? WHERE PTCN= ?";
 				pstmt = conn.prepareStatement(sql);
 				pstmt.setDouble(1, tareWt);
 				pstmt.setDouble(2, fillerWt);

webitm-wms/ibase/webitm/ejb/wms/WaveGenerationPrc.java

@@ -13394,8 +13394,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 						//Changed by Pragyan on 19-SEP-14   [W14FSUN003]	
 						//sqlSize = "SELECT LENGTH , WIDTH , HEIGHT FROM PACKING WHERE PACK_CODE = (SELECT PACK_CODE FROM CARTON_MASTER WHERE CARTON_NO = ? )";
 						
-						sqlSize = "SELECT C.PACK_CODE,C.TARE_WEIGHT,C.FILLER_WEIGHT, P.LENGTH , P.WIDTH , P.HEIGHT " 
-								+" FROM CARTON_MASTER C,PACKING P WHERE C.PACK_CODE = P.PACK_CODE AND C.CARTON_NO  = ? )";
+						sqlSize = " SELECT C.PACK_CODE,C.TARE_WEIGHT,C.FILLER_WEIGHT, P.LENGTH , P.WIDTH , P.HEIGHT " 
+								+" FROM CARTON_MASTER C,PACKING P WHERE C.PACK_CODE = P.PACK_CODE AND C.CARTON_NO  = ? ";
 						pstmt2 = conn.prepareStatement(sqlSize);