Skip to content

B
business-java
Commit 4ec30105 authored by prahate's avatar prahate
Browse files
Options

Changes done for WMS-UTL. 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@192590 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 74a02228
Hide whitespace changes
Inline Side-by-side
Showing with 4187 additions and 15 deletions
webitm-wms/ibase/webitm/ejb/wms/AsnIC.java
View file @ 4ec30105
......@@ -1128,9 +1128,11 @@ public String itemChanged( Document dom, Document dom1, Document dom2, String ob
InetAddress ownIP=InetAddress.getLocalHost();
chgTerm = ownIP.getHostAddress();
ITMDBAccessRemote itmDBAccess = (ITMDBAccessRemote)ctx.lookup("ibase/ITMDBAccessEJB/remote");
//Commented and Added by Pankaj R on 29-OCT-18 [START]
//ITMDBAccessRemote itmDBAccess = (ITMDBAccessRemote)ctx.lookup("ibase/ITMDBAccessEJB/remote");
ITMDBAccessEJB itmDBAccess = new ITMDBAccessEJB();
//Commented and Added by Pankaj R on 29-OCT-18 [END]
System.out.println("<!@#> ItemChange for ASn is Called objContext " +objContext);
//Commented by Santosh on 14-06-2016
......
webitm-wms/ibase/webitm/ejb/wms/DockTranPos.java 0 → 100644
View file @ 4ec30105
This source diff could not be displayed because it is too large. You can view the blob instead.
webitm-wms/ibase/webitm/ejb/wms/PalletNoIC.java
View file @ 4ec30105
......@@ -879,7 +879,10 @@ public class PalletNoIC extends ValidatorEJB implements PalletNoICLocal, PalletN
System.out.println("CASE2 ptcnPalletNo["+ptcnPalletNo+"]");
locCodeTo = checkNull(genericUtility.getColumnValue("loc_code__to", allFormDataDom, "1" ));
//palletNo = checkNull(genericUtility.getColumnValue("pallet_no", allFormDataDom, "1" ));
palletNo = checkNull(genericUtility.getColumnValue(ptcnPalletNo, allFormDataDom, "1" ));
//Commented and Added by Pankaj R on 29-OCT-18 [START]
//palletNo = checkNull(genericUtility.getColumnValue(ptcnPalletNo, allFormDataDom, "1" ));
palletNo = checkNull(genericUtility.getColumnValue("ptcn", allFormDataDom, "1" ));
//Commented and Added by Pankaj R on 29-OCT-18 [END]
System.out.println("pallet no -----["+palletNo+"]");
System.out.println("location to "+locCodeTo);
......@@ -988,7 +991,7 @@ public class PalletNoIC extends ValidatorEJB implements PalletNoICLocal, PalletN
}
System.out.println(" locCodeTo [" + locCodeTo + "] docLocCode [" + docLocCode + "]");
domID = 1; //Added by Pankaj R on 29-OCT-18
valueXmlString.append( "<Detail2 domID='"+ domID +"' objContext = '"+currentFormNo+"' objName='"+objName+"' selected=\"Y\">\r\n" );
//valueXmlString.append( "<attribute selected=\"Y\"/>\r\n" );
valueXmlString.append( "<loc_code__sys protect = '1'><![CDATA[" ).append(docLocCode).append( "]]></loc_code__sys>\r\n" );
......
webitm-wms/ibase/webitm/ejb/wms/StockTransferGrlIC.java
View file @ 4ec30105
......@@ -1355,9 +1355,9 @@ public class StockTransferGrlIC extends ValidatorEJB implements StockTransferGrl
try
{
System.out.println ( "currFrmXmlStr [" + currFrmXmlStr + "]");
System.out.println ( "currFrmXmlStr [" + hdrFrmXmlStr + "]");
System.out.println ( "currFrmXmlStr [" + allFrmXmlStr + "]");
System.out.println ( "currFrmXmlStr 1 [" + currFrmXmlStr + "]");
System.out.println ( "currFrmXmlStr 2 [" + hdrFrmXmlStr + "]");
System.out.println ( "currFrmXmlStr All[" + allFrmXmlStr + "]");
if (currFrmXmlStr != null && currFrmXmlStr.trim().length()!=0)
{
currDom = genericUtility.parseString(currFrmXmlStr);
......
webitm-wms/ibase/webitm/ejb/wms/WaveGenerationPrc.java
View file @ 4ec30105
......@@ -8248,8 +8248,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
ptcnID = getTranId( "w_ptcn", conn );
//changed by wasim on 16-06-2015 to insert pallet_no [START]
if("DDUK".equalsIgnoreCase(projectName))
{
//Commented and Added by Pankaj R on 29-OCT-18 [START] - as per KB sir
// if("DDUK".equalsIgnoreCase(projectName))
// {
sql = " INSERT INTO PALLET_NO (PALLET_NO,STATUS) VALUES (?,'A') ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,ptcnID);
......@@ -8259,7 +8260,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pstmt.close();
pstmt = null;
}
}
//}
//Commented and Added by Pankaj R on 29-OCT-18 [END]
//changed by wasim on 16-06-2015 to insert pallet_no [END]
//Changed by sumit on 07/08/12 adding generated PTCN in list for forther use start
ptcnList.add(ptcnID);
......@@ -21733,7 +21735,11 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
//changed by sankara on 11/10/13 for getting drug_lic_no_1 and drug_licno1_upto end.
+" S.DLV_PIN AS DLV_PIN, "
//changed by Pragyan on 23/12/13 for getting FRT TERM.
+" S.FRT_TERM AS FRT_TERM";
+" S.FRT_TERM AS FRT_TERM"
//Added by Pankaj R on 29-OCT-18 [START]
+", S.TRAN_CODE AS TRAN_CODE," //Changed by Dadaso pawar on 05/06/15
+" S.TRANS_MODE AS TRANS_MODE";
//Added by Pankaj R on 29-OCT-18 [END]
//Changed by Manish on 04/11/15 for ddwms merging
if("DDUK".equalsIgnoreCase(projectName))
......@@ -21793,6 +21799,10 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
lincenceUpto = rs.getDate("DRUG_LICNO1_UPTO");
//changed by sankara on 11/10/13 for getting drug_lic_no_1 and drug_licno1_upto end.
frtTerm = rs.getString("FRT_TERM");
//Added by Pankaj R on 29-OCT-18 [START]
tranCode = rs.getString("TRAN_CODE");
transMod = rs.getString("TRANS_MODE");
//Added by Pankaj R on 29-OCT-18 [END]
//Changed by Manish on 04/11/15 for ddwms merging
if("DDUK".equalsIgnoreCase(projectName))
{
......@@ -21882,6 +21892,10 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
sordInfoMap.put("FAX", shipFax);
sordInfoMap.put("CUST_PORD", custPord);
sordInfoMap.put("DLV_PIN", dlvPin);
//Added by Pankaj R on 29-OCT-18 [START]
sordInfoMap.put("TRAN_CODE", tranCode);
sordInfoMap.put("TRANS_MODE", transMod);
//Commented and Added by Pankaj R on 29-OCT-18 [END]
//Changed by Dadaso pawar on 05/06/15 [Start]
if("DDUK".equalsIgnoreCase(projectName))
{
......@@ -24533,13 +24547,14 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
//errString = jrGenerator.printReport(reportObjName, xsdString, chgUser, printerStr, 1, conn);
if( "PDF".equalsIgnoreCase(reportSavetype))
{
XSDParser xsdParser = new XSDParser(reportObjName);
System.out.println("getUserInfo() ::: Pankaj : "+getUserInfo());
XSDParser xsdParser = new XSDParser(reportObjName, getUserInfo());
argMap = jrGenerator.createArgMap(xsdString);
System.out.println("TreeMap:::->"+argMap);
//outputFilename = reportObjName.trim() + chgUser + new Random().nextInt();
//outputFilename = chgUser + "_" + saleOrder+"_"+waveId;
outputFilename = chgUser + "_" + saleOrder+"_"+waveId+"_"+ new Random().nextInt();
jrGenerator.createReport(reportObjName , argMap, xsdParser, chgUser, outputFilename, conn);
//jrGenerator.createReport(reportObjName , argMap, xsdParser, chgUser, outputFilename, conn); //KALE
}
else
{
webitm-wms/ibase/webitm/ejb/wms/WavegenWizEJB.java
View file @ 4ec30105
......@@ -477,7 +477,7 @@ public class WavegenWizEJB extends ValidatorEJB implements WavegenWizEJBLocal, W
ctx=getInitialContext();
//Changes by mayur on 20-July-2018
waveGenerationICRemote = new WaveGenerationIC();//(ibase.webitm.ejb.wms.WaveGenerationICRemote) ctx.lookup("ibase/WaveGenerationIC/remote");
waveGenerationICRemote.setUserInfo(getUserInfo()); //Added by Pankaj R on 29-OCT-18
if (objContext != null && objContext.trim().length() > 0)
{
currentFormNo = Integer.parseInt(objContext);
......
webitm-wms/ibase/webitm/ejb/wms/WavegenWizPos.java
View file @ 4ec30105
......@@ -128,6 +128,8 @@ public class WavegenWizPos extends ValidatorEJB implements WavegenWizPosLocal, W
ctx=getInitialContext();
//Changes by mayur on 20-July-2018
waveGenerationPrcRemote = new WaveGenerationPrc();//(ibase.webitm.ejb.wms.WaveGenerationPrcRemote) ctx.lookup("ibase/WaveGenerationPrc/remote");
System.out.println("Setting userInfo");
waveGenerationPrcRemote.setUserInfo(getUserInfo()); //Added by Pankaj R on 29-OCT-18
retString = waveGenerationPrcRemote.process(headerXMLStr, detailXMLStr, "wavegen", xtraParmas);
System.out.println("********retString["+retString+"]***********");
......@@ -137,7 +139,10 @@ public class WavegenWizPos extends ValidatorEJB implements WavegenWizPosLocal, W
if(retString.indexOf("VTCOMPL")!=-1)
{
waveID = retString.substring(retString.indexOf("[")+1,retString.indexOf("]"));
retString = "Wave Task Generated Successfully!";
//Commented and Added by Pankaj R on 29-OCT-18 [START]
//retString = "Wave Task Generated Successfully!";
System.out.println("::::::Generated RETSTRING ["+retString+"]");
//Commented and Added by Pankaj R on 29-OCT-18 [END]
System.out.println("::::::Generated WaveID["+waveID+"]");
}
}
......
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