Skip to content

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

added new functionality 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@97200 ce508802-f39f-4f6c-b175-0d175dae99d5
parent e43d841f
Show whitespace changes
Inline Side-by-side
Showing with 332 additions and 146 deletions
webitm-wms/ibase/webitm/ejb/wms/MultiplePtcnWiz.java
View file @ 614ed5ed
...@@ -830,9 +830,10 @@ public class MultiplePtcnWiz extends ValidatorEJB implements PickIssICLocal, Pic ...@@ -830,9 +830,10 @@ public class MultiplePtcnWiz extends ValidatorEJB implements PickIssICLocal, Pic
{ {
System.out.println("item change form 3........"); System.out.println("item change form 3........");
ArrayList<String> ptcnList = null; ArrayList<String> ptcnList = null;
HashMap<String,String> ptcnMap =new HashMap<String,String>();
String pickOrder = "" ,saleOrderL = "",itemCode = "" ,locCode = "" ,lotNo = "" ,lotSl = "",subSql = "", String pickOrder = "" ,saleOrderL = "",itemCode = "" ,locCode = "" ,lotNo = "" ,lotSl = "",subSql = "",
ptcnNo = "" ,mark = "",cartonNo = "",itemDescr = "",outerCartenNo = "",sorderLine = ""; ptcnNo = "" ,mark = "",cartonNo = "",itemDescr = "",outerCartenNo = "",sorderLine = "";
int noArt = 0,count = 0,domId = 0 ; int noArt = 0,count = 0,domId = 0,pstmtCount=0 ;
double quantity = 0,deAllQuantity = 0; double quantity = 0,deAllQuantity = 0;
tranId = checkNull(genericUtility.getColumnValue( "tran_id", hdrDataDom )); tranId = checkNull(genericUtility.getColumnValue( "tran_id", hdrDataDom ));
String qty = checkNull(genericUtility.getColumnValue( "quantity", allFormDataDom )); String qty = checkNull(genericUtility.getColumnValue( "quantity", allFormDataDom ));
...@@ -845,11 +846,11 @@ public class MultiplePtcnWiz extends ValidatorEJB implements PickIssICLocal, Pic ...@@ -845,11 +846,11 @@ public class MultiplePtcnWiz extends ValidatorEJB implements PickIssICLocal, Pic
if( currentColumn.trim().equalsIgnoreCase( "itm_default" ) ) if( currentColumn.trim().equalsIgnoreCase( "itm_default" ) )
{ {
System.out.println("item change form 3........itm_default"); System.out.println("item change form 3........itm_default");
ptcnList = getPtcnNo("ptcn", allFormDataDom, "2"); ptcnMap = getPtcnNo("ptcn", allFormDataDom, "2");
System.out.println("ptcnList@----->"+ptcnList); System.out.println("ptcnMap@----->"+ptcnMap);
for(int i=0 ;i < ptcnList.size();i++) for(Map.Entry<String, String> entry : ptcnMap.entrySet())
{ {
subSql = subSql + ","+ptcnList.get(i); subSql = subSql + ","+entry.getValue();
} }
subSql = subSql.substring(1,subSql.length()) ; subSql = subSql.substring(1,subSql.length()) ;
System.out.println("@@@ sql in @@@ :["+subSql+"]"); System.out.println("@@@ sql in @@@ :["+subSql+"]");
...@@ -860,7 +861,7 @@ public class MultiplePtcnWiz extends ValidatorEJB implements PickIssICLocal, Pic ...@@ -860,7 +861,7 @@ public class MultiplePtcnWiz extends ValidatorEJB implements PickIssICLocal, Pic
+ "FROM PICK_ORD_DET PODET, ITEM ITEM WHERE PODET.PICK_ORDER IN " + "FROM PICK_ORD_DET PODET, ITEM ITEM WHERE PODET.PICK_ORDER IN "
+ "(SELECT REF_ID FROM WAVE_TASK_DET WHERE PTCN IN ("); + "(SELECT REF_ID FROM WAVE_TASK_DET WHERE PTCN IN (");
for (int i= 0;i < ptcnList.size();i++) for(Map.Entry<String, String> entry : ptcnMap.entrySet())
{ {
mark = mark + "?,"; mark = mark + "?,";
} }
...@@ -871,9 +872,9 @@ public class MultiplePtcnWiz extends ValidatorEJB implements PickIssICLocal, Pic ...@@ -871,9 +872,9 @@ public class MultiplePtcnWiz extends ValidatorEJB implements PickIssICLocal, Pic
+ "ORDER BY PODET.LOC_CODE, PODET.ITEM_CODE"); + "ORDER BY PODET.LOC_CODE, PODET.ITEM_CODE");
System.out.println("sqlBuf : "+sqlBuf.toString()); System.out.println("sqlBuf : "+sqlBuf.toString());
pstmt = conn.prepareStatement(sqlBuf.toString()); pstmt = conn.prepareStatement(sqlBuf.toString());
for (int i= 0;i < ptcnList.size();i++) for(Map.Entry<String, String> entry : ptcnMap.entrySet())
{ {
pstmt.setString(i+1, ptcnList.get(i)); pstmt.setString(++pstmtCount,entry.getValue());
} }
rs =pstmt.executeQuery(); rs =pstmt.executeQuery();
...@@ -896,11 +897,15 @@ public class MultiplePtcnWiz extends ValidatorEJB implements PickIssICLocal, Pic ...@@ -896,11 +897,15 @@ public class MultiplePtcnWiz extends ValidatorEJB implements PickIssICLocal, Pic
deAllQuantity = rs.getDouble("DEALLOC_QTY"); deAllQuantity = rs.getDouble("DEALLOC_QTY");
sorderLine = checkNull(rs.getString("LINE_NO__SORD")); sorderLine = checkNull(rs.getString("LINE_NO__SORD"));
if(ptcnList !=null && ptcnList.size() > 0) /*if(ptcnList !=null && ptcnList.size() > 0)
{ {
ptcnNo = ptcnList.get(count); ptcnNo = ptcnList.get(count);
} }*/
count++; count++;
if(ptcnMap !=null && ptcnMap.size() > 0)
{
ptcnNo = ptcnMap.get(saleOrderL);
}
valueXmlString.append("<Detail3 domID='"+domId+"' selected=\"N\">\r\n"); valueXmlString.append("<Detail3 domID='"+domId+"' selected=\"N\">\r\n");
//valueXmlString.append("<attribute selected=\"N\" updateFlag=\"A\" status=\"N\" pkNames=\"\" />\r\n"); //valueXmlString.append("<attribute selected=\"N\" updateFlag=\"A\" status=\"N\" pkNames=\"\" />\r\n");
...@@ -970,12 +975,15 @@ public class MultiplePtcnWiz extends ValidatorEJB implements PickIssICLocal, Pic ...@@ -970,12 +975,15 @@ public class MultiplePtcnWiz extends ValidatorEJB implements PickIssICLocal, Pic
cartonNo = checkNull(rs.getString("CARTON_NO")); cartonNo = checkNull(rs.getString("CARTON_NO"));
deAllQuantity = rs.getDouble("DEALLOC_QTY"); deAllQuantity = rs.getDouble("DEALLOC_QTY");
sorderLine = checkNull(rs.getString("LINE_NO__SORD")); sorderLine = checkNull(rs.getString("LINE_NO__SORD"));
if(ptcnList !=null && ptcnList.size() > 0) /*if(ptcnList !=null && ptcnList.size() > 0)
{ {
ptcnNo = ptcnList.get(count); ptcnNo = ptcnList.get(count);
} }*/
count++; count++;
if(ptcnMap !=null && ptcnMap.size() > 0)
{
ptcnNo = ptcnMap.get(saleOrderL);
}
valueXmlString.append("<Detail3 domID='"+domId+"' selected=\"N\">\r\n"); valueXmlString.append("<Detail3 domID='"+domId+"' selected=\"N\">\r\n");
valueXmlString.append("<attribute selected=\"N\" updateFlag=\"A\" status=\"N\" pkNames=\"\" />\r\n"); valueXmlString.append("<attribute selected=\"N\" updateFlag=\"A\" status=\"N\" pkNames=\"\" />\r\n");
...@@ -1229,43 +1237,39 @@ public class MultiplePtcnWiz extends ValidatorEJB implements PickIssICLocal, Pic ...@@ -1229,43 +1237,39 @@ public class MultiplePtcnWiz extends ValidatorEJB implements PickIssICLocal, Pic
} }
return lineNo; return lineNo;
} }
public ArrayList<String> getPtcnNo(String colName, Document dom, String formNo) public HashMap<String,String> getPtcnNo(String colName, Document dom, String formNo)
{ {
ArrayList<String> colVal = new ArrayList<String>(); ArrayList<String> colVal = new ArrayList<String>();
Node elementName = null, parentNode = null; HashMap<String,String> colMap = new HashMap<String,String>();
NodeList elementList = null; NodeList parentNodeList = null;
Element elementAttr = null; NodeList childNodeList = null;
Node parentNode = null;
Node childNode = null;
int childNodeListLength = 0;
String childNodeName = null,ptcn = "",oldPtcn = "",saleOrder = "";
GenericUtility genericUtility = GenericUtility.getInstance();
String columnName = ""; String columnName = "";
String columnValue = null; String columnValue = null;
boolean continueLoop = true; boolean continueLoop = true;
boolean isFormNo = false; boolean isFormNo = false;
int ctr;
try try
{ {
elementList = dom.getElementsByTagName(colName); parentNodeList = dom.getElementsByTagName("Detail2");
if (Integer.parseInt(formNo) < 1) childNodeListLength = parentNodeList.getLength();
{ System.out.println("childNodeListLength----->>"+childNodeListLength);
isFormNo = true; for (int ctr = 0; ctr < childNodeListLength; ctr++)
}
for(ctr = 0; ctr < elementList.getLength(); ctr++)
{
elementName = elementList.item(ctr);
parentNode = elementName.getParentNode();
elementAttr = (Element)parentNode;
if(elementAttr.getAttribute("objContext").equals(formNo) || elementAttr.getAttribute("formno").equals(formNo) || isFormNo)
{
columnName = elementName.getNodeName();
columnValue = "";
if(elementName.getFirstChild()!=null)
{ {
columnValue = elementName.getFirstChild().getNodeValue(); childNode = parentNodeList.item(ctr);
colVal.add(columnValue); childNodeName = childNode.getNodeName();
} System.out.println("Child name --->> "+childNodeName);
else
if (childNode.getNodeType() == Node.ELEMENT_NODE)
{ {
columnValue = null; Element eElement = (Element) childNode;
colVal.add(columnValue); ptcn = checkNull(eElement.getElementsByTagName("ptcn").item(0).getTextContent());
} saleOrder = checkNull(eElement.getElementsByTagName("sale_order").item(0).getTextContent());
System.out.println("sale_order0----->"+saleOrder+ " PTCN --->["+ptcn+"]");
colMap.put(saleOrder,ptcn);
} }
} }
} }
...@@ -1274,15 +1278,8 @@ public class MultiplePtcnWiz extends ValidatorEJB implements PickIssICLocal, Pic ...@@ -1274,15 +1278,8 @@ public class MultiplePtcnWiz extends ValidatorEJB implements PickIssICLocal, Pic
System.out.println("Exception : [getPtcnNo(2)] :==>\n"+e.getMessage()); System.out.println("Exception : [getPtcnNo(2)] :==>\n"+e.getMessage());
} }
finally
{ return colMap;
elementName = null;
parentNode = null;
elementList = null;
elementAttr = null;
columnName = null;
}
return colVal;
} }
private String getSiteCode( String xtraParams, Connection conn ) throws ITMException private String getSiteCode( String xtraParams, Connection conn ) throws ITMException
{ {
......
webitm-wms/ibase/webitm/ejb/wms/MultiplePtcnWizConf.java
View file @ 614ed5ed
...@@ -24,9 +24,16 @@ import org.w3c.dom.*; ...@@ -24,9 +24,16 @@ import org.w3c.dom.*;
@Stateless @Stateless
public class MultiplePtcnWizConf extends ActionHandlerEJB implements MultiplePtcnWizConfLocal, MultiplePtcnWizConfRemote public class MultiplePtcnWizConf extends ActionHandlerEJB implements MultiplePtcnWizConfLocal, MultiplePtcnWizConfRemote
{ {
boolean isError = false; boolean isError = false,isMultipleLines = false;
GenericUtility genericUtility = GenericUtility.getInstance(); GenericUtility genericUtility = GenericUtility.getInstance();
String chgUser = "",chgTerm = "",empCode = ""; String chgUser = "",chgTerm = "",empCode = "",pickIsseTranId = "";
public String getPickIsseTranId() {
return pickIsseTranId;
}
public void setPickIsseTranId(String pickIsseTranId) {
this.pickIsseTranId = pickIsseTranId;
}
public String confirm(String tranID,String xtraParams, String forcedFlag) throws RemoteException,ITMException public String confirm(String tranID,String xtraParams, String forcedFlag) throws RemoteException,ITMException
{ {
...@@ -72,6 +79,8 @@ public class MultiplePtcnWizConf extends ActionHandlerEJB implements MultiplePtc ...@@ -72,6 +79,8 @@ public class MultiplePtcnWizConf extends ActionHandlerEJB implements MultiplePtc
double shipperSize = 0, itemGrossWeight = 0, caseGrossWeight = 0, itemNetWeight = 0, caseNetWeight = 0, double shipperSize = 0, itemGrossWeight = 0, caseGrossWeight = 0, itemNetWeight = 0, caseNetWeight = 0,
qtyOrd = 0,sordAllocQty = 0; qtyOrd = 0,sordAllocQty = 0;
isError = false; isError = false;
isMultipleLines = false;
pickIsseTranId = "";
boolean isUpdatehdr= false; boolean isUpdatehdr= false;
java.sql.Timestamp expDate = null,currDate = null, mfgDate = null,restestDate = null,dateAlloc = null; java.sql.Timestamp expDate = null,currDate = null, mfgDate = null,restestDate = null,dateAlloc = null;
...@@ -84,6 +93,7 @@ public class MultiplePtcnWizConf extends ActionHandlerEJB implements MultiplePtc ...@@ -84,6 +93,7 @@ public class MultiplePtcnWizConf extends ActionHandlerEJB implements MultiplePtc
HashMap itmVolumeMap = new HashMap(); HashMap itmVolumeMap = new HashMap();
HashMap strAllocate = null; HashMap strAllocate = null;
HashMap <String,String>dataMap = new HashMap<String,String>(); HashMap <String,String>dataMap = new HashMap<String,String>();
ArrayList<String> ptcnScanList = new ArrayList<String>();
try try
{ {
currDate = new java.sql.Timestamp( System.currentTimeMillis() ); currDate = new java.sql.Timestamp( System.currentTimeMillis() );
...@@ -107,9 +117,9 @@ public class MultiplePtcnWizConf extends ActionHandlerEJB implements MultiplePtc ...@@ -107,9 +117,9 @@ public class MultiplePtcnWizConf extends ActionHandlerEJB implements MultiplePtc
} }
else else
{ {
stagingLoc = checkNull(distCommon.getDisparams( "999999", "STAGING_LOC", conn)==null?"":distCommon.getDisparams( "999999", "STAGING_LOC", conn)); stagingLoc = checkNull(distCommon.getDisparams( "999999", "IMEDIATE_LOC", conn));
System.out.println("stagingLoc------>>["+stagingLoc+"]"); System.out.println("stagingLoc1212------>>["+stagingLoc+"]");
stkUpdate = new StockUpdate(); stkUpdate = new StockUpdate();
invAllocTrace = new InvAllocTraceBean(); invAllocTrace = new InvAllocTraceBean();
...@@ -126,14 +136,15 @@ public class MultiplePtcnWizConf extends ActionHandlerEJB implements MultiplePtc ...@@ -126,14 +136,15 @@ public class MultiplePtcnWizConf extends ActionHandlerEJB implements MultiplePtc
pstmtStock = conn.prepareStatement(sql); pstmtStock = conn.prepareStatement(sql);
sql = "SELECT H.WAVE_ID WAVE_ID,R.PTCN PTCN,R.TRAN_ID,R.LINE_NO LINE_NO, R.ITEM_CODE ITEM_CODE, R.SITE_CODE SITE_CODE, " sql = "SELECT O.LINE_NO LINE_NO__ORD,H.WAVE_ID WAVE_ID,R.PTCN PTCN,R.TRAN_ID,R.LINE_NO LINE_NO, R.ITEM_CODE ITEM_CODE, R.SITE_CODE SITE_CODE, "
+ "R.LOC_CODE LOC_CODE, R.LOT_NO LOT_NO, R.LOT_SL LOT_SL, " + "R.LOC_CODE LOC_CODE, R.LOT_NO LOT_NO, R.LOT_SL LOT_SL, "
+ "(R.QUANTITY - (CASE WHEN R.DEALLOC_QTY IS NULL THEN 0 ELSE R.DEALLOC_QTY END )) AS QUANTITY," + "(R.QUANTITY - (CASE WHEN R.DEALLOC_QTY IS NULL THEN 0 ELSE R.DEALLOC_QTY END )) AS QUANTITY,"
+ " R.NO_ART NO_ART,O.SALE_ORDER SALE_ORDER, O.LINE_NO__SORD LINE_NO__SORD, O.PICK_ORDER,H.PICK_TYPE," + " R.NO_ART NO_ART,O.SALE_ORDER SALE_ORDER, O.LINE_NO__SORD LINE_NO__SORD, O.PICK_ORDER,H.PICK_TYPE,"
+ "O.EXP_LEV EXP_LEV " + "O.EXP_LEV EXP_LEV "
+ " FROM MULTI_PICK_ISS_DET R, PICK_ORD_DET O ,PICK_ORD_HDR H WHERE R.TRAN_ID = ? " + " FROM MULTI_PICK_ISS_DET R, PICK_ORD_DET O ,PICK_ORD_HDR H WHERE R.TRAN_ID = ? "
+ " AND R.PICK_ORDER = O.PICK_ORDER AND H.PICK_ORDER = O.PICK_ORDER " + " AND R.PICK_ORDER = O.PICK_ORDER AND H.PICK_ORDER = O.PICK_ORDER "
+ " AND O.LINE_NO = R.LINE_NO__SORD " //+ " AND O.LINE_NO = R.LINE_NO__SORD "
+ " AND R.ITEM_CODE = O.ITEM_CODE "
+ " AND (R.QUANTITY - (CASE WHEN R.DEALLOC_QTY IS NULL THEN 0 ELSE R.DEALLOC_QTY END )) > 0 "; + " AND (R.QUANTITY - (CASE WHEN R.DEALLOC_QTY IS NULL THEN 0 ELSE R.DEALLOC_QTY END )) > 0 ";
//+ " AND R.LOC_CODE <> R.LOC_CODE__TO"; //+ " AND R.LOC_CODE <> R.LOC_CODE__TO";
...@@ -148,7 +159,12 @@ public class MultiplePtcnWizConf extends ActionHandlerEJB implements MultiplePtc ...@@ -148,7 +159,12 @@ public class MultiplePtcnWizConf extends ActionHandlerEJB implements MultiplePtc
System.out.println("dataMap clear.............."); System.out.println("dataMap clear..............");
dataMap.clear(); dataMap.clear();
} }
System.out.println("WHILE CONDITION.........."+(++rowsCount)); System.out.println("WHILE CONDITION12.........."+(++rowsCount));
if(rowsCount > 1)
{
isMultipleLines = true;
}
lineNoOrd = rs.getInt( "LINE_NO__ORD" );
waveId = checkNull(rs.getString( "WAVE_ID" )); waveId = checkNull(rs.getString( "WAVE_ID" ));
ptcn = checkNull(rs.getString( "PTCN" )); ptcn = checkNull(rs.getString( "PTCN" ));
itemCode = rs.getString( "ITEM_CODE" ); itemCode = rs.getString( "ITEM_CODE" );
...@@ -165,11 +181,11 @@ public class MultiplePtcnWizConf extends ActionHandlerEJB implements MultiplePtc ...@@ -165,11 +181,11 @@ public class MultiplePtcnWizConf extends ActionHandlerEJB implements MultiplePtc
lineNoSord = lineNoSord.substring(lineNoSord.length()-3); lineNoSord = lineNoSord.substring(lineNoSord.length()-3);
replOrder = rs.getString( "PICK_ORDER" ); replOrder = rs.getString( "PICK_ORDER" );
pickType = rs.getString( "PICK_TYPE" ); pickType = rs.getString( "PICK_TYPE" );
lineNoOrd = rs.getInt( "LINE_NO__SORD" ); //lineNoOrd = rs.getInt( "LINE_NO__SORD" );
dExpLev = checkNull(rs.getString( "EXP_LEV" )); dExpLev = checkNull(rs.getString( "EXP_LEV" ));
System.out.println("dExpLev->> ["+dExpLev+"]"); System.out.println("dExpLev->> ["+dExpLev+"]");
System.out.println("locCode->> ["+locCode+"]"); System.out.println("locCode->> ["+locCode+"]");
ptcnScanList.add(checkNull(ptcn));
itmVolumeMap.clear(); itmVolumeMap.clear();
itmVolumeMap = getItemVoumeMap(itemCode,lotNo,conn); itmVolumeMap = getItemVoumeMap(itemCode,lotNo,conn);
shipperSize = (Double) itmVolumeMap.get("SHIPPER_SIZE"); shipperSize = (Double) itmVolumeMap.get("SHIPPER_SIZE");
...@@ -188,7 +204,8 @@ public class MultiplePtcnWizConf extends ActionHandlerEJB implements MultiplePtc ...@@ -188,7 +204,8 @@ public class MultiplePtcnWizConf extends ActionHandlerEJB implements MultiplePtc
dataMap.put("sale_order", saleOrder); dataMap.put("sale_order", saleOrder);
dataMap.put("line_no__sord", lineNoSord); dataMap.put("line_no__sord", lineNoSord);
dataMap.put("line_no", ""+lineNo); dataMap.put("line_no__ord", ""+lineNoOrd);
dataMap.put("line_no", ""+rowsCount);
dataMap.put("pick_order", replOrder); dataMap.put("pick_order", replOrder);
dataMap.put("pick_type", pickType); dataMap.put("pick_type", pickType);
dataMap.put("stag_loc", stagingLoc); dataMap.put("stag_loc", stagingLoc);
...@@ -721,23 +738,23 @@ public class MultiplePtcnWizConf extends ActionHandlerEJB implements MultiplePtc ...@@ -721,23 +738,23 @@ public class MultiplePtcnWizConf extends ActionHandlerEJB implements MultiplePtc
System.out.println("Return from insertPickIssHdrDet------->>["+str+"]"); System.out.println("Return from insertPickIssHdrDet------->>["+str+"]");
str = insertPackHdrDet(dataMap,conn); str = insertPackHdrDet(dataMap,conn);
System.out.println("Return from insertPackHdrDet------->>["+str+"]"); System.out.println("Return from insertPackHdrDet------->>["+str+"]");
System.out.println("isUpdatehdr121------->>["+isUpdatehdr+"]");
if(isUpdatehdr) if(isUpdatehdr)
{ {
sql = "SELECT REF_SER,PTCN FROM WAVE_TASK_DET WHERE REF_ID = ?"; sql = "SELECT REF_SER,PTCN FROM WAVE_TASK_DET WHERE REF_ID = ?";
pstmt1 = conn.prepareStatement(sql); pstmt1 = conn.prepareStatement(sql);
pstmt1.setString(1,replOrder); pstmt1.setString(1,replOrder);
rs1 = pstmt.executeQuery(); rs1 = pstmt1.executeQuery();
if( rs1.next() ) if( rs1.next() )
{ {
refSer = rs1.getString("ref_ser"); refSer = checkNull(rs1.getString("REF_SER"));
refSer = refSer == null?"":refSer; ptcn = checkNull(rs1.getString("PTCN"));
ptcn = rs1.getString("ptcn");
ptcn = ptcn == null?"":ptcn;
} }
System.out.println(" ref_ser ["+refSer+"]"); System.out.println(" ref_ser ["+refSer+"]");
rs1.close();rs1 = null; rs1.close();rs1 = null;
pstmt1.close();pstmt1 = null; pstmt1.close();pstmt1 = null;
System.out.println("pickType IN CONFIRMED-------->>["+pickType+"]");
if(!("A".equalsIgnoreCase(pickType)) && !"P-PICK".equalsIgnoreCase(refSer) && !"A-PICK".equalsIgnoreCase(refSer) ) if(!("A".equalsIgnoreCase(pickType)) && !"P-PICK".equalsIgnoreCase(refSer) && !"A-PICK".equalsIgnoreCase(refSer) )
{ {
//update wave_status of wave_task_det, same time of updating status 'Y' //update wave_status of wave_task_det, same time of updating status 'Y'
...@@ -806,19 +823,25 @@ public class MultiplePtcnWizConf extends ActionHandlerEJB implements MultiplePtc ...@@ -806,19 +823,25 @@ public class MultiplePtcnWizConf extends ActionHandlerEJB implements MultiplePtc
System.out.println("Header updated successfully"); System.out.println("Header updated successfully");
/*ConsolidatToDoc conToDoc = new ConsolidatToDoc(); System.out.println("pickType -------->>["+pickType+"]");
if("C".equalsIgnoreCase(pickType))
{
ConsolidatToDoc conToDoc = new ConsolidatToDoc();
retString = conToDoc.process(ptcn, conn,xtraParams); retString = conToDoc.process(ptcn, conn,xtraParams);
System.out.println("ConsolidatToDoc retString :"+retString);
if (retString != null && retString.trim().length() > 0 ) if (retString != null && retString.trim().length() > 0 )
{ {
isError = true; isError = true;
return retString; return retString;
}*/ }
System.out.println("ret string :"+retString);
} }
} //end while
}
} //end while
isMultipleLines = false;
if(rs != null) if(rs != null)
{ {
rs.close(); rs.close();
...@@ -840,7 +863,9 @@ public class MultiplePtcnWizConf extends ActionHandlerEJB implements MultiplePtc ...@@ -840,7 +863,9 @@ public class MultiplePtcnWizConf extends ActionHandlerEJB implements MultiplePtc
isError = true; isError = true;
return errorString; return errorString;
} }
//insert record in pallet_no and update carton master table
String str = insertPalletNoAndUpdCartonMast(ptcnScanList,conn);
System.out.println("After insertPalletNo str----->>["+str+"]");
updateSql = "UPDATE MULTI_PICK_ISS SET CONFIRMED = 'Y', CONF_DATE = ?, EMP_CODE__USER = ?" updateSql = "UPDATE MULTI_PICK_ISS SET CONFIRMED = 'Y', CONF_DATE = ?, EMP_CODE__USER = ?"
+ " WHERE TRAN_ID = ? "; + " WHERE TRAN_ID = ? ";
pstmt = conn.prepareStatement(updateSql); pstmt = conn.prepareStatement(updateSql);
...@@ -871,32 +896,29 @@ public class MultiplePtcnWizConf extends ActionHandlerEJB implements MultiplePtc ...@@ -871,32 +896,29 @@ public class MultiplePtcnWizConf extends ActionHandlerEJB implements MultiplePtc
} }
finally finally
{ {
if(isError) System.out.println("not commited.....................");
/*if(isError)
{ {
conn.rollback(); conn.rollback();
} }
else else
{ {
conn.commit(); conn.commit();
} }*/
if(conn != null)
{
conn.close();
conn = null;
}
} }
return errorString; return errorString;
} }
private String insertPickIssHdrDet(HashMap<String,String>issueDataMap,Connection conn) throws Exception private String insertPickIssHdrDet(HashMap<String,String>issueDataMap,Connection conn) throws Exception
{ {
System.out.println("insertPickIssHdrDet----------->>"+issueDataMap); System.out.println("insertPickIssHdrDet123----------->>"+issueDataMap);
ResultSet rs = null; ResultSet rs = null;
PreparedStatement pstmt = null; //currDate PreparedStatement pstmt = null; //currDate
java.sql.Timestamp currDate = null; java.sql.Timestamp currDate = null;
String sql = "",keyString = "",keyCol = "",tranSer = "",xmlValues = "",siteCode = "",tranId = "", String sql = "",keyString = "",keyCol = "",tranSer = "",xmlValues = "",siteCode = "",tranId = "",
currDateStr = "",cartonNo = "",packCode =""; currDateStr = "",cartonNo = "",packCode ="",locCodeTo = "";
int count = 0 ; int count = 0,rowIns = 0 ;
try try
{ {
if(issueDataMap != null && issueDataMap.size() > 0) if(issueDataMap != null && issueDataMap.size() > 0)
...@@ -931,9 +953,19 @@ public class MultiplePtcnWizConf extends ActionHandlerEJB implements MultiplePtc ...@@ -931,9 +953,19 @@ public class MultiplePtcnWizConf extends ActionHandlerEJB implements MultiplePtc
xmlValues = xmlValues + "<tran_date>" + currDateStr + "</tran_date>"; xmlValues = xmlValues + "<tran_date>" + currDateStr + "</tran_date>";
xmlValues = xmlValues + "</Detail1></Root>"; xmlValues = xmlValues + "</Detail1></Root>";
System.out.println("xmlValues :["+xmlValues+"]"); System.out.println("xmlValues :["+xmlValues+"]");
System.out.println("isMultipleLines------>>["+isMultipleLines+"]TranId : ["+pickIsseTranId+"]");
if(isMultipleLines)
{
tranId = pickIsseTranId;
System.out.println("tranId pick Issue------>>["+tranId+"]");
}
else
{
TransIDGenerator tg = new TransIDGenerator(xmlValues, "BASE", CommonConstants.DB_NAME); TransIDGenerator tg = new TransIDGenerator(xmlValues, "BASE", CommonConstants.DB_NAME);
tranId = tg.generateTranSeqID(tranSer, keyCol, keyString, conn); tranId = tg.generateTranSeqID(tranSer, keyCol, keyString, conn);
System.out.println("@@tranId@@ ---->>["+tranId+"]"); pickIsseTranId = tranId;
System.out.println("TranId put in globle var@@------->>"+pickIsseTranId);
sql = "INSERT INTO PICK_ISS_HDR (TRAN_DATE,EMP_CODE__APRV,CHG_DATE,CONFIRMED,PICK_ORDER,CHG_TERM," sql = "INSERT INTO PICK_ISS_HDR (TRAN_DATE,EMP_CODE__APRV,CHG_DATE,CONFIRMED,PICK_ORDER,CHG_TERM,"
+ "CHG_USER,TRAN_ID,PICK_TYPE,SITE_CODE,PTCN,CONF_DATE ) " + "CHG_USER,TRAN_ID,PICK_TYPE,SITE_CODE,PTCN,CONF_DATE ) "
+ "values (?,?,?,?,?,?,?,?,?,?,?,?)"; + "values (?,?,?,?,?,?,?,?,?,?,?,?)";
...@@ -952,8 +984,8 @@ public class MultiplePtcnWizConf extends ActionHandlerEJB implements MultiplePtc ...@@ -952,8 +984,8 @@ public class MultiplePtcnWizConf extends ActionHandlerEJB implements MultiplePtc
pstmt.setString(11, checkNull(issueDataMap.get("ptcn"))); pstmt.setString(11, checkNull(issueDataMap.get("ptcn")));
pstmt.setTimestamp(12, currDate); pstmt.setTimestamp(12, currDate);
int rowIns = pstmt.executeUpdate(); rowIns = pstmt.executeUpdate();
System.out.println("rowIns------>>["+rowIns+"]");
if(rowIns > 0) if(rowIns > 0)
{ {
count++; count++;
...@@ -961,6 +993,11 @@ public class MultiplePtcnWizConf extends ActionHandlerEJB implements MultiplePtc ...@@ -961,6 +993,11 @@ public class MultiplePtcnWizConf extends ActionHandlerEJB implements MultiplePtc
} }
pstmt.close(); pstmt.close();
pstmt =null; pstmt =null;
}
System.out.println("@@tranId@@ ---->>["+tranId+"]");
sql = " SELECT CARTON_NO,PACK_CODE FROM CARTON_MASTER WHERE PICK_ORDER = ?" sql = " SELECT CARTON_NO,PACK_CODE FROM CARTON_MASTER WHERE PICK_ORDER = ?"
+ " AND LINE_NO__PICK = ? "; + " AND LINE_NO__PICK = ? ";
...@@ -977,29 +1014,41 @@ public class MultiplePtcnWizConf extends ActionHandlerEJB implements MultiplePtc ...@@ -977,29 +1014,41 @@ public class MultiplePtcnWizConf extends ActionHandlerEJB implements MultiplePtc
rs = null; rs = null;
pstmt.close(); pstmt.close();
pstmt =null; pstmt =null;
if(issueDataMap.containsKey("sale_order"))
{
locCodeTo = checkNull(getColumnDescr(conn, "LOC_CODE__TO", "PICK_ORD_DET", "SALE_ORDER", issueDataMap.get("sale_order")));
System.out.println("PICK_ORD_DET locCodeTo------>>["+locCodeTo+"]");
}
else
{
locCodeTo = "";
}
sql = "INSERT INTO PICK_ISS_DET(LOC_CODE__SYS,CARTON_NO,LOT_SL,PICK_ORDER,PACK_CODE,QUANTITY,LOC_CODE__TO," sql = "INSERT INTO PICK_ISS_DET(LOC_CODE__SYS,CARTON_NO,LOT_SL,PICK_ORDER,PACK_CODE,QUANTITY,LOC_CODE__TO,"
+ "TRAN_ID,LINE_NO,SITE_CODE,NO_ART,LINE_NO__ORD,LOT_NO,ITEM_CODE,LOC_CODE) " + "TRAN_ID,LINE_NO,SITE_CODE,NO_ART,LINE_NO__ORD,LOT_NO,ITEM_CODE,LOC_CODE) "
+ "VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; + "VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, checkNull(issueDataMap.get("stag_loc"))); pstmt.setString(1, locCodeTo);
pstmt.setString(2, cartonNo); pstmt.setString(2, cartonNo);
pstmt.setString(3, issueDataMap.get("lot_sl")); pstmt.setString(3, issueDataMap.get("lot_sl"));
pstmt.setString(4, checkNull(issueDataMap.get("pick_order"))); pstmt.setString(4, checkNull(issueDataMap.get("pick_order")));
pstmt.setString(5, packCode); pstmt.setString(5, packCode);
pstmt.setDouble(6, Double.parseDouble(checkNull(issueDataMap.get("quantity")))); pstmt.setDouble(6, Double.parseDouble(checkNull(issueDataMap.get("quantity"))));
pstmt.setString(7, checkNull(issueDataMap.get("stag_loc"))); pstmt.setString(7, locCodeTo);
pstmt.setString(8, tranId); pstmt.setString(8, tranId);
pstmt.setString(9, checkNull(issueDataMap.get("line_no"))); pstmt.setString(9, checkNull(issueDataMap.get("line_no")));
pstmt.setString(10, siteCode); pstmt.setString(10, siteCode);
pstmt.setString(11, checkNull(issueDataMap.get("no_art"))); pstmt.setString(11, checkNull(issueDataMap.get("no_art")));
pstmt.setString(12, issueDataMap.get("line_no__sord")); pstmt.setString(12, issueDataMap.get("line_no__ord"));
pstmt.setString(13, issueDataMap.get("lot_no")); pstmt.setString(13, issueDataMap.get("lot_no"));
pstmt.setString(14, checkNull(issueDataMap.get("item_code"))); pstmt.setString(14, checkNull(issueDataMap.get("item_code")));
pstmt.setString(15, checkNull(issueDataMap.get("stag_loc"))); pstmt.setString(15, checkNull(issueDataMap.get("stag_loc")));
rowIns = pstmt.executeUpdate(); rowIns = pstmt.executeUpdate();
System.out.println("rowIns------>>["+rowIns+"]");
if(rowIns > 0) if(rowIns > 0)
{ {
count++; count++;
...@@ -1222,7 +1271,7 @@ public class MultiplePtcnWizConf extends ActionHandlerEJB implements MultiplePtc ...@@ -1222,7 +1271,7 @@ public class MultiplePtcnWizConf extends ActionHandlerEJB implements MultiplePtc
pstmtPickOrdHdr.close(); pstmtPickOrdHdr.close();
pstmtPickOrdHdr=null; pstmtPickOrdHdr=null;
} }
System.out.println("@@@@ isUpdateHdr------->>["+isUpdateHdr+"]");
if(isUpdateHdr) if(isUpdateHdr)
{ {
...@@ -1259,6 +1308,74 @@ public class MultiplePtcnWizConf extends ActionHandlerEJB implements MultiplePtc ...@@ -1259,6 +1308,74 @@ public class MultiplePtcnWizConf extends ActionHandlerEJB implements MultiplePtc
return false; return false;
} }
private String insertPalletNoAndUpdCartonMast(ArrayList<String> ptcnList,Connection conn) throws Exception
{
PreparedStatement pstmt = null;
String sql = "",mark = "";
int updCnt = 0,cnt = 0,pstmtCnt = 1 ;
StringBuffer sqlBuf = new StringBuffer();
System.out.println("PTCN scan List---------->>"+ptcnList);
try
{
if(ptcnList != null && ptcnList.size() > 0)
{
sql = " INSERT INTO PALLET_NO (PALLET_NO,STATUS) VALUES (?,?) ";
for(int i = 0 ; i < ptcnList.size(); i++)
{
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,ptcnList.get(i));
pstmt.setString(2,"U");
updCnt = pstmt.executeUpdate();
pstmt.close();
pstmt = null;
}
sqlBuf.append("UPDATE CARTON_MASTER SET STATUS = ? WHERE PTCN IN (");
for(int i = 0; i < ptcnList.size(); i++)
{
mark = mark + "?,";
}
mark = mark.substring(0,mark.length() - 1);
sqlBuf.append(mark);
sqlBuf.append( ") AND STATUS <> ?");
pstmt = conn.prepareStatement(sqlBuf.toString());
pstmt.setString(1,"U");
for (String list : ptcnList)
{
pstmt.setString(++pstmtCnt,list);
}
pstmt.setString(++pstmtCnt,"R");
cnt = pstmt.executeUpdate();
if(pstmt !=null)
{
pstmt.close();
pstmt = null;
}
}
else
{
System.out.println("No PTCN scanned..................");
}
System.out.println(":Rows inserted pallet_no:["+updCnt+"] and updated carton master: ["+cnt+"]");
if(updCnt > 0 && cnt > 0)
{
System.out.println("Record successfully inserted in pallet_no and updated in carton master...... ");
return "Success";
}
}
catch(Exception e)
{
e.printStackTrace();
throw new Exception(e);
}
return "Error";
}
private int waveStatusUpdate(String replOrder, Connection conn) throws ITMException private int waveStatusUpdate(String replOrder, Connection conn) throws ITMException
{ {
String sql = "", sql1 = ""; String sql = "", sql1 = "";
......
webitm-wms/ibase/webitm/ejb/wms/MultiplePtcnWizPos.java
View file @ 614ed5ed
...@@ -13,9 +13,12 @@ import java.sql.Connection; ...@@ -13,9 +13,12 @@ import java.sql.Connection;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import org.w3c.dom.Document; import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList; import org.w3c.dom.NodeList;
@javax.ejb.Stateless @javax.ejb.Stateless
public class MultiplePtcnWizPos extends ValidatorEJB implements MultiplePtcnWizPosLocal, MultiplePtcnWizPosRemote public class MultiplePtcnWizPos extends ValidatorEJB implements MultiplePtcnWizPosLocal, MultiplePtcnWizPosRemote
...@@ -44,21 +47,69 @@ public class MultiplePtcnWizPos extends ValidatorEJB implements MultiplePtcnWizP ...@@ -44,21 +47,69 @@ public class MultiplePtcnWizPos extends ValidatorEJB implements MultiplePtcnWizP
Document dom = null; Document dom = null;
ResultSet rs = null; ResultSet rs = null;
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
String errorString = "",sql = ""; String errorString = "",sql = "",ptcn= "",saleOrder= "",childNodeName = "",mark = "";
int count = 0,nodeLength = 0,cnt = 0; int count = 0,nodeLength = 0,cnt = 0,childNodeListLength= 0;
NodeList detail3List = null; Node parentNode = null;
Node childNode = null;
NodeList detail3List = null,detail2List = null;
NodeList childNodeList = null;
MultiplePtcnWizConf MultiplePtcnWizConfobj = null; MultiplePtcnWizConf MultiplePtcnWizConfobj = null;
NodeList parentNodeList = null;
ArrayList<String> sorderList = new ArrayList <String>();
HashMap<String,Integer> sorderItemCountMap = new HashMap<String,Integer> ();
StringBuffer sqlBuf = new StringBuffer();
int pstmtCnt = 0;
try try
{ {
conn.setAutoCommit(false); conn.setAutoCommit(false);
dom = genericUtility.parseString(domString); dom = genericUtility.parseString(domString);
if(dom != null) if(dom != null)
{ {
detail3List = dom.getElementsByTagName("Detail3"); parentNodeList = dom.getElementsByTagName("Detail2");
System.out.println("parentNode >>>{"+parentNode+"}");
int nodeCnt = parentNodeList.getLength();
System.out.println("nodeCnt >>>{"+nodeCnt+"}");
if(nodeCnt > 0)
{
childNodeListLength = parentNodeList.getLength();
System.out.println("childNodeListLength----->>"+childNodeListLength);
for (int ctr = 0; ctr < childNodeListLength; ctr++)
{
childNode = parentNodeList.item(ctr);
childNodeName = childNode.getNodeName();
System.out.println("Child name --->> "+childNodeName);
if (childNode.getNodeType() == Node.ELEMENT_NODE)
{
Element eElement = (Element) childNode;
ptcn = eElement.getElementsByTagName("ptcn").item(0).getTextContent();
saleOrder = eElement.getElementsByTagName("sale_order").item(0).getTextContent();
saleOrder = saleOrder == null ? "" : saleOrder.trim();
System.out.println("ptcn --->> "+ptcn);
System.out.println("saleOrder --->> "+saleOrder);
sorderList.add(saleOrder);
} }
sql = "select count(*) from multi_pick_iss_hdr where tran_id = ? "; }
pstmt = conn.prepareStatement(sql); }
pstmt.setString(1, tranId); }
System.out.println("saleOrder List-------->>"+sorderList);
if(sorderList.size() > 0)
{
sqlBuf.append("SELECT COUNT(*) FROM PICK_ORD_DET WHERE SALE_ORDER IN ( ");
for(int i = 0; i < sorderList.size(); i++)
{
mark = mark + "?,";
}
mark = mark.substring(0,mark.length() - 1);
sqlBuf.append(mark);
sqlBuf.append( ")");
pstmt = conn.prepareStatement(sqlBuf.toString());
for (String list : sorderList)
{
pstmt.setString(++pstmtCnt,list);
}
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if(rs.next()) if(rs.next())
{ {
...@@ -69,7 +120,11 @@ public class MultiplePtcnWizPos extends ValidatorEJB implements MultiplePtcnWizP ...@@ -69,7 +120,11 @@ public class MultiplePtcnWizPos extends ValidatorEJB implements MultiplePtcnWizP
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
sql = "select count(*) from multi_pick_iss_det where tran_id = ? "; }
System.out.println("PICK_ORD_DET count--------->>"+count);
sql = "SELECT COUNT(*) FROM MULTI_PICK_ISS_DET WHERE TRAN_ID = ? ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, tranId); pstmt.setString(1, tranId);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
...@@ -81,14 +136,11 @@ public class MultiplePtcnWizPos extends ValidatorEJB implements MultiplePtcnWizP ...@@ -81,14 +136,11 @@ public class MultiplePtcnWizPos extends ValidatorEJB implements MultiplePtcnWizP
rs = null; rs = null;
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
System.out.println("multi_pick_iss_hdr count---->>["+count+"]");
System.out.println("multi_pick_iss_det count---->>["+cnt+"]"); System.out.println("multi_pick_iss_det count---->>["+cnt+"]");
nodeLength = detail3List.getLength(); //nodeLength = detail3List.getLength();
System.out.println("nodeLength count---->>["+nodeLength+"]"); if( count != 0 && cnt == count)
if(detail3List != null && count != 0 && cnt == count)
{ {
MultiplePtcnWizConfobj = new MultiplePtcnWizConf(); MultiplePtcnWizConfobj = new MultiplePtcnWizConf();
System.out.println("Detail3 length = "+detail3List.getLength());
errorString = MultiplePtcnWizConfobj.confirm( tranId, xtraParams,"", conn, false ) ; errorString = MultiplePtcnWizConfobj.confirm( tranId, xtraParams,"", conn, false ) ;
//errorString = confirmedMultiplePickIssue(tranId, xtraParams, conn); //errorString = confirmedMultiplePickIssue(tranId, xtraParams, conn);
...@@ -129,6 +181,26 @@ public class MultiplePtcnWizPos extends ValidatorEJB implements MultiplePtcnWizP ...@@ -129,6 +181,26 @@ public class MultiplePtcnWizPos extends ValidatorEJB implements MultiplePtcnWizP
} }
return ""; return "";
} }
/*private boolean isPtcnConfirmed(ArrayList<String> ptcnList,Connection conn) throws Exception
{
ResultSet rs = null;
PreparedStatement pstmt = null;
String sql = "";
try
{
if(ptcnList !=null && ptcnList.size() > 0)
{
}
}
catch(Exception e)
{
e.printStackTrace();
throw new Exception(e);
}
}*/
private String confirmedMultiplePickIssue(String tranId,String xtraParams,Connection conn) throws Exception private String confirmedMultiplePickIssue(String tranId,String xtraParams,Connection conn) throws Exception
{ {
System.out.println("@@@@@@@@ Call confirmedMultiplePickIssue Method @@@@@@@@"); System.out.println("@@@@@@@@ Call confirmedMultiplePickIssue Method @@@@@@@@");
......
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