To merge src for WMS updated wave gen changes and phy item scan

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

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

@@ -1472,7 +1472,7 @@ public class PhyScanVerifyIC extends ValidatorEJB implements PhyScanVerifyICLoca
 									valueXmlString.append("<site_code>").append(siteCode).append("</site_code>\r\n");
 									valueXmlString.append("<loc_code><![CDATA[").append(checkNullAndTrim(locCode)).append("]]></loc_code>\r\n");
 									//valueXmlString.append("<location_descr>").append(locDescr).append("</location_descr>\r\n");
-									valueXmlString.append("<location_descr><![CDATA[").append(locDescr)).append("]]></location_descr>\r\n")
+									valueXmlString.append("<location_descr><![CDATA[").append(locDescr).append("]]></location_descr>\r\n");
 									valueXmlString.append("<lot_no>").append(checkNullAndTrim(lotNo)).append("</lot_no>\r\n");
 									valueXmlString.append("<lot_sl><![CDATA[").append(checkNullAndTrim(lotSl)).append("]]></lot_sl>\r\n");
 									valueXmlString.append("<quantity>").append(quantity).append("</quantity>\r\n");														

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

@@ -33994,9 +33994,10 @@ INSERT INTO POPHELP (
 	NULL,
 	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;
-