added loc_group field

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

webitm-mfg/ibase/webitm/ejb/mfg/WorderCampaign.java

@@ -89,6 +89,7 @@ public class WorderCampaign extends ProcessEJB implements WorderCampaignLocal, W
 		addUser="",addTerm="",addDate="",chgDate="",chgUser="",chgTerm="",valMfg="",campNo="",loginSiteCode="";
 		Double quantity = 0.0,currQty=0.0,conQstd=0.0,stdQty=0.0,quanMps=0.0;
 
+		String locGroupHdr="",locGroup="",subQuery1="";  // added by cpatil on 22/05/14 for locGroup display 
 
 		try {
 			sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
@@ -109,14 +110,15 @@ public class WorderCampaign extends ProcessEJB implements WorderCampaignLocal, W
 
 				fromDate = genericUtility.getColumnValue("date_from", headerDom);
 				toDate = genericUtility.getColumnValue("date_to", headerDom);
-				System.out.println(">>>>>>fromDate"+fromDate+">>>>D"+toDate);
+				locGroupHdr = checkNull( genericUtility.getColumnValue("loc_group", headerDom));    // added by cpatil on 22/05/14 for locGroup display
+				System.out.println(">>>>>>fromDate["+fromDate+"]>>>>toDate["+toDate+"]locGroupHdr["+locGroupHdr+"]");
 
-				System.out.println(">>>>>>>>>>MNNNN");
+				//System.out.println(">>>>>>>>>>MNNNN");
 				fromDateDtUtil = sdf.parse(fromDate);
 				fromDateDtSql = new java.sql.Date(fromDateDtUtil.getTime());
 
 
-				System.out.println(">>>>>>>>>>MNNNN>>>");
+				//System.out.println(">>>>>>>>>>MNNNN>>>");
 				toDateDtUtil = sdf.parse(toDate);
 				toDateDtSql = new java.sql.Date(toDateDtUtil.getTime());
 
@@ -141,6 +143,12 @@ public class WorderCampaign extends ProcessEJB implements WorderCampaignLocal, W
 				resultWorkOrdType = workOrdTypeSplit.substring(0, workOrdTypeSplit.length() - 1);
 				subQuery= " AND (WORKORDER.ORDER_TYPE in("+resultWorkOrdType+"))";
 			}
+			
+			if(locGroupHdr != null && (locGroupHdr.trim().length() > 0))      // added by cpatil on 22/05/14 for locGroup display
+			{
+				subQuery1= "  AND WORKORDER.LOC_GROUP = '"+locGroupHdr+"' ";
+			}
+			
 			//End Added by chandrashekar on 12-Feb-15
 			sql ="SELECT WORKORDER.TRAN_ID,WORKORDER.WORK_ORDER,"
 				+ "WORKORDER.ORDER_TYPE,"
@@ -152,17 +160,19 @@ public class WorderCampaign extends ProcessEJB implements WorderCampaignLocal, W
 				+ "ITEM.PHY_ATTRIB_4,ITEM.PHY_ATTRIB_5,ITEM.PHY_ATTRIB_6,"
 				+ "WORKORDER.TRAN_ID__MPS,"
 				+ "WORKORDER.ADD_DATE,WORKORDER.ADD_USER,WORKORDER.ADD_TERM,WORKORDER.CHG_DATE,"
-				+ "WORKORDER.CHG_USER,WORKORDER.CHG_TERM,WORKORDER.CAMPGN_NO"
-				+ " FROM"
+				+ "WORKORDER.CHG_USER,WORKORDER.CHG_TERM,WORKORDER.CAMPGN_NO " 
+				+ " , WORKORDER.LOC_GROUP "        // added by cpatil on 22/05/14 for locGroup display
+				+ " FROM "
 				+ "  WORKORDER  WORKORDER,ITEM  ITEM  WHERE  ( WORKORDER.ITEM_CODE      = ITEM.ITEM_CODE   ) AND ( WORKORDER.ORD_DATE    >=      ? )  AND ( WORKORDER.ORD_DATE    <=      ? )" 
 				//+ " AND WORKORDER.ORDER_TYPE='F' "
 				+ " AND WORKORDER.STATUS IN('P','M','U') AND WORKORDER.SITE_CODE = ? " //login sitecode added by mahendra dated 07-JAN-2014
-				+ " AND WORKORDER.CAMPGN_NO IS NULL"+subQuery;//subQuery condition added by chandrashekar on 12-feb-15
+				+ " AND WORKORDER.CAMPGN_NO IS NULL "+subQuery + subQuery1;//subQuery condition added by chandrashekar on 12-feb-15    // added by cpatil on 22/05/14 for locGroup display
 
 			pStmt = conn.prepareStatement(sql);
 			pStmt.setDate(1, fromDateDtSql);
 			pStmt.setDate(2, toDateDtSql);
 			pStmt.setString(3, loginSiteCode);
+			
 			rs = pStmt.executeQuery();
 			while (rs.next()) {
 				dataFound = true;
@@ -203,10 +213,11 @@ public class WorderCampaign extends ProcessEJB implements WorderCampaignLocal, W
 				chgUser = rs.getString("CHG_USER") == null ? "" : rs.getString("CHG_USER").trim();
 				chgTerm = rs.getString("CHG_TERM") == null ? "" : rs.getString("CHG_TERM").trim();
 				campNo = rs.getString("CAMPGN_NO") == null ? "" : rs.getString("CAMPGN_NO").trim();
-
+				locGroup = rs.getString("LOC_GROUP") == null ? "" : rs.getString("LOC_GROUP").trim();
 
 				resultData.append(tranID).append("\t");
 				resultData.append(workOrder).append("\t");
+				resultData.append(locGroup).append("\t");
 				resultData.append(bomCode).append("\t");
 				resultData.append(itemCode).append("\t");
 				resultData.append(shdscr).append("\t");
@@ -290,6 +301,15 @@ public class WorderCampaign extends ProcessEJB implements WorderCampaignLocal, W
 		return retString;
 	}
 
+	private String checkNull(String value)
+	{
+		if (value == null)
+		{
+			value = "";
+		}
+		return value;
+	}
+	
 	@Override
 	public String process(String xmlString, String xmlString2, String windowName, String xtraParams) throws RemoteException, ITMException {
 		System.out.println("^^^^^^^ Inside process -> Process Method 1 ^^^^^^^");
@@ -353,7 +373,10 @@ public class WorderCampaign extends ProcessEJB implements WorderCampaignLocal, W
 		GenericUtility genutility = null;
 		HashMap<String, String> comMap=new HashMap<String, String>();
 		String campItemWise="";
-
+		
+		String locGroup="",locGroupPreVal="";
+		boolean locGroupFlag = false;
+		
 		try {
 			connDriver = new ConnDriver();
 			conn = connDriver.getConnectDB("DriverITM");
@@ -388,6 +411,35 @@ public class WorderCampaign extends ProcessEJB implements WorderCampaignLocal, W
 					if (childNodeName.equals("work_order")) {
 						workorder = childNode.getFirstChild() == null ? "" : childNode.getFirstChild().getNodeValue();
 					}
+					
+					if (childNodeName.equals("loc_group")) {   //added by cpatil on 22/05/15 for validation of loc_group
+						locGroup = childNode.getFirstChild() == null ? "" : childNode.getFirstChild().getNodeValue();
+						
+						if(!(locGroupFlag))
+						{
+							locGroupPreVal = locGroup;
+						}
+							
+					}
+				}
+				
+				System.out.println(">>>>>locGroup i["+i+"].....locGroupPreVal["+locGroupPreVal+"]locGroup["+locGroup+"]locGroupFlag["+locGroupFlag+"]");
+				if( locGroupFlag )
+				{
+					 if(!(locGroupPreVal.equalsIgnoreCase(locGroup)))
+					 { 
+							System.out.println(">>>>>locGroup miss match......locGroupVal["+locGroupPreVal+"]locGroup["+locGroup+"]");
+							errCode = "VTLOCGRINV"; 
+							retString = itmDBAccessEJB.getErrorString("", errCode, "", "", conn);
+							
+							isError = true;
+							
+							return retString;
+					 }
+				}
+				else
+				{
+					locGroupFlag = true;
 				}
 
 				workorder = workorder == null ? "" : workorder.trim();
@@ -461,7 +513,7 @@ public class WorderCampaign extends ProcessEJB implements WorderCampaignLocal, W
 		System.out.println("GENERATED TRAN ID"+utranid);*/
 
 
-				System.out.println("WORK ORDER NO"+workorder);
+				System.out.println("WORK ORDER NO "+workorder);
 				sql = "select status from workorder where work_order = ?";
 				pstmt=conn.prepareStatement(sql);
 				pstmt.setString(1,workorder);
@@ -490,7 +542,7 @@ public class WorderCampaign extends ProcessEJB implements WorderCampaignLocal, W
 					}
 					else
 					{
-						conn.commit();
+					//	conn.commit();
 					}
 
 					pstmt.close(); 
@@ -515,7 +567,7 @@ public class WorderCampaign extends ProcessEJB implements WorderCampaignLocal, W
 					else
 					{
 
-						conn.commit();
+					//	conn.commit();
 						System.out.println(">>>>>process completed>>>>VV>>>>");
 						errCode = "VTWOCPRCGN"; // generated successfully
 						retString = itmDBAccessEJB.getErrorString("", errCode, "", "", conn);