Skip to content

B
business-java
Commit ad991d52 authored by kshinde's avatar kshinde
Browse files
Options

Changed logic for displaying MRP in side panel. 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@194362 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 8da0e397
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 3 deletions
webitm-dis/module-resource/jsp/ItemDetails.jsp
View file @ ad991d52
...@@ -10,9 +10,11 @@ if(userInfo != null) ...@@ -10,9 +10,11 @@ if(userInfo != null)
String siteCode = ((String) request.getParameter("site_code") == null) ? (String) request.getParameter("site_code") : (String) request.getParameter("site_code"); String siteCode = ((String) request.getParameter("site_code") == null) ? (String) request.getParameter("site_code") : (String) request.getParameter("site_code");
String quantity = ((String) request.getParameter("QUANTITY") == null) ? (String) request.getParameter("QUANTITY") : (String) request.getParameter("QUANTITY"); String quantity = ((String) request.getParameter("QUANTITY") == null) ? (String) request.getParameter("QUANTITY") : (String) request.getParameter("QUANTITY");
String lotNo = ((String) request.getParameter("LOT_NO") == null) ? (String) request.getParameter("LOT_NO") : (String) request.getParameter("LOT_NO");
System.out.println("itemList item ========>> ["+ item +"]"); System.out.println("itemList item ========>> ["+ item +"]");
System.out.println("sitecode ========>> ["+ siteCode +"]"); System.out.println("sitecode ========>> ["+ siteCode +"]");
System.out.println("quantity ========>> ["+ quantity +"]"); System.out.println("quantity ========>> ["+ quantity +"]");
System.out.println("lotNo ========>> ["+lotNo +"]");
if(item.equals("") || item.equals(null)) if(item.equals("") || item.equals(null))
{ {
...@@ -24,7 +26,7 @@ if(userInfo != null) ...@@ -24,7 +26,7 @@ if(userInfo != null)
//ItemDetails itemDetails = new ItemDetails(); //ItemDetails itemDetails = new ItemDetails();
ItemDetails itemDetails = new ItemDetails(userInfo); ItemDetails itemDetails = new ItemDetails(userInfo);
ArrayList<String> itemList = new ArrayList<String>(); ArrayList<String> itemList = new ArrayList<String>();
itemList = itemDetails.getItemListDetails(item ,siteCode,"","1000"); itemList = itemDetails.getItemListDetails(item ,siteCode,lotNo,quantity);
System.out.println("itemList inside jsp ::: ["+ itemList +"]"); System.out.println("itemList inside jsp ::: ["+ itemList +"]");
//Added and replace by sarita on 2nd JAN 2018 //Added and replace by sarita on 2nd JAN 2018
//String docList = itemDetails.getDocId(item); //String docList = itemDetails.getDocId(item);
......
webitm-dis/module-resource/jsp/ItemDetailsContainer.jsp
View file @ ad991d52
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
String item = ((String) request.getParameter("item_code") == null) ? "" : (String) request.getParameter("item_code"); String item = ((String) request.getParameter("item_code") == null) ? "" : (String) request.getParameter("item_code");
String siteCode = ((String) request.getParameter("site_code") == null) ? "" : (String) request.getParameter("site_code"); String siteCode = ((String) request.getParameter("site_code") == null) ? "" : (String) request.getParameter("site_code");
String quantity = ((String) request.getParameter("QUANTITY") == null) ? "" : (String) request.getParameter("QUANTITY"); String quantity = ((String) request.getParameter("QUANTITY") == null) ? "" : (String) request.getParameter("QUANTITY");
String lotNo = ((String) request.getParameter("LOT_NO") == null) ? "" : (String) request.getParameter("LOT_NO");
System.out.println("item inside ItemDetailsJSP "+item + "\t"+ "siteCodeinside ItemDetailsJSP "+siteCode+"quantity"+quantity); System.out.println("item inside ItemDetailsJSP "+item + "\t"+ "siteCodeinside ItemDetailsJSP "+siteCode+"quantity"+quantity);
if(siteCode.equals("site_code") || siteCode.equals("site_code__ship") || siteCode.equals("site_code__req") ) if(siteCode.equals("site_code") || siteCode.equals("site_code__ship") || siteCode.equals("site_code__req") )
{ {
...@@ -12,6 +13,6 @@ if(siteCode.equals("site_code") || siteCode.equals("site_code__ship") || siteCod ...@@ -12,6 +13,6 @@ if(siteCode.equals("site_code") || siteCode.equals("site_code__ship") || siteCod
<head> <head>
</head> </head>
<body style="overflow:hidden;"> <body style="overflow:hidden;">
<iframe src="/ibase/webitm/jsp/ItemDetails.jsp?item_code=<%=item%>&site_code=<%=siteCode%>&QUANTITY=<%=quantity%>" width="100%" height="100%" class="FrameFlowPanel" style="border:none;"></iframe> <iframe src="/ibase/webitm/jsp/ItemDetails.jsp?item_code=<%=item%>&site_code=<%=siteCode%>&QUANTITY=<%=quantity%>LOT_NO=<%=lotNo%>" width="100%" height="100%" class="FrameFlowPanel" style="border:none;"></iframe>
</body> </body>
</html> </html>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment