Skip to content

B
business-java
Commit 209fd7f6 authored by wansari's avatar wansari
Browse files
Options

W15JSUN002 updated for considering BSR location and exempted location 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@99987 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 63e432c8
Hide whitespace changes
Inline Side-by-side
Showing with 245 additions and 38 deletions
webitm-wms/ibase/webitm/ejb/wms/PalletOutPos.java
View file @ 209fd7f6
...@@ -313,16 +313,20 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal ...@@ -313,16 +313,20 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
} }
else if("PR".equalsIgnoreCase(refSer)) else if("PR".equalsIgnoreCase(refSer))
{ {
sql = "SELECT S.ITEM_CODE,S.QUANTITY,S.LOT_NO,S.LOT_SL,P.LOC_CODE,S.LOC_CODE AS LOC_CODE_FROM,S.ALLOC_QTY,P.NO_ART,"+ sql = "SELECT S.ITEM_CODE,S.QUANTITY,S.LOT_NO,S.LOT_SL,P.LOC_CODE,S.LOC_CODE AS LOC_CODE_FROM,S.ALLOC_QTY,P.NO_ART,"
" S.SITE_CODE FROM STOCK S,PALLET_REQ_DET P WHERE S.INV_STAT IN ('AWMS','AWMSQ')" + +" S.SITE_CODE FROM STOCK S,PALLET_REQ_DET P WHERE"
" AND P.TRAN_ID = ? AND P.LINE_NO = ? AND (S.LOC_CODE = P.PALLET_NO OR S.LOC_CODE = ? ) AND S.QUANTITY > 0"; +" P.TRAN_ID = ? AND P.LINE_NO = ? AND"
+" (S.LOC_CODE = P.PALLET_NO OR S.LOC_CODE = ? OR S.LOC_CODE = ? OR S.LOC_CODE = ? OR S.LOC_CODE = ? OR S.LOC_CODE = ? OR S.LOC_CODE = ? OR S.LOC_CODE = ?) "
+" AND S.QUANTITY > 0";
} }
else if("PRS".equalsIgnoreCase(refSer)) else if("PRS".equalsIgnoreCase(refSer))
{ {
sql = "SELECT P.ITEM_CODE,S.QUANTITY,P.LOT_NO,P.LOT_SL,P.LOC_CODE,S.LOC_CODE AS LOC_CODE_FROM,H.SITE_CODE,S.ALLOC_QTY,P.NO_ART" sql = "SELECT P.ITEM_CODE,S.QUANTITY,P.LOT_NO,P.LOT_SL,P.LOC_CODE,S.LOC_CODE AS LOC_CODE_FROM,H.SITE_CODE,S.ALLOC_QTY,P.NO_ART"
+" FROM PALLET_REQ_DET P,STOCK S,PALLET_REQ_HDR H WHERE P.TRAN_ID = ? AND P.LINE_NO = ?" +" FROM PALLET_REQ_DET P,STOCK S,PALLET_REQ_HDR H WHERE P.TRAN_ID = ? AND P.LINE_NO = ?"
+" AND P.TRAN_ID = H.TRAN_ID AND P.ITEM_CODE = S.ITEM_CODE" +" AND P.TRAN_ID = H.TRAN_ID AND P.ITEM_CODE = S.ITEM_CODE"
+" AND H.SITE_CODE = S.SITE_CODE AND (P.PALLET_NO = S.LOC_CODE OR S.LOC_CODE = ? )" //+" AND H.SITE_CODE = S.SITE_CODE AND (P.PALLET_NO = S.LOC_CODE OR S.LOC_CODE = ? )"
+" AND H.SITE_CODE = S.SITE_CODE AND "
+" (P.PALLET_NO = S.LOC_CODE OR S.LOC_CODE = ? OR S.LOC_CODE = ? OR S.LOC_CODE = ? OR S.LOC_CODE = ? OR S.LOC_CODE = ? OR S.LOC_CODE = ? OR S.LOC_CODE = ?) "
+" AND P.LOT_NO = S.LOT_NO" +" AND P.LOT_NO = S.LOT_NO"
+" AND P.LOT_SL = S.LOT_SL AND S.QUANTITY > 0"; +" AND P.LOT_SL = S.LOT_SL AND S.QUANTITY > 0";
} }
...@@ -349,6 +353,7 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal ...@@ -349,6 +353,7 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
{ {
locCodeFrom = checkNullAndTrim(rsInterface.getString("PALLET_NO")); locCodeFrom = checkNullAndTrim(rsInterface.getString("PALLET_NO"));
palletNo = checkNullAndTrim(rsInterface.getString("PALLET_NO"));
if("S-ORD".equalsIgnoreCase(refSer))//this is because sordalloc has char(3) in line_no if("S-ORD".equalsIgnoreCase(refSer))//this is because sordalloc has char(3) in line_no
{ {
...@@ -403,8 +408,14 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal ...@@ -403,8 +408,14 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
else if("PR".equalsIgnoreCase(refSer) || "PRS".equalsIgnoreCase(refSer)) else if("PR".equalsIgnoreCase(refSer) || "PRS".equalsIgnoreCase(refSer))
{ {
pstmt.setString(2, lineNoInterface); pstmt.setString(2, lineNoInterface);
locCodeQuarnt = checkNullAndTrim(rsInterface.getString("PALLET_NO")); //locCodeQuarnt = checkNullAndTrim(rsInterface.getString("PALLET_NO"));
pstmt.setString(3, locCodeQuarnt+"Q"); pstmt.setString(3, locCodeFrom+"Q");
pstmt.setString(4, locCodeFrom+"U");
pstmt.setString(5, locCodeFrom+"P");
pstmt.setString(6, locCodeFrom+"M");
pstmt.setString(7, locCodeFrom+"X");
pstmt.setString(8, locCodeFrom+"B");
pstmt.setString(9, locCodeFrom+"S");
} }
else else
{ {
...@@ -451,7 +462,7 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal ...@@ -451,7 +462,7 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
//locCodeTo = getLocCodeTo(itemCode,conn); //locCodeTo = getLocCodeTo(itemCode,conn);
//locCodeTo = distComm.getDisparams("999999",refSer,conn); //locCodeTo = distComm.getDisparams("999999",refSer,conn);
} }
System.out.println("Loc code to recieved=["+locCodeTo+"]Loc Code From["+locCodeFrom+"]"); System.out.println("Loc code to recieved=["+locCodeTo+"]Loc Code From["+locCodeFrom+"]PalletNo["+palletNo+"]");
lineNo++; lineNo++;
...@@ -586,7 +597,7 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal ...@@ -586,7 +597,7 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
pstmtUpdate = conn.prepareStatement(sqlUpdate); pstmtUpdate = conn.prepareStatement(sqlUpdate);
pstmtUpdate.setString(1, refId); pstmtUpdate.setString(1, refId);
pstmtUpdate.setString(2, lineNoInterface.trim());//this trim is for in case of S-ORD pstmtUpdate.setString(2, lineNoInterface.trim());//this trim is for in case of S-ORD
pstmtUpdate.setString(3, locCodeFrom); pstmtUpdate.setString(3, palletNo);
int caseCount = pstmtUpdate.executeUpdate(); int caseCount = pstmtUpdate.executeUpdate();
System.out.println("Updated ="+caseCount); System.out.println("Updated ="+caseCount);
pstmtUpdate.close();pstmtUpdate = null; pstmtUpdate.close();pstmtUpdate = null;
...@@ -1080,7 +1091,7 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal ...@@ -1080,7 +1091,7 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
String sqlSordAlloc = "",sqlDisorderAlloc = "",sqlDistIss = "",locCodeReturn = "",tranId = ""; String sqlSordAlloc = "",sqlDisorderAlloc = "",sqlDistIss = "",locCodeReturn = "",tranId = "";
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
ResultSet rs = null; ResultSet rs = null;
String sql = "",scheduleStatus = "",tableName = "",lineNo = "",refSer = "",id = ""; String sql = "",scheduleStatus = "",tableName = "",lineNo = "",refSer = "",id = "",expLev = "";
double quantity = 0; double quantity = 0;
boolean flag = false; boolean flag = false;
ArrayList allocLocList = new ArrayList(); ArrayList allocLocList = new ArrayList();
...@@ -1088,7 +1099,7 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal ...@@ -1088,7 +1099,7 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
{ {
System.out.println("inside checkStockAllocation"); System.out.println("inside checkStockAllocation");
sql = "SELECT SALE_ORDER,LOC_CODE,QUANTITY,LINE_NO FROM SORDALLOC WHERE SITE_CODE = ? AND ITEM_CODE = ? AND LOT_NO = ? AND LOT_SL = ?" sql = "SELECT EXP_LEV,SALE_ORDER,LOC_CODE,QUANTITY,LINE_NO FROM SORDALLOC WHERE SITE_CODE = ? AND ITEM_CODE = ? AND LOT_NO = ? AND LOT_SL = ?"
+" AND LOC_CODE = ?"; +" AND LOC_CODE = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, siteCode); pstmt.setString(1, siteCode);
...@@ -1104,6 +1115,8 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal ...@@ -1104,6 +1115,8 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
quantity = rs.getDouble("QUANTITY"); quantity = rs.getDouble("QUANTITY");
//lineNo = checkNullAndTrim(rs.getString("LINE_NO"));//Changed by wasim on 11-01-2015 as sordalloc has char(3) line no //lineNo = checkNullAndTrim(rs.getString("LINE_NO"));//Changed by wasim on 11-01-2015 as sordalloc has char(3) line no
lineNo = rs.getString("LINE_NO"); lineNo = rs.getString("LINE_NO");
expLev = rs.getString("EXP_LEV");
tableName = "SORDALLOC"; tableName = "SORDALLOC";
refSer = "S-ORD"; refSer = "S-ORD";
id = "SALE_ORDER"; id = "SALE_ORDER";
...@@ -1111,6 +1124,13 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal ...@@ -1111,6 +1124,13 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
HashMap hm = new HashMap(); HashMap hm = new HashMap();
hm.put("LOC_CODE_NEW", locCodeTo); hm.put("LOC_CODE_NEW", locCodeTo);
hm.put("LOC_CODE_OLD", locCodeFrom);//Added by wasim on 20-01-2016
hm.put("LOT_NO", lotNo);//Added by wasim on 20-01-2016
hm.put("LOT_SL", lotSl);//Added by wasim on 20-01-2016
hm.put("SITE_CODE", siteCode);//Added by wasim on 20-01-2016
hm.put("ITEM_CODE", itemCode);//Added by wasim on 20-01-2016
hm.put("EXP_LEV", expLev);//Added by wasim on 20-01-2016
hm.put("LINE_NO", lineNo); hm.put("LINE_NO", lineNo);
hm.put("TABLE", tableName); hm.put("TABLE", tableName);
hm.put("TRAN_ID", tranId); hm.put("TRAN_ID", tranId);
...@@ -1145,6 +1165,11 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal ...@@ -1145,6 +1165,11 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
HashMap hm = new HashMap(); HashMap hm = new HashMap();
hm.put("LOC_CODE_NEW", locCodeTo); hm.put("LOC_CODE_NEW", locCodeTo);
hm.put("LOC_CODE_OLD", locCodeFrom);//Added by wasim on 20-01-2016
hm.put("LOT_NO", lotNo);//Added by wasim on 20-01-2016
hm.put("LOT_SL", lotSl);//Added by wasim on 20-01-2016
hm.put("SITE_CODE", siteCode);//Added by wasim on 20-01-2016
hm.put("ITEM_CODE", itemCode);//Added by wasim on 20-01-2016
hm.put("LINE_NO", lineNo); hm.put("LINE_NO", lineNo);
hm.put("TABLE", tableName); hm.put("TABLE", tableName);
hm.put("TRAN_ID", tranId); hm.put("TRAN_ID", tranId);
...@@ -1179,6 +1204,11 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal ...@@ -1179,6 +1204,11 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
HashMap hm = new HashMap(); HashMap hm = new HashMap();
hm.put("LOC_CODE_NEW", locCodeTo); hm.put("LOC_CODE_NEW", locCodeTo);
hm.put("LOC_CODE_OLD", locCodeFrom);//Added by wasim on 20-01-2016
hm.put("LOT_NO", lotNo);//Added by wasim on 20-01-2016
hm.put("LOT_SL", lotSl);//Added by wasim on 20-01-2016
hm.put("SITE_CODE", siteCode);//Added by wasim on 20-01-2016
hm.put("ITEM_CODE", itemCode);//Added by wasim on 20-01-2016
hm.put("LINE_NO", lineNo); hm.put("LINE_NO", lineNo);
hm.put("TABLE", tableName); hm.put("TABLE", tableName);
hm.put("TRAN_ID", tranId); hm.put("TRAN_ID", tranId);
...@@ -1222,11 +1252,11 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal ...@@ -1222,11 +1252,11 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
String sqlSordAlloc = "",sqlDisorderAlloc = "",sqlDistIss = "",locCodeReturn = ""; String sqlSordAlloc = "",sqlDisorderAlloc = "",sqlDistIss = "",locCodeReturn = "";
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
ResultSet rs = null; ResultSet rs = null;
String sql = "",scheduleStatus = "",tableName = "",locCode = "",refSer = "",tranId = "",id = "",lineNo = ""; String sql = "",scheduleStatus = "",tableName = "",locCode = "",refSer = "",tranId = "",id = "",lineNo = "",locCodeOld = "";
double quantity = 0; double quantity = 0;
boolean flag = false; boolean flag = false;
HashMap hm = new HashMap(); HashMap hm = new HashMap();
String retString = ""; String retString = "",lotNo = "",lotSl = "",siteCode = "",itemCode = "",expLev = "";
int updCount = 0; int updCount = 0;
try try
{ {
...@@ -1252,6 +1282,13 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal ...@@ -1252,6 +1282,13 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
{ {
tableName = (String) detail.get("TABLE"); tableName = (String) detail.get("TABLE");
locCode = (String) detail.get("LOC_CODE_NEW"); locCode = (String) detail.get("LOC_CODE_NEW");
locCodeOld = (String) detail.get("LOC_CODE_OLD");//Changed by wasim on 20-1-2016
lotNo = (String) detail.get("LOT_NO");//Changed by wasim on 20-1-2016
lotSl = (String) detail.get("LOT_SL");//Changed by wasim on 20-1-2016
siteCode = (String) detail.get("SITE_CODE");//Changed by wasim on 20-1-2016
itemCode = (String) detail.get("ITEM_CODE");//Changed by wasim on 20-1-2016
lineNo = (String) detail.get("LINE_NO"); lineNo = (String) detail.get("LINE_NO");
refSer = (String) detail.get("REF_SER"); refSer = (String) detail.get("REF_SER");
tranId = (String) detail.get("TRAN_ID"); tranId = (String) detail.get("TRAN_ID");
...@@ -1260,11 +1297,36 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal ...@@ -1260,11 +1297,36 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
lineNo = " " + lineNo; lineNo = " " + lineNo;
lineNo = lineNo.substring( lineNo.length()-3 ); lineNo = lineNo.substring( lineNo.length()-3 );
sql = "UPDATE "+tableName+" SET LOC_CODE = ? WHERE "+id+" = ? AND LINE_NO = ?"; //sql = "UPDATE "+tableName+" SET LOC_CODE = ? WHERE "+id+" = ? AND LINE_NO = ?";
System.out.println("Table["+tableName+"]");
if("SORDALLOC".equalsIgnoreCase(tableName))
{
expLev = (String) detail.get("EXP_LEV");//Changed by wasim on 20-1-2016
sql = "UPDATE "+tableName+" SET LOC_CODE = ? WHERE "+id+" = ? AND LINE_NO = ? AND LOC_CODE = ?"
+ " AND LOT_NO = ? AND LOT_SL = ? AND ITEM_CODE = ? AND EXP_LEV = ?";
}
else
{
sql = "UPDATE "+tableName+" SET LOC_CODE = ? WHERE "+id+" = ? AND LINE_NO = ? AND LOC_CODE = ?"
+ " AND LOT_NO = ? AND LOT_SL = ? AND ITEM_CODE = ?";
}
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, locCode); pstmt.setString(1, locCode);
pstmt.setString(2, tranId); pstmt.setString(2, tranId);
pstmt.setString(3, lineNo); pstmt.setString(3, lineNo);
pstmt.setString(4, locCodeOld);
pstmt.setString(5, lotNo);
pstmt.setString(6, lotSl);
pstmt.setString(7, itemCode);
if("SORDALLOC".equalsIgnoreCase(tableName))
{
pstmt.setString(8, expLev);
}
updCount = pstmt.executeUpdate(); updCount = pstmt.executeUpdate();
System.out.println("Update="+updCount); System.out.println("Update="+updCount);
pstmt.clearParameters(); pstmt.clearParameters();
......
webitm-wms/ibase/webitm/utility/wms/ScheduleAWMSInOutTasks.java
View file @ 209fd7f6
...@@ -248,7 +248,7 @@ public class ScheduleAWMSInOutTasks implements Schedule ...@@ -248,7 +248,7 @@ public class ScheduleAWMSInOutTasks implements Schedule
palletNo = "",locCodeTo = "",locCodeFrom = "",siteCode = "",lineNoInterface = "",qcOrderStatus = "",locCodeReturn = ""; palletNo = "",locCodeTo = "",locCodeFrom = "",siteCode = "",lineNoInterface = "",qcOrderStatus = "",locCodeReturn = "";
double quantity = 0,allocQty = 0,distOrderAlloc = 0,sordAllocQty = 0; double quantity = 0,allocQty = 0,distOrderAlloc = 0,sordAllocQty = 0;
int updCnt = 0,lineNo = 0,countDso = 0; int updCnt = 0,lineNo = 0,countDso = 0,countInLoc = 0;
//HashMap hashMap = new HashMap(); //HashMap hashMap = new HashMap();
...@@ -454,13 +454,13 @@ public class ScheduleAWMSInOutTasks implements Schedule ...@@ -454,13 +454,13 @@ public class ScheduleAWMSInOutTasks implements Schedule
if("PZ".equalsIgnoreCase(refSer)) if("PZ".equalsIgnoreCase(refSer))
{ {
locCodeFrom = checkNullAndTrim(rs.getString("LOC_CODE")); locCodeFrom = checkNullAndTrim(rs.getString("LOC_CODE"));
locCodeTo = checkNullAndTrim(rs.getString("PALLET_NO")); //locCodeTo = checkNullAndTrim(rs.getString("PALLET_NO"));//Commented by wasim on 20-01-2016 as it will be calledonly once
allocQty = rs.getDouble("ALLOC_QTY");//Changed by wasim on 02-12-2015 for allocating stock to loc code to for palletization allocQty = rs.getDouble("ALLOC_QTY");//Changed by wasim on 02-12-2015 for allocating stock to loc code to for palletization
//noArt = checkNullAndTrim(rs.getString("NO_ART"));//Changed by wasim on 03-12-2015 //noArt = checkNullAndTrim(rs.getString("NO_ART"));//Changed by wasim on 03-12-2015
System.out.println("Before location code TO is=["+locCodeTo+"]"); System.out.println("Before location code TO is=["+locCodeTo+"]");
pstmtQc.setString(1, siteCode); /*pstmtQc.setString(1, siteCode);
pstmtQc.setString(2, itemCode); pstmtQc.setString(2, itemCode);
pstmtQc.setString(3, lotNo); pstmtQc.setString(3, lotNo);
rsQc = pstmtQc.executeQuery(); rsQc = pstmtQc.executeQuery();
...@@ -475,8 +475,15 @@ public class ScheduleAWMSInOutTasks implements Schedule ...@@ -475,8 +475,15 @@ public class ScheduleAWMSInOutTasks implements Schedule
if("U".equalsIgnoreCase(qcOrderStatus)) if("U".equalsIgnoreCase(qcOrderStatus))
{ {
locCodeTo = locCodeTo + "Q"; locCodeTo = locCodeTo + "Q";
} }*/
System.out.println("Final location code TO is=["+locCodeTo+"]"); System.out.println("countInLoc"+countInLoc);
if(countInLoc == 0)
{
locCodeTo = checkNullAndTrim(rs.getString("PALLET_NO"));
locCodeTo = getLocCodeTo(itemCode,lotNo,locCodeFrom,locCodeTo,siteCode,conn);
System.out.println("Final location code TO is=["+locCodeTo+"]");
countInLoc++;
}
} }
//else if("PR".equalsIgnoreCase(refSer))Changed by wasim on 19-11-2015 to add new ref ser PRS //else if("PR".equalsIgnoreCase(refSer))Changed by wasim on 19-11-2015 to add new ref ser PRS
else if("PR".equalsIgnoreCase(refSer) || "PRS".equalsIgnoreCase(refSer) || "RPZ".equalsIgnoreCase(refSer)) else if("PR".equalsIgnoreCase(refSer) || "PRS".equalsIgnoreCase(refSer) || "RPZ".equalsIgnoreCase(refSer))
...@@ -847,7 +854,7 @@ public class ScheduleAWMSInOutTasks implements Schedule ...@@ -847,7 +854,7 @@ public class ScheduleAWMSInOutTasks implements Schedule
userId = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginCode" ); userId = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginCode" );
chgTerm = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "chgTerm" ); chgTerm = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "chgTerm" );
String lockCodeName = "AWMS_LOCK",lockCode = "",lineNoInterface = "",locCodeFrom = ""; String lockCodeName = "AWMS_LOCK",lockCode = "",lineNoInterface = "",locCodeFrom = "",palletNo = "";
boolean headerFlag = true; boolean headerFlag = true;
try try
...@@ -929,14 +936,17 @@ public class ScheduleAWMSInOutTasks implements Schedule ...@@ -929,14 +936,17 @@ public class ScheduleAWMSInOutTasks implements Schedule
//sql = "SELECT S.ITEM_CODE,S.LOT_NO,S.LOT_SL,S.LOC_CODE,"+ //sql = "SELECT S.ITEM_CODE,S.LOT_NO,S.LOT_SL,S.LOC_CODE,"+
sql = "SELECT S.ITEM_CODE,S.LOT_NO,S.LOT_SL,S.LOC_CODE,P.PALLET_NO,"+ //Changed by wasim on 08-12-2015 to TAKE loc code for PR/PRS as it will be pallet no sql = "SELECT S.ITEM_CODE,S.LOT_NO,S.LOT_SL,S.LOC_CODE,P.PALLET_NO,"+ //Changed by wasim on 08-12-2015 to TAKE loc code for PR/PRS as it will be pallet no
" S.SITE_CODE FROM STOCK S,PALLET_REQ_DET P WHERE " + " S.SITE_CODE FROM STOCK S,PALLET_REQ_DET P WHERE " +
" P.TRAN_ID = ? AND P.LINE_NO = ? AND S.QUANTITY > 0 AND (S.LOC_CODE = P.PALLET_NO OR S.LOC_CODE = ?)"; " P.TRAN_ID = ? AND P.LINE_NO = ? AND S.QUANTITY > 0 AND "+
" (S.LOC_CODE = P.PALLET_NO OR S.LOC_CODE = ? OR S.LOC_CODE = ? OR S.LOC_CODE = ? OR S.LOC_CODE = ? OR S.LOC_CODE = ? OR S.LOC_CODE = ? OR S.LOC_CODE = ?)";
} }
else if("PRS".equalsIgnoreCase(refSer)) else if("PRS".equalsIgnoreCase(refSer))
{ {
sql = "SELECT P.ITEM_CODE,P.QUANTITY,P.LOT_NO,P.LOT_SL,S.LOC_CODE,H.SITE_CODE,P.PALLET_NO" sql = "SELECT P.ITEM_CODE,P.QUANTITY,P.LOT_NO,P.LOT_SL,S.LOC_CODE,H.SITE_CODE,P.PALLET_NO"
+" FROM PALLET_REQ_DET P,STOCK S,PALLET_REQ_HDR H WHERE P.TRAN_ID = ? AND P.LINE_NO = ?" +" FROM PALLET_REQ_DET P,STOCK S,PALLET_REQ_HDR H WHERE P.TRAN_ID = ? AND P.LINE_NO = ?"
+" AND P.TRAN_ID = H.TRAN_ID " +" AND P.TRAN_ID = H.TRAN_ID "
+" AND P.ITEM_CODE = S.ITEM_CODE AND H.SITE_CODE = S.SITE_CODE AND ( P.PALLET_NO = S.LOC_CODE OR S.LOC_CODE = ?) AND P.LOT_NO = S.LOT_NO" +" AND P.ITEM_CODE = S.ITEM_CODE AND H.SITE_CODE = S.SITE_CODE AND"
+" (P.PALLET_NO = S.LOC_CODE OR S.LOC_CODE = ? OR S.LOC_CODE = ? OR S.LOC_CODE = ? OR S.LOC_CODE = ? OR S.LOC_CODE = ? OR S.LOC_CODE = ? OR S.LOC_CODE = ?) "
+" AND P.LOT_NO = S.LOT_NO"
+" AND P.LOT_SL = S.LOT_SL AND S.QUANTITY > 0"; +" AND P.LOT_SL = S.LOT_SL AND S.QUANTITY > 0";
} }
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
...@@ -951,6 +961,7 @@ public class ScheduleAWMSInOutTasks implements Schedule ...@@ -951,6 +961,7 @@ public class ScheduleAWMSInOutTasks implements Schedule
{ {
locCodeFrom = checkNullAndTrim(rsInterface.getString("PALLET_NO")); locCodeFrom = checkNullAndTrim(rsInterface.getString("PALLET_NO"));
palletNo = checkNullAndTrim(rsInterface.getString("PALLET_NO"));
if("S-ORD".equalsIgnoreCase(refSer))//this is because sordalloc has char(3) in line_no if("S-ORD".equalsIgnoreCase(refSer))//this is because sordalloc has char(3) in line_no
{ {
...@@ -1001,8 +1012,14 @@ public class ScheduleAWMSInOutTasks implements Schedule ...@@ -1001,8 +1012,14 @@ public class ScheduleAWMSInOutTasks implements Schedule
else if("PR".equalsIgnoreCase(refSer) || "PRS".equalsIgnoreCase(refSer)) else if("PR".equalsIgnoreCase(refSer) || "PRS".equalsIgnoreCase(refSer))
{ {
pstmt.setString(2, lineNoInterface); pstmt.setString(2, lineNoInterface);
locCodeQuarnt = checkNullAndTrim(rsInterface.getString("PALLET_NO")); //locCodeQuarnt = checkNullAndTrim(rsInterface.getString("PALLET_NO"));
pstmt.setString(3, locCodeQuarnt+"Q"); pstmt.setString(3, locCodeFrom+"Q");
pstmt.setString(4, locCodeFrom+"U");
pstmt.setString(5, locCodeFrom+"P");
pstmt.setString(6, locCodeFrom+"M");
pstmt.setString(7, locCodeFrom+"X");
pstmt.setString(8, locCodeFrom+"B");
pstmt.setString(9, locCodeFrom+"S");
} }
else else
{ {
...@@ -1059,7 +1076,7 @@ public class ScheduleAWMSInOutTasks implements Schedule ...@@ -1059,7 +1076,7 @@ public class ScheduleAWMSInOutTasks implements Schedule
pstmtUpdate = conn.prepareStatement(sqlUpdate); pstmtUpdate = conn.prepareStatement(sqlUpdate);
pstmtUpdate.setString(1, refId); pstmtUpdate.setString(1, refId);
pstmtUpdate.setString(2, lineNoInterface.trim()); pstmtUpdate.setString(2, lineNoInterface.trim());
pstmtUpdate.setString(3, locCodeFrom); pstmtUpdate.setString(3, palletNo);
caseCount = pstmtUpdate.executeUpdate(); caseCount = pstmtUpdate.executeUpdate();
System.out.println("Updated ="+caseCount); System.out.println("Updated ="+caseCount);
pstmtUpdate.close();pstmtUpdate = null; pstmtUpdate.close();pstmtUpdate = null;
...@@ -1197,7 +1214,7 @@ public class ScheduleAWMSInOutTasks implements Schedule ...@@ -1197,7 +1214,7 @@ public class ScheduleAWMSInOutTasks implements Schedule
} }
private ArrayList checkStockAllocation(String siteCode,String itemCode,String lotNo,String lotSl,String locCodeFrom,String locCodeTo,Connection conn) throws ITMException, Exception private ArrayList checkStockAllocation(String siteCode,String itemCode,String lotNo,String lotSl,String locCodeFrom,String locCodeTo,Connection conn) throws ITMException, Exception
{ {
String sqlSordAlloc = "",sqlDisorderAlloc = "",sqlDistIss = "",locCodeReturn = "",tranId = ""; String sqlSordAlloc = "",sqlDisorderAlloc = "",sqlDistIss = "",locCodeReturn = "",tranId = "",expLev = "";
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
ResultSet rs = null; ResultSet rs = null;
String sql = "",scheduleStatus = "",tableName = "",lineNo = "",refSer = "",id = ""; String sql = "",scheduleStatus = "",tableName = "",lineNo = "",refSer = "",id = "";
...@@ -1208,7 +1225,7 @@ public class ScheduleAWMSInOutTasks implements Schedule ...@@ -1208,7 +1225,7 @@ public class ScheduleAWMSInOutTasks implements Schedule
{ {
System.out.println("inside checkStockAllocation"); System.out.println("inside checkStockAllocation");
sql = "SELECT SALE_ORDER,LOC_CODE,QUANTITY,LINE_NO FROM SORDALLOC WHERE SITE_CODE = ? AND ITEM_CODE = ? AND LOT_NO = ? AND LOT_SL = ?" sql = "SELECT EXP_LEV,SALE_ORDER,LOC_CODE,QUANTITY,LINE_NO FROM SORDALLOC WHERE SITE_CODE = ? AND ITEM_CODE = ? AND LOT_NO = ? AND LOT_SL = ?"
+" AND LOC_CODE = ?"; +" AND LOC_CODE = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, siteCode); pstmt.setString(1, siteCode);
...@@ -1224,6 +1241,8 @@ public class ScheduleAWMSInOutTasks implements Schedule ...@@ -1224,6 +1241,8 @@ public class ScheduleAWMSInOutTasks implements Schedule
quantity = rs.getDouble("QUANTITY"); quantity = rs.getDouble("QUANTITY");
//lineNo = checkNullAndTrim(rs.getString("LINE_NO"));//Changed by wasim on 11-01-2015 as sordalloc has char(3) line no //lineNo = checkNullAndTrim(rs.getString("LINE_NO"));//Changed by wasim on 11-01-2015 as sordalloc has char(3) line no
lineNo = rs.getString("LINE_NO"); lineNo = rs.getString("LINE_NO");
expLev = rs.getString("EXP_LEV");
tableName = "SORDALLOC"; tableName = "SORDALLOC";
refSer = "S-ORD"; refSer = "S-ORD";
id = "SALE_ORDER"; id = "SALE_ORDER";
...@@ -1231,6 +1250,13 @@ public class ScheduleAWMSInOutTasks implements Schedule ...@@ -1231,6 +1250,13 @@ public class ScheduleAWMSInOutTasks implements Schedule
HashMap hm = new HashMap(); HashMap hm = new HashMap();
hm.put("LOC_CODE_NEW", locCodeTo); hm.put("LOC_CODE_NEW", locCodeTo);
hm.put("LOC_CODE_OLD", locCodeFrom);//Added by wasim on 20-01-2016
hm.put("LOT_NO", lotNo);//Added by wasim on 20-01-2016
hm.put("LOT_SL", lotSl);//Added by wasim on 20-01-2016
hm.put("SITE_CODE", siteCode);//Added by wasim on 20-01-2016
hm.put("ITEM_CODE", itemCode);//Added by wasim on 20-01-2016
hm.put("EXP_LEV", expLev);
hm.put("LINE_NO", lineNo); hm.put("LINE_NO", lineNo);
hm.put("TABLE", tableName); hm.put("TABLE", tableName);
hm.put("TRAN_ID", tranId); hm.put("TRAN_ID", tranId);
...@@ -1264,6 +1290,11 @@ public class ScheduleAWMSInOutTasks implements Schedule ...@@ -1264,6 +1290,11 @@ public class ScheduleAWMSInOutTasks implements Schedule
HashMap hm = new HashMap(); HashMap hm = new HashMap();
hm.put("LOC_CODE_NEW", locCodeTo); hm.put("LOC_CODE_NEW", locCodeTo);
hm.put("LOC_CODE_OLD", locCodeFrom);//Added by wasim on 20-01-2016
hm.put("LOT_NO", lotNo);//Added by wasim on 20-01-2016
hm.put("LOT_SL", lotSl);//Added by wasim on 20-01-2016
hm.put("SITE_CODE", siteCode);//Added by wasim on 20-01-2016
hm.put("ITEM_CODE", itemCode);//Added by wasim on 20-01-2016
hm.put("LINE_NO", lineNo); hm.put("LINE_NO", lineNo);
hm.put("TABLE", tableName); hm.put("TABLE", tableName);
hm.put("TRAN_ID", tranId); hm.put("TRAN_ID", tranId);
...@@ -1297,6 +1328,11 @@ public class ScheduleAWMSInOutTasks implements Schedule ...@@ -1297,6 +1328,11 @@ public class ScheduleAWMSInOutTasks implements Schedule
HashMap hm = new HashMap(); HashMap hm = new HashMap();
hm.put("LOC_CODE_NEW", locCodeTo); hm.put("LOC_CODE_NEW", locCodeTo);
hm.put("LOC_CODE_OLD", locCodeFrom);//Added by wasim on 20-01-2016
hm.put("LOT_NO", lotNo);//Added by wasim on 20-01-2016
hm.put("LOT_SL", lotSl);//Added by wasim on 20-01-2016
hm.put("SITE_CODE", siteCode);//Added by wasim on 20-01-2016
hm.put("ITEM_CODE", itemCode);//Added by wasim on 20-01-2016
hm.put("LINE_NO", lineNo); hm.put("LINE_NO", lineNo);
hm.put("TABLE", tableName); hm.put("TABLE", tableName);
hm.put("TRAN_ID", tranId); hm.put("TRAN_ID", tranId);
...@@ -1338,11 +1374,11 @@ public class ScheduleAWMSInOutTasks implements Schedule ...@@ -1338,11 +1374,11 @@ public class ScheduleAWMSInOutTasks implements Schedule
String sqlSordAlloc = "",sqlDisorderAlloc = "",sqlDistIss = "",locCodeReturn = ""; String sqlSordAlloc = "",sqlDisorderAlloc = "",sqlDistIss = "",locCodeReturn = "";
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
ResultSet rs = null; ResultSet rs = null;
String sql = "",scheduleStatus = "",tableName = "",locCode = "",refSer = "",tranId = "",id = "",lineNo = ""; String sql = "",scheduleStatus = "",tableName = "",locCode = "",refSer = "",tranId = "",id = "",lineNo = "",locCodeOld = "";
double quantity = 0; double quantity = 0;
boolean flag = false; boolean flag = false;
HashMap hm = new HashMap(); HashMap hm = new HashMap();
String retString = ""; String retString = "",lotNo = "",lotSl = "",siteCode = "",itemCode = "",expLev = "";
int updCount = 0; int updCount = 0;
try try
{ {
...@@ -1368,6 +1404,13 @@ public class ScheduleAWMSInOutTasks implements Schedule ...@@ -1368,6 +1404,13 @@ public class ScheduleAWMSInOutTasks implements Schedule
{ {
tableName = (String) detail.get("TABLE"); tableName = (String) detail.get("TABLE");
locCode = (String) detail.get("LOC_CODE_NEW"); locCode = (String) detail.get("LOC_CODE_NEW");
locCodeOld = (String) detail.get("LOC_CODE_OLD");//Changed by wasim on 20-1-2016
lotNo = (String) detail.get("LOT_NO");//Changed by wasim on 20-1-2016
lotSl = (String) detail.get("LOT_SL");//Changed by wasim on 20-1-2016
siteCode = (String) detail.get("SITE_CODE");//Changed by wasim on 20-1-2016
itemCode = (String) detail.get("ITEM_CODE");//Changed by wasim on 20-1-2016
lineNo = (String) detail.get("LINE_NO"); lineNo = (String) detail.get("LINE_NO");
refSer = (String) detail.get("REF_SER"); refSer = (String) detail.get("REF_SER");
tranId = (String) detail.get("TRAN_ID"); tranId = (String) detail.get("TRAN_ID");
...@@ -1376,11 +1419,35 @@ public class ScheduleAWMSInOutTasks implements Schedule ...@@ -1376,11 +1419,35 @@ public class ScheduleAWMSInOutTasks implements Schedule
lineNo = " " + lineNo; lineNo = " " + lineNo;
lineNo = lineNo.substring( lineNo.length()-3 ); lineNo = lineNo.substring( lineNo.length()-3 );
sql = "UPDATE "+tableName+" SET LOC_CODE = ? WHERE "+id+" = ? AND LINE_NO = ?"; //sql = "UPDATE "+tableName+" SET LOC_CODE = ? WHERE "+id+" = ? AND LINE_NO = ?";
System.out.println("Table["+tableName+"]");
if("SORDALLOC".equalsIgnoreCase(tableName))
{
expLev = (String) detail.get("EXP_LEV");//Changed by wasim on 20-1-2016
sql = "UPDATE "+tableName+" SET LOC_CODE = ? WHERE "+id+" = ? AND LINE_NO = ? AND LOC_CODE = ?"
+ " AND LOT_NO = ? AND LOT_SL = ? AND ITEM_CODE = ? AND EXP_LEV = ?";
}
else
{
sql = "UPDATE "+tableName+" SET LOC_CODE = ? WHERE "+id+" = ? AND LINE_NO = ? AND LOC_CODE = ?"
+ " AND LOT_NO = ? AND LOT_SL = ? AND ITEM_CODE = ?";
}
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, locCode); pstmt.setString(1, locCode);
pstmt.setString(2, tranId); pstmt.setString(2, tranId);
pstmt.setString(3, lineNo); pstmt.setString(3, lineNo);
pstmt.setString(4, locCodeOld);
pstmt.setString(5, lotNo);
pstmt.setString(6, lotSl);
pstmt.setString(7, itemCode);
if("SORDALLOC".equalsIgnoreCase(tableName))
{
pstmt.setString(8, expLev);
}
updCount = pstmt.executeUpdate(); updCount = pstmt.executeUpdate();
System.out.println("Update="+updCount); System.out.println("Update="+updCount);
pstmt.clearParameters(); pstmt.clearParameters();
...@@ -4351,28 +4418,106 @@ public class ScheduleAWMSInOutTasks implements Schedule ...@@ -4351,28 +4418,106 @@ public class ScheduleAWMSInOutTasks implements Schedule
return retString; return retString;
} }
private String getLocCodeTo(String itemCode,Connection conn) throws ITMException, Exception private String getLocCodeTo(String itemCode,String lotNo,String locCodeFrom,String locCodeTo,String siteCode,Connection conn) throws ITMException, Exception
{ {
String locCodeTo = "",itemSerRg = ""; String itemSerRg = "",locGroup = "",QcStatus = "",exempted = "",locCodeToReturn = "",itemSerRgDisparm = "";
PreparedStatement pstmt=null; PreparedStatement pstmt=null;
ResultSet rs = null; ResultSet rs = null;
String sql = ""; String sql = "";
try try
{ {
sql = "SELECT ITEM_SER__FG1 FROM ITEM WHERE ITEM_CODE = ?"; exempted = checkNullAndTrim(distComm.getDisparams("999999", "EXTEMP_LOC_PARM" , conn));
itemSerRgDisparm = checkNullAndTrim(distComm.getDisparams("999999", "ITEM_SER_RG1" , conn));
sql = "SELECT LOC_GROUP FROM LOCATION WHERE LOC_CODE = ? AND SITE_CODE = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, locCodeFrom);
pstmt.setString(2, siteCode);
rs = pstmt.executeQuery();
if(rs.next())
{
locGroup = checkNullAndTrim(rs.getString("LOC_GROUP"));
}
rs.close();rs = null;
pstmt.close();pstmt = null;
System.out.println("Location group found from location["+locGroup+"]");
sql = "SELECT ITEM_SER__RG1 FROM SITEITEM WHERE ITEM_CODE = ? AND SITE_CODE = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, itemCode); pstmt.setString(1, itemCode);
pstmt.setString(2, siteCode);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if(rs.next()) if(rs.next())
{ {
itemSerRg = checkNullAndTrim(rs.getString("ITEM_SER__FG1")); itemSerRg = checkNullAndTrim(rs.getString("ITEM_SER__RG1"));
} }
rs.close();rs = null; rs.close();rs = null;
pstmt.close();pstmt = null; pstmt.close();pstmt = null;
System.out.println("Item series RG found from item["+itemSerRg+"]");
System.out.println("ITEM_SER__FG1["+itemSerRg+"]"); sql = "SELECT STATUS FROM QC_ORDER WHERE SITE_CODE = ? AND ITEM_CODE = ? AND LOT_NO = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, siteCode);
pstmt.setString(2, itemCode);
pstmt.setString(3, lotNo);
rs = pstmt.executeQuery();
if(rs.next())
{
QcStatus = checkNullAndTrim(rs.getString("STATUS"));
}
rs.close();rs = null;
pstmt.close();pstmt = null;
System.out.println("QC Status found from QC_ORDER1["+QcStatus+"]");
if(QcStatus == null || QcStatus.length() == 0 || !"U".equalsIgnoreCase(QcStatus))
{
QcStatus = "NA";
}
if(locGroup == null || locGroup.length() == 0 || !exempted.equalsIgnoreCase(locGroup))
{
locGroup = "NA";
}
if(itemSerRg == null || itemSerRg.length() == 0 || !itemSerRgDisparm.equalsIgnoreCase(itemSerRg))
{
itemSerRg = "NA";
}
locCodeTo = checkNullAndTrim(distComm.getDisparams("999999", itemSerRg , conn)); System.out.println("Exempted found from disparm["+exempted+"]");
System.out.println("ITEM_SER_RG1 found from disparm["+itemSerRgDisparm+"]");
System.out.println("********Loc Group["+locGroup+"]Item RG1["+itemSerRg+"]QC Status["+QcStatus+"]**********");
if(exempted.equalsIgnoreCase(locGroup) && itemSerRgDisparm.equalsIgnoreCase(itemSerRg) && "U".equalsIgnoreCase(QcStatus))
{
locCodeToReturn = locCodeTo + "U";
}
else if(exempted.equalsIgnoreCase(locGroup) && itemSerRgDisparm.equalsIgnoreCase(itemSerRg) && "NA".equalsIgnoreCase(QcStatus))
{
locCodeToReturn = locCodeTo + "P";
}
else if(exempted.equalsIgnoreCase(locGroup) && "NA".equalsIgnoreCase(itemSerRg) && "U".equalsIgnoreCase(QcStatus))
{
locCodeToReturn = locCodeTo + "M";
}
else if(exempted.equalsIgnoreCase(locGroup) && "NA".equalsIgnoreCase(itemSerRg) && "NA".equalsIgnoreCase(QcStatus))
{
locCodeToReturn = locCodeTo + "X";
}
else if("NA".equalsIgnoreCase(locGroup) && itemSerRgDisparm.equalsIgnoreCase(itemSerRg) && "NA".equalsIgnoreCase(QcStatus))
{
locCodeToReturn = locCodeTo + "B";
}
else if("NA".equalsIgnoreCase(locGroup) && itemSerRgDisparm.equalsIgnoreCase(itemSerRg) && "U".equalsIgnoreCase(QcStatus))
{
locCodeToReturn = locCodeTo + "S";
}
else if("NA".equalsIgnoreCase(locGroup) && "NA".equalsIgnoreCase(itemSerRg) && "U".equalsIgnoreCase(QcStatus))
{
locCodeToReturn = locCodeTo + "Q";
}
else if("NA".equalsIgnoreCase(locGroup) && "NA".equalsIgnoreCase(itemSerRg) && "NA".equalsIgnoreCase(QcStatus))
{
locCodeToReturn = locCodeTo;
}
} }
catch(Exception e) catch(Exception e)
{ {
...@@ -4391,8 +4536,8 @@ public class ScheduleAWMSInOutTasks implements Schedule ...@@ -4391,8 +4536,8 @@ public class ScheduleAWMSInOutTasks implements Schedule
throw new ITMException(ex); throw new ITMException(ex);
} }
} }
System.out.println("Location code returing["+locCodeTo+"]"); System.out.println("Location code returing["+locCodeToReturn+"]");
return locCodeTo; return locCodeToReturn;
} }
} }
......
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