Changes done for Work order return

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

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

@@ -36,7 +36,7 @@ import java.sql.*;
 
 import javax.ejb.Stateless;
 
-import org.apache.poi.hssf.record.formula.functions.Stdev;
+//import org.apache.poi.hssf.record.formula.functions.Stdev;
 
 @Stateless 
 public class WorkorderIssConf extends ActionHandlerEJB implements WorkorderIssConfLocal,WorkorderIssConfRemote
@@ -430,7 +430,7 @@ public class WorkorderIssConf extends ActionHandlerEJB implements WorkorderIssCo
 					}
 					//genWOIssue.writeLog(this.curTranId, "In woiss_confirm() update stock  qty_stduom [" + qtystduom + "]"); // 23/01/11 manoharan write the log
 					//stkUpdMap.put("qty_stduom",Double.toString(stkquantity));
-					stkUpdMap.put("tran_type","ID");
+					//stkUpdMap.put("tran_type","ID");
 					stkUpdMap.put("tran_date",tranDate);
 					stkUpdMap.put("tran_id",tranID);
 					stkUpdMap.put("tran_ser",tranSer);
@@ -442,7 +442,7 @@ public class WorkorderIssConf extends ActionHandlerEJB implements WorkorderIssCo
 					stkUpdMap.put("site_code__mfg",siteCode);
 					stkUpdMap.put("sundry_code",deptCode);
 					stkUpdMap.put("sundry_type","D");
-					if( "I".equalsIgnoreCase(tranType) || "O".equalsIgnoreCase(tranType) || "D".equalsIgnoreCase(tranType) || "F".equalsIgnoreCase(tranType) )
+					if( "I".equalsIgnoreCase(tranType) || "O".equalsIgnoreCase(tranType) || "D".equalsIgnoreCase(tranType) || "F".equalsIgnoreCase(tranType) || "R".equalsIgnoreCase(tranType) )//tranType condition added for Return by Manoj dtd 27/04/2016
 					{
 						sql   =" select item_code, item_code__ref "
 							+" from workorder_bill  where work_order  ='"+workOrder+"' "
@@ -561,6 +561,7 @@ public class WorkorderIssConf extends ActionHandlerEJB implements WorkorderIssCo
 						  stkUpdMap.put("cctr_code__dr",cctr_code__inv);
 						  stkUpdMap.put("acct_code__cr",acctCodeWp);
 						  stkUpdMap.put("cctr_code__cr",cctrCodeWp);
+						  stkUpdMap.put("tran_type","R");//tranType condition added for Return by Manoj dtd 27/04/2016
 						}
 						else
 						{
@@ -568,6 +569,7 @@ public class WorkorderIssConf extends ActionHandlerEJB implements WorkorderIssCo
 						  stkUpdMap.put("cctr_code__dr",cctrCodeWp);
 						  stkUpdMap.put("acct_code__cr",acct_code__inv);
 						  stkUpdMap.put("cctr_code__cr",cctr_code__inv);
+						  stkUpdMap.put("tran_type","ID");//tranType condition added for Return by Manoj dtd 27/04/2016
 						}
 						sql =" select iss_criteria  from item  where  item_code ='"+itemCode+"'";
 						pstmt = conn.prepareStatement(sql);
@@ -651,6 +653,11 @@ public class WorkorderIssConf extends ActionHandlerEJB implements WorkorderIssCo
 				else
 				{
 					upd =0;
+					//tranType condition added for Return by Manoj dtd 27/04/2016
+					if("R".equalsIgnoreCase(tranType))
+					{
+						quantity=-1*quantity;
+					}
 					sql ="update workorder_bill set iss_qty =  case when iss_qty is null then 0 else iss_qty end + " + quantity
 					  +", iss_date = ? where  work_order ='"+workOrder+"'  and operation ="+operation
 					  +" and exp_lev ='"+expLev+"'";
@@ -1062,7 +1069,7 @@ public class WorkorderIssConf extends ActionHandlerEJB implements WorkorderIssCo
 				if (!"0".equals(stkOpt))
 				{
 					//rahul on 07-08-03 for qc_reqd to be checked first from siteitem & then from item
-					qcReqd = mfgCommon.chkQcReqd(siteCode, itemCode, conn);
+					//qcReqd = mfgCommon.chkQcReqd(siteCode, itemCode, conn);
 					autoReQc = mfgCommon.chkAutoQcReqd(siteCode, itemCode, conn);
 
 					if ("I".equals(tranType) || "O".equals(tranType) || "D".equals(tranType) || "F".equals(tranType) )