Skip to content

B
business-java
Commit d178e776 authored by jshinde's avatar jshinde
Browse files
Options

Request ID:W15HSUN003 ,pallet request with stock details . 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@99387 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 943f2929
Hide whitespace changes
Inline Side-by-side
Showing with 58 additions and 7 deletions
webitm-wms/ibase/webitm/ejb/wms/PalletReqExpiryAct.java
View file @ d178e776
...@@ -101,14 +101,32 @@ public class PalletReqExpiryAct extends ActionHandlerEJB implements PalletReqExp ...@@ -101,14 +101,32 @@ public class PalletReqExpiryAct extends ActionHandlerEJB implements PalletReqExp
"AND L.INV_STAT=? AND S.SITE_CODE= ? AND S.QUANTITY > 0";//EXP_LOCK "AND L.INV_STAT=? AND S.SITE_CODE= ? AND S.QUANTITY > 0";//EXP_LOCK
*/ */
sql="SELECT DISTINCT (S.LOC_CODE) AS PALLET_NO ,S.ITEM_CODE, S.LOT_NO,S.LOT_SL,S.QUANTITY, "+ /*sql="SELECT DISTINCT (S.LOC_CODE) AS PALLET_NO ,S.ITEM_CODE, S.LOT_NO,S.LOT_SL,S.QUANTITY, "+
"S.NO_ART FROM INV_HOLD_DET D,INV_HOLD I , LOCATION L ,STOCK S ,SWMS_TO_AWMS A "+ "S.NO_ART FROM INV_HOLD_DET D,INV_HOLD I , LOCATION L ,STOCK S ,SWMS_TO_AWMS A "+
"WHERE S.ITEM_CODE = D.ITEM_CODE AND S.LOC_CODE = D.LOC_CODE AND S.LOT_NO = D.LOT_NO " + "WHERE S.ITEM_CODE = D.ITEM_CODE AND S.LOC_CODE = D.LOC_CODE AND S.LOT_NO = D.LOT_NO " +
"AND S.LOT_SL = D.LOT_SL AND S.SITE_CODE = D.SITE_CODE AND D.LOC_CODE=L.LOC_CODE " + "AND S.LOT_SL = D.LOT_SL AND S.SITE_CODE = D.SITE_CODE AND D.LOC_CODE=L.LOC_CODE " +
" AND I.TRAN_ID = D.TRAN_ID AND L.LOC_CODE=S.LOC_CODE AND D.HOLD_STATUS != ? " + " AND I.TRAN_ID = D.TRAN_ID AND L.LOC_CODE=S.LOC_CODE AND D.HOLD_STATUS != ? " +
" AND I.LOCK_CODE = ? AND L.INV_STAT= ? AND S.SITE_CODE= ? " + " AND I.LOCK_CODE = ? AND L.INV_STAT= ? AND S.SITE_CODE= ? " +
"AND A.IN_OUT= ? AND A.PALLET_NO=S.LOC_CODE AND A.ITEM_CODE=S.ITEM_CODE " + "AND A.IN_OUT= ? AND A.PALLET_NO=S.LOC_CODE AND A.ITEM_CODE=S.ITEM_CODE " +
"AND A.LOT_NO=S.LOT_NO AND A.LOT_SL=S.LOT_SL AND A.PALLET_STATUS= ? AND S.QUANTITY > 0";//EXP_LOCK "AND A.LOT_NO=S.LOT_NO AND A.LOT_SL=S.LOT_SL AND A.PALLET_STATUS= ? AND S.QUANTITY > 0 AND S.QTY_PER_ART > 0 AND S.NO_ART > 0";//EXP_LOCK
*/
sql="SELECT DISTINCT (S.LOC_CODE) AS PALLET_NO ,S.ITEM_CODE, S.LOT_NO,S.LOT_SL,S.QUANTITY, "+
"S.NO_ART FROM INV_HOLD_DET D,INV_HOLD I , LOCATION L ,STOCK S ,SWMS_TO_AWMS A "+
"WHERE S.ITEM_CODE = D.ITEM_CODE AND S.LOC_CODE = D.LOC_CODE AND S.LOT_NO = D.LOT_NO " +
"AND S.LOT_SL = D.LOT_SL AND S.SITE_CODE = D.SITE_CODE AND D.LOC_CODE=L.LOC_CODE " +
" AND I.TRAN_ID = D.TRAN_ID AND L.LOC_CODE=S.LOC_CODE AND D.HOLD_STATUS != ? " +
" AND I.LOCK_CODE = ? AND L.INV_STAT= ? AND S.SITE_CODE= ? " +
"AND A.IN_OUT= ? AND A.PALLET_NO=S.LOC_CODE AND A.ITEM_CODE=S.ITEM_CODE " +
"AND A.LOT_NO=S.LOT_NO AND A.LOT_SL=S.LOT_SL AND A.PALLET_STATUS= ? AND S.QUANTITY > 0 AND S.QTY_PER_ART > 0 AND S.NO_ART > 0"+
"UNION ALL SELECT DISTINCT SUBSTR(S.LOC_CODE,1,INSTR(S.LOC_CODE,'Q')-1) ,S.ITEM_CODE, S.LOT_NO,S.LOT_SL,S.QUANTITY, "+
"S.NO_ART FROM INV_HOLD_DET D,INV_HOLD I , LOCATION L ,STOCK S ,SWMS_TO_AWMS A "+
"WHERE S.ITEM_CODE = D.ITEM_CODE AND S.LOC_CODE = D.LOC_CODE AND S.LOT_NO = D.LOT_NO " +
"AND S.LOT_SL = D.LOT_SL AND S.SITE_CODE = D.SITE_CODE AND D.LOC_CODE=L.LOC_CODE " +
" AND I.TRAN_ID = D.TRAN_ID AND L.LOC_CODE=S.LOC_CODE AND D.HOLD_STATUS != ? " +
" AND I.LOCK_CODE = ? AND L.INV_STAT= ? AND S.SITE_CODE= ? " +
"AND A.IN_OUT= ? AND A.PALLET_NO=S.LOC_CODE AND A.ITEM_CODE=S.ITEM_CODE " +
"AND A.LOT_NO=S.LOT_NO AND A.LOT_SL=S.LOT_SL AND A.PALLET_STATUS= ? AND S.QUANTITY > 0 AND S.QTY_PER_ART > 0 AND S.NO_ART > 0";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, "R"); pstmt.setString(1, "R");
pstmt.setString(2, "EXP_LOCK"); pstmt.setString(2, "EXP_LOCK");
...@@ -116,6 +134,12 @@ public class PalletReqExpiryAct extends ActionHandlerEJB implements PalletReqExp ...@@ -116,6 +134,12 @@ public class PalletReqExpiryAct extends ActionHandlerEJB implements PalletReqExp
pstmt.setString(4, siteCode); pstmt.setString(4, siteCode);
pstmt.setString(5, "S"); pstmt.setString(5, "S");
pstmt.setString(6, "P"); pstmt.setString(6, "P");
pstmt.setString(7, "R");
pstmt.setString(8, "EXP_LOCK");
pstmt.setString(9, "AWMSQ");
pstmt.setString(10, siteCode);
pstmt.setString(11, "S");
pstmt.setString(12, "P");
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
while(rs.next()) while(rs.next())
...@@ -188,6 +212,16 @@ public class PalletReqExpiryAct extends ActionHandlerEJB implements PalletReqExp ...@@ -188,6 +212,16 @@ public class PalletReqExpiryAct extends ActionHandlerEJB implements PalletReqExp
"AND L.INV_STAT=? AND S.SITE_CODE= ? AND S.QUANTITY > 0";//NEXP_LOCK "AND L.INV_STAT=? AND S.SITE_CODE= ? AND S.QUANTITY > 0";//NEXP_LOCK
*/ */
/*sql="SELECT DISTINCT (S.LOC_CODE) AS PALLET_NO ,S.ITEM_CODE, S.LOT_NO,S.LOT_SL,S.QUANTITY, "+
"S.NO_ART FROM INV_HOLD_DET D,INV_HOLD I , LOCATION L ,STOCK S ,SWMS_TO_AWMS A "+
"WHERE S.ITEM_CODE = D.ITEM_CODE AND S.LOC_CODE = D.LOC_CODE AND S.LOT_NO = D.LOT_NO " +
"AND S.LOT_SL = D.LOT_SL AND S.SITE_CODE = D.SITE_CODE AND D.LOC_CODE=L.LOC_CODE " +
" AND I.TRAN_ID = D.TRAN_ID AND L.LOC_CODE=S.LOC_CODE AND D.HOLD_STATUS != ? " +
" AND I.LOCK_CODE = ? AND L.INV_STAT= ? AND S.SITE_CODE= ? " +
"AND A.IN_OUT= ? AND A.PALLET_NO=S.LOC_CODE AND A.ITEM_CODE=S.ITEM_CODE " +
"AND A.LOT_NO=S.LOT_NO AND A.LOT_SL=S.LOT_SL AND A.PALLET_STATUS= ? AND S.QUANTITY > 0 AND S.QTY_PER_ART > 0 AND S.NO_ART > 0";//NEXP_LOCK
*/
sql="SELECT DISTINCT (S.LOC_CODE) AS PALLET_NO ,S.ITEM_CODE, S.LOT_NO,S.LOT_SL,S.QUANTITY, "+ sql="SELECT DISTINCT (S.LOC_CODE) AS PALLET_NO ,S.ITEM_CODE, S.LOT_NO,S.LOT_SL,S.QUANTITY, "+
"S.NO_ART FROM INV_HOLD_DET D,INV_HOLD I , LOCATION L ,STOCK S ,SWMS_TO_AWMS A "+ "S.NO_ART FROM INV_HOLD_DET D,INV_HOLD I , LOCATION L ,STOCK S ,SWMS_TO_AWMS A "+
"WHERE S.ITEM_CODE = D.ITEM_CODE AND S.LOC_CODE = D.LOC_CODE AND S.LOT_NO = D.LOT_NO " + "WHERE S.ITEM_CODE = D.ITEM_CODE AND S.LOC_CODE = D.LOC_CODE AND S.LOT_NO = D.LOT_NO " +
...@@ -195,8 +229,15 @@ public class PalletReqExpiryAct extends ActionHandlerEJB implements PalletReqExp ...@@ -195,8 +229,15 @@ public class PalletReqExpiryAct extends ActionHandlerEJB implements PalletReqExp
" AND I.TRAN_ID = D.TRAN_ID AND L.LOC_CODE=S.LOC_CODE AND D.HOLD_STATUS != ? " + " AND I.TRAN_ID = D.TRAN_ID AND L.LOC_CODE=S.LOC_CODE AND D.HOLD_STATUS != ? " +
" AND I.LOCK_CODE = ? AND L.INV_STAT= ? AND S.SITE_CODE= ? " + " AND I.LOCK_CODE = ? AND L.INV_STAT= ? AND S.SITE_CODE= ? " +
"AND A.IN_OUT= ? AND A.PALLET_NO=S.LOC_CODE AND A.ITEM_CODE=S.ITEM_CODE " + "AND A.IN_OUT= ? AND A.PALLET_NO=S.LOC_CODE AND A.ITEM_CODE=S.ITEM_CODE " +
"AND A.LOT_NO=S.LOT_NO AND A.LOT_SL=S.LOT_SL AND A.PALLET_STATUS= ? AND S.QUANTITY > 0";//NEXP_LOCK "AND A.LOT_NO=S.LOT_NO AND A.LOT_SL=S.LOT_SL AND A.PALLET_STATUS= ? AND S.QUANTITY > 0 AND S.QTY_PER_ART > 0 AND S.NO_ART > 0"+
"UNION ALL SELECT DISTINCT SUBSTR(S.LOC_CODE,1,INSTR(S.LOC_CODE,'Q')-1) ,S.ITEM_CODE, S.LOT_NO,S.LOT_SL,S.QUANTITY, "+
"S.NO_ART FROM INV_HOLD_DET D,INV_HOLD I , LOCATION L ,STOCK S ,SWMS_TO_AWMS A "+
"WHERE S.ITEM_CODE = D.ITEM_CODE AND S.LOC_CODE = D.LOC_CODE AND S.LOT_NO = D.LOT_NO " +
"AND S.LOT_SL = D.LOT_SL AND S.SITE_CODE = D.SITE_CODE AND D.LOC_CODE=L.LOC_CODE " +
" AND I.TRAN_ID = D.TRAN_ID AND L.LOC_CODE=S.LOC_CODE AND D.HOLD_STATUS != ? " +
" AND I.LOCK_CODE = ? AND L.INV_STAT= ? AND S.SITE_CODE= ? " +
"AND A.IN_OUT= ? AND A.PALLET_NO=S.LOC_CODE AND A.ITEM_CODE=S.ITEM_CODE " +
"AND A.LOT_NO=S.LOT_NO AND A.LOT_SL=S.LOT_SL AND A.PALLET_STATUS= ? AND S.QUANTITY > 0 AND S.QTY_PER_ART > 0 AND S.NO_ART > 0";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, "R"); pstmt.setString(1, "R");
pstmt.setString(2, "NEXP_LOCK"); pstmt.setString(2, "NEXP_LOCK");
...@@ -204,6 +245,12 @@ public class PalletReqExpiryAct extends ActionHandlerEJB implements PalletReqExp ...@@ -204,6 +245,12 @@ public class PalletReqExpiryAct extends ActionHandlerEJB implements PalletReqExp
pstmt.setString(4, siteCode); pstmt.setString(4, siteCode);
pstmt.setString(5, "S"); pstmt.setString(5, "S");
pstmt.setString(6, "P"); pstmt.setString(6, "P");
pstmt.setString(7, "R");
pstmt.setString(8, "NEXP_LOCK");
pstmt.setString(9, "AWMSQ");
pstmt.setString(10, siteCode);
pstmt.setString(11, "S");
pstmt.setString(12, "P");
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
while(rs.next()) while(rs.next())
{ {
......
webitm-wms/ibase/webitm/ejb/wms/PalletReqIC.java
View file @ d178e776
...@@ -1131,7 +1131,7 @@ public class PalletReqIC extends ValidatorEJB implements PalletReqICLocal, Palle ...@@ -1131,7 +1131,7 @@ public class PalletReqIC extends ValidatorEJB implements PalletReqICLocal, Palle
locDescr = checkNullAndTrim(genericUtility.getColumnValue("location_descr",hdrDataDom)); locDescr = checkNullAndTrim(genericUtility.getColumnValue("location_descr",hdrDataDom));
valueXmlString.append( "<location_descr><![CDATA[" ).append( locDescr ).append( "]]></location_descr>\r\n" ); valueXmlString.append( "<location_descr><![CDATA[" ).append( locDescr ).append( "]]></location_descr>\r\n" );
valueXmlString.append( "<status><![CDATA[" ).append( "P" ).append( "]]></status>\r\n" ); valueXmlString.append( "<status><![CDATA[" ).append( "P" ).append( "]]></status>\r\n" );
valueXmlString.append( "<no_art><![CDATA[" ).append( "1" ).append( "]]></no_art>\r\n" ); //valueXmlString.append( "<no_art><![CDATA[" ).append( "1" ).append( "]]></no_art>\r\n" );
} }
else if( currentColumn.trim().equalsIgnoreCase( "loc_code" ) ) else if( currentColumn.trim().equalsIgnoreCase( "loc_code" ) )
{ {
...@@ -1224,6 +1224,7 @@ public class PalletReqIC extends ValidatorEJB implements PalletReqICLocal, Palle ...@@ -1224,6 +1224,7 @@ public class PalletReqIC extends ValidatorEJB implements PalletReqICLocal, Palle
} }
else else
{ {
valueXmlString.append( "<quantity><![CDATA[" ).append( 0 ).append( "]]></quantity>\r\n" ); valueXmlString.append( "<quantity><![CDATA[" ).append( 0 ).append( "]]></quantity>\r\n" );
valueXmlString.append( "<no_art><![CDATA[" ).append( 1 ).append( "]]></no_art>\r\n" ); valueXmlString.append( "<no_art><![CDATA[" ).append( 1 ).append( "]]></no_art>\r\n" );
} }
...@@ -1312,6 +1313,7 @@ public class PalletReqIC extends ValidatorEJB implements PalletReqICLocal, Palle ...@@ -1312,6 +1313,7 @@ public class PalletReqIC extends ValidatorEJB implements PalletReqICLocal, Palle
palletNo = checkNullAndTrim(genericUtility.getColumnValue("pallet_no",currFormDataDom)); palletNo = checkNullAndTrim(genericUtility.getColumnValue("pallet_no",currFormDataDom));
loginSite = checkNull(genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginSiteCode" )); loginSite = checkNull(genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginSiteCode" ));
noArtStr = checkNullAndTrim(genericUtility.getColumnValue("no_art",currFormDataDom)); noArtStr = checkNullAndTrim(genericUtility.getColumnValue("no_art",currFormDataDom));
String noArtTemp = noArtStr;
noArtStr = noArtStr.length() == 0 ? "0" : noArtStr; noArtStr = noArtStr.length() == 0 ? "0" : noArtStr;
noArtD = Double.parseDouble(noArtStr); noArtD = Double.parseDouble(noArtStr);
System.out.println( "lotSl>>>>>>>::"+lotSl); System.out.println( "lotSl>>>>>>>::"+lotSl);
...@@ -1364,9 +1366,11 @@ public class PalletReqIC extends ValidatorEJB implements PalletReqICLocal, Palle ...@@ -1364,9 +1366,11 @@ public class PalletReqIC extends ValidatorEJB implements PalletReqICLocal, Palle
*/ */
if(noArtD <= 0) if(noArtD <= 0 || noArtTemp.length() == 0)
{ {
valueXmlString.append( "<quantity><![CDATA[" ).append( 0 ).append( "]]></quantity>\r\n" ); quantity = 1 * qtyPerArt ;
valueXmlString.append( "<quantity><![CDATA[" ).append( quantity ).append( "]]></quantity>\r\n" );
System.out.println( "quantity AT 1 NO ART>>>>>>>::"+quantity);
//valueXmlString.append( "<lot_sl><![CDATA[" ).append( " " ).append( "]]></lot_sl>\r\n" ); //valueXmlString.append( "<lot_sl><![CDATA[" ).append( " " ).append( "]]></lot_sl>\r\n" );
valueXmlString.append( "<no_art><![CDATA[" ).append( 1 ).append( "]]></no_art>\r\n" ); valueXmlString.append( "<no_art><![CDATA[" ).append( 1 ).append( "]]></no_art>\r\n" );
} }
......
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