changes done for to enter Distribution receipt number

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

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

@@ -79,6 +79,7 @@ public class GRNTransfWizIC extends ValidatorEJB implements GRNTransfWizICLocal,
 		String locCodeTo="";
 		String invStat="";
 		String loginSiteCode="";
+		String orderType="";
 		int cnt;
 		int cnt1 =0;
 		int count = 0;
@@ -127,8 +128,42 @@ public class GRNTransfWizIC extends ValidatorEJB implements GRNTransfWizICLocal,
 					if ("grn_no".equalsIgnoreCase(childNodeName))
 					{
 						grnNo = genericUtility.getColumnValue("grn_no", dom);
-						System.out.println("grnNo[" + grnNo + "]");
+						orderType = genericUtility.getColumnValue("order_type", dom);
+						System.out.println("orderType[" + orderType + "]");
+						if("D".equalsIgnoreCase(orderType))
+						{
+							if (grnNo != null && grnNo.trim().length() > 0)
+							{
+								sql = " select count(1) cnt from distord_rcp where tran_id = ?  and (case when confirmed is null then 'N' else confirmed end = 'Y') ";
+								pstmt = conn.prepareStatement(sql);
+								pstmt.setString(1, grnNo);
+								rs = pstmt.executeQuery();
+								cnt = 0;
+								if (rs.next())
+								{
+									cnt = rs.getInt("cnt");
+								}
+								rs.close();
+								rs = null;
+								System.out.println("cnt:::[" + cnt + "]");
+								pstmt.close();
+								pstmt = null;
+								if (cnt == 0)
+								{
+									errCode = "INVDGRNNO";
+									errList.add(errCode);
+									errFields.add(childNodeName.toLowerCase());
+								}
+							} else
+							{
+								errCode = "VTGRNBLK";
+								errList.add(errCode);
+								errFields.add(childNodeName.toLowerCase());
+							}
 							
+						}
+						else
+						{
 							if (grnNo != null && grnNo.trim().length() > 0)
 							{
 								sql = " select count(1) cnt from porcp where tran_id = ?  and (case when confirmed is null then 'N' else confirmed end = 'Y') ";
@@ -142,12 +177,13 @@ public class GRNTransfWizIC extends ValidatorEJB implements GRNTransfWizICLocal,
 								}
 								rs.close();
 								rs = null;
-							System.out.println("cnt:::["+cnt+"]");
+								System.out.println("cnt:::[" + cnt + "]");
 								pstmt.close();
 								pstmt = null;
 								if (cnt == 0)
 								{
-								errCode = "INVGRNNO";
+									//errCode = "INVGRNNO";
+									errCode = "INVDGRNNO";
 									errList.add(errCode);
 									errFields.add(childNodeName.toLowerCase());
 								}
@@ -159,6 +195,7 @@ public class GRNTransfWizIC extends ValidatorEJB implements GRNTransfWizICLocal,
 							}
 						}
 					}
+				}
 			}// case1
 				break;
 			case 2:
@@ -178,7 +215,25 @@ public class GRNTransfWizIC extends ValidatorEJB implements GRNTransfWizICLocal,
 					}
 					System.out.println(" detail columnName [" + childNodeName + "] detail columnValue [" + columnValue + "]");
 					grnNo = genericUtility.getColumnValue("grn_no", dom1);
+					orderType = genericUtility.getColumnValue("order_type", dom1);
 					System.out.println("grnNodom1:"+grnNo);
+					if("D".equalsIgnoreCase(orderType))
+					{
+						sql = "select site_code from distord_rcp where tran_id = ?";
+						pstmt = conn.prepareStatement(sql);
+						pstmt.setString(1, grnNo);
+						rs = pstmt.executeQuery();
+						if (rs.next())
+						{
+							siteCode = rs.getString("site_code");
+						}
+						rs.close();
+						rs = null;
+						pstmt.close();
+						pstmt = null;
+					}
+					else
+					{
 						sql = "select site_code from porcp where tran_id = ?";
 						pstmt = conn.prepareStatement(sql);
 						pstmt.setString(1, grnNo);
@@ -191,7 +246,7 @@ public class GRNTransfWizIC extends ValidatorEJB implements GRNTransfWizICLocal,
 						rs = null;
 						pstmt.close();
 						pstmt = null;
-					
+					}
 					if (childNodeName.equalsIgnoreCase("site_code"))
 					{
 						loginSiteCode = genericUtility.getColumnValue("site_code", dom);
@@ -455,7 +510,7 @@ public class GRNTransfWizIC extends ValidatorEJB implements GRNTransfWizICLocal,
 		int newInt = 0;
 		String tranId="";
 		String sql1="";
-		String locCodeTo="",containerNo="",packRef="";
+		String locCodeTo="",containerNo="",packRef="",orderType="";
 		
 		Connection conn = null;
 		PreparedStatement pstmt = null;
@@ -559,8 +614,95 @@ public class GRNTransfWizIC extends ValidatorEJB implements GRNTransfWizICLocal,
 				if( currentColumn.trim().equalsIgnoreCase( "itm_default" ) )							
 				{
 					grnNo = genericUtility.getColumnValue( "grn_no", dom1 );
-					System.out.println("grnNo["+grnNo+"]");
+					orderType = genericUtility.getColumnValue( "order_type", dom1 );
+					System.out.println("orderType::["+orderType+"]");
+					if("D".equalsIgnoreCase(orderType))
+					{
+						sql = "select site_code from distord_rcp where tran_id = ?";
+						pstmt = conn.prepareStatement(sql);
+						pstmt.setString(1, grnNo);
+						rs = pstmt.executeQuery();
+						if (rs.next())
+						{
+							siteCode = rs.getString("site_code");
+						}
+						rs.close();
+						rs = null;
+						pstmt.close();
+						pstmt = null;
+						sql = "select line_no,item_code,loc_code,lot_sl,lot_no,unit,no_art,quantity from distord_rcpdet where tran_id= ?";
+						pstmt = conn.prepareStatement(sql);
+						pstmt.setString(1, grnNo);
+						rs = pstmt.executeQuery();
+						while (rs.next())
+						{
+							itemCode = rs.getString("item_code").trim();
+							locCode = rs.getString("loc_code").trim();
+							lotNo = rs.getString("lot_no").trim();
+							lotSl = rs.getString("lot_sl").trim();
+							quantity = rs.getDouble("quantity");
 														
+							sql1 = " SELECT stock.loc_code,stock.lot_sl,stock.lot_no, stock.no_art,stock.item_code,   "
+									+ " stock.site_code, stock.qty_per_art, stock.quantity  - case "
+									+ " when stock.alloc_qty is null then 0 else stock.alloc_qty end as quantity, "
+									+ " stock.acct_code__inv,stock.cctr_code__inv FROM stock,invstat  "
+									+ " WHERE ( stock.inv_stat = invstat.inv_stat ) and  " 
+									+ " ( stock.item_code = ? ) AND  " 
+									+ " ( stock.site_code = ?) AND  "
+									// +" ( stock.inv_stat = 'GRL') AND  "
+									+ " ( stock.loc_code = ?) AND  "
+									+ " ( stock.lot_no = ?) AND  " 
+									+ " ( stock.quantity  - case when stock.alloc_qty is null then 0 else stock.alloc_qty end >  0 )" 
+									+ " order by stock.lot_no,stock.lot_sl ";
+							pstmt1 = conn.prepareStatement(sql1);
+							pstmt1.setString(1, itemCode);
+							pstmt1.setString(2, siteCode);
+							pstmt1.setString(3, locCode);
+							pstmt1.setString(4, lotNo);
+							rs1 = pstmt1.executeQuery();
+							while (rs1.next())
+							{
+								locCode = rs1.getString("loc_code").trim();
+								lotSl = rs1.getString("lot_sl").trim();
+								siteCode = rs1.getString("site_code").trim();
+								quantity = rs1.getDouble("quantity");
+								noArt = rs1.getInt("no_art");
+								qtyPerArt = rs1.getDouble("qty_per_art");
+								acctCode = rs1.getString("acct_code__inv");
+								cctrCode = rs1.getString("cctr_code__inv");
+								domID++;
+								lineNo++;
+								itemDescr = findValue(conn, "descr", "item", "item_code", itemCode);
+								locDescr = findValue(conn, "descr", "location", "loc_code", locCode);
+
+								valueXmlString.append("<Detail3 domID='" + domID + "' selected=\"N\">\r\n");
+								valueXmlString.append("<attribute  selected=\"N\"  status=\"Y\" pkNames=\"\" />\r\n");
+								valueXmlString.append("<tran_id/>\r\n");
+								valueXmlString.append("<line_no><![CDATA[").append(lineNo).append("]]></line_no>\r\n");
+								valueXmlString.append("<item_code><![CDATA[").append(checkNull(itemCode)).append("]]></item_code>\r\n");
+								valueXmlString.append("<item_descr><![CDATA[").append(checkNull(itemDescr)).append("]]></item_descr>\r\n");
+								valueXmlString.append("<loc_code__fr><![CDATA[").append(checkNull(locCode)).append("]]></loc_code__fr>\r\n");
+								valueXmlString.append("<loc_descr__fr><![CDATA[").append(checkNull(locDescr)).append("]]></loc_descr__fr>\r\n");
+								valueXmlString.append("<loc_code__to><![CDATA[").append("").append("]]></loc_code__to>\r\n");
+								valueXmlString.append("<lot_no__fr><![CDATA[").append(checkNull(lotNo)).append("]]></lot_no__fr>\r\n");
+								valueXmlString.append("<lot_no__to><![CDATA[").append(checkNull(lotNo)).append("]]></lot_no__to>\r\n");
+								valueXmlString.append("<lot_sl__fr><![CDATA[").append(checkNullAndTrim(lotSl)).append("]]></lot_sl__fr>\r\n");
+								valueXmlString.append("<lot_sl__to><![CDATA[").append(checkNullAndTrim(lotSl)).append("]]></lot_sl__to>\r\n");
+								valueXmlString.append("<quantity><![CDATA[").append(quantity).append("]]></quantity>\r\n");
+								valueXmlString.append("<unit><![CDATA[").append(unit).append("]]></unit>\r\n");
+								valueXmlString.append("<no_art><![CDATA[").append(noArt).append("]]></no_art>\r\n");
+								valueXmlString.append("<line_no_sl><![CDATA[").append("1").append("]]></line_no_sl>\r\n");
+								valueXmlString.append("<no_art><![CDATA[").append(noArt).append("]]></no_art>\r\n");
+								valueXmlString.append("<acct_code__cr><![CDATA[").append(checkNull(acctCode)).append("]]></acct_code__cr>\r\n");
+								valueXmlString.append("<cctr_code__cr><![CDATA[").append(checkNull(cctrCode)).append("]]></cctr_code__cr>\r\n");
+								valueXmlString.append("<acct_code__dr><![CDATA[").append(checkNull(acctCode)).append("]]></acct_code__dr>\r\n");
+								valueXmlString.append("<cctr_code__dr><![CDATA[").append(checkNull(cctrCode)).append("]]></cctr_code__dr>\r\n");
+								valueXmlString.append("</Detail3>");
+							}
+						}
+					}
+					else
+					{
 						sql = "select site_code from porcp where tran_id = ?";
 						pstmt = conn.prepareStatement(sql);
 						pstmt.setString(1, grnNo);
@@ -575,30 +717,30 @@ public class GRNTransfWizIC extends ValidatorEJB implements GRNTransfWizICLocal,
 						pstmt = null;
 
 						sql = "select line_no,item_code,loc_code,lot_sl,lot_no,unit,no_art,quantity from porcpdet where tran_id= ?";
-					pstmt = conn.prepareStatement( sql );
-					pstmt.setString( 1, grnNo );						
+						pstmt = conn.prepareStatement(sql);
+						pstmt.setString(1, grnNo);
 						rs = pstmt.executeQuery();
-					while( rs.next() )
+						while (rs.next())
 						{
 							itemCode = rs.getString("item_code").trim();
 							locCode = rs.getString("loc_code").trim();
 							lotNo = rs.getString("lot_no").trim();
 							lotSl = rs.getString("lot_sl").trim();
 							quantity = rs.getDouble("quantity");
-						System.out.println("porcpdet quantity:"+quantity);
+							System.out.println("porcpdet quantity:" + quantity);
 
 							sql1 = " SELECT stock.loc_code,stock.lot_sl,stock.lot_no, stock.no_art,stock.item_code,   "
 									+ " stock.site_code, stock.qty_per_art, stock.quantity  - case "
-								+" when stock.alloc_qty is null then 0 else stock.alloc_qty end as quantity, "
-								+" stock.acct_code__inv,stock.cctr_code__inv FROM stock,invstat  "
-								+" WHERE ( stock.inv_stat = invstat.inv_stat ) and  "
-								+" ( stock.item_code = ? ) AND  "
-								+" ( stock.site_code = ?) AND  "
-								//+" ( stock.inv_stat = 'GRL') AND  "
-								+" ( stock.loc_code = ?) AND  "
-								+" ( stock.lot_no = ?) AND  "
-								+" ( stock.quantity  - case when stock.alloc_qty is null then 0 else stock.alloc_qty end >  0 )"
-								+" order by stock.lot_no,stock.lot_sl ";
+									+ " when stock.alloc_qty is null then 0 else stock.alloc_qty end as quantity, "
+									+ " stock.acct_code__inv,stock.cctr_code__inv FROM stock,invstat  "
+									+ " WHERE ( stock.inv_stat = invstat.inv_stat ) and  " 
+									+ " ( stock.item_code = ? ) AND  " 
+									+ " ( stock.site_code = ?) AND  "
+									// +" ( stock.inv_stat = 'GRL') AND  "
+									+ " ( stock.loc_code = ?) AND  "
+									+ " ( stock.lot_no = ?) AND  " 
+									+ " ( stock.quantity  - case when stock.alloc_qty is null then 0 else stock.alloc_qty end >  0 )" 
+									+ " order by stock.lot_no,stock.lot_sl ";
 							pstmt1 = conn.prepareStatement(sql1);
 							pstmt1.setString(1, itemCode);
 							pstmt1.setString(2, siteCode);
@@ -613,12 +755,12 @@ public class GRNTransfWizIC extends ValidatorEJB implements GRNTransfWizICLocal,
 								quantity = rs1.getDouble("quantity");
 								noArt = rs1.getInt("no_art");
 								qtyPerArt = rs1.getDouble("qty_per_art");
-							acctCode = rs1.getString("acct_code__inv").trim();
-							cctrCode = rs1.getString("cctr_code__inv").trim();
+								acctCode = rs1.getString("acct_code__inv");
+								cctrCode = rs1.getString("cctr_code__inv");
 								domID++;
 								lineNo++;
-							//for (int i = 1; i <= noArt; i++)
-							//{
+								// for (int i = 1; i <= noArt; i++)
+								// {
 								itemDescr = findValue(conn, "descr", "item", "item_code", itemCode);
 								locDescr = findValue(conn, "descr", "location", "loc_code", locCode);
 
@@ -645,16 +787,18 @@ public class GRNTransfWizIC extends ValidatorEJB implements GRNTransfWizICLocal,
 								valueXmlString.append("<acct_code__dr><![CDATA[").append(checkNull(acctCode)).append("]]></acct_code__dr>\r\n");
 								valueXmlString.append("<cctr_code__dr><![CDATA[").append(checkNull(cctrCode)).append("]]></cctr_code__dr>\r\n");
 								valueXmlString.append("</Detail3>");
-							//}
+								// }
 							}
 							rs1.close();
 							rs1 = null;
 							pstmt1.close();
 							pstmt1 = null;
 						}
-					rs.close();rs = null;
-					pstmt.close();pstmt = null;
-					
+						rs.close();
+						rs = null;
+						pstmt.close();
+						pstmt = null;
+					}
 					
 				}//itm_detault
 				break;