Skip to content

B
business-java
Commit 28df6669 authored by msharma's avatar msharma
Browse files
Options

Sitecodeship column is added in sord_alloc table for Manual stock allocation... 

Sitecodeship column is added in sord_alloc table for Manual stock allocation transaction(WMS) and show Quantity in terms of STD unit


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@93271 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 255a5297
Show whitespace changes
Inline Side-by-side
Showing with 117 additions and 16 deletions
webitm-dis/ibase/webitm/ejb/dis/StockAllocIc.java
View file @ 28df6669
......@@ -96,6 +96,8 @@ public class StockAllocIc extends ValidatorEJB implements StockAllocIcLocal, Sto
Connection conn = null;
PreparedStatement pstmt = null ;
ResultSet rs = null;
String siteCodeShip=""; // added by cpatil on 27/06/13
ConnDriver connDriver = new ConnDriver();
StringBuffer errStringXml = new StringBuffer("<?xml version = \"1.0\"?> \r\n <Root> <Errors>");
try
......@@ -190,6 +192,37 @@ public class StockAllocIc extends ValidatorEJB implements StockAllocIcLocal, Sto
}
}
else if(childNodeName.equalsIgnoreCase("site_code__ship"))
{
siteCodeShip = genericUtility.getColumnValue("site_code__ship", dom);
if(siteCodeShip == null || (siteCodeShip.length() == 0))
{
errList.add("VMSITECOD");
errFields.add(childNodeName.toLowerCase());
}
if(siteCodeShip != null && (siteCodeShip.trim().length() > 0))
{
sql = " select count(*) from site where site_code = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,siteCodeShip);
rs = pstmt.executeQuery();
if(rs.next())
{
cnt = rs.getInt(1);
if(cnt == 0)
{
errCode = "VMSITE1";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
}
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
}
}
}
break;
......@@ -203,7 +236,8 @@ public class StockAllocIc extends ValidatorEJB implements StockAllocIcLocal, Sto
childNodeListLength = childNodeList.getLength();
//Changed By Rohan on 10/17/12 to add validation on sale order
saleOrderHdr = genericUtility.getColumnValue("sale_order", dom1 );
System.out.println("saleOrderHdr==*****==>"+saleOrderHdr);
siteCodeShip = genericUtility.getColumnValue("site_code__ship", dom1);
System.out.println("saleOrderHdr==*****==>"+saleOrderHdr+"::::siteCodeShip===>"+siteCodeShip);
for(ctr = 0; ctr < childNodeListLength; ctr ++)
{
childNode = childNodeList.item(ctr);
......@@ -410,6 +444,7 @@ public class StockAllocIc extends ValidatorEJB implements StockAllocIcLocal, Sto
itemCode = genericUtility.getColumnValue("item_code", dom);
siteCode = genericUtility.getColumnValue("site_code", dom);
locCode = genericUtility.getColumnValue("loc_code", dom);
lotNo = genericUtility.getColumnValue("lot_no", dom);
Map tempMap = new HashMap();
......@@ -446,7 +481,7 @@ public class StockAllocIc extends ValidatorEJB implements StockAllocIcLocal, Sto
+" and lot_no = ? and lot_sl = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,itemCode);
pstmt.setString(2,siteCode);
pstmt.setString(2,siteCodeShip); // replace siteCode by cpatil 27/06/13
pstmt.setString(3,locCode);
pstmt.setString(4,lotNo);
pstmt.setString(5,lotSl);
......@@ -489,6 +524,7 @@ public class StockAllocIc extends ValidatorEJB implements StockAllocIcLocal, Sto
lineNoSord = genericUtility.getColumnValue("line_no__sord", dom);
itemCode = genericUtility.getColumnValue("item_code", dom);
siteCode = genericUtility.getColumnValue("site_code", dom);
//siteCodeShip = genericUtility.getColumnValue("site_code", dom1);
lotNo = genericUtility.getColumnValue("lot_no", dom);
lotSl = genericUtility.getColumnValue("lot_sl", dom);
System.out.println("saleOrder ["+saleOrder+"] lineNoSord["+lineNoSord+"] itemCode["+itemCode+"] siteCode["+siteCode+"] lotNo["+lotNo+"] lotSl["+lotSl+"]"); ;
......@@ -503,7 +539,7 @@ public class StockAllocIc extends ValidatorEJB implements StockAllocIcLocal, Sto
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, itemCode);
pstmt.setString(2, siteCode);
pstmt.setString(2, siteCodeShip); // replace siteCode by cpatil 27/06/13
pstmt.setString(3, locCode);
pstmt.setString(4, lotNo);
pstmt.setString(5, lotSl);
......@@ -689,7 +725,10 @@ public class StockAllocIc extends ValidatorEJB implements StockAllocIcLocal, Sto
int currentFormNo = 0;
double pendingQty = 0.0,qtyAvail = 0.0;
//Changes by Sumit end
// added by cpatil on 25/06/13 start
String siteCodeShip="",siteCodeShipDescr="",unit="", unitStd ="",columnValue="";
double orderQuantity = 0.0,convQtyStduom = 0.0,quantityStduom = 0.0;
// added by cpatil on 25/06/13 end
Connection conn = null;
PreparedStatement pstmt = null;
ResultSet rs = null ;
......@@ -697,6 +736,7 @@ public class StockAllocIc extends ValidatorEJB implements StockAllocIcLocal, Sto
ConnDriver connDriver = new ConnDriver();
try
{
System.out.println("@@@@@@@@@@@ itemchange method called for ---->>>>["+currentColumn+"]");
DistCommon discommon = new DistCommon();
conn = connDriver.getConnectDB("DriverITM");
conn.setAutoCommit(false);
......@@ -712,7 +752,7 @@ public class StockAllocIc extends ValidatorEJB implements StockAllocIcLocal, Sto
siteCode =(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginSiteCode"));
siteDescr = findValue(conn, "descr" ,"site", "site_code", siteCode);
System.out.println("@@@@@@ 1 siteCode["+siteCode+"]::::::siteDescr["+siteDescr+"]");
chgUser =(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginEmpCode"));
chgTerm =(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "chgTerm"));
......@@ -736,12 +776,15 @@ public class StockAllocIc extends ValidatorEJB implements StockAllocIcLocal, Sto
{
if(childNode.getFirstChild() != null)
{
columnValue = childNode.getFirstChild().getNodeValue().trim(); //added by cpatil
}
}
ctr ++;
}while(ctr < childNodeListLength && ! childNodeName.equals(currentColumn));
if(currentColumn.trim().equalsIgnoreCase("itm_default"))
{
System.out.println("@@@@@@ itm_default itemchange called");
System.out.println("@@@@@@ 2 siteCode["+siteCode+"]::::::siteDescr["+siteDescr+"]");
valueXmlString.append("<site_code>").append("<![CDATA[" + siteCode + "]]>").append("</site_code>");
valueXmlString.append("<site_descr>").append("<![CDATA[" + siteDescr + "]]>").append("</site_descr>");
......@@ -749,6 +792,12 @@ public class StockAllocIc extends ValidatorEJB implements StockAllocIcLocal, Sto
valueXmlString.append("<add_date>").append("<![CDATA[" + dateNow + "]]>").append("</add_date>");
valueXmlString.append("<add_user>").append("<![CDATA[" + chgUser + "]]>").append("</add_user>");
valueXmlString.append("<add_term>").append("<![CDATA[" + chgTerm + "]]>").append("</add_term>");
// added by cpatil start
valueXmlString.append("<chg_date>").append("<![CDATA[" + dateNow + "]]>").append("</chg_date>");
valueXmlString.append("<chg_user>").append("<![CDATA[" + chgUser + "]]>").append("</chg_user>");
valueXmlString.append("<chg_term>").append("<![CDATA[" + chgTerm + "]]>").append("</chg_term>");
// end
}//end of if
else if(currentColumn.trim().equalsIgnoreCase("itm_defaultedit"))
......@@ -767,13 +816,31 @@ public class StockAllocIc extends ValidatorEJB implements StockAllocIcLocal, Sto
}
else if(currentColumn.trim().equalsIgnoreCase("sale_order"))
{
System.out.println("@@@@@@ sale order itemchange called");
saleOrder = genericUtility.getColumnValue("sale_order", dom);
custCode = findValue(conn, "cust_code" ,"sorder", "sale_order", saleOrder);
valueXmlString.append("<cust_code>").append("<![CDATA[" + custCode + "]]>").append("</cust_code>");
custDescr = findValue(conn, "cust_name" ,"customer", "cust_code", custCode);
valueXmlString.append("<cust_name>").append("<![CDATA[" + custDescr + "]]>").append("</cust_name>");
}
// added by cpatil on 25/06/13 start
siteCodeShip = findValue(conn, "site_code__ship" ,"sorder", "sale_order", saleOrder);
siteCodeShipDescr = findValue(conn, "descr" ,"site", "site_code", siteCodeShip);
System.out.println("@@@@@ siteCodeShip["+siteCodeShip+"]siteCodeShipDescr["+siteCodeShipDescr+"]");
valueXmlString.append("<site_code__ship>").append("<![CDATA[" + siteCodeShip + "]]>").append("</site_code__ship>");
valueXmlString.append("<site_ship_descr>").append("<![CDATA[" + siteCodeShipDescr + "]]>").append("</site_ship_descr>");
// added by cpatil on 25/06/13 end
}
// added by cpatil on 25/06/13 start
else if(currentColumn.trim().equalsIgnoreCase("site_code__ship"))
{
System.out.println("@@@@@@ site_code__ship itemchange called");
siteCodeShip = genericUtility.getColumnValue("site_code__ship", dom);
siteCodeShipDescr = findValue(conn, "descr" ,"site", "site_code", siteCodeShip);
System.out.println("@@@@@ siteCodeShip["+siteCodeShip+"]siteCodeShipDescr["+siteCodeShipDescr+"]");
valueXmlString.append("<site_ship_descr>").append("<![CDATA[" + siteCodeShipDescr + "]]>").append("</site_ship_descr>");
}
// added by cpatil on 25/06/13 end
valueXmlString.append("</Detail1>");
break;
......@@ -796,7 +863,8 @@ public class StockAllocIc extends ValidatorEJB implements StockAllocIcLocal, Sto
}
ctr ++;
}while(ctr < childNodeListLength && ! childNodeName.equals(currentColumn));
siteCodeShip = genericUtility.getColumnValue("site_code__ship", dom1);
System.out.println("siteCodeShip----"+siteCodeShip);
if(currentColumn.trim().equalsIgnoreCase("itm_default"))
{
/*--commented and changes below by gulzar on 12/24/2011
......@@ -865,7 +933,7 @@ public class StockAllocIc extends ValidatorEJB implements StockAllocIcLocal, Sto
rs = pstmt.executeQuery();*/
if(expLev.trim().length() > 0)
{
sql = "SELECT ITEM_CODE,(CASE WHEN quantity IS NULL THEN 0 ELSE quantity END - CASE WHEN qty_alloc IS NULL THEN 0 ELSE qty_alloc END - CASE WHEN qty_desp IS NULL THEN 0 ELSE qty_desp END )"
sql = "SELECT ITEM_CODE,((CASE WHEN quantity IS NULL THEN 0 ELSE quantity END)*CONV__QTY_STDQTY - CASE WHEN qty_alloc IS NULL THEN 0 ELSE qty_alloc END - CASE WHEN qty_desp IS NULL THEN 0 ELSE qty_desp END )"
+ ", EXP_LEV FROM SORDITEM WHERE SALE_ORDER = ? AND LINE_NO = ? AND EXP_LEV = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,saleOrder);
......@@ -874,7 +942,7 @@ public class StockAllocIc extends ValidatorEJB implements StockAllocIcLocal, Sto
}
else
{
sql = "SELECT ITEM_CODE,(CASE WHEN quantity IS NULL THEN 0 ELSE quantity END - CASE WHEN qty_alloc IS NULL THEN 0 ELSE qty_alloc END - CASE WHEN qty_desp IS NULL THEN 0 ELSE qty_desp END )"
sql = "SELECT ITEM_CODE,((CASE WHEN quantity IS NULL THEN 0 ELSE quantity END)*CONV__QTY_STDQTY - CASE WHEN qty_alloc IS NULL THEN 0 ELSE qty_alloc END - CASE WHEN qty_desp IS NULL THEN 0 ELSE qty_desp END )"
+ ", EXP_LEV FROM SORDITEM WHERE SALE_ORDER = ? AND LINE_NO = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,saleOrder);
......@@ -903,7 +971,9 @@ public class StockAllocIc extends ValidatorEJB implements StockAllocIcLocal, Sto
//Changed by sumit on 07/01/13 start
Map stockDeatil = new HashMap();
stockDeatil = getStockDetail(siteCode, saleOrder, lineNoSord, conn, itemCode);
//stockDeatil = getStockDetail(siteCode, saleOrder, lineNoSord, conn, itemCode);//COMMENTED BY MANOJ DTD 27/06/2013 to get Stock etail for Site ode Ship
stockDeatil = getStockDetail(siteCodeShip, saleOrder, lineNoSord, conn, itemCode);
/**
* stockDetail.put("qtyAvail", qtyAvail);
* stockDetail.put("lotNo", lotNo);
......@@ -918,6 +988,37 @@ public class StockAllocIc extends ValidatorEJB implements StockAllocIcLocal, Sto
valueXmlString.append("<loc_code>").append("<![CDATA[" + stockDeatil.get("locCode") + "]]>").append("</loc_code>");
valueXmlString.append("<location_descr>").append("<![CDATA[" + stockDeatil.get("locDescr") + "]]>").append("</location_descr>");
//Changed by sumit on 07/01/13 end
// added by cpatil start
sql = " select quantity,unit,unit__std,conv__qty_stduom,quantity__stduom FROM sorddet " +
" WHERE sale_order = ? and line_no = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,saleOrder);
pstmt.setString(2,lineNoSord);
rs = pstmt.executeQuery();
if(rs.next())
{
orderQuantity = rs.getDouble("quantity");
unit = rs.getString("unit");
unitStd = rs.getString("unit__std");
convQtyStduom = rs.getDouble("conv__qty_stduom");
quantityStduom = rs.getDouble("quantity__stduom");
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
valueXmlString.append("<order_quantity>").append( orderQuantity ).append("</order_quantity>");
valueXmlString.append("<unit>").append( unit ).append("</unit>");
valueXmlString.append("<unit__std>").append( unitStd ).append("</unit__std>");
valueXmlString.append("<conv__qty_stduom>").append( convQtyStduom ).append("</conv__qty_stduom>");
valueXmlString.append("<quantity__stduom>").append( quantityStduom ).append("</quantity__stduom>");
// added by cpatil end
}
}
else if(currentColumn.trim().equalsIgnoreCase("lot_no"))
......@@ -931,7 +1032,7 @@ public class StockAllocIc extends ValidatorEJB implements StockAllocIcLocal, Sto
String getDataSql =" SELECT SORDER.CUST_CODE, CUSTOMER.CUST_NAME,SORDDET.LINE_NO, "
+"SORDER.SALE_ORDER,SORDER.DUE_DATE,SORDITEM.ITEM_CODE,"
+"ITEM.DESCR,SORDITEM.QUANTITY,"
+"(SORDITEM.QUANTITY - SORDITEM.QTY_DESP - SORDITEM.QTY_ALLOC) PENDING_QUANTITY,"
+"((SORDITEM.QUANTITY*SORDITEM.CONV__QTY_STDQTY) - SORDITEM.QTY_DESP - SORDITEM.QTY_ALLOC) PENDING_QUANTITY,"
+"SORDITEM.QTY_ALLOC,SORDDET.PACK_INSTR,"
+"SORDER.SITE_CODE,SORDITEM.EXP_LEV, "
+"SORDER.PART_QTY AS PART_QTY, CUSTOMER.SINGLE_LOT AS SINGLE_LOT, SORDITEM.MIN_SHELF_LIFE AS MIN_SHELF_LIFE "//Gulzar 5/13/2012
......@@ -963,7 +1064,7 @@ public class StockAllocIc extends ValidatorEJB implements StockAllocIcLocal, Sto
//+"AND (SORDITEM.QUANTITY - SORDITEM.QTY_DESP - SORDITEM.QTY_ALLOC > 0 OR SORDER.ALLOC_FLAG='M' )"
//Changed by sumit on 13/08/12 as per manual stock allocation start.
//+"AND SORDITEM.QUANTITY - SORDITEM.QTY_DESP - SORDITEM.QTY_ALLOC > 0 "
+" AND ((SORDITEM.QUANTITY - SORDITEM.QTY_DESP - SORDITEM.QTY_ALLOC > 0 ) "
+" AND (((SORDITEM.QUANTITY*SORDITEM.CONV__QTY_STDQTY) - SORDITEM.QTY_DESP - SORDITEM.QTY_ALLOC > 0 ) "
+" OR (FN_CHECK_MANUAL_STOCK_ALLOC(SORDER.SALE_ORDER, SORDDET.LINE_NO) = 0 ) )"
+"AND SORDITEM.LINE_TYPE = 'I'";
......@@ -1555,7 +1656,7 @@ public class StockAllocIc extends ValidatorEJB implements StockAllocIcLocal, Sto
String getDataSql =" SELECT SORDER.CUST_CODE, CUSTOMER.CUST_NAME,SORDDET.LINE_NO, "
+"SORDER.SALE_ORDER,SORDER.DUE_DATE,SORDITEM.ITEM_CODE,"
+"ITEM.DESCR,SORDITEM.QUANTITY,"
+"(SORDITEM.QUANTITY - SORDITEM.QTY_DESP - SORDITEM.QTY_ALLOC) PENDING_QUANTITY,"
+"((SORDITEM.QUANTITY*SORDITEM.CONV__QTY_STDQTY) - SORDITEM.QTY_DESP - SORDITEM.QTY_ALLOC) PENDING_QUANTITY,"
+"SORDITEM.QTY_ALLOC,SORDDET.PACK_INSTR,"
+"SORDER.SITE_CODE,SORDITEM.EXP_LEV, "
+"SORDER.PART_QTY AS PART_QTY, CUSTOMER.SINGLE_LOT AS SINGLE_LOT, SORDITEM.MIN_SHELF_LIFE AS MIN_SHELF_LIFE "//Gulzar 5/13/2012
......@@ -1583,7 +1684,7 @@ public class StockAllocIc extends ValidatorEJB implements StockAllocIcLocal, Sto
//+"AND (SORDITEM.QUANTITY - SORDITEM.QTY_DESP - SORDITEM.QTY_ALLOC > 0 OR SORDER.ALLOC_FLAG='M' )"
//Changed by sumit on 13/08/12 as per manual stock allocation start.
//+"AND SORDITEM.QUANTITY - SORDITEM.QTY_DESP - SORDITEM.QTY_ALLOC > 0 "
+" AND ((SORDITEM.QUANTITY - SORDITEM.QTY_DESP - SORDITEM.QTY_ALLOC > 0 ) "
+" AND (((SORDITEM.QUANTITY*SORDITEM.CONV__QTY_STDQTY) - SORDITEM.QTY_DESP - SORDITEM.QTY_ALLOC > 0 ) "
+" OR (FN_CHECK_MANUAL_STOCK_ALLOC(SORDER.SALE_ORDER, SORDDET.LINE_NO) = 0 ) )"
+"AND SORDITEM.LINE_TYPE = 'I'";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment