To merge src for WMS updated wave gen changes.

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

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

@@ -361,7 +361,7 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC
 								//Changed By Pragyan 
 								//else if ( "repl_iss".equalsIgnoreCase(objName) && ! orderType.trim().equalsIgnoreCase("C") &&  ! orderType.trim().equalsIgnoreCase("M") &&  ! orderType.trim().equalsIgnoreCase("E")  &&  ! orderType.trim().equalsIgnoreCase("F")  &&  ! orderType.trim().equalsIgnoreCase("G")  &&  ! orderType.trim().equalsIgnoreCase("H")  &&  ! orderType.trim().equalsIgnoreCase("J")  &&  ! orderType.trim().equalsIgnoreCase("K") && ! orderType.trim().equalsIgnoreCase("I") )//added by akhilesh on 23/jun/2012 put upper condition(orderType.trim().equalsIgnoreCase("I")) in this if
 								//Changed by Rohan on 05-09-12 for stock to dock replanishment
-								else if ( "repl_iss".equalsIgnoreCase(objName) && ! orderType.trim().equalsIgnoreCase("C") &&  ! orderType.trim().equalsIgnoreCase("M") &&  ! orderType.trim().equalsIgnoreCase("E")  &&  ! orderType.trim().equalsIgnoreCase("F")  &&  ! orderType.trim().equalsIgnoreCase("G")  &&  ! orderType.trim().equalsIgnoreCase("H")  &&  ! orderType.trim().equalsIgnoreCase("J")  &&  ! orderType.trim().equalsIgnoreCase("K") && ! orderType.trim().equalsIgnoreCase("I") && ! orderType.trim().equalsIgnoreCase("Q") && ! orderType.trim().equalsIgnoreCase("T"))//added by akhilesh on 23/jun/2012 put upper condition(orderType.trim().equalsIgnoreCase("I")) in this if		
+								else if ( "repl_iss".equalsIgnoreCase(objName) && ! orderType.trim().equalsIgnoreCase("C") &&  ! orderType.trim().equalsIgnoreCase("M") &&  ! orderType.trim().equalsIgnoreCase("E")  &&  ! orderType.trim().equalsIgnoreCase("F")  &&  ! orderType.trim().equalsIgnoreCase("G")  &&  ! orderType.trim().equalsIgnoreCase("H")  &&  ! orderType.trim().equalsIgnoreCase("J")  &&  ! orderType.trim().equalsIgnoreCase("K") && ! orderType.trim().equalsIgnoreCase("I") && ! orderType.trim().equalsIgnoreCase("Q")  && ! orderType.trim().equalsIgnoreCase("D") && ! orderType.trim().equalsIgnoreCase("L"))//added by akhilesh on 23/jun/2012 put upper condition(orderType.trim().equalsIgnoreCase("I")) in this if		
 								{
 									/*System.out.println("equals ignores case");
 									errList.add( "CASEPICK" );
@@ -2980,6 +2980,7 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC
 						valueXmlString.append( "<line_no><![CDATA[" ).append( issLineNo ).append( "]]></line_no>\r\n" );
 						valueXmlString.append( "<repl_order><![CDATA[" ).append( checkNull(rs.getString("REPL_ORDER")) ).append( "]]></repl_order>\r\n" );
 						valueXmlString.append( "<line_no__ord><![CDATA[" ).append( lineNoOrd ).append( "]]></line_no__ord>\r\n" );
+						valueXmlString.append( "<order_type><![CDATA[" ).append( orderType ).append( "]]></order_type>\r\n" );
 						valueXmlString.append( "<item_code><![CDATA[" ).append( checkNullAndTrim( rs.getString("ITEM_CODE") )).append( "]]></item_code>\r\n" );
 						valueXmlString.append( "<item_descr><![CDATA[" ).append( checkNull( rs.getString("ITEM_DESCR") )).append( "]]></item_descr>\r\n" );
 						valueXmlString.append( "<site_code><![CDATA[" ).append( checkNull( rs.getString("SITE_CODE") )).append( "]]></site_code>\r\n" );
@@ -3064,6 +3065,7 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC
 						valueXmlString.append( "<line_no><![CDATA[" ).append( domID ).append( "]]></line_no>\r\n" );//changed by gulzar on 12/22/2011
 						valueXmlString.append( "<repl_order><![CDATA[" ).append( replOrder ).append( "]]></repl_order>\r\n" );
 						valueXmlString.append( "<line_no__ord><![CDATA[" ).append( lineNoOrd ).append( "]]></line_no__ord>\r\n" );
+						valueXmlString.append( "<order_type><![CDATA[" ).append( orderType ).append( "]]></order_type>\r\n" );
 						valueXmlString.append( "<item_code><![CDATA[" ).append( checkNullAndTrim( itemCode )).append( "]]></item_code>\r\n" );
 						valueXmlString.append( "<item_descr><![CDATA[" ).append( checkNull( itemDescr )).append( "]]></item_descr>\r\n" );
 						valueXmlString.append( "<site_code><![CDATA[" ).append( checkNull( siteCode )).append( "]]></site_code>\r\n" );

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

@@ -695,7 +695,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 					HashMap itemVolMap = getItemVoumeMap(itemCode, "", conn);
 					double packSize = (Double)itemVolMap.get("PACK_SIZE");
 					double itemWeight = (Double)itemVolMap.get("ITEM_WEIGHT");
-					
+					System.out.println("itemWeight =["+itemWeight+"]");
 					//Change by Rohan Bhogale on 19/07/12 To display transporte details.start
 					getTranInfo = new HashMap();
 					saleOrderTran = rs.getString("SALE_ORDER");
@@ -13087,7 +13087,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 											{	
 												replRefDeepId = updateWaveTaskDet(waveID,1,saleOrder,"RP-ACT","E",ptcn,conn);
 												pstmtRplHdr.setString(1,replRefDeepId);
-												pstmtRplHdr.setString(9,"Q");
+												//pstmtRplHdr.setString(9,"Q");
+												pstmtRplHdr.setString(9,"T");
 												pstmtRplHdr.executeUpdate();
 												isReplHdrRSV = true;
 												replOrdRSVCpy = replRefDeepId;

webitm-wms/module-resource/sql/update.sql

@@ -32625,8 +32625,181 @@ INSERT INTO disparm (
 	fn_sysdate(),
 	'BASE      ',
 	'BASE           ');
+---12-10-12	
+---SELECT DISTINCT(R.REPL_ORDER),L.LOC_CODE FROM REPL_ORD_DET R,WAVE_TASK_DET W,LOCATION L  WHERE R.REPL_ORDER = W.REF_ID AND W.STATUS = 'N' AND R.LOC_CODE = L.LOC_CODE AND L.INV_STAT = '?'
+
+--SELECT DISTINCT WH.WAVE_ID,WH.CANCEL, W.PTCN,R.REPL_ORDER ,L.LOC_CODE FROM REPL_ORD_DET R,REPL_ORD_HDR H,WAVE_TASK_DET W,LOCATION L ,WAVE_TASK WH WHERE W.WAVE_ID = WH.WAVE_ID AND R.REPL_ORDER = H.REPL_ORDER AND R.REPL_ORDER = W.REF_ID AND W.STATUS = 'N'  AND H.ORDER_TYPE = 'A' AND FN_VALID_REPL (H.REPL_ORDER) = 'Y' AND R.LOC_CODE = L.LOC_CODE  AND L.INV_STAT = '?' 
+SET ECHO ON
+SPOOL D:\TEST.LOG
+
+CREATE OR REPLACE function fn_valid_repl (as_replorder in char) 
+ return varchar2 is 
+ ls_validrepl varchar2(1) := 'Y';
+ ls_waveid wave_task.wave_id%type ;
+ ls_ptcn wave_task_det.ptcn%type ;
+ ls_cancel char(1) := 'N';
+ ll_count number(3) := 0;
+begin 
+	begin
+		select h.wave_id,d.ptcn,case when h.cancel is null then 'N' else h.cancel end  into ls_waveid, ls_ptcn, ls_cancel  
+		from wave_task_det d, wave_task h where h.wave_id = d.wave_id and d.ref_id = as_replorder and rownum =  1;
+	exception when others then
+		ls_waveid := ' ';
+		ls_ptcn := ' ';
+		ls_cancel := ' '; 
+	end;
+	if ls_cancel = 'Y' then
+		begin
+			select count(1) into ll_count from pick_ord_det p,wave_task_det w, wave_task wh
+			where w.wave_id = wh.wave_id
+			and w.ref_id = p.pick_order
+			and wh.wave_id <> ls_waveid
+			and case when wh.cancel is null then 'N' else wh.cancel end = 'N'
+			and (p.repl_order, p.line_no__repl) in (select repl_order,line_no from repl_ord_det where repl_order = as_replorder);
+		end;
+	--else
+	end if;
+
+	return ls_validrepl ; 
+end;
+/
+
+delete from pophelp where field_name = 'REPL_ORDER' AND MOD_NAME IN ('W_ACTIVE_REPL_ISS','W_REPL_ISS','W_REPL_ISS_DOCK');
+
+INSERT INTO pophelp (field_name,
+	mod_name,
+	sql_str,
+	dw_object,
+	msg_title,
+	width,
+	height,
+	chg_date,
+	chg_user,
+	chg_term,
+	dist_opt,
+	filter_string,
+	sql_input,
+	default_col,
+	pop_align,
+	query_mode,
+	page_context,
+	pophelp_cols,
+	pophelp_source,
+	multi_opt,
+	help_option)
+VALUES (
+	'REPL_ORDER',
+	'W_ACTIVE_REPL_ISS',
+	'SELECT DISTINCT R.REPL_ORDER ,L.LOC_CODE FROM REPL_ORD_DET R,REPL_ORD_HDR H,WAVE_TASK_DET W,LOCATION L ,WAVE_TASK WH WHERE W.WAVE_ID = WH.WAVE_ID AND R.REPL_ORDER = H.REPL_ORDER AND R.REPL_ORDER = W.REF_ID AND W.STATUS = ''N'' AND H.ORDER_TYPE IN (''E'',''Q'') AND FN_VALID_REPL (H.REPL_ORDER) = ''Y'' AND R.LOC_CODE = L.LOC_CODE  AND L.INV_STAT = ''?'' ',
+	NULL,
+	'Repl Order',
+	0,
+	NULL,
+	TO_DATE('20-09-2012 11:37:36','DD-MM-YYYY HH24:MI:SS'),
+	'SUN       ',
+	'BASE           ',
+	'0',
+	NULL,
+	':1.repl_order',
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	'S',
+	NULL,
+	NULL);
+INSERT INTO pophelp (field_name,
+	mod_name,
+	sql_str,
+	dw_object,
+	msg_title,
+	width,
+	height,
+	chg_date,
+	chg_user,
+	chg_term,
+	dist_opt,
+	filter_string,
+	sql_input,
+	default_col,
+	pop_align,
+	query_mode,
+	page_context,
+	pophelp_cols,
+	pophelp_source,
+	multi_opt,
+	help_option)
+VALUES (
+	'REPL_ORDER',
+	'W_REPL_ISS',
+	'SELECT DISTINCT R.REPL_ORDER ,L.LOC_CODE FROM REPL_ORD_DET R,REPL_ORD_HDR H,WAVE_TASK_DET W,LOCATION L ,WAVE_TASK WH WHERE W.WAVE_ID = WH.WAVE_ID AND R.REPL_ORDER = H.REPL_ORDER AND R.REPL_ORDER = W.REF_ID AND W.STATUS = ''N'' AND H.ORDER_TYPE NOT IN (''E'',''Q'') AND FN_VALID_REPL (H.REPL_ORDER) = ''Y'' AND R.LOC_CODE = L.LOC_CODE  AND L.INV_STAT = ''?'' ',
+	NULL,
+	'Repl Order',
+	0,
+	NULL,
+	TO_DATE('20-09-2012 10:46:27','DD-MM-YYYY HH24:MI:SS'),
+	'SUN       ',
+	'BASE           ',
+	'0',
+	NULL,
+	':1.repl_order',
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	'S',
+	NULL,
+	NULL);
+INSERT INTO pophelp (field_name,
+	mod_name,
+	sql_str,
+	dw_object,
+	msg_title,
+	width,
+	height,
+	chg_date,
+	chg_user,
+	chg_term,
+	dist_opt,
+	filter_string,
+	sql_input,
+	default_col,
+	pop_align,
+	query_mode,
+	page_context,
+	pophelp_cols,
+	pophelp_source,
+	multi_opt,
+	help_option)
+VALUES (
+	'REPL_ORDER',
+	'W_REPL_ISS_DOCK',
+	'SELECT DISTINCT R.REPL_ORDER ,L.LOC_CODE FROM REPL_ORD_DET R,REPL_ORD_HDR H,WAVE_TASK_DET W,LOCATION L ,WAVE_TASK WH WHERE W.WAVE_ID = WH.WAVE_ID AND R.REPL_ORDER = H.REPL_ORDER AND R.REPL_ORDER = W.REF_ID AND W.STATUS = ''N'' AND H.ORDER_TYPE IN (''D'',''L'') AND FN_VALID_REPL (H.REPL_ORDER) = ''Y'' AND R.LOC_CODE = L.LOC_CODE  AND L.INV_STAT = ''?'' ',
+	NULL,
+	'Repl Order',
+	0,
+	NULL,
+	TO_DATE('23-11-2004 13:30:41','DD-MM-YYYY HH24:MI:SS'),
+	'SUN       ',
+	'BASE           ',
+	'0',
+	NULL,
+	':1.repl_order',
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	'S',
+	NULL,
+	NULL);
+	update obj_forms set scan_metadata='<SCAN_INFO><MAPPING_SCAN ORDER="1"><SCAN_LABEL>Location From:</SCAN_LABEL><FIELDS SEPARATOR="" DELIMITER=""><FIELD>loc_code</FIELD></FIELDS></MAPPING_SCAN><MAPPING_SCAN ORDER="2"><SCAN_LABEL>LPN No:</SCAN_LABEL><FIELDS SEPARATOR="" DELIMITER=""><FIELD>lot_sl</FIELD></FIELDS></MAPPING_SCAN><INPUT_SCAN ORDER="1"><SCAN_LABEL>New LPN:</SCAN_LABEL><FIELDS SEPARATOR="" DELIMITER=""><FIELD>lot_sl__new</FIELD></FIELDS></INPUT_SCAN> <SCAN_CONDITION field="lot_sl__new">order_type != ''T''</SCAN_CONDITION></SCAN_INFO>'
+where win_name='w_active_repl_iss' and form_no='3';
+
+COMMIT;
 
-	commit;