Skip to content

B
business-java
Commit 336cb077 authored by sshinde's avatar sshinde
Browse files
Options

remove trim logic for lot_no and lot_sl from autobackflush 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@93658 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 8c13c990
Hide whitespace changes
Inline Side-by-side
Showing with 74 additions and 26 deletions
webitm-dis/ibase/webitm/ejb/dis/adv/PoRcpConf.java
View file @ 336cb077
...@@ -3857,7 +3857,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -3857,7 +3857,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
String purcOrder = "",retString = "",suppCode= "",pordSite = "",ordType = ""; String purcOrder = "",retString = "",suppCode= "",pordSite = "",ordType = "";
String channelPartner = "", disLink = "", sordSite = "", distOrder = "", distRcp = ""; String channelPartner = "", disLink = "", sordSite = "", distOrder = "", distRcp = "";
String itemSer = "",itemCode = "", bomCode = "", unit = "",itemCodeDet = "", unitDet = ""; String itemSer = "",itemCode = "", bomCode = "", unit = "",itemCodeDet = "", unitDet = "";
String trNoFld = "",keyStr = "",exit = "", locHdr = "", saleOrder = "", custCode = ""; String trNoFld = "",keyStr = "",keyStrFrDepatch="",exit = "", locHdr = "", saleOrder = "", custCode = "";
String custCodeDlv = "",tranCode = "",stanCode = "",dlv1 = "", dlv2 = "",dlvCity = "", dlvPin = ""; String custCodeDlv = "",tranCode = "",stanCode = "",dlv1 = "", dlv2 = "",dlvCity = "", dlvPin = "";
String dlvCnt = "", currCode = "",currCodeFrt = "", stanCodeInit = "",orderType = "",transMode = ""; String dlvCnt = "", currCode = "",currCodeFrt = "", stanCodeInit = "",orderType = "",transMode = "";
String remarks = "", remarks2 = "",remarks3 = "", currCodeIns ="",dlv3 = "", gpSer = ""; String remarks = "", remarks2 = "",remarks3 = "", currCodeIns ="",dlv3 = "", gpSer = "";
...@@ -3907,6 +3907,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -3907,6 +3907,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
int iRow = 0, currRow = 0, hdrRow = 0, updCnt = 0; int iRow = 0, currRow = 0, hdrRow = 0, updCnt = 0;
Timestamp ordDate = null,mfgDt = null, expDt = null,expDate=null; Timestamp ordDate = null,mfgDt = null, expDt = null,expDate=null;
boolean noBom = true; boolean noBom = true;
TransIDGenerator tg=null;
try try
{ {
ITMDBAccessEJB itmDBAccessLocal = new ITMDBAccessEJB(); ITMDBAccessEJB itmDBAccessLocal = new ITMDBAccessEJB();
...@@ -3977,6 +3978,36 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -3977,6 +3978,36 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
pstmt = null; pstmt = null;
rs.close(); rs.close();
rs = null; rs = null;
sql ="SELECT KEY_STRING FROM TRANSETUP WHERE UPPER(TRAN_WINDOW) = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, "W_DESPATCH");
rs = pstmt.executeQuery();
if ( rs.next() )
{
keyStrFrDepatch = checkNull(rs.getString("KEY_STRING"));
}
else
{
sql = "SELECT KEY_STRING FROM TRANSETUP WHERE TRAN_WINDOW = ?";
pstmt1 = conn.prepareStatement(sql);
pstmt1.setString(1, "GENERAL");
rs1 = pstmt.executeQuery();
if ( rs1.next() )
{
keyStrFrDepatch = checkNull(rs1.getString("KEY_STRING"));
}
pstmt1.close();
pstmt1=null;
rs1.close();
rs1=null;
}
pstmt.close();
pstmt = null;
rs.close();
rs = null;
sql = "SELECT PURC_ORDER FROM PORCP WHERE TRAN_ID = ? "; sql = "SELECT PURC_ORDER FROM PORCP WHERE TRAN_ID = ? ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
...@@ -4019,7 +4050,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -4019,7 +4050,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
disLink = checkNull(rs.getString("DIS_LINK")); disLink = checkNull(rs.getString("DIS_LINK"));
sordSite = checkNull(rs.getString("SITE_CODE__CH")); sordSite = checkNull(rs.getString("SITE_CODE__CH"));
} }
/* cahnge done by sachin remove else condition on 23-9-13*/
if(channelPartner == null ) if(channelPartner == null )
{ {
sql = "SELECT (CASE WHEN CHANNEL_PARTNER IS NULL THEN 'N' ELSE CHANNEL_PARTNER END) AS CHANNEL_PARTNER, DIS_LINK, SITE_CODE FROM SUPPLIER WHERE SUPP_CODE = ? "; sql = "SELECT (CASE WHEN CHANNEL_PARTNER IS NULL THEN 'N' ELSE CHANNEL_PARTNER END) AS CHANNEL_PARTNER, DIS_LINK, SITE_CODE FROM SUPPLIER WHERE SUPP_CODE = ? ";
...@@ -4037,8 +4068,6 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -4037,8 +4068,6 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
rs1.close(); rs1.close();
rs1=null; rs1=null;
} }
/* cahnge done by sachin remove else condition on 23-9-13 end*/
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
rs.close(); rs.close();
...@@ -4063,7 +4092,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -4063,7 +4092,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
rs1 = pstmt1.executeQuery(); rs1 = pstmt1.executeQuery();
if (rs1.next()) if (rs1.next())
{ {
distIss= checkNull(rs1.getString("TRAN_ID")); distIss= checkNullFrLotSl(rs1.getString("TRAN_ID"));
} }
else else
{ {
...@@ -4310,9 +4339,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -4310,9 +4339,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
xmlValues = xmlValues + "<tran_date>"+ getCurrdateAppFormat() + "</tran_date>\r\n"; xmlValues = xmlValues + "<tran_date>"+ getCurrdateAppFormat() + "</tran_date>\r\n";
xmlValues = xmlValues + "</Detail1>\r\n</Root>"; xmlValues = xmlValues + "</Detail1>\r\n</Root>";
System.out.println("xmlValues :["+xmlValues+"]"); System.out.println("xmlValues :["+xmlValues+"]");
TransIDGenerator tg = new TransIDGenerator(xmlValues, "BASE", CommonConstants.DB_NAME); tg = new TransIDGenerator(xmlValues, "BASE", CommonConstants.DB_NAME);
// generatedTranId=this.generateTranId("w_receipt_backflush", sordSite,today, conn);
generatedTranId=tg.generateTranSeqID("R-BFS", "tran_id", keyStr, conn); generatedTranId=tg.generateTranSeqID("R-BFS", "tran_id", keyStr, conn);
...@@ -4322,12 +4349,9 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -4322,12 +4349,9 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
return retString; return retString;
} }
//lotNo[lnoPoRcpDetInInt] = tg.generateTranSeqID("QC-ORD", "lot_no", keyStr, conn);
//lotNo.add(lnoPoRcpDetInInt, tg.generateTranSeqID("QC-ORD", "lot_no", keyStr, conn)); //replaced by swati
System.out.println("generatedTranId is :"+generatedTranId); System.out.println("generatedTranId is :"+generatedTranId);
System.out.println("outer hash key:"+Integer.parseInt(entry.getKey().toString())); System.out.println("outer hash key:"+Integer.parseInt(entry.getKey().toString()));
lotNoMap.put(Integer.parseInt(entry.getKey().toString()), tg.generateTranSeqID("QC-ORD", "lot_no", keyStr, conn)); lotNoMap.put(Integer.parseInt(entry.getKey().toString()), tg.generateTranSeqID("QC-ORD", "lot_no", keyStr, conn));
if (("ERROR").equalsIgnoreCase(lotNoMap.get(Integer.parseInt(entry.getKey().toString())))) if (("ERROR").equalsIgnoreCase(lotNoMap.get(Integer.parseInt(entry.getKey().toString()))))
...@@ -4368,7 +4392,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -4368,7 +4392,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
rs1=pstmt1.executeQuery(); rs1=pstmt1.executeQuery();
if(rs1.next()) if(rs1.next())
{ {
lotNo=rs1.getString("lot_no__passign"); lotNo=checkNullFrLotSl(rs1.getString("lot_no__passign"));
expDate=rs1.getTimestamp("exp_date__passign"); expDate=rs1.getTimestamp("exp_date__passign");
} }
System.out.println("lot_no__passign is= "+lotNo +"and exp_date__passign is ="+expDate); System.out.println("lot_no__passign is= "+lotNo +"and exp_date__passign is ="+expDate);
...@@ -4387,7 +4411,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -4387,7 +4411,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
} }
if( lotNo!=null && lotNo.trim().length()>0) if( lotNo!=null )
{ {
pstmtRbHdr.setString(19,lotNo); pstmtRbHdr.setString(19,lotNo);
} }
...@@ -4499,7 +4523,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -4499,7 +4523,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
rs1 = pstmt1.executeQuery(); rs1 = pstmt1.executeQuery();
if (rs1.next()) if (rs1.next())
{ {
lot_Sl=rs1.getString(1); lot_Sl=checkNullFrLotSl(rs1.getString(1));
} }
pstmt1.close(); pstmt1.close();
pstmt1 = null; pstmt1 = null;
...@@ -4551,11 +4575,8 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -4551,11 +4575,8 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
// lotSl[setRow] = checkNull(rs1.getString("LOT_SL")); // lotSl[setRow] = checkNull(rs1.getString("LOT_SL"));
locCodeMap.put(setRow, checkNull(rs1.getString("LOC_CODE"))); locCodeMap.put(setRow, checkNull(rs1.getString("LOC_CODE")));
lotNoMap.put(setRow, checkNull(rs1.getString("LOT_NO"))); lotNoMap.put(setRow, checkNullFrLotSl(rs1.getString("LOT_NO")));
lotSlMap.put(setRow, checkNull(rs1.getString("LOT_SL"))); lotSlMap.put(setRow, checkNullFrLotSl(rs1.getString("LOT_SL")));
rateMap.put(setRow, rs1.getDouble("RATE")); rateMap.put(setRow, rs1.getDouble("RATE"));
chkQty = chkQty + stkQtyMap.get(setRow); chkQty = chkQty + stkQtyMap.get(setRow);
setRow = setRow + 1; setRow = setRow + 1;
...@@ -4584,8 +4605,8 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -4584,8 +4605,8 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
// lotSl[setRow] = checkNull(rs1.getString("LOT_SL")); // lotSl[setRow] = checkNull(rs1.getString("LOT_SL"));
locCodeMap.put(setRow, checkNull(rs1.getString("LOC_CODE"))); locCodeMap.put(setRow, checkNull(rs1.getString("LOC_CODE")));
lotNoMap.put(setRow, checkNull(rs1.getString("LOT_NO"))); lotNoMap.put(setRow, checkNullFrLotSl(rs1.getString("LOT_NO")));
lotSlMap.put(setRow, checkNull(rs1.getString("LOT_SL"))); lotSlMap.put(setRow, checkNullFrLotSl(rs1.getString("LOT_SL")));
rateMap.put(setRow,rs1.getDouble("RATE")); rateMap.put(setRow,rs1.getDouble("RATE"));
setRow = setRow + 1; setRow = setRow + 1;
...@@ -4961,7 +4982,24 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -4961,7 +4982,24 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
rs.close(); rs.close();
rs=null; rs=null;
generatedTranId=this.generateTranId("w_despatch", sordSite,today, conn);
//generatedTranId=this.generateTranId("w_despatch", sordSite,today, conn);
xmlValues="";
xmlValues ="<?xml version=\"1.0\" encoding=\"utf-8\"?><Root>";
xmlValues = xmlValues + "<Header></Header>\r\n";
xmlValues = xmlValues + "<Detail1>\r\n";
xmlValues = xmlValues + "<tran_id></tran_id>\r\n";
xmlValues = xmlValues + "<site_code>" + sordSite + "</site_code>\r\n";
xmlValues = xmlValues + "<tran_date>"+ getCurrdateAppFormat() + "</tran_date>\r\n";
xmlValues = xmlValues + "</Detail1>\r\n</Root>";
System.out.println("xmlValues :["+xmlValues+"]");
tg = new TransIDGenerator(xmlValues, "BASE", CommonConstants.DB_NAME);
generatedTranId=tg.generateTranSeqID("S-DSP", "tran_id",keyStrFrDepatch, conn);
System.out.println(" generatedTranId for despatch is ="+generatedTranId);
if("ERROR".equalsIgnoreCase(generatedTranId)) if("ERROR".equalsIgnoreCase(generatedTranId))
{ {
retString = itmDBAccessLocal.getErrorString("","VTTRANID",""); retString = itmDBAccessLocal.getErrorString("","VTTRANID","");
...@@ -6258,8 +6296,8 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -6258,8 +6296,8 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
rate = rs.getDouble("RATE"); rate = rs.getDouble("RATE");
netAmt = rs.getDouble("NET_AMT"); netAmt = rs.getDouble("NET_AMT");
locCode = checkNull(rs.getString("LOC_CODE")); locCode = checkNull(rs.getString("LOC_CODE"));
lotNo = checkNull(rs.getString("LOT_NO")); lotNo = checkNullFrLotSl(rs.getString("LOT_NO"));
lotSl = checkNull(rs.getString("LOT_SL")); lotSl = checkNullFrLotSl(rs.getString("LOT_SL"));
disc = rs.getDouble("DISCOUNT"); disc = rs.getDouble("DISCOUNT");
cctrCodeDr = checkNull(rs.getString("CCTR_CODE__DR")); cctrCodeDr = checkNull(rs.getString("CCTR_CODE__DR"));
purcOrder = checkNull(rs.getString("PURC_ORDER")); purcOrder = checkNull(rs.getString("PURC_ORDER"));
...@@ -6282,7 +6320,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -6282,7 +6320,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
qcLocCode = checkNull(rs1.getString("LOC_CODE")); qcLocCode = checkNull(rs1.getString("LOC_CODE"));
qcItemCode = checkNull(rs1.getString("ITEM_CODE")); qcItemCode = checkNull(rs1.getString("ITEM_CODE"));
passed = rs1.getDouble("QTY_PASSED"); passed = rs1.getDouble("QTY_PASSED");
qcLotNoNew = checkNull(rs1.getString("LOT_NO__NEW")); qcLotNoNew = checkNullFrLotSl(rs1.getString("LOT_NO__NEW"));
qcLotNo = checkNull(rs1.getString("LOT_NO")); qcLotNo = checkNull(rs1.getString("LOT_NO"));
} }
pstmt1.close(); pstmt1.close();
...@@ -6644,6 +6682,16 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -6644,6 +6682,16 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
} }
return input; return input;
} }
private String checkNullFrLotSl( String input )
{
if( input == null )
{
input = "";
}
return input;
}
private String generateTranId( String windowName, String siteCode, String tranDateStr, Connection conn )throws ITMException private String generateTranId( String windowName, String siteCode, String tranDateStr, Connection conn )throws ITMException
{ {
......
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