Many bug fixing and validation as per requirement

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

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

@@ -143,9 +143,9 @@ public class DespatchPrs extends ValidatorEJB implements DespatchPrsLocal, Despa
 			
 			currDetail	 = getCurrentDetailFromDom(dom,domID);
 			updateStatus = getCurrentUpdateFlag(currDetail);
-			System.out.println("*************** Update Status *************** ");
-			System.out.println("DomID :: "+domID+"\n Update Status ::"+updateStatus);
-			System.out.println("*************** Update Status *************** ");
+			
+			System.out.println("manohar executepreSaveRec DomID ["+domID+"] Update Status ["+updateStatus + "]");
+			
 			//01/11/2012 manoj sharma for deallocation
 			int length=0;
 			NodeList parentNodeList = null;
@@ -162,9 +162,12 @@ public class DespatchPrs extends ValidatorEJB implements DespatchPrsLocal, Despa
 			double totAllocQty=0;
 			if (currDetail != null ) //&& !updateStatus.equalsIgnoreCase("A")) // 22/02/10 manoharan if allocation found in sordalloc the deallocate
 			{
-				currlineNo      =GenericUtility.getInstance().getColumnValueFromNode("line_no",currDetail);
-				itemCode		= GenericUtility.getInstance().getColumnValueFromNode("item_code",currDetail);
+
+				//if (!updateStatus.equalsIgnoreCase("A")) // 09/10/14 manoharan edit/delete mode get detail from database
+				
 				lineNo			= GenericUtility.getInstance().getColumnValueFromNode("line_no",currDetail);
+         		currlineNo      =GenericUtility.getInstance().getColumnValueFromNode("line_no",currDetail);
+				itemCode		= GenericUtility.getInstance().getColumnValueFromNode("item_code",currDetail);
 				locCode			= GenericUtility.getInstance().getColumnValueFromNode("loc_code",currDetail);
 				lotNo			= GenericUtility.getInstance().getColumnValueFromNode("lot_no",currDetail);
 				lotSl			= GenericUtility.getInstance().getColumnValueFromNode("lot_sl",currDetail);
@@ -173,6 +176,8 @@ public class DespatchPrs extends ValidatorEJB implements DespatchPrsLocal, Despa
 				itemCodeOrd		= GenericUtility.getInstance().getColumnValueFromNode("item_code__ord",currDetail);
 				sordNo			= GenericUtility.getInstance().getColumnValueFromNode("sord_no",currDetail);
 				lineNoSord		= GenericUtility.getInstance().getColumnValueFromNode("line_no__sord",currDetail);
+
+
 				currkey=itemCode.trim()+"@"+sordNo.trim()+"@"+lineNoSord.trim()+"@"+locCode.trim()+"@"+lotNo.trim()+"@"+lotSl.trim()+"@"+expLev.trim()+"@"+itemCodeOrd.trim();
 				System.out.println("currkey---"+currkey);
 				sql="SELECT SUM(QUANTITY) FROM DESPATCHDET "
@@ -428,20 +433,24 @@ public class DespatchPrs extends ValidatorEJB implements DespatchPrsLocal, Despa
 										+"AND LOT_NO = '"+lotNo+"' "
 										+"AND LOT_SL = '"+lotSl+"' ";
 									//	+"AND ALLOC_MODE = 'A' "; //Commented by Jiten 10/10/06 as Commented in PB - manual allocation should also get deallocated.
-						System.out.println("Select SQL sqlSordAlloc :"+sqlSordAlloc);
+						System.out.println("manohar Select SQL sqlSordAlloc ["+sqlSordAlloc + "]");
+						System.out.println("manohar executepreSaveRec DomID ["+domID+"] Update Status ["+updateStatus + "]");
 						rs1 = stmt1.executeQuery(sqlSordAlloc);
 						if (rs1.next())
 						{
 							qtyAlloc = rs1.getDouble(1);
-							System.out.println("qtyAlloc :"+qtyAlloc);
+							//System.out.println("qtyAlloc :"+qtyAlloc);
 
 							if (String.valueOf(qtyAlloc) == null)
 							{
 								qtyAlloc = 0;
 							}
 							// 22/02/10 manoharan if allocation found in sordalloc then deallocate
+							
+							System.out.println("manohar executepreSaveRec qtyAlloc ["+qtyAlloc+"] qtyStduom ["+qtyStduom + "]");
 							if (qtyAlloc - qtyStduom <= 0)
 							{
+								System.out.println("manohar executepreSaveRec deleting qtyAlloc ["+qtyAlloc+"] qtyStduom ["+qtyStduom + "]");
 								sqlSord = "DELETE FROM SORDALLOC WHERE SALE_ORDER = ? "
 									 +"AND LINE_NO = ? "
 									 +"AND EXP_LEV = ? " 
@@ -450,7 +459,7 @@ public class DespatchPrs extends ValidatorEJB implements DespatchPrsLocal, Despa
 									 +"AND LOT_NO = ? " 
 									 +"AND LOT_SL = ? "
 									 +"AND LOC_CODE = ? ";
-								System.out.println("Delete sql sqlSord :"+sqlSord);
+								//System.out.println("Delete sql sqlSord :"+sqlSord);
 								pstmt = conn.prepareStatement(sqlSord);
 								pstmt.setString(1,sordNo);
 								pstmt.setString(2,lineNoSord);
@@ -467,6 +476,7 @@ public class DespatchPrs extends ValidatorEJB implements DespatchPrsLocal, Despa
 							}
 							else
 							{
+								System.out.println("manohar executepreSaveRec updating qtyAlloc ["+qtyAlloc+"] qtyStduom ["+qtyStduom + "]");
 								sqlSord = "UPDATE SORDALLOC SET QTY_ALLOC = QTY_ALLOC - ? "
 									  +"WHERE SALE_ORDER = ? "
 									  +"AND LINE_NO = ? "
@@ -476,7 +486,7 @@ public class DespatchPrs extends ValidatorEJB implements DespatchPrsLocal, Despa
 									  +"AND LOT_NO = ? "
 									  +"AND LOT_SL = ? "
 									  +"AND LOC_CODE = ? ";
-								System.out.println("Update sql sqlSord :"+sqlSord);
+								//System.out.println("Update sql sqlSord :"+sqlSord);
 								pstmt = conn.prepareStatement(sqlSord);
 								pstmt.setDouble(1,qtyStduom);
 								pstmt.setString(2,sordNo);

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

@@ -131,10 +131,16 @@ public class DespatchWiz extends ValidatorEJB implements DespatchWizLocal, Despa
 		StringBuffer errStringXml = new StringBuffer("<?xml version=\"1.0\"?>\r\n<Root><Errors>");
 		ArrayList <String> errList = new ArrayList<String>();
 		ArrayList <String>errFields = new ArrayList <String> ();
-		String sql = "",locCode ="",invstat="",aval="",avalyn="",status="",errorType="";
+		String sql = "",locCode ="",invstat="",aval="",avalyn="",status="",errorType="",despId = "";
         double qtyConf=0,qtyShip=0,totQty=0,detquantity=0,stkquantity=0,quantity=0,totquantity=0;
 		String squantity="",distOrder = "",itemCode="",confirmed="",tranId="",siteCode="",lotSl="",addUser="",tranCode="";
 		String itemCodeL="",SiteCodeL="",CustCodeL="",ChanPart="",sorderNo="";
+		ArrayList<String> lockList=new ArrayList<String>();
+		HashMap<String,String>invHoldMap=new HashMap<String,String>();
+		String lotNo="",locCodeL="",qcLockValue="";
+		double sdetQty=0,despatchQty=0,actQty=0;
+		ArrayList <String> itemCodeList=new ArrayList<String>();					
+		int count=0;
 
 		try {
 			genericUtility = GenericUtility.getInstance();
@@ -348,6 +354,29 @@ public class DespatchWiz extends ValidatorEJB implements DespatchWizLocal, Despa
 							}
 						}
 					}
+					else if(childNodeName.equalsIgnoreCase("desp_id"))
+					{
+
+						despId = genericUtility.getColumnValue("desp_id",dom2);
+						sql = "select count(1) from ship_docs where ref_ser = 'S-DSP' and ref_id = ?";
+						pstmt=conn.prepareStatement(sql);
+						pstmt.setString(1,tranId);
+						rs = pstmt.executeQuery();
+						if(rs.next())
+						{
+							cnt = rs.getInt(1);
+						}
+						pstmt.close();
+						rs.close();
+						pstmt = null;
+						rs = null;
+						if(cnt > 0)
+						{
+							errCode = "DIDOEISHDO";
+							errList.add( errCode );
+							errFields.add( childNodeName.toLowerCase() );
+						}
+					}
 
 
 				}
@@ -411,9 +440,7 @@ public class DespatchWiz extends ValidatorEJB implements DespatchWizLocal, Despa
 					else if(childNodeName.equalsIgnoreCase("item_code"))
 					{
 						System.out.println("----------in wfvaldata of item_code............");
-						ArrayList <String> itemCodeList=new ArrayList<String>();					
-						String qcLockValue="";
-						int count=0;
+						qcLockValue="";
 						sorderNo = checkNull(genericUtility.getColumnValue("sale_order_no", dom1));
 						itemCode = checkNull(genericUtility.getColumnValue("item_code", dom2,"3"));
 						//lotSlL=checkNull(genericUtility.getColumnValue("lot_sl", dom2,"3"));
@@ -458,10 +485,6 @@ public class DespatchWiz extends ValidatorEJB implements DespatchWizLocal, Despa
 					else if(childNodeName.equalsIgnoreCase("quantity")) 
 					{	
 						System.out.println("-------------wfvalData..quantity.............");
-						String lotNo="",locCodeL="",despId="",qcLockValue="";
-						double sdetQty=0,despatchQty=0,actQty=0;
-						ArrayList<String> lockList=new ArrayList<String>();
-						HashMap<String,String>invHoldMap=new HashMap<String,String>();
 						sorderNo = checkNull(genericUtility.getColumnValue("sale_order_no", dom1));
 						squantity = genericUtility.getColumnValue("quantity",dom2);
 						siteCode = genericUtility.getColumnValue("site_code",dom2,"2");

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

@@ -237,10 +237,6 @@ public class DistIssWiz extends ValidatorEJB implements DistIssWizLocal, DistIss
 
 					}
 
-
-
-
-
 				}
 				break;
 			case 2:
@@ -337,6 +333,29 @@ public class DistIssWiz extends ValidatorEJB implements DistIssWizLocal, DistIss
 							}
 						}
 					}
+					else if(childNodeName.equalsIgnoreCase("tran_id"))
+					{
+
+						tranId = genericUtility.getColumnValue("tran_id",dom2);
+						sql = "select count(1) from ship_docs where ref_ser = 'D-ISS' and ref_id = ?";
+						pstmt=conn.prepareStatement(sql);
+						pstmt.setString(1,tranId);
+						rs = pstmt.executeQuery();
+						if(rs.next())
+						{
+							cnt = rs.getInt(1);
+						}
+						pstmt.close();
+						rs.close();
+						pstmt = null;
+						rs = null;
+						if(cnt > 0)
+						{
+							errCode = "DIDOEISHDO";
+							errList.add( errCode );
+							errFields.add( childNodeName.toLowerCase() );
+						}
+					}
 
 
 				}