Sarita : Done changes on 18MARCH2018

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

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

@@ -112,6 +112,7 @@ public class SRLContainerSplit extends ActionHandlerEJB implements SRLContainerS
 		java.sql.Timestamp lastRcpDate = null;
 		java.sql.Timestamp lastIssDate = null;
 		java.sql.Timestamp lastPhyDate = null;
+		java.sql.Timestamp tranSerialDate = null;
 		StringBuffer valueXmlforIssue = new StringBuffer();
 		StringBuffer valueXmlforReceipt = new StringBuffer();
 		boolean issueCondition = false;
@@ -125,8 +126,8 @@ public class SRLContainerSplit extends ActionHandlerEJB implements SRLContainerS
 			//conn = getConnection();
 			userId = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginCode");
 			SimpleDateFormat simpleDateFormat = new SimpleDateFormat(genericUtility.getApplDateFormat());
-			
-			sql = "select item_code , lot_no , lot_sl from srl_container where serial_no=?";
+			//Added by sarita on 18MARCH2018
+			sql = "select item_code , lot_no , lot_sl,serial_date from srl_container where serial_no=?";
 			pstmt = conn.prepareStatement(sql);
 			pstmt.setString(1, tranId);
 			rs = pstmt.executeQuery();
@@ -135,6 +136,7 @@ public class SRLContainerSplit extends ActionHandlerEJB implements SRLContainerS
 				itemCodeHdr = rs.getString("item_code");
 				lotNoHdr = rs.getString("lot_no");
 				lotSlHdr = rs.getString("lot_sl");
+				tranSerialDate = rs.getTimestamp("serial_date");
 				System.out.println("For Header Data ::::[item_code ["+itemCodeHdr+"]] \t [lot_no ["+lotNoHdr+"]] \t [lot_sl ["+lotSlHdr+"]]");
 			}
 			if(rs != null){rs.close();rs = null;}
@@ -151,12 +153,18 @@ public class SRLContainerSplit extends ActionHandlerEJB implements SRLContainerS
 				cnt = rs.getInt("cnt");
 				System.out.println("Total Records of Stock ::"+cnt);
 			}
-			if(cnt > 0)
+			//changes by sarita on 18MARCH2018
+			if(cnt == 0)
+			{
+				retSting = itmDBAccessEJB.getErrorString("", "VTNOSTK", "");//itmDBAccessEJB.getErrorString("","VTBLNKDTL","","",conn);
+    			return retSting;
+			}
+			if(cnt > 1)
 			{
 				retSting = itmDBAccessEJB.getErrorString("", "INVRCDSTOC", "");//itmDBAccessEJB.getErrorString("","VTBLNKDTL","","",conn);
     			return retSting;
 			}
-						
+			//changes by sarita (quantity > 0) on 18MARCH 2018			
 			sql =     "SELECT SITE_CODE , LOC_CODE , ITEM_SER, QUANTITY, UNIT, GRADE , CREA_DATE , EXP_DATE , LTRAN_DATE , REMARKS , INV_STAT ," +
 					  "ALLOC_QTY , PACK_CODE , MFG_DATE , SITE_CODE__MFG , POTENCY_PERC , LAST_RCP_DATE , LAST_ISS_DATE , RATE , LAST_PHYC_DATE , " +
 					  "GROSS_WEIGHT , TARE_WEIGHT , NET_WEIGHT , PACK_INSTR , DIMENSION , SUPP_CODE__MFG , ACCT_CODE__INV , CCTR_CODE__INV , RATE__OH ," +
@@ -165,7 +173,7 @@ public class SRLContainerSplit extends ActionHandlerEJB implements SRLContainerS
 					  "CONSIDER_ALLOCATE , PALLET_NO FROM STOCK "
 					  + "WHERE ITEM_CODE = ? "
 					  + "AND LOT_NO = ? "
-					  + "and LOT_SL = ? ";
+					  + "and LOT_SL = ? and quantity > 0";
 					 
 			pstmtStock = conn.prepareStatement(sql);
 			pstmtStock.setString(1,itemCodeHdr);
@@ -248,8 +256,10 @@ public class SRLContainerSplit extends ActionHandlerEJB implements SRLContainerS
 						valueXmlforIssue.append("<Detail1 dbID=\"\" domID=\"1\" objContext=\"1\" objName=\"adj_iss\">\n");
 						valueXmlforIssue.append("<attribute pkNames=\"\" selected=\"N\" status=\"O\" updateFlag=\"A\"/>\n");
 						valueXmlforIssue.append("<tran_id/>\n");
-						valueXmlforIssue.append("<tran_date><![CDATA[").append((ltranDate==null)?"":simpleDateFormat.format(ltranDate)).append("]]></tran_date>\n");
-						valueXmlforIssue.append("<eff_date><![CDATA[").append(simpleDateFormat.format(new Date())).append("]]></eff_date>\n");
+						//valueXmlforIssue.append("<tran_date><![CDATA[").append((ltranDate==null)?"":simpleDateFormat.format(ltranDate)).append("]]></tran_date>\n");
+						valueXmlforIssue.append("<tran_date><![CDATA[").append((tranSerialDate==null)?"":simpleDateFormat.format(tranSerialDate)).append("]]></tran_date>\n");
+						valueXmlforIssue.append("<eff_date><![CDATA[").append((tranSerialDate==null)?"":simpleDateFormat.format(tranSerialDate)).append("]]></eff_date>\n");
+						//valueXmlforIssue.append("<eff_date><![CDATA[").append(simpleDateFormat.format(new Date())).append("]]></eff_date>\n");
 						valueXmlforIssue.append("<ref_ser><![CDATA[").append("ADJISS").append("]]></ref_ser>\n");
 						valueXmlforIssue.append("<order_id><![CDATA[").append("").append("]]></order_id>\n");
 						valueXmlforIssue.append("<site_code><![CDATA[").append(siteCode).append("]]></site_code>\n");
@@ -343,8 +353,10 @@ public class SRLContainerSplit extends ActionHandlerEJB implements SRLContainerS
 					valueXmlforReceipt.append("<Detail1 dbID=\"\" domID=\"1\" objContext=\"1\" objName=\"adj_rcp\">\n");
 					valueXmlforReceipt.append("<attribute pkNames=\"\" selected=\"N\" status=\"O\" updateFlag=\"A\"/>\n");
 					valueXmlforReceipt.append("<tran_id/>\n");
-					valueXmlforReceipt.append("<tran_date><![CDATA[").append((ltranDate==null)?"":simpleDateFormat.format(ltranDate)).append("]]></tran_date>\n");
-					valueXmlforReceipt.append("<eff_date><![CDATA[").append(simpleDateFormat.format(new Date())).append("]]></eff_date>\n");
+					//valueXmlforReceipt.append("<tran_date><![CDATA[").append((ltranDate==null)?"":simpleDateFormat.format(ltranDate)).append("]]></tran_date>\n");
+					valueXmlforReceipt.append("<tran_date><![CDATA[").append((tranSerialDate==null)?"":simpleDateFormat.format(tranSerialDate)).append("]]></tran_date>\n");
+					//valueXmlforReceipt.append("<eff_date><![CDATA[").append(simpleDateFormat.format(new Date())).append("]]></eff_date>\n");
+					valueXmlforReceipt.append("<eff_date><![CDATA[").append((tranSerialDate==null)?"":simpleDateFormat.format(tranSerialDate)).append("]]></eff_date>\n");
 					valueXmlforReceipt.append("<ref_ser><![CDATA[ADJRCP]]></ref_ser>\n");
 					valueXmlforReceipt.append("<order_id><![CDATA[").append("").append("]]></order_id>\n");
 					valueXmlforReceipt.append("<site_code><![CDATA[").append(siteCode).append("]]></site_code>\n");
@@ -519,7 +531,8 @@ public class SRLContainerSplit extends ActionHandlerEJB implements SRLContainerS
 				    
 				    	if(tranIdForReciept.length() > 0 && flagSaveString == "")
 				    	{
-				    		sql = "update srl_contentainer set status ='C' where serial_no=?";
+				    	    //changes by sarita on 18MARCH2018
+				    		sql = "update srl_container set status ='C' where serial_no=?";
 				    		pstmt = conn.prepareStatement(sql);
 				    		pstmt.setString(1, tranId);
 				    		int j = pstmt.executeUpdate();