Skip to content

B
business-java
Commit c362ff68 authored by dpawar's avatar dpawar
Browse files
Options

update source code 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@97621 ce508802-f39f-4f6c-b175-0d175dae99d5
parent a3204917
Expand all Show whitespace changes
Inline Side-by-side
Showing with 424 additions and 291 deletions
webitm-wms/ibase/webitm/ejb/wms/MultiplePtcnWizConf.java
View file @ c362ff68
......@@ -6,6 +6,7 @@ import ibase.webitm.ejb.*;
import ibase.webitm.ejb.dis.*;
import ibase.system.config.*;
import ibase.webitm.utility.ITMException;
import ibase.webitm.utility.wms.CommonWmsUtil;
import ibase.utility.CommonConstants;
import java.io.*;
......@@ -66,9 +67,9 @@ public class MultiplePtcnWizConf extends ActionHandlerEJB implements MultiplePtc
String itemCode = "",siteCode = "",locCode = "",lotNo = "",lotSl = "",locCodeTo = "",saleOrder = "",
lineNoSord = "",replOrder = "",pickType = "",dExpLev = "",remarks = "",dimension = "";
String acctCodeDr = "",cctrCodeDr = "",packCode = "",siteCodeMfg = "",stagingLoc = "",
packInstr = "",suppCodeMfg = "",unitAlt = "",batchNo = "",unit = "",grade = "",
packInstr = "",suppCodeMfg = "",unitAlt = "",batchNo = "",unit = "",grade = "",stkOpt = "",
expLev = "",itemCodeOrd = "",itemRef = "",status = "",itemGrade = "",waveId = "",retString = "",
allocMode = "",reasCode = "",unitStd = "",sSQL = "",updateSql = "",ptcn = "",refSer = "";
allocMode = "",reasCode = "",unitStd = "",sSQL = "",updateSql = "",ptcn = "",refSer = "",lineNoStr = "";
int lineNoOrd= 0,lineNo= 0,updCnt = 0,rowsCount = 0;
double quantity = 0,noArt =0,stkGrossRate = 0,convQtyStduom = 0,batchSize = 0,holdQuantity = 0,stkRate = 0;
double shipperSize = 0, itemGrossWeight = 0, caseGrossWeight = 0, itemNetWeight = 0, caseNetWeight = 0,
......@@ -88,6 +89,7 @@ public class MultiplePtcnWizConf extends ActionHandlerEJB implements MultiplePtc
HashMap <String,String>dataMap = new HashMap<String,String>();
//ArrayList<String> ptcnScanList = new ArrayList<String>();
Set<String> ptcnScanSet = new HashSet<String>();
CommonWmsUtil CommonWmsUtilobj= CommonWmsUtil.getInstance();
try
{
currDate = new java.sql.Timestamp( System.currentTimeMillis() );
......@@ -160,6 +162,18 @@ public class MultiplePtcnWizConf extends ActionHandlerEJB implements MultiplePtc
itemCode = rs.getString( "ITEM_CODE" );
siteCode = rs.getString( "SITE_CODE" );
locCode = rs.getString( "LOC_CODE" );
if("2".equalsIgnoreCase(stkOpt))
{
lotNo = checkNull(rs.getString( "LOT_NO" ));
lotSl = checkNull(rs.getString( "LOT_SL" ));
}
else
{
lotNo = rs.getString( "LOT_NO" );
lotSl = rs.getString( "LOT_SL" );
}
lotNo = rs.getString( "LOT_NO" );
lotSl = rs.getString( "LOT_SL" );
quantity = rs.getDouble( "QUANTITY" );
......@@ -199,6 +213,11 @@ public class MultiplePtcnWizConf extends ActionHandlerEJB implements MultiplePtc
dataMap.put("pick_order", replOrder);
dataMap.put("pick_type", pickType);
dataMap.put("stag_loc", stagingLoc);
stkOpt = checkNull(CommonWmsUtilobj.getStockOption(itemCode, conn));
System.out.println("stkOpt-------->>["+stkOpt+"]");
if(lotNo == null || lotNo.trim().length() == 0)
{
lotNo =" ";
......@@ -208,7 +227,11 @@ public class MultiplePtcnWizConf extends ActionHandlerEJB implements MultiplePtc
lotSl = " ";
}
lineNo = rs.getInt( "LINE_NO" );
lineNoStr = checkNull(rs.getString( "LINE_NO" ));
pstmtStock.setString(1,itemCode);
......@@ -268,7 +291,7 @@ public class MultiplePtcnWizConf extends ActionHandlerEJB implements MultiplePtc
updateRowMap.put("rate",Double.toString(stkRate));
updateRowMap.put("gross_rate",Double.toString(stkGrossRate));
updateRowMap.put("tran_id", tranId );
updateRowMap.put("line_no", "" + lineNo );
updateRowMap.put("line_no", lineNoStr );
updateRowMap.put("tran_date", tranDate );
updateRowMap.put("tran_type","ID");
......@@ -709,7 +732,7 @@ public class MultiplePtcnWizConf extends ActionHandlerEJB implements MultiplePtc
pstmtUpdPickOrdDet = conn.prepareStatement(updatePickOrdSql);
pstmtUpdPickOrdDet.setString(1, stagingLoc);
pstmtUpdPickOrdDet.setString(2, tranId);
pstmtUpdPickOrdDet.setInt(3, lineNo);
pstmtUpdPickOrdDet.setString(3, lineNoStr);
updCntPickOrdDet = pstmtUpdPickOrdDet.executeUpdate();
......
webitm-wms/ibase/webitm/ejb/wms/MultiplePtcnWizPos.java
View file @ c362ff68
......@@ -57,6 +57,7 @@ public class MultiplePtcnWizPos extends ValidatorEJB implements MultiplePtcnWizP
MultiplePtcnWizConf MultiplePtcnWizConfobj = null;
NodeList parentNodeList = null;
ArrayList<String> sorderList = new ArrayList <String>();
ArrayList<String> ptcnList = new ArrayList <String>();
HashMap<String,Integer> sorderItemCountMap = new HashMap<String,Integer> ();
StringBuffer sqlBuf = new StringBuffer();
int pstmtCnt = 0;
......@@ -76,13 +77,16 @@ public class MultiplePtcnWizPos extends ValidatorEJB implements MultiplePtcnWizP
dom = genericUtility.parseString(domString);
}
tranId =checkNull(tranId);
if(dom != null && tranId.length() == 0)
if(dom != null)
{
System.out.println("dom ins not null..............");
tranId = checkNull( genericUtility.getColumnValueFromNode("tran_id", dom.getElementsByTagName("Detail1").item(0)) );
System.out.println("tranId in dom >>>{"+tranId+"}");
if(tranId.length() == 0)
{
tranId = checkNull( genericUtility.getColumnValueFromNode("tran_id", dom.getElementsByTagName("Detail1").item(0)) );
}
System.out.println("tranId in dom >>>{"+tranId+"}");
parentNodeList = dom.getElementsByTagName("Detail2");
System.out.println("parentNode >>>{"+parentNode+"}");
int nodeCnt = parentNodeList.getLength();
......@@ -101,26 +105,21 @@ public class MultiplePtcnWizPos extends ValidatorEJB implements MultiplePtcnWizP
Element eElement = (Element) childNode;
ptcn = checkNull(eElement.getElementsByTagName("ptcn").item(0).getTextContent());
System.out.println("ptcn --->> "+ptcn);
if(ptcn.length() > 0)
{
break;
}
//sorderList.add(ptcn);
ptcnList.add(ptcn);
}
}
}
}
}
ptcn = checkNull(ptcn);
System.out.println("tranId ptcn@-------->>["+tranId+"] ["+ptcn+"]");
if(ptcn.length() > 0)
System.out.println("ptcnList ptcn@-------->>["+tranId+"] ["+ptcnList+"]");
if(ptcnList.size() > 0 && tranId.length() == 0)
{
sql = "SELECT H.TRAN_ID FROM MULTI_PICK_ISS_HDR H,MULTI_PICK_ISS D "
+ "WHERE H.TRAN_ID = D.TRAN_ID AND H.PTCN = ? AND D.CONFIRMED = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, ptcn);
pstmt.setString(1, ptcnList.get(0));
pstmt.setString(2, "N");
rs = pstmt.executeQuery();
if(rs.next())
......@@ -132,21 +131,10 @@ public class MultiplePtcnWizPos extends ValidatorEJB implements MultiplePtcnWizP
pstmt.close();
pstmt = null;
}
System.out.println("tranId List-------->>"+tranId);
sql = "SELECT PTCN FROM MULTI_PICK_ISS_DET WHERE TRAN_ID = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, tranId);
rs = pstmt.executeQuery();
while(rs.next())
{
sorderList.add(checkNull(rs.getString(1)));
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
System.out.println("saleOrder List-------->>"+sorderList);
if(sorderList.size() > 0)
System.out.println("tranId-------->>"+tranId);
System.out.println("ptcnList List-------->>"+ptcnList);
if(ptcnList.size() > 0)
{
/*SELECT * FROM PICK_ORD_DET WHERE PICK_ORDER IN
( SELECT REF_ID FROM WAVE_TASK_DET WHERE PTCN = 'PTCN000076' AND STATUS = 'N'
......@@ -156,7 +144,7 @@ public class MultiplePtcnWizPos extends ValidatorEJB implements MultiplePtcnWizP
sqlBuf.append(" SELECT REF_ID FROM WAVE_TASK_DET WHERE PTCN in ( ");
for(int i = 0; i < sorderList.size(); i++)
for(int i = 0; i < ptcnList.size(); i++)
{
mark = mark + "?,";
}
......@@ -167,7 +155,7 @@ public class MultiplePtcnWizPos extends ValidatorEJB implements MultiplePtcnWizP
sqlBuf.append("AND (QUANTITY - (CASE WHEN DEALLOC_QTY IS NULL THEN 0 ELSE DEALLOC_QTY END)) > 0");
System.out.println("sqlBuf : "+sqlBuf.toString());
pstmt = conn.prepareStatement(sqlBuf.toString());
for (String list : sorderList)
for (String list : ptcnList)
{
pstmt.setString(++pstmtCnt,list);
}
......@@ -288,7 +276,7 @@ public class MultiplePtcnWizPos extends ValidatorEJB implements MultiplePtcnWizP
String acctCodeDr = "",cctrCodeDr = "",packCode = "",siteCodeMfg = "",stagingLoc = "",
packInstr = "",suppCodeMfg = "",unitAlt = "",batchNo = "",unit = "",grade = "",
expLev = "",itemCodeOrd = "",itemRef = "",status = "",itemGrade = "",
allocMode = "",reasCode = "",unitStd = "",sSQL = "",updateSql = "";
allocMode = "",reasCode = "",unitStd = "",sSQL = "",updateSql = "",lineNoStr= "";
int lineNoOrd= 0,lineNo= 0,updCnt = 0,rowsCount = 0;
double quantity = 0,noArt =0,stkGrossRate = 0,convQtyStduom = 0,batchSize = 0,holdQuantity = 0,stkRate = 0;
double shipperSize = 0, itemGrossWeight = 0, caseGrossWeight = 0, itemNetWeight = 0, caseNetWeight = 0,
......@@ -401,7 +389,7 @@ public class MultiplePtcnWizPos extends ValidatorEJB implements MultiplePtcnWizP
lotSl = " ";
}
lineNo = rs.getInt( "LINE_NO" );
lineNoStr = rs.getString( "LINE_NO" );
pstmtStock.setString(1,itemCode);
......@@ -462,7 +450,7 @@ public class MultiplePtcnWizPos extends ValidatorEJB implements MultiplePtcnWizP
updateRowMap.put("gross_rate",Double.toString(stkGrossRate));
updateRowMap.put("tran_id", tranId );
// 17/10/11 manoharan
updateRowMap.put("line_no", "" + lineNo );
updateRowMap.put("line_no", lineNoStr );
// end 17/10/11 manoharan
updateRowMap.put("tran_date", tranDate );
updateRowMap.put("tran_type","ID");
......
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