modify for noart, netweight, feedback reqd for supreme

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

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

@@ -8791,7 +8791,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
 
 			//pstmtWorkOrder = conn.prepareStatement(sqlWorkOrder);
 
-			String sqlMpsOrder = "INSERT INTO MPS_ORDER(TRAN_ID,ORDER_TYPE,ITEM_CODE,SITE_CODE, " + "QUANTITY,ORD_DATE,PLAN_DUE_DATE,MRP_RUN_ID, " + "ADDN_ORDER,DUE_DATE,STATUS,STATUS_DATE,YIELD_PERC,ROUTE_CODE, " + "BOM_CODE,PROJ_CODE,CHG_DATE,CHG_USER,CHG_TERM,UNIT, " + "ACCT_CODE__WP,CCTR_CODE__WP,CURRENT_BATCH_QTY,UNIT__STD,STD_QTY,CONV__QTY_STDUOM,SALE_ORDER,LINE_NO) " + "VALUES ( ? , ? , ? , ? , ? ," + " ? , ? , ? , ? , ? ," + " ? , ? , ? , ? , ? ," + " ? , ? , ? , ? , ? ," + " ? , ? , ? ,?, ?, ?,?,?)";
+			String sqlMpsOrder = "INSERT INTO MPS_ORDER(TRAN_ID,ORDER_TYPE,ITEM_CODE,SITE_CODE, " + "QUANTITY,ORD_DATE,PLAN_DUE_DATE,MRP_RUN_ID, " + "ADDN_ORDER,DUE_DATE,STATUS,STATUS_DATE,YIELD_PERC,ROUTE_CODE, " + "BOM_CODE,PROJ_CODE,CHG_DATE,CHG_USER,CHG_TERM,UNIT, " + "ACCT_CODE__WP,CCTR_CODE__WP,CURRENT_BATCH_QTY,UNIT__STD,STD_QTY,CONV__QTY_STDUOM,SALE_ORDER,LINE_NO, LOC_group ) " + "VALUES ( ? , ? , ? , ? , ? ," + " ? , ? , ? , ? , ? ," + " ? , ? , ? , ? , ? ," + " ? , ? , ? , ? , ? ," + " ? , ? , ? ,?, ?, ?,?,?,?)";  // added LOC_group by cpatil for supreme on 28/09/15
 
 			pstmtMpsOrder = conn.prepareStatement(sqlMpsOrder);
 
@@ -9045,6 +9045,32 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
 							pstmtMpsOrder.setNull(28, java.sql.Types.CHAR);
 						}
 
+						
+						if( isDetailReq )  // added for supreme loc_group on 28/09/15
+						{
+							System.out.println("@@@@@final---locGroupMap["+locGroupMap+"]]");
+							String tempLocGroup="";
+
+							Set s1=locGroupMap.entrySet(); 
+							Iterator itr=s1.iterator();
+							while(itr.hasNext())
+							{ 
+								Map.Entry m=(Map.Entry)itr.next(); 
+								{ 
+									String keyListStr =  m.getKey().toString(); 
+									tempLocGroup =    locGroupMap.get(keyListStr).toString();
+									break;
+								}
+							}
+							pstmtMpsOrder.setString(29,tempLocGroup);
+						}
+						else
+						{
+							pstmtMpsOrder.setString(29,"");
+						}
+						
+						
+						
 						// **************pstmtMpsOrder.setDouble(25, demandQty);
 						pstmtMpsOrder.addBatch();
 

webitm-mfg/ibase/webitm/ejb/mfg/adv/WorkorderPrc.java

@@ -22,9 +22,9 @@ import javax.naming.InitialContext;
 
 import ibase.webitm.utility.ITMException;
 import ibase.webitm.ejb.*;
-import ibase.webitm.utility.GenericUtility;
+import ibase.webitm.ejb.dis.DistCommon;
+import ibase.webitm.ejb.mfg.MfgCommon;
 import ibase.webitm.utility.*;
-import ibase.webitm.utility.TransIDGenerator;
 import ibase.utility.CommonConstants;
 import ibase.ejb.*;
 import ibase.system.config.*;
@@ -160,35 +160,35 @@ public class WorkorderPrc extends ProcessEJB implements  WorkorderPrcLocal,Worko
 			if((commonConstants.DB_NAME).equalsIgnoreCase("ORACLE"))
 			{
 				getDataSql="SELECT A.ITEM_CODE,C.DESCR,(CASE WHEN RTRIM(B.MFG_TYPE) IS NULL THEN RTRIM(C.MFG_TYPE)ELSE RTRIM(B.MFG_TYPE) END) "
-				+" AS MFG_TYPE,A.DUE_DATE,(CASE WHEN B.MIN_QTY IS NULL THEN C.MIN_QTY ELSE B.MIN_QTY END )"
-				+" AS MIN_QTY,(CASE WHEN B.MAX_QTY IS NULL THEN C.MAX_QTY ELSE B.MAX_QTY END)AS MAX_QTY,"
-				+" A.QUANTITY,A.DEMAND_QTY,A.SITE_CODE,A.TRAN_ID,"
-				+" CASE WHEN A.QUANTITY IS NULL THEN 0 ELSE A.QUANTITY END * CASE WHEN DDF_PICK_RATE(ddf_get_mrp_plist(),(fn_sysdate()),a.item_code,null,'L') IS NULL THEN 0 ELSE "
-				+" DDF_PICK_RATE(ddf_get_mrp_plist(),(fn_sysdate()),a.item_code,null,'L') END AS AMOUNT ,"
-				+" CASE WHEN A.DEMAND_QTY IS NULL THEN 0 ELSE A.DEMAND_QTY END * CASE WHEN "
-				+" DDF_PICK_RATE(ddf_get_mrp_plist(),(fn_sysdate()),a.item_code,null,'L') IS NULL THEN 0 ELSE "
-				+" DDF_PICK_RATE(ddf_get_mrp_plist(),(fn_sysdate()),a.item_code,null,'L') END AS DEMAND_AMT "
-				+" FROM MPS_ORDER A,SITEITEM B,ITEM C "
-				+" WHERE ( A.ITEM_CODE = B.ITEM_CODE (+)) AND "
-				+" ( A.SITE_CODE = B.SITE_CODE (+)) AND  ( A.ITEM_CODE = C.ITEM_CODE ) "
-				+" AND ( ( A.STATUS <> 'C' ) AND ( A.SITE_CODE =?) )";
+						+" AS MFG_TYPE,A.DUE_DATE,(CASE WHEN B.MIN_QTY IS NULL THEN C.MIN_QTY ELSE B.MIN_QTY END )"
+						+" AS MIN_QTY,(CASE WHEN B.MAX_QTY IS NULL THEN C.MAX_QTY ELSE B.MAX_QTY END)AS MAX_QTY,"
+						+" A.QUANTITY,A.DEMAND_QTY,A.SITE_CODE,A.TRAN_ID,"
+						+" CASE WHEN A.QUANTITY IS NULL THEN 0 ELSE A.QUANTITY END * CASE WHEN DDF_PICK_RATE(ddf_get_mrp_plist(),(fn_sysdate()),a.item_code,null,'L') IS NULL THEN 0 ELSE "
+						+" DDF_PICK_RATE(ddf_get_mrp_plist(),(fn_sysdate()),a.item_code,null,'L') END AS AMOUNT ,"
+						+" CASE WHEN A.DEMAND_QTY IS NULL THEN 0 ELSE A.DEMAND_QTY END * CASE WHEN "
+						+" DDF_PICK_RATE(ddf_get_mrp_plist(),(fn_sysdate()),a.item_code,null,'L') IS NULL THEN 0 ELSE "
+						+" DDF_PICK_RATE(ddf_get_mrp_plist(),(fn_sysdate()),a.item_code,null,'L') END AS DEMAND_AMT "
+						+" FROM MPS_ORDER A,SITEITEM B,ITEM C "
+						+" WHERE ( A.ITEM_CODE = B.ITEM_CODE (+)) AND "
+						+" ( A.SITE_CODE = B.SITE_CODE (+)) AND  ( A.ITEM_CODE = C.ITEM_CODE ) "
+						+" AND ( ( A.STATUS <> 'C' ) AND ( A.SITE_CODE =?) )";
 
 			}
 			else if((commonConstants.DB_NAME).equalsIgnoreCase("DB2")||(commonConstants.DB_NAME).equalsIgnoreCase("MSSQL"))
 			{
 				getDataSql="SELECT  A.ITEM_CODE ,C.DESCR ,(CASE WHEN RTRIM(B.MFG_TYPE) IS NULL THEN RTRIM(C.MFG_TYPE)ELSE RTRIM(B.MFG_TYPE) END) "
-				+" AS MFG_TYPE,A.DUE_DATE ,(CASE WHEN B.MIN_QTY IS NULL THEN C.MIN_QTY ELSE B.MIN_QTY END )AS"
-				+" MIN_QTY,(CASE WHEN B.MAX_QTY IS NULL THEN C.MAX_QTY ELSE B.MAX_QTY END)AS MAX_QTY,"
-				+" A.QUANTITY ,A.DEMAND_QTY ,A.SITE_CODE ,A.TRAN_ID, "
-				+" CASE WHEN A.QUANTITY IS NULL THEN 0 ELSE A.QUANTITY END * CASE WHEN DDF_PICK_RATE(ddf_get_mrp_plist(),(fn_sysdate()),a.item_code,' ','L') IS NULL THEN 0 ELSE "
-				+" DDF_PICK_RATE(ddf_get_mrp_plist(),(fn_sysdate()),a.item_code,' ','L') END AS AMOUNT ,"
-				+" CASE WHEN A.DEMAND_QTY IS NULL THEN 0 ELSE A.DEMAND_QTY END * CASE WHEN "
-				+" DDF_PICK_RATE(ddf_get_mrp_plist(),(fn_sysdate()),a.item_code,' ','L') IS NULL THEN 0 ELSE "
-				+" DDF_PICK_RATE(ddf_get_mrp_plist(),(fn_sysdate()),a.item_code,' ','L') END AS DEMAND_AMT "
-				+" FROM MPS_ORDER A LEFT OUTER JOIN SITEITEM B ON A.ITEM_CODE = B.ITEM_CODE AND "
-				+" A.SITE_CODE = B.SITE_CODE , ITEM C "
-				+" WHERE ( A.ITEM_CODE = C.ITEM_CODE) AND ( ( A.STATUS <> 'C' ) "
-				+" AND ( A.SITE_CODE = ? ) ) ";
+						+" AS MFG_TYPE,A.DUE_DATE ,(CASE WHEN B.MIN_QTY IS NULL THEN C.MIN_QTY ELSE B.MIN_QTY END )AS"
+						+" MIN_QTY,(CASE WHEN B.MAX_QTY IS NULL THEN C.MAX_QTY ELSE B.MAX_QTY END)AS MAX_QTY,"
+						+" A.QUANTITY ,A.DEMAND_QTY ,A.SITE_CODE ,A.TRAN_ID, "
+						+" CASE WHEN A.QUANTITY IS NULL THEN 0 ELSE A.QUANTITY END * CASE WHEN DDF_PICK_RATE(ddf_get_mrp_plist(),(fn_sysdate()),a.item_code,' ','L') IS NULL THEN 0 ELSE "
+						+" DDF_PICK_RATE(ddf_get_mrp_plist(),(fn_sysdate()),a.item_code,' ','L') END AS AMOUNT ,"
+						+" CASE WHEN A.DEMAND_QTY IS NULL THEN 0 ELSE A.DEMAND_QTY END * CASE WHEN "
+						+" DDF_PICK_RATE(ddf_get_mrp_plist(),(fn_sysdate()),a.item_code,' ','L') IS NULL THEN 0 ELSE "
+						+" DDF_PICK_RATE(ddf_get_mrp_plist(),(fn_sysdate()),a.item_code,' ','L') END AS DEMAND_AMT "
+						+" FROM MPS_ORDER A LEFT OUTER JOIN SITEITEM B ON A.ITEM_CODE = B.ITEM_CODE AND "
+						+" A.SITE_CODE = B.SITE_CODE , ITEM C "
+						+" WHERE ( A.ITEM_CODE = C.ITEM_CODE) AND ( ( A.STATUS <> 'C' ) "
+						+" AND ( A.SITE_CODE = ? ) ) ";
 			}
 			System.out.println("getDataSql..."+ getDataSql);
 			pstmt = conn.prepareStatement(getDataSql);
@@ -197,34 +197,34 @@ public class WorkorderPrc extends ProcessEJB implements  WorkorderPrcLocal,Worko
 
 			while(rs1.next())
 			{
-					System.out.println("Inside while...");
-					//item code
-					retTabSepStrBuff.append(rs1.getString(1)).append("\t");
-					//ITEM DESC
-					retTabSepStrBuff.append(rs1.getString(2)).append("\t");
-					//mfg TYPE
-					retTabSepStrBuff.append(rs1.getString(3)).append("\t");
-					//DUE_DATE
-					dueDate=this.genericUtility.getValidDateString(rs1.getTimestamp(4).toString(),this.genericUtility.getDBDateFormat(),this.genericUtility.getApplDateFormat());
-					retTabSepStrBuff.append(dueDate).append("\t");
-					//min_qty
-					retTabSepStrBuff.append(rs1.getDouble(5)).append("\t");
-					//max_qty
-					retTabSepStrBuff.append(rs1.getDouble(6)).append("\t");
-					//Quantity
-					retTabSepStrBuff.append(rs1.getDouble(7)).append("\t");
-					//demand qty
-					retTabSepStrBuff.append(rs1.getDouble(8)).append("\t");
-					//site_code
-					retTabSepStrBuff.append(rs1.getString(9)).append("\t");
-					//for tranid
-					retTabSepStrBuff.append(rs1.getString(10)).append("\t");
-					//FOR AMOUNT
-					retTabSepStrBuff.append(rs1.getDouble(11)).append("\t");
-					//FOR DEMAND AMOUNT
-					retTabSepStrBuff.append(rs1.getDouble(12)).append("\t");
-
-					retTabSepStrBuff.append("\n");
+				System.out.println("Inside while...");
+				//item code
+				retTabSepStrBuff.append(rs1.getString(1)).append("\t");
+				//ITEM DESC
+				retTabSepStrBuff.append(rs1.getString(2)).append("\t");
+				//mfg TYPE
+				retTabSepStrBuff.append(rs1.getString(3)).append("\t");
+				//DUE_DATE
+				dueDate=this.genericUtility.getValidDateString(rs1.getTimestamp(4).toString(),this.genericUtility.getDBDateFormat(),this.genericUtility.getApplDateFormat());
+				retTabSepStrBuff.append(dueDate).append("\t");
+				//min_qty
+				retTabSepStrBuff.append(rs1.getDouble(5)).append("\t");
+				//max_qty
+				retTabSepStrBuff.append(rs1.getDouble(6)).append("\t");
+				//Quantity
+				retTabSepStrBuff.append(rs1.getDouble(7)).append("\t");
+				//demand qty
+				retTabSepStrBuff.append(rs1.getDouble(8)).append("\t");
+				//site_code
+				retTabSepStrBuff.append(rs1.getString(9)).append("\t");
+				//for tranid
+				retTabSepStrBuff.append(rs1.getString(10)).append("\t");
+				//FOR AMOUNT
+				retTabSepStrBuff.append(rs1.getDouble(11)).append("\t");
+				//FOR DEMAND AMOUNT
+				retTabSepStrBuff.append(rs1.getDouble(12)).append("\t");
+
+				retTabSepStrBuff.append("\n");
 			}
 			resultString = retTabSepStrBuff.toString();
 			System.out.println("ResultString....." + resultString);
@@ -283,10 +283,10 @@ public class WorkorderPrc extends ProcessEJB implements  WorkorderPrcLocal,Worko
 
 		try
 		{
-				System.out.println("xmlString[process]::::::::::;;;"+xmlString);
-				System.out.println("xmlString2[process]::::::::::;;;"+xmlString2);
-				System.out.println("windowName[process]::::::::::;;;"+windowName);
-				System.out.println("xtraParams[process]:::::::::;;;"+xtraParams);
+			System.out.println("xmlString[process]::::::::::;;;"+xmlString);
+			System.out.println("xmlString2[process]::::::::::;;;"+xmlString2);
+			System.out.println("windowName[process]::::::::::;;;"+windowName);
+			System.out.println("xtraParams[process]:::::::::;;;"+xtraParams);
 
 		}
 		catch(Exception e)
@@ -339,11 +339,11 @@ public class WorkorderPrc extends ProcessEJB implements  WorkorderPrcLocal,Worko
 		Node childNode = null;
 		ArrayList tranList = new ArrayList();
 		try
-			{
-				ConnDriver connDriver = new ConnDriver();
-				conn = connDriver.getConnectDB("DriverITM");
-				conn.setAutoCommit(false);
-				connDriver = null;
+		{
+			ConnDriver connDriver = new ConnDriver();
+			conn = connDriver.getConnectDB("DriverITM");
+			conn.setAutoCommit(false);
+			connDriver = null;
 
 			loginCode=genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginCode");
 			loginCode=blanknull(loginCode).trim();
@@ -446,10 +446,10 @@ public class WorkorderPrc extends ProcessEJB implements  WorkorderPrcLocal,Worko
 			{
 				System.out.println("Exception : WorkorderPrcEJB =>"+d.toString());
 				d.printStackTrace();
-			System.out.println("Exception :WorkorderPrcEJB :process(String xmlString2, String xmlString2, String windowName, String xtraParams):" + e.getMessage() + ":");
-			e.printStackTrace();
-			errString = e.getMessage();
-			throw new ITMException(e);
+				System.out.println("Exception :WorkorderPrcEJB :process(String xmlString2, String xmlString2, String windowName, String xtraParams):" + e.getMessage() + ":");
+				e.printStackTrace();
+				errString = e.getMessage();
+				throw new ITMException(e);
 			}
 		}
 		finally
@@ -515,16 +515,25 @@ public class WorkorderPrc extends ProcessEJB implements  WorkorderPrcLocal,Worko
 
 		String tranId1 = null; //blanknull(tranId1).trim();
 
+		String feedbackReqd="";    // added for feedback req 'Y' for supreme on 28/09/15 by cpatil 
+		MfgCommon mfgCommon = new MfgCommon();
+		DistCommon distCommon=new DistCommon();
+		ArrayList<Double> noArtList = new ArrayList<Double>();
+		ArrayList<Double> netWeightList = new ArrayList<Double>();
+		double noArt=0,netWeight=0;
+		String locGroup="";
+		
 		String sqlSelect = " SELECT WORK_ORDER,ORDER_TYPE,QUANTITY,YIELD_PERC, ROUTE_CODE, "
-					+" BOM_CODE, UNIT, MRP_RUN_ID, ACCT_CODE__WP, CCTR_CODE__WP,ADDN_ORDER,"
-					+" PLAN_DUE_DATE,TRAN_ID,SITE_CODE,ITEM_CODE,DUE_DATE "
-					+" FROM MPS_ORDER WHERE TRAN_ID=?";
+				+" BOM_CODE, UNIT, MRP_RUN_ID, ACCT_CODE__WP, CCTR_CODE__WP,ADDN_ORDER,"
+				+" PLAN_DUE_DATE,TRAN_ID,SITE_CODE,ITEM_CODE,DUE_DATE ,LOC_GROUP"
+				+" FROM MPS_ORDER WHERE TRAN_ID=?";
 
 		String sqlInsert = "INSERT INTO WORKORDER(WORK_ORDER,ORDER_TYPE,QUANTITY,YIELD_PERC,ROUTE_CODE,BOM_CODE,"
-			+" UNIT,MRP_RUN_ID,ACCT_CODE__WP,CCTR_CODE__WP,ADDN_ORDER,PLAN_DUE_DATE,TRAN_ID,SITE_CODE,"
-			+" ITEM_CODE,ORD_DATE,DUE_DATE,STATUS,STATUS_DATE,FEEDBACK_REQD,CHG_DATE,CHG_USER,CHG_TERM,QUANTITY__RCVD,"
-			+" CURRENT_BATCH_QTY,UNIT__STD,STD_QTY,CONV__QTY_STDUOM,QUANTITY__MPS,TRAN_ID__MPS, LOT_SL, DEPT_CODE) "
-			+" VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,'1S',?)";
+				+" UNIT,MRP_RUN_ID,ACCT_CODE__WP,CCTR_CODE__WP,ADDN_ORDER,PLAN_DUE_DATE,TRAN_ID,SITE_CODE,"
+				+" ITEM_CODE,ORD_DATE,DUE_DATE,STATUS,STATUS_DATE,FEEDBACK_REQD,CHG_DATE,CHG_USER,CHG_TERM,QUANTITY__RCVD,"
+				+" CURRENT_BATCH_QTY,UNIT__STD,STD_QTY,CONV__QTY_STDUOM,QUANTITY__MPS,TRAN_ID__MPS, LOT_SL, DEPT_CODE" 
+				+" ,NO_ART,NET_WEIGHT,LOC_GROUP  ) "  // added for supreme on 28/09/15 by cpatil
+				+" VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,'1S',?,?,?,?)";
 
 
 		String sqlUpdate = " UPDATE MPS_ORDER SET STATUS = 'C'	WHERE TRAN_ID =?" ;
@@ -536,6 +545,10 @@ public class WorkorderPrc extends ProcessEJB implements  WorkorderPrcLocal,Worko
 
 		try
 		{
+			
+			feedbackReqd =mfgCommon.getEnvMfg("999999","FEEDBACK_REQD",conn);  // added for feedback req 'Y' for supreme on 23/09/15 by cpatil
+			System.out.println("@@@@@@@@ feedbackReqd["+feedbackReqd+"]");
+			
 			// 30/06/10 manoharan
 			deptCodeMfg = itmDBAccessEJB.getEnvDis("999999", "DEPT_CODE_MFG",conn);
 			// end 30/06/10 manoharan
@@ -581,8 +594,10 @@ public class WorkorderPrc extends ProcessEJB implements  WorkorderPrcLocal,Worko
 					tranId_db=rs1.getString(13);//selected from mps_order table
 					siteCode=rs1.getString(14);//for sitecode
 					itemCode=rs1.getString(15);//for itemcode
-					dueDate=rs1.getString(16);//for dueDate
+					dueDate= rs1.getString(16);//for dueDate
 
+					locGroup = blanknull(rs1.getString("LOC_GROUP"));  // for locGroup
+					
 					//=====FUNCTION blanknull() is to avoid NullPointerException==========
 					workOrder=blanknull(workOrder);
 					orderType=blanknull(orderType);
@@ -600,8 +615,8 @@ public class WorkorderPrc extends ProcessEJB implements  WorkorderPrcLocal,Worko
 					dueDate=blanknull(dueDate);
 
 					tranDate=genericUtility.getValidDateString(new Timestamp(System.currentTimeMillis()).toString(),
-					genericUtility.getDBDateFormat(),
-					genericUtility.getApplDateFormat());
+							genericUtility.getDBDateFormat(),
+							genericUtility.getApplDateFormat());
 					tranDate=blanknull(tranDate);
 
 
@@ -643,7 +658,8 @@ public class WorkorderPrc extends ProcessEJB implements  WorkorderPrcLocal,Worko
 					System.out.println("[WorkorderPrcEJB][dueDate]=>"+dueDate);
 					System.out.println("[WorkorderPrcEJB][tranDate]=>"+tranDate);
 					System.out.println("[WorkorderPrcEJB][tranIddb]=>"+tranId_db);
-
+					System.out.println("[WorkorderPrcEJB][locGroup]=>"+locGroup);
+					
 					pstmtInsert.setString(1,tranId.trim());//for work_order
 					pstmtInsert.setString(2,orderType.trim());//for ordertype
 					pstmtInsert.setDouble(3,quantity);//for quantity
@@ -683,29 +699,35 @@ public class WorkorderPrc extends ProcessEJB implements  WorkorderPrcLocal,Worko
 					pstmtInsert.setString(18,"P");//for status
 					pstmtInsert.setTimestamp(19,new Timestamp(System.currentTimeMillis()));//for status_date
 
-
-					sql2="SELECT ITEM_SER FROM ITEM WHERE ITEM_CODE='"+itemCode.trim()+"'";
-					pstmtSql2=conn.prepareStatement(sql2);
-					rsSql2=pstmtSql2.executeQuery();
-					while(rsSql2.next())
+					if("Y".equalsIgnoreCase(feedbackReqd))   // added for feedback req 'Y' for supreme  on 23/09/15 by cpatil  
 					{
-						itemSer=rsSql2.getString(1);
+						feedBackValue = "Y";
 					}
-					itemSer=blanknull(itemSer).trim();
-					feedBackValue="N";
-					for(i=0;i<ar.size();i++)
+					else
 					{
-						itemSer2=ar.get(i).toString();
-						itemSer2=blanknull(itemSer2).trim();
-						if(itemSer.equalsIgnoreCase(itemSer2))
+						sql2="SELECT ITEM_SER FROM ITEM WHERE ITEM_CODE='"+itemCode.trim()+"'";
+						pstmtSql2=conn.prepareStatement(sql2);
+						rsSql2=pstmtSql2.executeQuery();
+						while(rsSql2.next())
+						{
+							itemSer=rsSql2.getString(1);
+						}
+						itemSer=blanknull(itemSer).trim();
+						feedBackValue="N";
+						for(i=0;i<ar.size();i++)
 						{
-							feedBackValue="Y";
-							break;
+							itemSer2=ar.get(i).toString();
+							itemSer2=blanknull(itemSer2).trim();
+							if(itemSer.equalsIgnoreCase(itemSer2))
+							{
+								feedBackValue="Y";
+								break;
+							}
 						}
+						rsSql2.close();
+						pstmtSql2.close();
 					}
 					pstmtInsert.setString(20,feedBackValue);//for feedback_reqd
-					rsSql2.close();
-					pstmtSql2.close();
 
 					pstmtInsert.setTimestamp(21,new Timestamp(System.currentTimeMillis()));//for chg_date
 					pstmtInsert.setString(22,loginCode.trim());//for chg_user
@@ -719,6 +741,28 @@ public class WorkorderPrc extends ProcessEJB implements  WorkorderPrcLocal,Worko
 					pstmtInsert.setString(30,tranId_db);//for tran_id__mps
 					pstmtInsert.setString(31,deptCodeMfg); // 30/06/10 manoharan
 
+					
+					// added for supreme start for net_weight, noArt on 28/09/15
+					
+					noArtList = distCommon.getConvQuantityFact(unit, "NOS", itemCode, quantity, 0, conn);
+					if( noArtList.size() == 2 )
+					{
+						System.out.println("@@@@@noArtList["+noArtList.toString()+"]");
+						noArt =  Double.parseDouble(noArtList.get(1)+"");
+					}
+					netWeightList = distCommon.getConvQuantityFact(unit, "KGS", itemCode, quantity, 0, conn);
+					if( netWeightList.size() == 2 )
+					{
+						System.out.println("@@@@@netWeightList["+netWeightList.toString()+"]");
+						netWeight = Double.parseDouble( netWeightList.get(1)+"");
+					}
+					System.out.println("@@@@@noArt["+noArt+"]netWeight["+netWeight+"]");
+					pstmtInsert.setDouble(32, noArt);
+					pstmtInsert.setDouble(33, netWeight);
+					pstmtInsert.setString(34, locGroup);
+					
+					// end
+					
 					pstmtInsert.addBatch();
 
 					//===========Code to update Record in MPS_ORDER table==========
@@ -769,9 +813,9 @@ public class WorkorderPrc extends ProcessEJB implements  WorkorderPrcLocal,Worko
 		String tranId = null;
 		String newKeystring = "";
 		String srType = "RS";
-		 try
-	     {
-	    	sql = "SELECT KEY_STRING, TRAN_ID_COL, REF_SER FROM TRANSETUP WHERE UPPER(TRAN_WINDOW)=UPPER('"+windowName+"')";
+		try
+		{
+			sql = "SELECT KEY_STRING, TRAN_ID_COL, REF_SER FROM TRANSETUP WHERE UPPER(TRAN_WINDOW)=UPPER('"+windowName+"')";
 			stmt = conn.createStatement();
 			rs = stmt.executeQuery(sql);
 			System.out.println("keyString :"+rs.toString());
@@ -794,13 +838,13 @@ public class WorkorderPrc extends ProcessEJB implements  WorkorderPrcLocal,Worko
 			tranId = tg.generateTranSeqID(tranSer1, keyCol, keyString, conn);
 			System.out.println("tranId :"+tranId);
 			if(rs!=null)
-			 {
+			{
 				rs.close();
-			 }
-			 if(stmt!=null)
-			 {
+			}
+			if(stmt!=null)
+			{
 				stmt.close();
-			 }
+			}
 		}
 		catch(SQLException ex)
 		{
@@ -824,11 +868,11 @@ public class WorkorderPrc extends ProcessEJB implements  WorkorderPrcLocal,Worko
 		java.sql.Timestamp currDate = null;
 		try
 		{
-				Object date = null;
-				currDate =new java.sql.Timestamp(System.currentTimeMillis()) ;
-				SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getDBDateFormat());
-				date = sdf.parse(currDate.toString());
-				currDate =	java.sql.Timestamp.valueOf(sdf.format(date).toString() + " 00:00:00.0");
+			Object date = null;
+			currDate =new java.sql.Timestamp(System.currentTimeMillis()) ;
+			SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getDBDateFormat());
+			date = sdf.parse(currDate.toString());
+			currDate =	java.sql.Timestamp.valueOf(sdf.format(date).toString() + " 00:00:00.0");
 		}
 		catch(Exception e)
 		{