Skip to content

B
business-java
Commit 60870a10 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@99384 ce508802-f39f-4f6c-b175-0d175dae99d5
parent d6a5fc65
Show whitespace changes
Inline Side-by-side
Showing with 24 additions and 18 deletions
webitm-wms/ibase/webitm/ejb/wms/PalletReqConf.java
View file @ 60870a10
......@@ -208,16 +208,17 @@ public class PalletReqConf extends ActionHandlerEJB implements PalletReqConfLoca
+" AND S.LOT_SL=?";*/
sql="SELECT S.QTY_PER_ART,I.DESCR ,S.UNIT,I.ITEM_TYPE ,S.MFG_DATE,S.EXP_DATE " +
"FROM STOCK S ,ITEM I WHERE S.SITE_CODE=? AND S.LOC_CODE = ? " +
"FROM STOCK S ,ITEM I WHERE S.SITE_CODE=? AND S.LOC_CODE IN (?,?) " +
"AND S.ITEM_CODE= ? AND S.LOT_NO= ? " +
"AND S.LOT_SL= ? AND S.ITEM_CODE=I.ITEM_CODE";
pstmt1 = conn.prepareStatement(sql);
pstmt1.setString(1, siteCode);
pstmt1.setString(2, palletNo);
pstmt1.setString(3, itemCode);
pstmt1.setString(4, lotNo);
pstmt1.setString(5, lotSl);
pstmt1.setString(3, palletNo+"Q");
pstmt1.setString(4, itemCode);
pstmt1.setString(5, lotNo);
pstmt1.setString(6, lotSl);
rs1 = pstmt1.executeQuery();
if(rs1.next())
......
webitm-wms/ibase/webitm/ejb/wms/PalletReqExpiryAct.java
View file @ 60870a10
......@@ -268,10 +268,10 @@ public class PalletReqExpiryAct extends ActionHandlerEJB implements PalletReqExp
*/
sql="SELECT DISTINCT S.LOC_CODE AS PALLET_NO,S.ITEM_CODE,S.LOT_NO,S.LOT_SL,S.QUANTITY, S.NO_ART FROM STOCK S " +
"WHERE S.INV_STAT = ? AND S.SITE_CODE= ? AND S.QUANTITY > 0 " +
"WHERE S.INV_STAT = ? AND S.SITE_CODE= ? 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 STOCK S WHERE " +
"S.INV_STAT = ? AND S.SITE_CODE= ? AND S.QUANTITY > 0";
"S.INV_STAT = ? AND S.SITE_CODE= ? AND S.QUANTITY > 0 AND S.QTY_PER_ART > 0 AND S.NO_ART > 0";
PreparedStatement pstmt = conn.prepareStatement(sql);
pstmt.setString(1, "AWMS");
pstmt.setString(2, siteCode);
......
webitm-wms/ibase/webitm/ejb/wms/PalletReqIC.java
View file @ 60870a10
......@@ -131,9 +131,7 @@ public class PalletReqIC extends ValidatorEJB implements PalletReqICLocal, Palle
genericUtility = GenericUtility.getInstance();
System.out.println("xtraParam----->>["+xtraParams+"]");
System.out.println("DOM---->>["+genericUtility.serializeDom(dom).toString()+"]");
System.out.println("DOM1----->>["+genericUtility.serializeDom(dom1).toString()+"]");
System.out.println("DOM2----->>["+genericUtility.serializeDom(dom2).toString()+"]");
loginSite = checkNull(genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginSiteCode" ));
ConnDriver connDriver = new ConnDriver();
......@@ -292,11 +290,13 @@ public class PalletReqIC extends ValidatorEJB implements PalletReqICLocal, Palle
}
else
{
sql = "SELECT COUNT(1) FROM LOCATION WHERE INV_STAT =? AND LOC_CODE=? AND SITE_CODE=?";
sql = "SELECT COUNT(1) FROM LOCATION WHERE INV_STAT IN (?,?) AND LOC_CODE IN (?,?) AND SITE_CODE=?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, "AWMS");
pstmt.setString(2, palletNo);
pstmt.setString(3, loginSite);
pstmt.setString(2, "AWMSQ");
pstmt.setString(3, palletNo);
pstmt.setString(4, palletNo+"Q");
pstmt.setString(5, loginSite);
rs = pstmt.executeQuery();
if(rs.next())
{
......@@ -726,8 +726,8 @@ public class PalletReqIC extends ValidatorEJB implements PalletReqICLocal, Palle
// "AND S.LOC_CODE=L.LOC_CODE AND S.QUANTITY>0 AND S.ITEM_CODE=? AND S.LOT_NO=? AND S.LOT_SL=?";
sql = "SELECT S.QUANTITY, S.QTY_PER_ART FROM STOCK S ,LOCATION L " +
"WHERE L.INV_STAT IN (?,?) AND L.LOC_CODE= IN(?,?) AND L.SITE_CODE=? " +
"AND S.LOC_CODE=L.LOC_CODE AND S.QUANTITY>0 AND S.ITEM_CODE=? AND S.LOT_NO=? AND S.LOT_SL=?";
"WHERE L.INV_STAT IN (?,?) AND L.LOC_CODE IN (?,?) AND L.SITE_CODE= ? " +
"AND S.LOC_CODE=L.LOC_CODE AND S.QUANTITY>0 AND S.ITEM_CODE = ? AND S.LOT_NO = ? AND S.LOT_SL = ?";
pstmt = conn.prepareStatement(sql);
......@@ -782,12 +782,16 @@ public class PalletReqIC extends ValidatorEJB implements PalletReqICLocal, Palle
{
quantityStr = quantityStr.length() == 0 ? "0" : quantityStr;
quantity = Double.parseDouble(quantityStr);
System.out.println("quantity from dom>>>>>>>" +quantity);
System.out.println("quantityStr from dom>>>>>>>" +quantityStr);
if(quantity == 0 )
{
errCode = "VMQUANTNUL";
errList.add( errCode );
System.out.println("quantity errList>>>>>>>" +errList);
childNode = childNodeList.item(ctr);
childNodeName = childNode.getNodeName();
errFields.add( childNodeName.toLowerCase() );
......@@ -843,7 +847,7 @@ public class PalletReqIC extends ValidatorEJB implements PalletReqICLocal, Palle
}
break;
} //switch end
System.out.println("after switch");
System.out.println("after switch"+errList);
int errListSize = errList.size();
System.out.println("errListSize .........." + errListSize);
String errFldName = null;
......@@ -1127,6 +1131,7 @@ public class PalletReqIC extends ValidatorEJB implements PalletReqICLocal, Palle
locDescr = checkNullAndTrim(genericUtility.getColumnValue("location_descr",hdrDataDom));
valueXmlString.append( "<location_descr><![CDATA[" ).append( locDescr ).append( "]]></location_descr>\r\n" );
valueXmlString.append( "<status><![CDATA[" ).append( "P" ).append( "]]></status>\r\n" );
valueXmlString.append( "<no_art><![CDATA[" ).append( "1" ).append( "]]></no_art>\r\n" );
}
else if( currentColumn.trim().equalsIgnoreCase( "loc_code" ) )
{
......@@ -1220,7 +1225,7 @@ public class PalletReqIC extends ValidatorEJB implements PalletReqICLocal, Palle
else
{
valueXmlString.append( "<quantity><![CDATA[" ).append( 0 ).append( "]]></quantity>\r\n" );
valueXmlString.append( "<no_art><![CDATA[" ).append( 0 ).append( "]]></no_art>\r\n" );
valueXmlString.append( "<no_art><![CDATA[" ).append( 1 ).append( "]]></no_art>\r\n" );
}
rs.close();
pstmt.close();
......@@ -1363,7 +1368,7 @@ public class PalletReqIC extends ValidatorEJB implements PalletReqICLocal, Palle
{
valueXmlString.append( "<quantity><![CDATA[" ).append( 0 ).append( "]]></quantity>\r\n" );
//valueXmlString.append( "<lot_sl><![CDATA[" ).append( " " ).append( "]]></lot_sl>\r\n" );
valueXmlString.append( "<no_art><![CDATA[" ).append( 0 ).append( "]]></no_art>\r\n" );
valueXmlString.append( "<no_art><![CDATA[" ).append( 1 ).append( "]]></no_art>\r\n" );
}
else
{
......
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