Case Transfer bugs

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

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

@@ -135,6 +135,7 @@ public class CaseTransferPos extends ValidatorEJB implements CaseTransferPosLoca
 					rs.close();
 					rs = null;
 
+					System.out.println("Calling Case trasfer sql check");
 					////////// 15/10/12 manoharan get the old despatch line info ///////////////////////////////////////////////////
 					sSQL =  "SELECT  LINE_NO, SORD_NO, LINE_NO__SORD, EXP_LEV, " +
 					"ITEM_CODE__ORD, QUANTITY__ORD, QUANTITY, LOC_CODE, " +
@@ -143,6 +144,7 @@ public class CaseTransferPos extends ValidatorEJB implements CaseTransferPosLoca
 					"NETT_WEIGHT, MFG_DATE, EXP_DATE, SITE_CODE__MFG, RATE__CLG, COST_RATE, LINE_TYPE, " +
 					"CONV__RTUOM_STDUOM, PACK_CODE, CUST_ITEM__REF, RETEST_DATE  " +
 					" FROM  DESPATCHDET WHERE DESP_ID = ? AND ITEM_CODE = ? AND LOT_SL = ? AND LOT_NO = ? AND PALLET_NO = ?";
+					pstmt = conn.prepareStatement(sSQL);
 					pstmt.setString(1,despId);
 					pstmt.setString(2,itemCode);
 					pstmt.setString(3,lotSl);
@@ -213,6 +215,23 @@ public class CaseTransferPos extends ValidatorEJB implements CaseTransferPosLoca
 					rs.close();
 					rs = null;
 
+					//Changed as per Manohran sir on 25/10/12 for No Of articale should be NO_ART = NO_ART - 1
+					//sSQL = "UPDATE DESPATCHDET SET  QUANTITY = QUANTITY - ?, NO_ART = 1, GROSS_WEIGHT =  GROSS_WEIGHT - ?, TARE_WEIGHT = TARE_WEIGHT - ?, "
+					sSQL = "UPDATE DESPATCHDET SET  QUANTITY = QUANTITY - ?, NO_ART = NO_ART - 1, GROSS_WEIGHT =  GROSS_WEIGHT - ?, TARE_WEIGHT = TARE_WEIGHT - ?, "
+							+ " NETT_WEIGHT = NETT_WEIGHT - ? , QUANTITY__STDUOM = QUANTITY__STDUOM - ?,QUANTITY_REAL =  QUANTITY_REAL - ? WHERE  DESP_ID = ? AND LINE_NO = ?";
+					pstmt = conn.prepareStatement(sSQL);
+					pstmt.setDouble(1,caseQty);
+					pstmt.setDouble(2,caseGrossWeight);
+					pstmt.setDouble(3,caseTareWeight);
+					pstmt.setDouble(4,caseNetWeight);
+					pstmt.setDouble(5,caseQtyStduom);
+					pstmt.setDouble(6,caseQty);
+					pstmt.setString(7, despId);
+					pstmt.setString(8, despLineOld);
+					pstmt.executeUpdate();	
+					pstmt.close();
+					pstmt = null;
+
 					if(count == 0)
 					{
 						//map = addDespatchDetail(itemCode, lotNo, lotSl,pickOrder, despId, palletNoNew, xtraParams, conn);
@@ -221,20 +240,6 @@ public class CaseTransferPos extends ValidatorEJB implements CaseTransferPosLoca
 						// 15/10/12 manoharan 1. reduce value in  despatchdet for old record
 						// 2. insert a new record in despatch det
 						
-						sSQL = "UPDATE DESPATCHDET SET  QUANTITY = QUANTITY - ?, NO_ART = NO_ART - 1, GROSS_WEIGHT =  GROSS_WEIGHT - ?, TARE_WEIGHT = TARE_WEIGHT - ?, "
-							+ " NET_WEIGHT = NET_WEIGHT - ? , QUANTITY__STDUOM = QUANTITY__STDUOM - ?, QUANTITY_REAL = QUANTITY_REAL - ? WHERE  DESP_ID = ? , LINE_NO = ?";
-						pstmt = conn.prepareStatement(sSQL);
-						pstmt.setDouble(1,caseQty);
-						pstmt.setDouble(2,caseGrossWeight);
-						pstmt.setDouble(3,caseTareWeight);
-						pstmt.setDouble(4,caseNetWeight);
-						pstmt.setDouble(5,caseQtyStduom);
-						pstmt.setDouble(6,caseQty);
-						pstmt.setString(7, despId);
-						pstmt.setString(8, despLineOld);
-						pstmt.executeUpdate();	
-						pstmt.close();
-						pstmt = null;
 
 						sSQL = "SELECT MAX(TO_NUMBER(LINE_NO)) AS LINE_NO FROM DESPATCHDET WHERE DESP_ID = ?";
 						pstmt = conn.prepareStatement(sSQL);
@@ -248,8 +253,10 @@ public class CaseTransferPos extends ValidatorEJB implements CaseTransferPosLoca
 						pstmt = null;									 
 						rs.close();
 						rs = null;
+						
 						lineNo++;
-						despLineNo = "   " + (Integer)map.get("lineNo");
+						//despLineNo = "   " + (Integer)map.get("lineNo");
+						despLineNo = "   " + lineNo;
 						despLineNo = despLineNo.substring( despLineNo.length()-3 );
 						
 						///////////sample
@@ -340,7 +347,7 @@ public class CaseTransferPos extends ValidatorEJB implements CaseTransferPosLoca
 					
 						// despatchdet already has the same stock in another pallet just update the quntity and weights
 						sSQL = "UPDATE DESPATCHDET SET  QUANTITY = QUANTITY + ?, NO_ART = NO_ART + 1, GROSS_WEIGHT =  GROSS_WEIGHT + ?, TARE_WEIGHT = TARE_WEIGHT + ?, "
-							+ " NET_WEIGHT = NET_WEIGHT + ? , QUANTITY__STDUOM = QUANTITY__STDUOM + ?,QUANTITY_REAL = QUANTITY_REAL + ?  WHERE  DESP_ID = ? , LINE_NO = ?";
+							+ " NETT_WEIGHT = NETT_WEIGHT + ? , QUANTITY__STDUOM = QUANTITY__STDUOM + ?,QUANTITY_REAL = QUANTITY_REAL + ? WHERE  DESP_ID = ? AND LINE_NO = ?";
 						pstmt = conn.prepareStatement(sSQL);
 						pstmt.setDouble(1,caseQty);
 						pstmt.setDouble(2,caseGrossWeight);