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.*;
@@ -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 "
+				+" 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',?)";
+				+" 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,7 +594,9 @@ 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);
@@ -643,6 +658,7 @@ 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
@@ -683,7 +699,12 @@ public class WorkorderPrc extends ProcessEJB implements  WorkorderPrcLocal,Worko
 					pstmtInsert.setString(18,"P");//for status
 					pstmtInsert.setTimestamp(19,new Timestamp(System.currentTimeMillis()));//for status_date
 
-
+					if("Y".equalsIgnoreCase(feedbackReqd))   // added for feedback req 'Y' for supreme  on 23/09/15 by cpatil  
+					{
+						feedBackValue = "Y";
+					}
+					else
+					{
 						sql2="SELECT ITEM_SER FROM ITEM WHERE ITEM_CODE='"+itemCode.trim()+"'";
 						pstmtSql2=conn.prepareStatement(sql2);
 						rsSql2=pstmtSql2.executeQuery();
@@ -703,9 +724,10 @@ public class WorkorderPrc extends ProcessEJB implements  WorkorderPrcLocal,Worko
 								break;
 							}
 						}
-					pstmtInsert.setString(20,feedBackValue);//for feedback_reqd
 						rsSql2.close();
 						pstmtSql2.close();
+					}
+					pstmtInsert.setString(20,feedBackValue);//for feedback_reqd
 
 					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==========