Skip to content

B
business-java
Commit bba3fdd0 authored by pjain's avatar pjain
Browse files
Options

changd by sankara on 13/10/14 updated shipmentconf for is loading condition 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@96588 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 01ee8639
Show whitespace changes
Inline Side-by-side
Showing with 125 additions and 515 deletions
webitm-wms/ibase/webitm/ejb/wms/ShipmentConf.java
View file @ bba3fdd0
......@@ -178,6 +178,11 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal,
conn = connDriver.getConnectDB( "DriverITM" );
String userID = genericUtility.getValueFromXTRA_PARAMS( xtraParam, "LoginCode" );
System.out.println(" forced flag:::>>>>:: ["+forcedFlag+"]");
//changed by sankara on 10/10/14 for adeded condition isLoading
String isLoading = genericUtility.getValueFromXTRA_PARAMS( xtraParam, "isLoading" );
//Changed by Pragyan
isLoading = isLoading == null?"N":isLoading;
System.out.println("isLoading:::::"+isLoading);
ITMDBAccessLocal itmDBAccessLocal = new ITMDBAccessEJB();
//changed by sankara on 22/09/14 for site transporter start.
......@@ -252,7 +257,9 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal,
if(("".equalsIgnoreCase(refSer.trim())) || ("D-ISS".equalsIgnoreCase(refSer.trim()) || "C-ISS".equalsIgnoreCase(refSer.trim()) || "P-RET".equalsIgnoreCase(refSer.trim()) ))
{
//changed by sankara on 10/10/14 for added isloading condition
if( !"Y".equalsIgnoreCase(isLoading) )
{
if(noOfPallet <= 0 && !refSer.trim().equalsIgnoreCase("S-DSP"))
{
......@@ -336,7 +343,33 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal,
rs = null;
pstmt.close();
pstmt = null;
} //changed by sankara on 10/10/14 for added isloading condition end
//changed by sankara on 10/10/14 for added isloading condition start.
else
{
sql = "SELECT CONSIGNEE_NAME,ADDR1,ADDR2,ADDR3,LORRY_NO,TRAN_CODE,LR_NO,LR_DATE, PRO_NO FROM SHIPMENT WHERE SHIPMENT_ID = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, tranId);
rs = pstmt.executeQuery();
if( rs.next() )
{
custName = checkNull(rs.getString("CONSIGNEE_NAME")).trim();
shipAdd1 = checkNull(rs.getString("ADDR3")).trim();
shipAdd2 = checkNull(rs.getString("ADDR2")).trim();
shipAdd3 = checkNull(rs.getString("ADDR1")).trim();
lorryNo = checkNull(rs.getString("LORRY_NO"));
tranCode = checkNull(rs.getString("TRAN_CODE"));
lrNo = checkNull(rs.getString("LR_NO"));
lrDate = rs.getTimestamp("LR_DATE");
proNo = checkNull(rs.getString("PRO_NO"));
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
}
//changed by sankara on 10/10/14 for added isloading condition end.
}//if(("".equalsIgnoreCase(refSer.trim())) || ("D-ISS".equalsIgnoreCase(refSer.trim()) || "C-ISS".equalsIgnoreCase(refSer.trim()) || "P-RET".equalsIgnoreCase(refSer.trim()) ))
sql = "SELECT COUNT(*) as COUNT FROM SHIPMENT_CONTENT WHERE SHIPMENT_ID = ?";
......@@ -349,7 +382,10 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal,
}
rs.close();rs = null;
pstmt.close();pstmt = null;
if( noOfPallet != count && !("S-DSP".equalsIgnoreCase(refSer.trim())))
// changed by sankara on 10/10/14 for added loading condition
// if( noOfPallet != count && !("S-DSP".equalsIgnoreCase(refSer.trim()))
if( noOfPallet != count && !("S-DSP".equalsIgnoreCase(refSer.trim())) && !"Y".equalsIgnoreCase(isLoading) )
{
errString = itmDBAccessLocal.getErrorString("","NOOFPALLET","");
}
......
webitm-wms/ibase/webitm/ejb/wms/StockTransferMultipleIC.java
View file @ bba3fdd0
......@@ -134,8 +134,6 @@ public class StockTransferMultipleIC extends ValidatorEJB implements StockTransf
String locInvList = "";
String[] locList = null;
String invStatLoc = "";
//changed by Dhanraj on 30-08-14 [W14DSUN001] add interLocXFrXAllow for control stock tranfer to same,cross or not to invstat.
String interLocXFrXAllow="2";
boolean isLocToValid = true;
java.util.Date tranDateDt = null;
String prdCode = "";
......@@ -478,16 +476,14 @@ public class StockTransferMultipleIC extends ValidatorEJB implements StockTransf
if( "loc_code__to".equalsIgnoreCase( childNodeName ) )
{
/*Added By Dipak On 4 June 2012 Start*/
//changed by sankara on 22/09/14 not reuired in case3 start.
/* activePickInvstat = distCommon.getDisparams("999999","ACTIVE_PICK_INVSTAT",conn);
activePickInvstat = distCommon.getDisparams("999999","ACTIVE_PICK_INVSTAT",conn);
casePickInvstat = distCommon.getDisparams("999999","CASE_PICK_INVSTAT",conn);
resrvLocInvstat = distCommon.getDisparams("999999","RESERV_LOCATION",conn);
invStatList.add(activePickInvstat);
invStatList.add(casePickInvstat);
invStatList.add(resrvLocInvstat);
Added By Dipak On 4 June 2012 End
/*Added By Dipak On 4 June 2012 End*/
itemCode = genericUtility.getColumnValue("item_code", allDom, "3" );
siteCode = genericUtility.getColumnValue("site_code", allDom, "1" );
......@@ -676,56 +672,8 @@ public class StockTransferMultipleIC extends ValidatorEJB implements StockTransf
errList.add( "VTINVTRANF" );
errFields.add( childNodeName.toLowerCase() );
}
}*/
//changed by sankara on 09-07-13 validation for nosl end.....
//changed by sankara on 22/09/14 not reuired in case3 end.
//Start changed by Dhanraj 0n 30-08-14 [W14DSUN001] for contro stock transfer using stock_transfer_type maste data.not allowed.same invstat and any invsta.
System.out.println(" loc From invStat====> "+locFrominvStat+" locToinvStat====> "+locToinvStat);
/* sql =" SELECT STT.TRAN_TYPE,STT.EXP_SEG,STT.INTER_LOC_XFRX_ALLOW,IST.INV_STAT FROM STOCK_TRANSFER_TYPE STT,LOCATION LOC,INVSTAT IST "
+ " WHERE LOC.INV_STAT=IST.INV_STAT AND STT.TRAN_TYPE=IST.INV_STAT_TYPE AND LOC.LOC_CODE= ? ";*/
/* sql= " SELECT STT.TRAN_TYPE,STT.EXP_SEG,STT.INTER_LOC_XFRX_ALLOW FROM STOCK_TRANSFER_TYPE STT,INVSTAT IST "
+" WHERE STT.TRAN_TYPE=IST.INV_STAT_TYPE AND IST.INV_STAT= ? ";
pstmt = conn.prepareStatement( sql );
pstmt.setString( 1, locFrominvStat );
rs = pstmt.executeQuery();
if( rs.next() )
{
interLocXFrXAllow = rs.getString("INTER_LOC_XFRX_ALLOW");
System.out.println(" InterLocXFrXAllow "+interLocXFrXAllow);
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
if("2".equalsIgnoreCase(interLocXFrXAllow))
{
System.out.println("Stock transfer allowed to any inv stat");
}
else if("0".equalsIgnoreCase(interLocXFrXAllow))
{
//stock tranfer not allowed;
System.out.println("Stock transfer not allowed ");
errList.add( "VTTRANFNOT" );
errFields.add( childNodeName.toLowerCase() );
}
else if("1".equalsIgnoreCase(interLocXFrXAllow))
{
if(!locFrominvStat.equalsIgnoreCase(locToinvStat))
{
//stock transfer allowed only same invstat.
System.out.println("Stock transfer allowed to same inv stat ");
errList.add( "VTTRANFASA" );
errFields.add( childNodeName.toLowerCase());
}
}*/
//End changed by Dhanraj 0n 30-08-14 [W14DSUN001] for contro stock transfer using stock_transfer_type maste data.not allowed.same invstat and any invsta.
//End Dhanraj Code Changes on 30-08-14 [W14DSUN001] .
//changed by sankara on 09-07-13 validation for nosl end.....
} //End of case "loc_code__to"
else if( "lot_sl__to".equalsIgnoreCase( childNodeName ) )//Case added by gulzar on 21/12/11
......@@ -920,327 +868,6 @@ public class StockTransferMultipleIC extends ValidatorEJB implements StockTransf
break;
}
//Changed By Pragyan 11-AUG-14 To check and Facility Master implementation.end
//Start Changed by Dhanraj 03-09-14 [W14DSUN001]
//changed by sankara on 22/09/14 commented as per pragyan start.
/* locCodeFrom = genericUtility.getColumnValue( "loc_code__fr", currDom );
sql = "SELECT INV_STAT FROM LOCATION WHERE LOC_CODE= ? ";
pstmt = conn.prepareStatement( sql );
pstmt.setString( 1, locCode ); //To Locaton_Code
rs = pstmt.executeQuery();
if( rs.next() )
{
locToinvStat = rs.getString("INV_STAT"); //To InvStat
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
sql = " SELECT INV_STAT FROM LOCATION WHERE LOC_CODE = ? ";
pstmt = conn.prepareStatement( sql );
pstmt.setString( 1, locCodeFrom );//from Location_code
rs = pstmt.executeQuery();
if( rs.next() )
{
locFrominvStat = rs.getString("INV_STAT"); //from invstat
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
System.out.println(" loc From location====> "+locCodeFrom+" loc location to====> "+locCode);
System.out.println(" loc From invStat====> "+locFrominvStat+" locToinvStat====> "+locToinvStat);
sql= " SELECT STT.TRAN_TYPE,STT.EXP_SEG,STT.INTER_LOC_XFRX_ALLOW FROM STOCK_TRANSFER_TYPE STT,INVSTAT IST "
+" WHERE STT.TRAN_TYPE=IST.INV_STAT_TYPE AND IST.INV_STAT= ? ";
pstmt = conn.prepareStatement( sql );
pstmt.setString( 1, locFrominvStat );
rs = pstmt.executeQuery();
if( rs.next() )
{
interLocXFrXAllow = rs.getString("INTER_LOC_XFRX_ALLOW");
System.out.println(" InterLocXFrXAllow "+interLocXFrXAllow);
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
if("2".equalsIgnoreCase(interLocXFrXAllow))
{
System.out.println("Stock transfer allowed to any inv stat");
}
else if("0".equalsIgnoreCase(interLocXFrXAllow))
{
//stock tranfer not allowed;
System.out.println("Stock transfer not allowed ");
errList.add( "VTTRANFNOT" );
errFields.add( childNodeName.toLowerCase() );
}
else if("1".equalsIgnoreCase(interLocXFrXAllow))
{
if(!locFrominvStat.equalsIgnoreCase(locToinvStat))
{
//stock transfer allowed only same invstat.
System.out.println("Stock transfer allowed to same inv stat ");
errList.add( "VTTRANFASA" );
errFields.add( childNodeName.toLowerCase());
}
}*/
/*Added By Dipak On 4 June 2012 Start*/
activePickInvstat = distCommon.getDisparams("999999","ACTIVE_PICK_INVSTAT",conn);
casePickInvstat = distCommon.getDisparams("999999","CASE_PICK_INVSTAT",conn);
resrvLocInvstat = distCommon.getDisparams("999999","RESERV_LOCATION",conn);
invStatList.add(activePickInvstat);
invStatList.add(casePickInvstat);
invStatList.add(resrvLocInvstat);
/*Added By Dipak On 4 June 2012 End*/
itemCode = genericUtility.getColumnValue("item_code", allDom, "3" );
siteCode = genericUtility.getColumnValue("site_code", allDom, "1" );
locCodeTo = checkNull(genericUtility.getColumnValue("loc_code__to", allDom, "3" ));
lotNo = genericUtility.getColumnValue("lot_no__fr", allDom, "3" );
lpnNo = genericUtility.getColumnValue("lot_sl__fr", allDom, "3" );
locCode = genericUtility.getColumnValue("loc_code__fr", allDom, "2" );
sql ="SELECT COUNT(*) AS LOCCOUNT FROM STOCK WHERE ITEM_CODE = ? AND SITE_CODE = ? AND LOC_CODE = ? " +
" AND LOT_NO = ? AND LOT_SL = ? AND EXP_DATE <= fn_sysdate()";
pstmt = conn.prepareStatement( sql );
pstmt.setString( 1, itemCode );
pstmt.setString( 2, siteCode );
pstmt.setString( 3, locCode );
pstmt.setString( 4, lotNo );
pstmt.setString( 5, lpnNo );
rs = pstmt.executeQuery();
if( rs.next() )
{
locCount = rs.getInt("LOCCOUNT");
}
pstmt.close();
rs.close();
pstmt = null;
rs =null;
if(locCount > 0)
{
locInvList = distCommon.getDisparams("999999","NOT_TRANF_INV_STAT",conn);
System.out.println("locInvList>>>>>>"+locInvList);
if((!"".equalsIgnoreCase(locInvList.trim()) || locInvList != null) && locInvList.trim().length() > 0 )
{
locList = locInvList.split(",");
sql = "SELECT INV_STAT FROM LOCATION WHERE LOC_CODE = ?";
pstmt = conn.prepareStatement( sql );
pstmt.setString( 1, locCodeTo );
rs = pstmt.executeQuery();
if( rs.next() )
{
invStatLoc = checkNull(rs.getString("INV_STAT"));
}
for(int i =0; i < locList.length ; i++)
{
System.out.println("Comparing values"+invStatLoc+"locList[i]"+locList[i]);
if(invStatLoc.trim().equalsIgnoreCase(locList[i].trim()))
{
errList.add( "VTLOCNTVAL" );
errFields.add( childNodeName.toLowerCase());
isLocToValid = false;
break;
}
}
}
}
System.out.println("isLocToValid["+isLocToValid+"]");
if(isLocToValid)
{
sql = "SELECT SINGLE_LOT_SL, ITEM_LOT_OPT, INV_STAT FROM LOCATION WHERE LOC_CODE = ?";//Changes are done by Dipak On 4 June 2012
pstmt = conn.prepareStatement( sql );
pstmt.setString( 1, locCodeTo );
rs = pstmt.executeQuery();
if( rs.next() )
{
singleLotSl = checkNull(rs.getString("SINGLE_LOT_SL"));
itemLotOpt = checkNull(rs.getString("ITEM_LOT_OPT"));
invStat = checkNull(rs.getString("INV_STAT"));//Added By Dipak On 4 June 2012
}
else
{
errList.add( "VMLOC6" );
errFields.add( childNodeName.toLowerCase() );
}
rs.close(); rs = null;
pstmt.close(); pstmt = null;
System.out.println("singleLotSl:::::::"+singleLotSl);
System.out.println("locCodeTo:::::::"+locCodeTo);
if( singleLotSl.trim().equalsIgnoreCase("Y") )
{
sql = "SELECT QUANTITY FROM STOCK WHERE SITE_CODE = ?"
+ " AND LOC_CODE = ? ORDER BY QUANTITY DESC";
pstmt = conn.prepareStatement( sql );
pstmt.setString( 1, siteCode );
pstmt.setString( 2, locCodeTo );
rs = pstmt.executeQuery();
if( rs.next() )
{
quantity = rs.getDouble("QUANTITY");
}
rs.close(); rs = null;
pstmt.close(); pstmt = null;
if( quantity != 0 )
{
errList.add( "LOCNOTEMPT" );
errFields.add( childNodeName.toLowerCase() );
}
}
else
{
if( itemLotOpt.trim().equals("0") )
{
sql = "SELECT COUNT(*) AS COUNT FROM STOCK WHERE (ITEM_CODE <> ? OR LOT_NO <> ?) AND SITE_CODE = ? AND LOC_CODE = ? AND QUANTITY > 0";
pstmt = conn.prepareStatement( sql );
pstmt.setString( 1, itemCode );
pstmt.setString( 2, lotNo );
pstmt.setString( 3, siteCode );
pstmt.setString( 4, locCodeTo );
rs = pstmt.executeQuery();
if( rs.next() )
{
count = rs.getInt("COUNT");
}
rs.close(); rs = null;
pstmt.close(); pstmt = null;
if( count > 0 )
{
errList.add( "VTLOCCODE2" );
errFields.add( childNodeName.toLowerCase() );
}
}
else if( itemLotOpt.trim().equals("1") )
{
sql = "SELECT COUNT(*) AS COUNT FROM STOCK WHERE ITEM_CODE <> ? AND SITE_CODE = ? AND LOC_CODE = ? AND QUANTITY > 0";
pstmt = conn.prepareStatement( sql );
pstmt.setString( 1, itemCode );
pstmt.setString( 2, siteCode );
pstmt.setString( 3, locCodeTo );
rs = pstmt.executeQuery();
if( rs.next() )
{
count = rs.getInt("COUNT");
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
if( count > 0 )
{
errList.add( "VTLOCCODE4" );
errFields.add( childNodeName.toLowerCase() );
}
}
}
}
//changed by sankara on 09-07-13 validation for nosl start.....
locCodeFrom = genericUtility.getColumnValue( "loc_code__fr", currDom );
sql = " SELECT INV_STAT FROM LOCATION WHERE LOC_CODE = ? ";
pstmt = conn.prepareStatement( sql );
pstmt.setString( 1, locCodeFrom );//from Location_code
rs = pstmt.executeQuery();
if( rs.next() )
{
locFrominvStat = rs.getString("INV_STAT"); //from invstat
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
NoslInvstat = distCommon.getDisparams("999999","INV_NO_SL",conn);
//Start Dhanraj Code Changes on 30-08-14 [W14DSUN001].
//Start Changed by Dhanraj on 30-08-14 [W14DSUN001] for get inv stat multiple time....use only
sql = "SELECT INV_STAT FROM LOCATION WHERE LOC_CODE= ? ";
pstmt = conn.prepareStatement( sql );
pstmt.setString( 1, locCodeTo );
rs = pstmt.executeQuery();
if( rs.next() )
{
locToinvStat = rs.getString("INV_STAT");
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
//Start Changed by Dhanraj on 30-08-14 [W14DSUN001] for get inv stat multiple time....use only
if( locFrominvStat.trim().equalsIgnoreCase(NoslInvstat) )
{
//Start Changed by Dhanraj on 30-08-14 [W14DSUN001] for get inv stat multiple time....hide only
/*sql = "SELECT INV_STAT FROM LOCATION WHERE LOC_CODE= ? ";
pstmt = conn.prepareStatement( sql );
pstmt.setString( 1, locCodeTo );
rs = pstmt.executeQuery();
if( rs.next() )
{
locToinvStat = rs.getString("INV_STAT");
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;*/
//Start Changed by Dhanraj on 30-08-14 [W14DSUN001] for get inv stat multiple time....hide only
if(!locFrominvStat.equalsIgnoreCase(locToinvStat))
{
errList.add( "VTINVTRANF" );
errFields.add( childNodeName.toLowerCase() );
}
}
//changed by sankara on 09-07-13 validation for nosl end.....
System.out.println(" loc From invStat====> "+locFrominvStat+" locToinvStat====> "+locToinvStat);
//changed by sankara on 22/09/14 commented as per pragyan end.
//changed by sankara on 22/09/14 for location not emty for different item start.
itemCode = genericUtility.getColumnValue("item_code", allDom, "3" );
lotNo = genericUtility.getColumnValue("lot_no__fr", allDom, "3" );
System.out.println("itemCode::::::"+itemCode);
System.out.println("locCode::::::"+locCode);
System.out.println("lotNo::::::"+lotNo);
sql = " SELECT COUNT(*) AS COUNT FROM STOCK WHERE ITEM_CODE <> ? AND LOT_NO = ? AND LOC_CODE = ? AND QUANTITY > 0 ";
pstmt = conn.prepareStatement(sql);
pstmt.setString( 1, itemCode );
pstmt.setString( 2, lotNo );
pstmt.setString( 3, locCodeTo );
rs = pstmt.executeQuery();
if( rs.next() )
{
count = rs.getInt("COUNT");
System.out.println(" count:::::::::: "+count);
}
if(count > 0)
{
errList.add( "LOCNOTEMPT" );
errFields.add( childNodeName.toLowerCase() );
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
//changed by sankara on 22/09/14 for location not emty for different item end.
//End Changed by Dhanraj 03-09-14 [W14DSUN001]
}
}// for loop end
} //case 4 end
......@@ -1445,7 +1072,6 @@ public class StockTransferMultipleIC extends ValidatorEJB implements StockTransf
}
public String default_ItemChanged( Document currDom, Document hdrDom, Document allDom, String objContext, String currentColumn, String editFlag, String xtraParams ) throws RemoteException,ITMException
{
System.out.println("Call stocktransfermultipleIc default_ItemChanged");
String sql = "";
String itemCode = "";
String itemDescr = "";
......@@ -1517,7 +1143,6 @@ public class StockTransferMultipleIC extends ValidatorEJB implements StockTransf
{
case 1:
{
System.out.println("Call stocktransfermultipleIc item changed case 1");
valueXmlString.append( "<Detail1 domID='1'>\r\n" );
if( currentColumn.trim().equalsIgnoreCase( "itm_default" ) )
{
......@@ -1564,7 +1189,6 @@ public class StockTransferMultipleIC extends ValidatorEJB implements StockTransf
break;
case 2:
{
System.out.println("Call stocktransfermultipleIc item changed case 2");
valueXmlString.append( "<Detail2 domID='1'>\r\n" );
if( currentColumn.trim().equalsIgnoreCase( "itm_default" ) )
{
......@@ -1583,7 +1207,6 @@ public class StockTransferMultipleIC extends ValidatorEJB implements StockTransf
break;
case 3:
{
System.out.println("Call stocktransfermultipleIc item changed case 3");
if( currentColumn.trim().equalsIgnoreCase( "itm_default" ) )
{
int lineNo = 0;
......@@ -1597,29 +1220,10 @@ public class StockTransferMultipleIC extends ValidatorEJB implements StockTransf
{
siteCode = getSiteCode( xtraParams, conn );
}
// Start Changed by Dhanraj on 30-08-14 [W14DSUN001] for get to inv stat use..
String tranTypeDesc="";
sql = " SELECT INV_STAT_TYPE,STT.DESCR FROM LOCATION LOC,INVSTAT INV,STOCK_TRANSFER_TYPE STT "
+" WHERE LOC.INV_STAT=INV.INV_STAT AND STT.TRAN_TYPE=INV.INV_STAT_TYPE AND LOC_CODE= ? ";
pstmt = conn.prepareStatement( sql );
pstmt.setString( 1, locCode );
rs = pstmt.executeQuery();
if( rs.next() )
{
tranTypeDesc=rs.getString("INV_STAT_TYPE")+" - "+rs.getString("DESCR");
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
//End Changed by Dhanraj on 30-08-14 [W14DSUN001] for get to inv stat use..
sql = " SELECT A.ITEM_CODE, A.SITE_CODE, A.LOC_CODE, A.LOT_NO, A.LOT_SL," +
" C.ITEM_SER, C.DESCR ITEM_DESCR, C.LOC_TYPE, C.LOC_ZONE__PREF, A.QUANTITY, "+
" D.DESCR LOC_DESCR, A.PACK_CODE, A.ALLOC_QTY, A.MFG_DATE, A.NO_ART, " +
//changed by sankara on 22/09/14 added unit as per ashish sir.
//" A.ACCT_CODE__INV, A.CCTR_CODE__INV, D.PHY_HAN_BASIS "+
" A.ACCT_CODE__INV, A.CCTR_CODE__INV, D.PHY_HAN_BASIS, A.UNIT "+
" A.ACCT_CODE__INV, A.CCTR_CODE__INV, D.PHY_HAN_BASIS "+
" FROM STOCK A,ITEM C, LOCATION D "+
" WHERE A.LOC_CODE = D.LOC_CODE " +
" AND A.ITEM_CODE = C.ITEM_CODE " +
......@@ -1646,7 +1250,7 @@ public class StockTransferMultipleIC extends ValidatorEJB implements StockTransf
cctrCode = rs.getString("CCTR_CODE__INV");
itemlocType = rs.getString("LOC_TYPE");
locZonePref = rs.getInt("LOC_ZONE__PREF");
unit = rs.getString("UNIT");
//phyHanBasis = rs.getString("PHY_HAN_BASIS");
domID++;
lineNo++;
......@@ -1672,12 +1276,10 @@ public class StockTransferMultipleIC extends ValidatorEJB implements StockTransf
valueXmlString.append("<cctr_code__dr><![CDATA[").append(checkNull(cctrCode)).append("]]></cctr_code__dr>\r\n");
valueXmlString.append("<phy_han_basis><![CDATA[").append(checkNull(phyHanBasis)).append("]]></phy_han_basis>\r\n");
sql = " SELECT DISTINCT A.LOC_CODE, S.QUANTITY FROM LOCATION A ,INVSTAT B, STOCK S " +
sql = " SELECT DISTINCT A.LOC_CODE FROM LOCATION A ,INVSTAT B, STOCK S " +
" WHERE A.INV_STAT = B.INV_STAT AND B.AVAILABLE = 'Y' " +
" AND (CASE WHEN B.STAT_TYPE IS NULL THEN ' ' ELSE B.STAT_TYPE END) <> 'S' " +
//changed by sankara on 22/09/14 for location not emty for sufggest loc code
//" AND A.LOC_CODE = S.LOC_CODE AND A.LOC_CODE <> ? AND S.ITEM_CODE = ? AND S.LOT_NO = ? AND S.SITE_CODE = ? AND S.QUANTITY <= 0 ";
" AND A.LOC_CODE = S.LOC_CODE AND A.LOC_CODE <> ? AND S.ITEM_CODE = ? AND S.LOT_NO = ? AND S.SITE_CODE = ? ORDER BY S.QUANTITY DESC ";
" AND A.LOC_CODE = S.LOC_CODE AND A.LOC_CODE <> ? AND S.ITEM_CODE = ? AND S.LOT_NO = ? AND S.SITE_CODE = ? AND S.QUANTITY <= 0 ";
pstmt1 = conn.prepareStatement(sql);
pstmt1.setString(1,locCode );
pstmt1.setString(2,itemCode );
......@@ -1692,12 +1294,10 @@ public class StockTransferMultipleIC extends ValidatorEJB implements StockTransf
if ( locCodeTo == null || locCodeTo.trim().length() == 0 )
{
System.out.println("inside else if..........................................");
sql = " SELECT DISTINCT A.LOC_CODE, S.QUANTITY FROM LOCATION A ,INVSTAT B, STOCK S " +
sql = " SELECT DISTINCT A.LOC_CODE FROM LOCATION A ,INVSTAT B, STOCK S " +
" WHERE A.INV_STAT = B.INV_STAT AND B.AVAILABLE = 'Y' " +
" AND (CASE WHEN B.STAT_TYPE IS NULL THEN ' ' ELSE B.STAT_TYPE END) <> 'S' " +
//changed by sankara on 22/09/14 for location not emty for sufggest loc code
//" AND A.LOC_CODE = S.LOC_CODE AND A.LOC_CODE <> ? AND S.ITEM_CODE = ? AND S.LOT_NO <> ? AND S.SITE_CODE = ? AND S.QUANTITY <= 0 ";
" AND A.LOC_CODE = S.LOC_CODE AND A.LOC_CODE <> ? AND S.ITEM_CODE = ? AND S.LOT_NO <> ? AND S.SITE_CODE = ? ORDER BY S.QUANTITY DESC ";
" AND A.LOC_CODE = S.LOC_CODE AND A.LOC_CODE <> ? AND S.ITEM_CODE = ? AND S.LOT_NO <> ? AND S.SITE_CODE = ? AND S.QUANTITY <= 0 ";
pstmt1 = conn.prepareStatement(sql);
pstmt1.setString(1,locCode );
pstmt1.setString(2,itemCode );
......@@ -1721,8 +1321,6 @@ public class StockTransferMultipleIC extends ValidatorEJB implements StockTransf
valueXmlString.append("<loc_code__to><![CDATA[").append(checkNull(locCodeTo.trim())).append("]]></loc_code__to>\r\n");
valueXmlString.append("<loc_code__sys><![CDATA[").append(checkNull(locCodeTo.trim())).append("]]></loc_code__sys>\r\n");
//Changed by Dhanraj on 30-08-14 [W14DSUN001] add tab(inv_stat_type) for tran type with desc disp.
valueXmlString.append("<transaction_type ><![CDATA[").append(checkNull(tranTypeDesc)).append("]]></transaction_type>\r\n");
valueXmlString.append("</Detail3>\r\n");
}
rs.close();rs = null;
......@@ -1765,8 +1363,6 @@ public class StockTransferMultipleIC extends ValidatorEJB implements StockTransf
String lotSlNew = genericUtility.getColumnValueFromNode("lot_sl__to", parentNode);
noArt = genericUtility.getColumnValueFromNode("no_art", parentNode);
String Quantity = genericUtility.getColumnValueFromNode("quantity", parentNode);
//changed by sankara for unit 22/09/14
unit = genericUtility.getColumnValueFromNode("unit", parentNode);
System.out.println("itemCode ----- ["+itemCode+"]");
acctCode = genericUtility.getColumnValueFromNode("acct_code__cr", parentNode);
cctrCode = genericUtility.getColumnValueFromNode("cctr_code__cr", parentNode);
......@@ -1790,32 +1386,10 @@ public class StockTransferMultipleIC extends ValidatorEJB implements StockTransf
valueXmlString.append("<lot_sl__to><![CDATA[").append(lotSlNew.trim()).append("]]></lot_sl__to>\r\n");
valueXmlString.append("<quantity><![CDATA[" + Quantity + "]]></quantity>\r\n");
valueXmlString.append("<no_art><![CDATA[" + noArt + "]]></no_art>\r\n");
//changed by sankara for unit 22/09/14
valueXmlString.append("<unit><![CDATA[").append(unit).append("]]></unit>\r\n");
valueXmlString.append("<acct_code__cr><![CDATA[").append(checkNull(acctCode)).append("]]></acct_code__cr>\r\n");
valueXmlString.append("<cctr_code__cr><![CDATA[").append(checkNull(cctrCode)).append("]]></cctr_code__cr>\r\n");
valueXmlString.append("<acct_code__dr><![CDATA[").append(checkNull(acctCode)).append("]]></acct_code__dr>\r\n");
valueXmlString.append("<cctr_code__dr><![CDATA[").append(checkNull(cctrCode)).append("]]></cctr_code__dr>\r\n");
// Start Changed by Dhanraj on 30-08-14 [W14DSUN001] for get to inv stat use..
String tranTypeDesc="";
sql = " SELECT INV_STAT_TYPE,STT.DESCR FROM LOCATION LOC,INVSTAT INV,STOCK_TRANSFER_TYPE STT "
+" WHERE LOC.INV_STAT=INV.INV_STAT AND STT.TRAN_TYPE=INV.INV_STAT_TYPE AND LOC_CODE= ? ";
pstmt = conn.prepareStatement( sql );
pstmt.setString( 1, locCode );
rs = pstmt.executeQuery();
if( rs.next() )
{
tranTypeDesc=rs.getString("INV_STAT_TYPE")+" - "+rs.getString("DESCR");
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
//Changed by Dhanraj on 30-08-14 [W14DSUN001] add tab(inv_stat_type) for tran type with desc disp.
valueXmlString.append("<transaction_type ><![CDATA[").append(checkNull(tranTypeDesc)).append("]]></transaction_type>\r\n");
//End Changed by Dhanraj on 30-08-14 [W14DSUN001] for get to inv stat use..
valueXmlString.append("</Detail4>\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