Skip to content

B
business-java
Commit cc86f37a authored by rbhogale's avatar rbhogale
Browse files
Options

Changed by Rohan on 10-05-13 for sumit source merging 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@93040 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 5911ebaa
Hide whitespace changes
Inline Side-by-side
Showing with 370 additions and 8 deletions
webitm-wms/ibase/webitm/ejb/wms/DockTranPos.java
View file @ cc86f37a
...@@ -80,6 +80,17 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT ...@@ -80,6 +80,17 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
HashMap itmVolumeMap = new HashMap(); HashMap itmVolumeMap = new HashMap();
double shipperSize = 0, itemGrossWeight = 0, caseGrossWeight = 0, itemNetWeight = 0, caseNetWeight = 0; double shipperSize = 0, itemGrossWeight = 0, caseGrossWeight = 0, itemNetWeight = 0, caseNetWeight = 0;
// end 10/10/12 manoharan // end 10/10/12 manoharan
//Changed By 02/05/13 Pragyan To check the sordalloc allocated quantity > quantity then insert new record deducte quantity from old location.start
PreparedStatement pstmt1 = null,pstmtSord = null;
ResultSet rs1 = null,rsSord = null;
String expLev = "",itemCodeOrd = "",itemRef = "",status = "",allocMode = "",
itemGrade = "",reasCode = "",unitStd = "",sSQL = "";
java.sql.Timestamp dateAlloc = null;
double qtyOrd = 0.0,sordAllocQty = 0.0;
ITMDBAccessEJB itmDBAccess = new ITMDBAccessEJB();
//Changed By 02/05/13 Pragyan To check the sordalloc allocated quantity > quantity then insert new record deducte quantity from old location.end
try try
{ {
updateRowMap = new HashMap() ; updateRowMap = new HashMap() ;
...@@ -362,7 +373,8 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT ...@@ -362,7 +373,8 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
lineNoSord = " " + lineNoSord; lineNoSord = " " + lineNoSord;
lineNoSord = lineNoSord.substring(lineNoSord.length()-3); lineNoSord = lineNoSord.substring(lineNoSord.length()-3);
// end 16/10/11 manoharan allocation stock for new location //Changed By 02/05/13 Pragyan To check the sordalloc allocated quantity > quantity then insert new record deducte quantity from old location.start
/*// end 16/10/11 manoharan allocation stock for new location
// 16/10/11 manoharan update sordalloc // 16/10/11 manoharan update sordalloc
updateSql = "UPDATE SORDALLOC SET LOC_CODE = ? " updateSql = "UPDATE SORDALLOC SET LOC_CODE = ? "
+ " WHERE SALE_ORDER = ? AND LINE_NO = ? " + " WHERE SALE_ORDER = ? AND LINE_NO = ? "
...@@ -382,6 +394,301 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT ...@@ -382,6 +394,301 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
updCnt = pstmtUpd.executeUpdate(); //change done by kunal on 14/09/12 uncomment sql query updCnt = pstmtUpd.executeUpdate(); //change done by kunal on 14/09/12 uncomment sql query
// end 16/10/11 manoharan update sordalloc // end 16/10/11 manoharan update sordalloc
*/
sql = " SELECT EXP_LEV, ITEM_CODE__ORD, "
+ " ITEM_REF, UNIT, DATE_ALLOC, STATUS, ITEM_GRADE, EXP_DATE, ALLOC_MODE, SITE_CODE, "
+ " CONV__QTY_STDUOM, UNIT__STD, MFG_DATE, SITE_CODE__MFG, REAS_CODE,QUANTITY,QTY_ALLOC FROM SORDALLOC "
+ " WHERE SALE_ORDER = ? AND LINE_NO = ? "
+ " AND ITEM_CODE = ? "
+ " AND LOC_CODE = ? "
+ " AND LOT_NO = ? "
+ " AND LOT_SL = ? "
+ " AND QTY_ALLOC > 0";
pstmt1 = conn.prepareStatement(sql);
pstmt1.setString(1, saleOrder);
pstmt1.setString(2, lineNoSord);
pstmt1.setString(3, itemCode);
pstmt1.setString(4, locCode);
pstmt1.setString(5, lotNo);
pstmt1.setString(6, lotSl);
rs1 = pstmt1.executeQuery();
if( rs1.next())
{
expLev = rs1.getString( "EXP_LEV" );
itemCodeOrd = rs1.getString( "ITEM_CODE__ORD" );
itemRef = rs1.getString( "ITEM_REF" );
unit = rs1.getString( "UNIT" );
status = rs1.getString( "STATUS" );
itemGrade = rs1.getString( "ITEM_GRADE" );
allocMode = rs1.getString( "ALLOC_MODE" );
siteCode = rs1.getString( "SITE_CODE" );
siteCodeMfg = rs1.getString( "SITE_CODE__MFG" );
reasCode = rs1.getString( "REAS_CODE" );
unitStd = rs1.getString( "UNIT__STD" );
convQtyStduom = rs1.getDouble( "CONV__QTY_STDUOM" );
dateAlloc = rs1.getTimestamp("DATE_ALLOC");
expDate = rs1.getTimestamp("EXP_DATE");
mfgDate = rs1.getTimestamp("MFG_DATE");
qtyOrd = rs1.getDouble( "QUANTITY" );
sordAllocQty = rs1.getDouble( "QTY_ALLOC" );
}
else
{
isError = true;
retString = itmDBAccess.getErrorString("","RECNOTSORA","");
return retString;
}
rs1.close();
rs1 = null;
pstmt1.close();
pstmt1 = null;
sSQL = "SELECT COUNT(*) AS COUNT FROM SORDALLOC WHERE "
+ " SALE_ORDER = ? AND LINE_NO = ? "
+ " AND ITEM_CODE = ? "
+ " AND LOC_CODE = ? "
+ " AND LOT_NO = ? "
+ " AND LOT_SL = ? ";
int count = 0;
if(sordAllocQty > quantity)
{
//Changed by sumit on 09/05/13 substituting QUANTITY__STDUOM too.
//updateSql = "UPDATE SORDALLOC SET QTY_ALLOC = QTY_ALLOC - ? "
updateSql = "UPDATE SORDALLOC SET QTY_ALLOC = QTY_ALLOC - ? ,QUANTITY__STDUOM = QUANTITY__STDUOM - ?" //LOC_CODE = ? ,LOT_SL = ? "
+ " WHERE SALE_ORDER = ? AND LINE_NO = ? "
+ " AND ITEM_CODE = ? "
+ " AND LOC_CODE = ? "
+ " AND LOT_NO = ? "
+ " AND LOT_SL = ? "
+ " AND QTY_ALLOC > 0";
pstmtUpd = conn.prepareStatement(updateSql);
pstmtUpd.setDouble(1, quantity);
////Changed by sumit on 09/05/13 setting value as per sql.
pstmtUpd.setDouble(2, quantity * convQtyStduom);
pstmtUpd.setString(3, saleOrder);
pstmtUpd.setString(4, lineNoSord);
pstmtUpd.setString(5, itemCode);
pstmtUpd.setString(6, locCode);
pstmtUpd.setString(7, lotNo);
pstmtUpd.setString(8, lotSl);
updCnt = pstmtUpd.executeUpdate();
System.out.println("Changed By 02/05/13 Pragyan sordalloc updated updCnt [" + updCnt + "]");
pstmtSord = conn.prepareStatement(sSQL);
pstmtSord.setString(1, saleOrder);
pstmtSord.setString(2, lineNoSord);
pstmtSord.setString(3, itemCode);
/*if(("A".equalsIgnoreCase(pickType)) || ("M".equalsIgnoreCase(pickType)))
{
pstmtSord.setString(4, stagingLoc);
}
else
{
pstmtSord.setString(4, locCodeTo);
}
*/
pstmtSord.setString(4, locCodeTo);
pstmtSord.setString(5, lotNo);
pstmtSord.setString(6, lotSl);
rsSord = pstmtSord.executeQuery();
if(rsSord.next())
{
count = rsSord.getInt(1);
}
if(count > 0)
{
System.out.println("Changed By 02/05/13 Pragyan sordalloc If alrady exist Location Update Inside grater updCnt1st [" + updCnt + "]");
updateSql = "UPDATE SORDALLOC SET QTY_ALLOC = QTY_ALLOC + ? ,QUANTITY__STDUOM = QUANTITY__STDUOM + ?"
+ " WHERE SALE_ORDER = ? AND LINE_NO = ? "
+ " AND ITEM_CODE = ? "
+ " AND LOC_CODE = ? "
+ " AND LOT_NO = ? "
+ " AND LOT_SL = ? "
+ " AND QTY_ALLOC > 0";
pstmtUpd = conn.prepareStatement(updateSql);
pstmtUpd.setDouble(1, quantity);
pstmtUpd.setDouble(2, quantity);
pstmtUpd.setString(3, saleOrder);
pstmtUpd.setString(4, lineNoSord);
pstmtUpd.setString(5, itemCode);
/*if(("A".equalsIgnoreCase(pickType)) || ("M".equalsIgnoreCase(pickType)))
{
pstmtUpd.setString(6, stagingLoc);
}
else
{
pstmtUpd.setString(6, locCodeTo);
}
*/
pstmtUpd.setString(6, locCodeTo);
pstmtUpd.setString(7, lotNo);
pstmtUpd.setString(8, lotSl);
updCnt = pstmtUpd.executeUpdate();
System.out.println("Changed By 02/05/13 Pragyan sordalloc If alrady exist Location Update Inside grater updCnt2nd [" + updCnt + "]");
}
else
{
updateSql = "insert into sordalloc( SALE_ORDER, LINE_NO, EXP_LEV, ITEM_CODE__ORD, "
+ " ITEM_CODE, LOT_NO, LOT_SL, LOC_CODE, ITEM_REF, QUANTITY, UNIT, "
+ " QTY_ALLOC, DATE_ALLOC, STATUS, ITEM_GRADE, EXP_DATE, ALLOC_MODE, SITE_CODE, "
+ " CONV__QTY_STDUOM, UNIT__STD, QUANTITY__STDUOM, MFG_DATE, SITE_CODE__MFG, "
+ " REAS_CODE ) VALUES (?, ?, ?, ?, "
+ " ?, ?, ? , ?, ?, ?, ?, "
+ " ?,?, ?, ?, ?, ?, ?, "
+ " ?, ?, ? , ?, ?, ?) ";
pstmtUpd = conn.prepareStatement(updateSql);
pstmtUpd.setString(1, saleOrder);
pstmtUpd.setString(2, lineNoSord);
pstmtUpd.setString(3, expLev);
pstmtUpd.setString(4, itemCodeOrd);
pstmtUpd.setString(5, itemCode);
pstmtUpd.setString(6, lotNo);
pstmtUpd.setString(7, lotSl);
//pstmtUpd.setString(8, locCodeTo);
/*if(("A".equalsIgnoreCase(pickType)) || ("M".equalsIgnoreCase(pickType)))
{
pstmtUpd.setString(8, stagingLoc);
}
else
{
pstmtUpd.setString(8, locCodeTo);
} */
//Changed by sumit on 09/05/13
pstmtUpd.setString(8, locCodeTo);
pstmtUpd.setString(9, itemRef);
pstmtUpd.setDouble(10, qtyOrd);
pstmtUpd.setString(11, unit);
pstmtUpd.setDouble(12, quantity);
pstmtUpd.setTimestamp(13, dateAlloc);
pstmtUpd.setString(14, status);
pstmtUpd.setString(15, itemGrade);
pstmtUpd.setTimestamp(16, expDate);
pstmtUpd.setString(17, allocMode);
pstmtUpd.setString(18, siteCode);
pstmtUpd.setDouble(19, convQtyStduom );
pstmtUpd.setString(20, unitStd);
pstmtUpd.setDouble(21, quantity * convQtyStduom);
pstmtUpd.setTimestamp(22, mfgDate );
pstmtUpd.setString(23, siteCodeMfg);
pstmtUpd.setString(24, reasCode);
updCnt = pstmtUpd.executeUpdate();
System.out.println("Changed By 02/05/13 Pragyan sordalloc inserted updCnt [" + updCnt + "]");
}
}
else
{
pstmtSord = conn.prepareStatement(sSQL);
pstmtSord.setString(1, saleOrder);
pstmtSord.setString(2, lineNoSord);
pstmtSord.setString(3, itemCode);
/*if(("A".equalsIgnoreCase(pickType)) || ("M".equalsIgnoreCase(pickType)))
{
pstmtSord.setString(4, stagingLoc);
}
else
{
pstmtSord.setString(4, locCodeTo);
} */
pstmtSord.setString(4, locCodeTo);
pstmtSord.setString(5, lotNo);
pstmtSord.setString(6, lotSl);
rsSord = pstmtSord.executeQuery();
if(rsSord.next())
{
count = rsSord.getInt(1);
}
if(count > 0)
{
updateSql = "UPDATE SORDALLOC SET QTY_ALLOC = QTY_ALLOC - ? ,QUANTITY__STDUOM = QUANTITY__STDUOM - ?" //LOC_CODE = ? ,LOT_SL = ? "
+ " WHERE SALE_ORDER = ? AND LINE_NO = ? "
+ " AND ITEM_CODE = ? "
+ " AND LOC_CODE = ? "
+ " AND LOT_NO = ? "
+ " AND LOT_SL = ? "
+ " AND QTY_ALLOC > 0";
pstmtUpd = conn.prepareStatement(updateSql);
pstmtUpd.setDouble(1, quantity);
pstmtUpd.setDouble(2, quantity);
pstmtUpd.setString(3, saleOrder);
pstmtUpd.setString(4, lineNoSord);
pstmtUpd.setString(5, itemCode);
pstmtUpd.setString(6, locCode);
pstmtUpd.setString(7, lotNo);
pstmtUpd.setString(8, lotSl);
updCnt = pstmtUpd.executeUpdate();
System.out.println("Changed By 02/05/13 Pragyan If alrady exist Location Update updCnt1st [" + updCnt + "]");
updateSql = "UPDATE SORDALLOC SET QTY_ALLOC = QTY_ALLOC + ? ,QUANTITY__STDUOM = QUANTITY__STDUOM + ?"
+ " WHERE SALE_ORDER = ? AND LINE_NO = ? "
+ " AND ITEM_CODE = ? "
+ " AND LOC_CODE = ? "
+ " AND LOT_NO = ? "
+ " AND LOT_SL = ? "
+ " AND QTY_ALLOC > 0";
pstmtUpd = conn.prepareStatement(updateSql);
pstmtUpd.setDouble(1, quantity);
pstmtUpd.setDouble(2, quantity);
pstmtUpd.setString(3, saleOrder);
pstmtUpd.setString(4, lineNoSord);
pstmtUpd.setString(5, itemCode);
/*if(("A".equalsIgnoreCase(pickType)) || ("M".equalsIgnoreCase(pickType)))
{
pstmtUpd.setString(6, stagingLoc);
}
else
{
pstmtUpd.setString(6, locCodeTo);
} */
pstmtUpd.setString(6, locCodeTo);
pstmtUpd.setString(7, lotNo);
pstmtUpd.setString(8, lotSl);
updCnt = pstmtUpd.executeUpdate();
System.out.println("Changed By 02/05/13 Pragyan sordalloc If alrady exist Location Update updCnt2nd [" + updCnt + "]");
}
else
{
updateSql = "UPDATE SORDALLOC SET LOC_CODE = ? "
+ " WHERE SALE_ORDER = ? AND LINE_NO = ? "
+ " AND ITEM_CODE = ? "
+ " AND LOC_CODE = ? "
+ " AND LOT_NO = ? "
+ " AND LOT_SL = ? "
+ " AND QTY_ALLOC > 0";
pstmtUpd = conn.prepareStatement(updateSql);
pstmtUpd.setString(1, locCodeTo);
pstmtUpd.setString(2, saleOrder);
pstmtUpd.setString(3, lineNoSord);
pstmtUpd.setString(4, itemCode);
pstmtUpd.setString(5, locCode);
pstmtUpd.setString(6, lotNo);
pstmtUpd.setString(7, lotSl);
updCnt = pstmtUpd.executeUpdate();
}
}
//Changed By 02/05/13 Pragyan To check the sordalloc allocated quantity > quantity then insert new record deducte quantity from old location.end
updateSql = "UPDATE PICK_ISS_DET SET LOC_CODE__TO = ? " updateSql = "UPDATE PICK_ISS_DET SET LOC_CODE__TO = ? "
+ " WHERE TRAN_ID = ? AND LINE_NO = ? "; + " WHERE TRAN_ID = ? AND LINE_NO = ? ";
...@@ -471,6 +778,32 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT ...@@ -471,6 +778,32 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
} }
//Changed By 02/05/13 Pragyan To Close The Connections.start
if( rs1 != null)
{
rs1.close();
rs1 = null;
}
if( rsSord != null)
{
rsSord.close();
rsSord = null;
}
if(pstmt1 != null)
{
pstmt1.close();
pstmt1 = null;
}
if(pstmtSord != null)
{
pstmtSord.close();
pstmtSord = null;
}
//Changed By 02/05/13 Pragyan Close The Connections.end
ConsolidatToDoc conToDoc = new ConsolidatToDoc(); ConsolidatToDoc conToDoc = new ConsolidatToDoc();
//Changed by Rohan on 10-06-12 to add xtraParams in process as argument for hazmap report to get chg user //Changed by Rohan on 10-06-12 to add xtraParams in process as argument for hazmap report to get chg user
...@@ -510,6 +843,32 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT ...@@ -510,6 +843,32 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
} }
//Changed By 02/05/13 Pragyan To Close The Connections.start
if( rs1 != null)
{
rs1.close();
rs1 = null;
}
if( rsSord != null)
{
rsSord.close();
rsSord = null;
}
if(pstmt1 != null)
{
pstmt1.close();
pstmt1 = null;
}
if(pstmtSord != null)
{
pstmtSord.close();
pstmtSord = null;
}
//Changed By 02/05/13 Pragyan Close The Connections.end
} }
catch(Exception e) catch(Exception e)
{ {
......
webitm-wms/ibase/webitm/ejb/wms/PickIssConf.java
View file @ cc86f37a
...@@ -538,7 +538,8 @@ public class PickIssConf extends ActionHandlerEJB implements PickIssConfLocal, P ...@@ -538,7 +538,8 @@ public class PickIssConf extends ActionHandlerEJB implements PickIssConfLocal, P
if(sordAllocQty > quantity) if(sordAllocQty > quantity)
{ {
updateSql = "UPDATE SORDALLOC SET QTY_ALLOC = QTY_ALLOC - ? " //LOC_CODE = ? ,LOT_SL = ? " //Changed by sumit on 10/09/13 subtracting QUANTITY__STDUOM
updateSql = "UPDATE SORDALLOC SET QTY_ALLOC = QTY_ALLOC - ? ,QUANTITY__STDUOM = QUANTITY__STDUOM - ?" //LOC_CODE = ? ,LOT_SL = ? "
+ " WHERE SALE_ORDER = ? AND LINE_NO = ? " + " WHERE SALE_ORDER = ? AND LINE_NO = ? "
+ " AND ITEM_CODE = ? " + " AND ITEM_CODE = ? "
+ " AND LOC_CODE = ? " + " AND LOC_CODE = ? "
...@@ -547,12 +548,14 @@ public class PickIssConf extends ActionHandlerEJB implements PickIssConfLocal, P ...@@ -547,12 +548,14 @@ public class PickIssConf extends ActionHandlerEJB implements PickIssConfLocal, P
+ " AND QTY_ALLOC > 0"; + " AND QTY_ALLOC > 0";
pstmtUpd = conn.prepareStatement(updateSql); pstmtUpd = conn.prepareStatement(updateSql);
pstmtUpd.setDouble(1, quantity); pstmtUpd.setDouble(1, quantity);
pstmtUpd.setString(2, saleOrder); //Changed by sumit on 10/09/13 setting
pstmtUpd.setString(3, lineNoSord); pstmtUpd.setDouble(2, quantity * convQtyStduom);
pstmtUpd.setString(4, itemCode); pstmtUpd.setString(3, saleOrder);
pstmtUpd.setString(5, locCode); pstmtUpd.setString(4, lineNoSord);
pstmtUpd.setString(6, lotNo); pstmtUpd.setString(5, itemCode);
pstmtUpd.setString(7, lotSl); pstmtUpd.setString(6, locCode);
pstmtUpd.setString(7, lotNo);
pstmtUpd.setString(8, lotSl);
updCnt = pstmtUpd.executeUpdate(); updCnt = pstmtUpd.executeUpdate();
System.out.println("manohar 18/09/12 sordalloc updated updCnt [" + updCnt + "]"); System.out.println("manohar 18/09/12 sordalloc updated updCnt [" + updCnt + "]");
......
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