Set EMP_CODE__REQ,ACCT_CODE,CCTR_CODE,SITE_CODE__BIL,SITE_CODE__DES in Indent

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

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

@@ -86,6 +86,7 @@ class ADPElement
 	//Added by manoj dtd 31/10/2013 to store Detail level trace hainv key=tran_id@tran_ser
 	//private HashMap<String, ADPElement> detMap=new HashMap<String, ADPElement>();
 	private ArrayList<HashMap<String, ADPElement>> detList=new ArrayList<HashMap<String, ADPElement>>();
+	private String empCodePlan;//Manoj dtd 11/03/2014
 	
 	public ADPElement()
 	{
@@ -604,6 +605,16 @@ class ADPElement
 		return this.pendDRQty;
 	}
 	//End changes by Gulzar on 4/18/2012
+	//Added by Manoj dtd 11/03/2014
+	public void setEmpCodePlan(String code)
+	{
+		this.empCodePlan = code;
+	}
+	public String getEmpCodePlan()
+	{
+		return this.empCodePlan;
+	}
+	//End Manoj dtd 11/03/2014
 	
 
 	//private void updateTimeMrp(java.sql.Timestamp dueDate, double demand, double supply, double stockQty, double othSupply, String saleOrder, String lineNo)

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

@@ -38,7 +38,7 @@ public class Indent
 	public java.sql.Timestamp planDueDate = null;
 	public java.sql.Timestamp reqDate = null;	
 	public java.sql.Timestamp chgDate = new java.sql.Timestamp(System.currentTimeMillis());
-			
+	public String itemSer="";//Added by Manoj dtd 11/03/2014		
 
 	public Indent()
 	{

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

@@ -32,6 +32,7 @@ import javax.ejb.*;
 import ibase.webitm.utility.ITMException;
 import ibase.webitm.ejb.*;
 import ibase.webitm.ejb.dis.DistCommon;
+import ibase.webitm.ejb.fin.FinCommon;
 import ibase.webitm.utility.GenericUtility;
 import ibase.webitm.utility.TransIDGenerator;
 import ibase.system.config.*;
@@ -2135,7 +2136,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
 					// 31, 32
 					+ " CASE WHEN A.MFG_TYPE IS NULL THEN 'MRP' ELSE A.MFG_TYPE END, A.ROUTE_CODE, "
 					// 33, 34
-					+ " case when a.mfg_lead_basis is null then 'F' else a.mfg_lead_basis end, case when a.batch_size_lead is null then 0 else a.batch_size_lead end  " + " FROM SITEITEM A, ITEM B, ITEMSER C " + " WHERE A.ITEM_CODE = B.ITEM_CODE " + " AND B.ITEM_SER = C.ITEM_SER " + " AND A.SITE_CODE = ? " + " AND A.ITEM_CODE = ? ";
+					+ " case when a.mfg_lead_basis is null then 'F' else a.mfg_lead_basis end, case when a.batch_size_lead is null then 0 else a.batch_size_lead end,A.EMP_CODE__PLN  " + " FROM SITEITEM A, ITEM B, ITEMSER C " + " WHERE A.ITEM_CODE = B.ITEM_CODE " + " AND B.ITEM_SER = C.ITEM_SER " + " AND A.SITE_CODE = ? " + " AND A.ITEM_CODE = ? ";
 			// +" AND A.SITE_CODE = '" + siteCode + "' "
 			// +" AND A.ITEM_CODE = '" + itemCode + "' ";
 
@@ -2248,6 +2249,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
 				adpElement.setMfgLeadBasis(mfgLeadBasis);
 				batchSizeLead = rs.getDouble(34);
 				adpElement.setBatchSizeLead(batchSizeLead);
+				adpElement.setEmpCodePlan(rs.getString("EMP_CODE__PLN"));//Manoj dtd 11/03/2014 
 				// end 22/06/10 manoharan
 				rs.close();
 			} else
@@ -2318,7 +2320,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
 						// 30
 						+ " B.ITEM_SER, "
 						// 31
-						+ " CASE WHEN B.MFG_TYPE IS NULL THEN 'MRP' ELSE B.MFG_TYPE END " + " FROM ITEM B, ITEMSER C " + " WHERE B.ITEM_SER = C.ITEM_SER" + " AND B.ITEM_CODE = '" + itemCode + "' ";
+						+ " CASE WHEN B.MFG_TYPE IS NULL THEN 'MRP' ELSE B.MFG_TYPE END,B.EMP_CODE__PLN " + " FROM ITEM B, ITEMSER C " + " WHERE B.ITEM_SER = C.ITEM_SER" + " AND B.ITEM_CODE = '" + itemCode + "' ";
 
 				pstmt = conn.prepareStatement(sql);
 				// pstmt.setString(1,siteCode);
@@ -2421,6 +2423,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
 					adpElement.setMfgLeadBasis("F");
 					adpElement.setBatchSizeLead(0);
 					// end 22/06/10 manoharan
+					adpElement.setEmpCodePlan(rs.getString("EMP_CODE__PLN"));//Manoj dtd 11/03/2014 
 
 					rs.close();
 				}
@@ -3169,13 +3172,17 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
 				// cpatil start
 				System.out.println("@@@@@saleOrder["+saleOrder+"]["+adpElement.getSaleOrder()+"]lineNo["+lineNo+"]["+adpElement.getLineNo()+"]@@@@@@@@@@@");
 				System.out.println("@@@@@@@@@@@sorderList["+sorderList+"]@@@@@@@@@itemCodeList["+itemCodeList+"]");
-				if(!(itemCodeList.indexOf(saleOrder+rsItemCode) > -1 ))
+				//System.out.println("itemCodeList.length()-----"+itemCodeList.isEmpty());
+				if(isDetailReq)
+				{
+					if(itemCodeList.length()>0 && !(itemCodeList.indexOf(saleOrder+rsItemCode) > -1 ))
 					{
 						//if(!(itemCodeList.indexOf(rsItemCode) > -1 ))
 						//{
 						continue;
 						//}
 					}
+				}
 				adpElement.setSaleOrder(saleOrder);
 				adpElement.setLineNo(lineNo);
 
@@ -4928,7 +4935,8 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
 								indent.acctCode = adpElement.getAcctCodePh();
 								indent.cctrCode = adpElement.getCctrCodePh();
 								indent.empCodePur = adpElement.getEmpCodePur();
-								indent.empCodeReq = adpElement.getEmpCodePur();
+								//indent.empCodeReq = adpElement.getEmpCodePur();
+								indent.empCodeReq = adpElement.getEmpCodePlan();//Manoj dtd 11/03/2014 to set EmpCode Plan in Emp_code__req
 								indent.suppCodePref = adpElement.getSuppCodePref();
 								indent.purcRate = adpElement.getPurcRate();
 								;
@@ -4938,7 +4946,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
 								indent.chgTerm = userId;
 								indent.purLeadTime = purLeadTime;
 								indent.convQtyStdUom = 1;
-
+								indent.itemSer=adpElement.getItemSer();//Added by manoj dtd 11/03/2014
 								indList.add(indent);
 							}
 							System.out.println("@@@@@@cpatil333-indList["+indList+"]");
@@ -4985,7 +4993,8 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
 								newIndent.acctCode = adpElement.getAcctCodePh();
 								newIndent.cctrCode = adpElement.getCctrCodePh();
 								newIndent.empCodePur = adpElement.getEmpCodePur();
-								newIndent.empCodeReq = adpElement.getEmpCodePur();
+								//newIndent.empCodeReq = adpElement.getEmpCodePur();
+								newIndent.empCodeReq = adpElement.getEmpCodePlan();//Manoj dtd 11/03/2014 to set EmpCode Plan in Emp_code__req
 								newIndent.suppCodePref = adpElement.getSuppCodePref();
 								newIndent.purcRate = adpElement.getPurcRate();
 								;
@@ -4998,7 +5007,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
 
 								// System.out.println("Indent creation for :" +
 								// itemCode + " " + decFormat(reqQty) );
-
+								newIndent.itemSer=adpElement.getItemSer();//Added by manoj dtd 11/03/2014
 								indList.add(newIndent);
 							}
 						}
@@ -5708,7 +5717,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
 
 			pstmtMpsOrder = conn.prepareStatement(sqlMpsOrder);
 
-			String sqlIndent = "INSERT INTO INDENT(IND_NO,IND_DATE,IND_TYPE,DEPT_CODE, " + "PLAN_DUE_DATE,REQ_DATE,ITEM_CODE,ITEM_DESCR, " + "QUANTITY,QUANTITY__STDUOM,ORD_QTY,UNIT__IND,UNIT__STD,SITE_CODE, " + "SITE_CODE__DLV,SITE_CODE__ACCT,APR_CODE,PRIORITY,ACCT_CODE, " + "CCTR_CODE,EMP_CODE__PUR,EMP_CODE__REQ,SUPP_CODE__PREF,PURC_RATE," + "PACK_CODE,STATUS,CHG_DATE,CHG_USER,CHG_TERM,PUR_LEAD_TIME,CONV__QTY_STDUOM) " + "VALUES ( ? , ? , ? , ? , ? , ? ," + " ? , ? , ? , ? , ? , ? ," + " ? , ? , ? , ? , ? , ? ," + " ? , ? , ? , ? , ? , ? ," + " ? , ? , ? , ? , ? , ? ," + " ? )";
+			String sqlIndent = "INSERT INTO INDENT(IND_NO,IND_DATE,IND_TYPE,DEPT_CODE, " + "PLAN_DUE_DATE,REQ_DATE,ITEM_CODE,ITEM_DESCR, " + "QUANTITY,QUANTITY__STDUOM,ORD_QTY,UNIT__IND,UNIT__STD,SITE_CODE, " + "SITE_CODE__DLV,SITE_CODE__ACCT,APR_CODE,PRIORITY,ACCT_CODE, " + "CCTR_CODE,EMP_CODE__PUR,EMP_CODE__REQ,SUPP_CODE__PREF,PURC_RATE," + "PACK_CODE,STATUS,CHG_DATE,CHG_USER,CHG_TERM,PUR_LEAD_TIME,CONV__QTY_STDUOM,SITE_CODE__DES,SITE_CODE__BIL) " + "VALUES ( ? , ? , ? , ? , ? , ? ," + " ? , ? , ? , ? , ? , ? ," + " ? , ? , ? , ? , ? , ? ," + " ? , ? , ? , ? , ? , ? ," + " ? , ? , ? , ? , ? , ? ," + " ?,?,? )";
 			pstmtIndent = conn.prepareStatement(sqlIndent);
 
 			String sqlDistDemand = "INSERT INTO DIST_DEMAND(TRAN_ID,TRAN_DATE,SITE_CODE,ITEM_CODE, " + "PLAN_DUE_DATE,DUE_DATE,QTY_REQUIRED,UNIT,SITE_CODE__SOURCE, " + "STATUS,DUE_DATE__ORD,CHG_DATE,CHG_USER,CHG_TERM) " + "VALUES ( ? , ? , ? , ? , ? ," + " ? , ? , ? , ? , ? , " + " ? , ? , ? , ? )";
@@ -5948,10 +5957,21 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
 					chgDate = indent.chgDate;
 					purLeadTime = indent.purLeadTime;
 					convQtyStdUom = indent.convQtyStdUom;
+					itemSer= indent.itemSer;//Added by Manoj dtd 11/03/2014
+					System.out.println("Item Series During Indent Generation---"+itemSer);
 
 					// 20/01/09 manoharan
 					// xmlValues
 					// ="<?xml version=\"1.0\" encoding=\"utf-8\"?><Root>";
+					//Added by Manoj dtd 11/03/2014 to set Account Code
+					FinCommon fcommon=new FinCommon();
+					String stracctDet=fcommon.getAcctDetrTtype(itemCode,itemSer,"IN",indType,conn);
+					System.out.println("stracctDet----"+stracctDet);
+					String acctDetArray[]=stracctDet.split(",");
+					acctCode=acctDetArray[0];
+					cctrCode=acctDetArray[1];
+					fcommon=null;
+					//Ended by Manoj dtd 11/03/2014 to set Account Code
 					xmlValues = "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?><Root>";
 					xmlValues = xmlValues + "<Header></Header>";
 					xmlValues = xmlValues + "<Detail1>";
@@ -5985,6 +6005,9 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
 					xmlValues = xmlValues + "<chg_term><![CDATA[" + chgTerm + "]]></chg_term>";
 					xmlValues = xmlValues + "<pur_lead_time><![CDATA[" + purLeadTime + "]]></pur_lead_time>";
 					xmlValues = xmlValues + "<conv__qty_stdoum><![CDATA[" + convQtyStdUom + "]]></conv__qty_stdoum>";
+					xmlValues = xmlValues + "<site_code__des><![CDATA[" + siteCode + "]]></site_code__des>";
+					xmlValues = xmlValues + "<site_code__bill><![CDATA[" + siteCode + "]]></site_code__bill>";
+					
 					xmlValues = xmlValues + "</Detail1></Root>";
 
 					tranIdIndent = getUniqueKey(xmlValues, indKeyStr, "ind_no", "IND");
@@ -6023,7 +6046,8 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
 					pstmtIndent.setString(29, chgTerm);
 					pstmtIndent.setDouble(30, purLeadTime);
 					pstmtIndent.setDouble(31, convQtyStdUom);
-
+					pstmtIndent.setString(32, siteCode);
+					pstmtIndent.setString(33, siteCode);
 					pstmtIndent.addBatch();
 					
 					HashMap valueMap = new HashMap();