Skip to content

B
business-java
Commit 267f3deb authored by cpatil's avatar cpatil
Browse files
Options

modify code from old version 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@93315 ce508802-f39f-4f6c-b175-0d175dae99d5
parent c7952160
Hide whitespace changes
Inline Side-by-side
Showing with 52 additions and 36 deletions
webitm-dis/ibase/webitm/ejb/dis/adv/StockAllocPrc.java
View file @ 267f3deb
...@@ -211,9 +211,10 @@ public class StockAllocPrc extends ActionHandlerEJB implements StockAllocPrcLoca ...@@ -211,9 +211,10 @@ public class StockAllocPrc extends ActionHandlerEJB implements StockAllocPrcLoca
String itemRef = null; String itemRef = null;
String lineNoSord = null; String lineNoSord = null;
String itemCode = null; String itemCode = null;
String siteCode = null; //String siteCode = null;
String siteCodeShip = null; // change by cpatil for siteCode to siteCodeShip
String expLev = null; String expLev = null;
String updateSorditem = null; String updateSorditem = null,sqlst=null;
String sordAllocSql = null; String sordAllocSql = null;
String insertSql = null; String insertSql = null;
String updateSql= null; String updateSql= null;
...@@ -233,7 +234,7 @@ public class StockAllocPrc extends ActionHandlerEJB implements StockAllocPrcLoca ...@@ -233,7 +234,7 @@ public class StockAllocPrc extends ActionHandlerEJB implements StockAllocPrcLoca
java.sql.Date dateAlloc= new java.sql.Date(System.currentTimeMillis()); java.sql.Date dateAlloc= new java.sql.Date(System.currentTimeMillis());
PreparedStatement pstmt = null; PreparedStatement pstmt = null,pstmtStk=null;
PreparedStatement pSordAllocDet = null; PreparedStatement pSordAllocDet = null;
PreparedStatement pSelSordItem = null; PreparedStatement pSelSordItem = null;
PreparedStatement pUpdSordItem = null; PreparedStatement pUpdSordItem = null;
...@@ -241,10 +242,11 @@ public class StockAllocPrc extends ActionHandlerEJB implements StockAllocPrcLoca ...@@ -241,10 +242,11 @@ public class StockAllocPrc extends ActionHandlerEJB implements StockAllocPrcLoca
PreparedStatement pUpdSordAlloc = null; PreparedStatement pUpdSordAlloc = null;
PreparedStatement pInsSordAlloc = null; PreparedStatement pInsSordAlloc = null;
ResultSet rs = null ; ResultSet rs = null ,rsst=null;
ResultSet rsTemp = null; ResultSet rsTemp = null;
ITMDBAccessEJB itmDBAccessEJB = null; ITMDBAccessEJB itmDBAccessEJB = null;
InvAllocTraceBean invAllocTrace = new InvAllocTraceBean(); InvAllocTraceBean invAllocTrace = new InvAllocTraceBean();
GenericUtility genericUtility = GenericUtility.getInstance(); GenericUtility genericUtility = GenericUtility.getInstance();
...@@ -260,23 +262,13 @@ public class StockAllocPrc extends ActionHandlerEJB implements StockAllocPrcLoca ...@@ -260,23 +262,13 @@ public class StockAllocPrc extends ActionHandlerEJB implements StockAllocPrcLoca
java.sql.Timestamp tranDate = java.sql.Timestamp.valueOf(genericUtility.getValidDateString( currDateStr , applDateFormat, dbDateFormat ) + " 00:00:00.0") ; java.sql.Timestamp tranDate = java.sql.Timestamp.valueOf(genericUtility.getValidDateString( currDateStr , applDateFormat, dbDateFormat ) + " 00:00:00.0") ;
/*
sorditemSql = "SELECT ITEM_CODE,ITEM_CODE__ORD,UNIT, ITEM_REF" sorditemSql = "SELECT ITEM_CODE,ITEM_CODE__ORD,UNIT, ITEM_REF"
//+" QUANTITY - QTY_DESP PENDING_QUANTITY " //+" QUANTITY - QTY_DESP PENDING_QUANTITY " // remove comment by cpatil on 03/07/13
+" FROM SORDITEM WHERE SALE_ORDER = ? " +" FROM SORDITEM WHERE SALE_ORDER = ? "
+" AND LINE_NO = ? " +" AND LINE_NO = ? "
+" AND EXP_LEV = ? "; +" AND EXP_LEV = ? ";
//System.out.println("sorditemSql:::"+sorditemSql); //System.out.println("sorditemSql:::"+sorditemSql);
*/ // commented by cpatil on 02/07/13
// added by cpatil on 02/07/13
sorditemSql = " SELECT i.ITEM_CODE,i.ITEM_CODE__ORD,i.UNIT, i.ITEM_REF ," +
" d.unit__std , d.conv__qty_stduom, d.quantity__stduom " +
" FROM SORDITEM i , sorddet d " +
" WHERE i.SALE_ORDER = ? AND i.LINE_NO = ? " +
" AND i.EXP_LEV = ? " +
" AND i.SALE_ORDER = d.SALE_ORDER " +
" AND i.LINE_NO = d.LINE_NO ";
// added by cpatil on 02/07/13
pSelSordItem = conn.prepareStatement(sorditemSql); pSelSordItem = conn.prepareStatement(sorditemSql);
updateSorditem ="UPDATE SORDITEM SET QTY_ALLOC = CASE WHEN QTY_ALLOC IS NULL THEN 0 ELSE QTY_ALLOC END + ? " updateSorditem ="UPDATE SORDITEM SET QTY_ALLOC = CASE WHEN QTY_ALLOC IS NULL THEN 0 ELSE QTY_ALLOC END + ? "
...@@ -329,7 +321,7 @@ public class StockAllocPrc extends ActionHandlerEJB implements StockAllocPrcLoca ...@@ -329,7 +321,7 @@ public class StockAllocPrc extends ActionHandlerEJB implements StockAllocPrcLoca
pSordAllocDet = conn.prepareStatement(getDataSql); pSordAllocDet = conn.prepareStatement(getDataSql);
pSordAllocDet.setString(1,tranId); pSordAllocDet.setString(1,tranId);
rs = pSordAllocDet.executeQuery(); rs = pSordAllocDet.executeQuery();
System.out.println("tranId------"+ tranId); System.out.println("tranId------["+ tranId);
int updCount = 0; int updCount = 0;
while(rs.next()) while(rs.next())
...@@ -354,14 +346,41 @@ public class StockAllocPrc extends ActionHandlerEJB implements StockAllocPrcLoca ...@@ -354,14 +346,41 @@ public class StockAllocPrc extends ActionHandlerEJB implements StockAllocPrcLoca
//QUANTITY //QUANTITY
quantity = rs.getDouble(8); quantity = rs.getDouble(8);
//SITE_CODE //SITE_CODE
siteCode = rs.getString(10); //siteCode = rs.getString(10); // chage by cpatil for siteCode to siteCodeShip
siteCodeShip = rs.getString(10); // change by cpatil for siteCode to siteCodeShip
//EXP_LEV //EXP_LEV
expLev = rs.getString(11); expLev = rs.getString(11);
pendingQuantity = rs.getDouble(12); pendingQuantity = rs.getDouble(12);
qtyToBeAllocated = quantity; qtyToBeAllocated = quantity;
// added by cpatil on 04/07/13
sqlst = " SELECT UNIT,CONV__QTY_STDUOM," +
//"QUANTITY , quantity__stduom " +
" FROM STOCK " +
" WHERE ITEM_CODE = ? AND LOC_CODE = ? AND SITE_CODE = ? AND LOT_NO = ? AND LOT_SL = ? ";
pstmtStk = conn.prepareStatement(sqlst);
pstmtStk.setString(1,itemCode);
pstmtStk.setString(2,locCode);
//pstmtStk.setString(3,siteCode); // change by cpatil for siteCode to siteCodeShip
pstmtStk.setString(3,siteCodeShip); // change by cpatil for siteCode to siteCodeShip
pstmtStk.setString(4,lotNo);
pstmtStk.setString(5,lotSl);
rsst = pstmtStk.executeQuery();
if(rsst.next())
{
unit = rsst.getString("unit");
convQtyStduom = rsst.getDouble("conv__qty_stduom");
//quantityStduom = rsst.getDouble("quantity__stduom");
}
rsst.close();
rsst = null;
pstmtStk.close();
pstmtStk = null;
System.out.println("@@@@ unit["+unit+"]:::convQtyStduom["+convQtyStduom+"]:::quantityStduom["+quantityStduom+"]");
// end
System.out.print("Allocatio Qty = " + qtyToBeAllocated); System.out.print("Allocatio Qty = " + qtyToBeAllocated);
if (qtyToBeAllocated > 0) if (qtyToBeAllocated > 0)
...@@ -371,7 +390,8 @@ public class StockAllocPrc extends ActionHandlerEJB implements StockAllocPrcLoca ...@@ -371,7 +390,8 @@ public class StockAllocPrc extends ActionHandlerEJB implements StockAllocPrcLoca
strAllocate.put("ref_ser","S-ALC"); strAllocate.put("ref_ser","S-ALC");
strAllocate.put("ref_id",saleOrder); strAllocate.put("ref_id",saleOrder);
strAllocate.put("ref_line", "" + lineNoSord); strAllocate.put("ref_line", "" + lineNoSord);
strAllocate.put("site_code",siteCode); //strAllocate.put("site_code",siteCode); // change by cpatil for siteCode to siteCodeShip
strAllocate.put("site_code",siteCodeShip); // change by cpatil for siteCode to siteCodeShip
strAllocate.put("item_code",itemCode); strAllocate.put("item_code",itemCode);
strAllocate.put("loc_code",locCode); strAllocate.put("loc_code",locCode);
strAllocate.put("lot_no",lotNo); strAllocate.put("lot_no",lotNo);
...@@ -403,17 +423,11 @@ public class StockAllocPrc extends ActionHandlerEJB implements StockAllocPrcLoca ...@@ -403,17 +423,11 @@ public class StockAllocPrc extends ActionHandlerEJB implements StockAllocPrcLoca
//ITEM_CODE__ORD //ITEM_CODE__ORD
itemCodeOrd = rsTemp.getString(2); itemCodeOrd = rsTemp.getString(2);
//UNIT //UNIT
//unitStd = rsTemp.getString(3); // comment by cpatil on 02/07/13 unitStd = rsTemp.getString(3);
unit = rsTemp.getString(3); // added by cpatil on 02/07/13
//ITEM_REF //ITEM_REF
itemRef = rsTemp.getString(4); itemRef = rsTemp.getString(4);
//PENDING_QUANTITY //PENDING_QUANTITY
unitStd = rsTemp.getString(5); // added by cpatil on 02/07/13 //pendingQuantity = rsTemp.getDouble(5); // added comment by cpatil on 03/07/13
//conv__qty_stduom convQtyStduom
convQtyStduom = rsTemp.getDouble(6); // added by cpatil on 02/07/13
// quantity__stduom quantityStduom
quantityStduom = rsTemp.getDouble(7); // added by cpatil on 02/07/13
} }
rsTemp.close(); rsTemp = null; rsTemp.close(); rsTemp = null;
...@@ -483,8 +497,11 @@ public class StockAllocPrc extends ActionHandlerEJB implements StockAllocPrcLoca ...@@ -483,8 +497,11 @@ public class StockAllocPrc extends ActionHandlerEJB implements StockAllocPrcLoca
pInsSordAlloc.setString(4, itemCodeOrd); pInsSordAlloc.setString(4, itemCodeOrd);
System.out.println("item_code__ord------->"+itemCodeOrd); System.out.println("item_code__ord------->"+itemCodeOrd);
//SITE_CODE //SITE_CODE
pInsSordAlloc.setString(5, siteCode); //pInsSordAlloc.setString(5, siteCode); // change by cpatil for siteCode to siteCodeShip
System.out.println("siteCode------->"+siteCode); //System.out.println("siteCode------->"+siteCode); // change by cpatil for siteCode to siteCodeShip
pInsSordAlloc.setString(5, siteCodeShip); // change by cpatil for siteCode to siteCodeShip
System.out.println("siteCode------->"+siteCodeShip); // change by cpatil for siteCode to siteCodeShip
//ITEM_CODE //ITEM_CODE
pInsSordAlloc.setString(6, itemCode); pInsSordAlloc.setString(6, itemCode);
System.out.println("itemCode------->"+itemCode); System.out.println("itemCode------->"+itemCode);
...@@ -525,16 +542,15 @@ public class StockAllocPrc extends ActionHandlerEJB implements StockAllocPrcLoca ...@@ -525,16 +542,15 @@ public class StockAllocPrc extends ActionHandlerEJB implements StockAllocPrcLoca
pInsSordAlloc.setString(18,"M"); pInsSordAlloc.setString(18,"M");
//CONV__QTY_STDUOM //CONV__QTY_STDUOM
pInsSordAlloc.setDouble(19,convQtyStduom); pInsSordAlloc.setDouble(19,convQtyStduom);
System.out.println("convQtyStduom------->"+convQtyStduom); //conv__qty_stduom System.out.println("convQtyStduom------->"+convQtyStduom);
//UNIT__STD //UNIT__STD
pInsSordAlloc.setString(20,unitStd); pInsSordAlloc.setString(20,unitStd);
System.out.println("unitStd------->"+unitStd+":::::quantityStduom["+quantityStduom+"]"); System.out.println("unitStd------->"+unitStd);
System.out.println("convQtyStduom------->"+convQtyStduom+":::::qtyToBeAllocated["+qtyToBeAllocated+"]");
//quantityStduom = convQtyStduom * qtyToBeAllocated ; // commented by cpatil on 02/07/13 quantityStduom = convQtyStduom * qtyToBeAllocated ;
quantityStduom = qtyToBeAllocated ; // added by cpatil on 02/07/13
//QUANTITY__STDUOM //QUANTITY__STDUOM
pInsSordAlloc.setDouble(21,quantityStduom); pInsSordAlloc.setDouble(21,quantityStduom);
System.out.println("quantityStduom------->"+quantityStduom); // quantity__stduom System.out.println("quantityStduom------->"+quantityStduom);
//MFG_DATE //MFG_DATE
pInsSordAlloc.setDate(22,mfgDate); pInsSordAlloc.setDate(22,mfgDate);
System.out.println("mfgDate------->"+mfgDate); System.out.println("mfgDate------->"+mfgDate);
......
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