ItemMnfrIC.java

-Added item_code itemchange

SOrderForm.java
-Changes made to fix bug on itemchange of cust_code

system_entry.sql
-Defined pophelp for manufacturer and lock_group in item manufacturer menu


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

webitm-dis/ibase/webitm/ejb/dis/ItemMnfrIC.java

@@ -427,6 +427,7 @@ implements ItemMnfrICLocal, ItemMnfrICRemote
 		//GenericUtility genericUtility = GenericUtility.getInstance();
 		E12GenericUtility genericUtility = new E12GenericUtility();
 		ConnDriver connDriver = new ConnDriver();
+		itemCode = "";//Modified by Anjali R. on[01/10/2018]
 		try
 		{
 			sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
@@ -527,7 +528,34 @@ implements ItemMnfrICLocal, ItemMnfrICRemote
 					valueXmlString.append("<supp_name>").append("<![CDATA["+suppName+"]]>").append("</supp_name>");
 					valueXmlString.append("<city>").append("<![CDATA["+city+"]]>").append("</city>");
 				}
-				
+				//Modified by Anjali R. on[01/10/2018][Added itemchange for column "item_code"][Start]
+				else if (currentColumn.trim().equalsIgnoreCase("item_code"))
+				{
+					itemCode = checkNull(genericUtility.getColumnValue("item_code", dom));
+					
+					sql = "select descr from item where item_code = ?";
+					pstmt = conn.prepareStatement(sql);
+					pstmt.setString(1, itemCode);
+					rs = pstmt.executeQuery();
+					if (rs.next())
+					{
+						descr = checkNull(rs.getString(1));
+					}
+					if(rs != null)
+					{
+						rs.close();
+						rs = null;
+					}
+					if(pstmt != null)
+					{
+						pstmt.close();
+						pstmt = null;
+					}
+					System.out.println("itemCode---["+itemCode+"] \n descr---["+descr+"]");
+					valueXmlString.append("<item_code>").append("<![CDATA["+itemCode+"]]>").append("</item_code>");
+					valueXmlString.append("<item_descr>").append("<![CDATA["+descr+"]]>").append("</item_descr>");
+				}
+				//Modified by Anjali R. on[01/10/2018][Added itemchange for column "item_code"][End]
 				valueXmlString.append("</Detail1>");
 				break;
 			case 2:

webitm-dis/ibase/webitm/ejb/dis/SOrderForm.java

@@ -3135,8 +3135,22 @@ public class SOrderForm extends ValidatorEJB implements SOrderFormLocal, SOrderF
 						pstmt.close();
 						pstmt = null;
 						
-						double creditLmtDbl = Double.parseDouble(creditLmt.trim());
-						double totAmtAdjAmtDbl = Double.parseDouble(totAmtAdjAmt.trim());
+					//Modified by Anjali R. on[01/10/2018][Start]
+					//double creditLmtDbl = Double.parseDouble(creditLmt.trim());
+					//double totAmtAdjAmtDbl = Double.parseDouble(totAmtAdjAmt.trim());
+					double creditLmtDbl = 0.0;
+					double totAmtAdjAmtDbl = 0.0;
+					creditLmt = "";totAmtAdjAmt="";addr1="";addr2="";addr3="";city="";stateDescr="";countryDescr="";orderType="";
+					
+					if(creditLmt != null && creditLmt.trim().length() >0)
+					{
+						creditLmtDbl = Double.parseDouble(creditLmt.trim());
+					}
+					if(totAmtAdjAmt != null && totAmtAdjAmt.trim().length() > 0)
+					{
+						totAmtAdjAmtDbl = Double.parseDouble(totAmtAdjAmt.trim());
+					}
+					//Modified by Anjali R. on[01/10/2018][End]
 						creditLmtDbl = Double.parseDouble(df.format(creditLmtDbl));
 						totAmtAdjAmtDbl = Double.parseDouble(df.format(totAmtAdjAmtDbl));
 						//valueXmlString.append("<st_cust_outs>").append("Customer Outstanding : Rs.").append("<![CDATA["+totAmtAdjAmt.trim()+"]]>").append("</st_cust_outs>");

webitm-dis/module-resource/sql/system_entry.sql

@@ -118,4 +118,15 @@ ADD REAS_CODE__BKLIST CHAR(5);
 
 Supplier master---[End] added by Pooja S on 6 sept 18
 
+--------Added by Anjali R. on [01/10/2018][Pophelp for item manufacturing][Start]
 
+set DEFINE off;
+
+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,POPUP_XSL_NAME,AUTO_FILL_LEN,THUMB_OBJ,THUMB_IMAGE_COL,THUMB_ALT_COL,AUTO_MIN_LENGTH,OBJ_NAME__DS,DATA_MODEL_NAME,VALIDATE_DATA,ITEM_CHANGE,MSG_NO,LAYOUT,FILTER_EXPR)
+values ('SUPP_CODE__MNFR','W_ITEMMNFR','SELECT SUPP_CODE,SUPP_NAME,CITY FROM SUPPLIER WHERE SUPP_NAME LIKE ''%?%''',null,'SUPP CODE MNFR',0,0,sysdate,'BASE','BASE','0',null,':supp_code__mnfr',1,null,null,null,null,null,null,2,null,3,'SUPP_CODE','SUPP_CODE','SUPP_NAME',3,null,null,null,'SUPP_CODE:supp_code__mnfr,SUPP_NAME:supp_name,CITY:city',null,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,POPUP_XSL_NAME,AUTO_FILL_LEN,THUMB_OBJ,THUMB_IMAGE_COL,THUMB_ALT_COL,AUTO_MIN_LENGTH,OBJ_NAME__DS,DATA_MODEL_NAME,VALIDATE_DATA,ITEM_CHANGE,MSG_NO,LAYOUT,FILTER_EXPR)
+values ('LOCK_GROUP','W_ITEMMNFR','SELECT LOCK_GROUP,DESCR FROM LOCK_GROUP',null,'LOCK GROUP',0,0,sysdate,'BASE','BASE','0',null,null,1,null,null,null,null,null,null,2,null,3,'LOCK_GROUP','LOCK_GROUP','LOCK_GROUP',3,null,null,null,null,null,null,null);
+
+COMMIT;
+-------Added by Anjali R. on [01/10/2018][Pophelp for item manufacturing][End]
\ No newline at end of file