W15GSUN003 changed by wasim to update location in despatch_det from disparm.

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

webitm-wms/ibase/webitm/utility/wms/ScheduleAWMSInOutTasks.java

@@ -2270,13 +2270,13 @@ public class ScheduleAWMSInOutTasks implements Schedule
 				    		  			+" TAX_CHAP,TAX_ENV,LOC_CODE,LOT_NO,LOT_SL,PACK_CODE,RATE,AMOUNT,TAX_AMT,NET_AMT,SITE_CODE__MFG,MFG_DATE,"
 				    		  			+" EXP_DATE,POTENCY_PERC,NO_ART,GROSS_WEIGHT,TARE_WEIGHT,NET_WEIGHT,PACK_INSTR,DIMENSION,SUPP_CODE__MFG,BATCH_NO,GRADE,"
 				    		  			+" RETEST_DATE,RATE_CLG,RATE__CLG,DISCOUNT,DISC_AMT,REMARKS,COST_RATE,UNIT__ALT,CONV__QTY__ALT,QTY_ORDER__ALT,PALLET_WT,"
-				    		  			+" RATE__ALT,CONV__RATE_ALT,RETURN_QTY,RETURN_DATE,RETURNED,BATCH_SIZE,CARTON_NO,PALLET_NO,SHELF_LIFE_TYPE,LOCK_CODE)"//52
+				    		  			+" RATE__ALT,CONV__RATE_ALT,RETURN_QTY,RETURN_DATE,RETURNED,BATCH_SIZE,CARTON_NO,PALLET_NO,SHELF_LIFE_TYPE)"//52-->51 lock code is not present in QC so removed
 				    		  			+ "VALUES (?,?,?,?,?,?,?,?,?,?,"
 				    		  			+ "?,?,?,?,?,?,?,?,?,?,"
 				    		  			+ "?,?,?,?,?,?,?,?,?,?,"
 				    		  			+ "?,?,?,?,?,?,?,?,?,?,"
 				    		  			+ "?,?,?,?,?,?,?,?,?,?,"
-				    		  			+ "?,?)";
+				    		  			+ "?)";
 				      distIssDetPstmt = conn.prepareStatement(sqlDistIssDet);
 				      
 				      	lineNoIssDet++;
@@ -2334,7 +2334,7 @@ public class ScheduleAWMSInOutTasks implements Schedule
 						distIssDetPstmt.setString(49, "");
 						distIssDetPstmt.setString(50, "");
 						distIssDetPstmt.setString(51, "");
-						distIssDetPstmt.setString(52, "");
+						//distIssDetPstmt.setString(52, "");
 						
 						distCount = distIssDetPstmt.executeUpdate();
 						distIssDetPstmt.close(); distIssDetPstmt = null;
@@ -3258,7 +3258,7 @@ public class ScheduleAWMSInOutTasks implements Schedule
         String resultStr = "",sql = "",despId = "",despDetSql = "",sordItemSql = "",sordSql = "",sordDetSql = "",stockSql = "",itemSql = "",
         		sqlHdr = "";
         
-        String despLineNo = "",lineNoSord = "",expLev = "",itemCodeOrd = "",itemCode = "",lotNo= "",lotSl = "",
+        String despLineNo = "",lineNoSord = "",expLev = "",itemCodeOrd = "",itemCode = "",lotNo= "",lotSl = "",locCodeDisparm = "",
         	   mbaseUnit = "", unit = "",unitStd = "",locCode = "",siteCode = "",partNo = "",siteCodeMfg = "",
         	   custItemRef = "",rateClg = "",packInstr = "",siteCodeSord = "",rateStduom = "",packCode = "",lineType = "I",palletNo = "";
         
@@ -3302,6 +3302,8 @@ public class ScheduleAWMSInOutTasks implements Schedule
 			rs.close();rs = null;
 			pstmt.close();pstmt = null;
 			
+			locCodeDisparm = checkNullAndTrim(distComm.getDisparams("999999", "S-ORD", conn));
+			
 			itemSql = "SELECT I.UNIT AS UNIT_STD, I.MFR_PART_NO, ILP.SHIPPER_SIZE,I.GROSS_WEIGHT,I.NET_WEIGHT FROM ITEM I , ITEM_LOT_PACKSIZE ILP "
 					+ " WHERE I.ITEM_CODE = ? AND I.ITEM_CODE = ILP.ITEM_CODE ";
 			pstmtItem = conn.prepareStatement(itemSql);
@@ -3428,7 +3430,8 @@ public class ScheduleAWMSInOutTasks implements Schedule
 						
 						pstmtStock.setString(1, itemCode);
 						pstmtStock.setString(2, siteCode);
-						pstmtStock.setString(3, locCode);
+						//pstmtStock.setString(3, locCode);
+						pstmtStock.setString(3, locCodeDisparm);//as despatch_det location should be from disparm as it is changed after stock transfer
 						pstmtStock.setString(4, lotNo);
 						pstmtStock.setString(5, lotSl);
 						rsStock = pstmtStock.executeQuery();
@@ -3714,7 +3717,7 @@ public class ScheduleAWMSInOutTasks implements Schedule
 					count++;
 			  } 
 			  
-			    if("D-SO".equalsIgnoreCase(refSer) && countDso > 0)
+			    if("D-SO".equalsIgnoreCase(refSer) && countDso == 0)
 				{
 			    	locCodeTo  = distComm.getDisparams("999999",refSer,conn);