Skip to content

B
business-java
Commit 1f00ac60 authored by smestry's avatar smestry
Browse files
Options

W15FSUN008, Create transaction screen Palletization and palletization Confirm for AWMS. 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@98843 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 0143687a
Show whitespace changes
Inline Side-by-side
Showing with 70 additions and 64 deletions
webitm-wms/ibase/webitm/ejb/wms/PalletizationConf.java
View file @ 1f00ac60
......@@ -35,7 +35,7 @@ public class PalletizationConf extends ValidatorEJB implements PalletizationConf
{
return "";
}
public String postSave( String domString, String tranId, String editFlag, String xtraParams, Connection conn123 ) throws RemoteException, ITMException
public String postSave( String domString, String tranId, String editFlag, String xtraParams, Connection conn ) throws RemoteException, ITMException
{
String errString = "", siteCode = "";
......
webitm-wms/ibase/webitm/ejb/wms/PalletizationIC.java
View file @ 1f00ac60
......@@ -665,8 +665,8 @@ public class PalletizationIC extends ValidatorEJB implements PalletizationICLoca
public String itemChanged( Document currFormDataDom, Document hdrDataDom, Document allFormDataDom, String objContext, String currentColumn,String editFlag, String xtraParams ) throws RemoteException,ITMException
{
Connection conn = null;
PreparedStatement pstmt = null;
ResultSet rs = null;
PreparedStatement pstmt = null, pstmt1 = null;
ResultSet rs = null, rs1 = null;
int currentFormNo = 0, domId = 0, childNodeListLength = 0;
String sql = "", tranId = "", chgUser = "", chgTerm = "", loginEmpCode = "",loginSite = "";
StringBuffer valueXmlString;
......@@ -772,6 +772,7 @@ public class PalletizationIC extends ValidatorEJB implements PalletizationICLoca
valueXmlString.append("<Detail2 domID=\"1\" selected=\"Y\">\r\n");
valueXmlString.append("<attribute selected=\"Y\" updateFlag=\"E\" status=\"O\" pkNames=\"\" />\r\n");
valueXmlString.append( "<tran_id><![CDATA[" ).append( tranIdEdit ).append( "]]></tran_id>\r\n" );
valueXmlString.append( "<tran_date><![CDATA[" ).append( sdf.format(tranDateEdit).toString() ).append( "]]></tran_date>\r\n" );
valueXmlString.append( "<site_code><![CDATA[" ).append( siteCodeEdit ).append( "]]></site_code>\r\n" );
......@@ -785,7 +786,7 @@ public class PalletizationIC extends ValidatorEJB implements PalletizationICLoca
valueXmlString.append( "<confirmed><![CDATA[" ).append( "N" ).append( "]]></confirmed>\r\n" );
valueXmlString.append( "<conf_date><![CDATA[" ).append( "" ).append( "]]></conf_date>\r\n" );
valueXmlString.append( "<emp_code__aprv><![CDATA[" ).append( loginEmpCode ).append( "]]></emp_code__aprv>\r\n" );
valueXmlString.append( "<status><![CDATA[" ).append( "" ).append( "]]></status>\r\n" );
valueXmlString.append( "<status><![CDATA[" ).append( "P" ).append( "]]></status>\r\n" );
valueXmlString.append( "<add_user><![CDATA[" ).append( chgUser ).append( "]]></add_user>\r\n" );
valueXmlString.append( "<add_date><![CDATA[" ).append( currDate ).append( "]]></add_date>\r\n" );
valueXmlString.append( "<add_term><![CDATA[" ).append( chgTerm ).append( "]]></add_term>\r\n" );
......@@ -800,30 +801,50 @@ public class PalletizationIC extends ValidatorEJB implements PalletizationICLoca
System.out.println("-------------- itemchanged Add mode in Details 2 ----------------------");
sql = "select inv_stat from location where loc_code in (?, ?) ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, locationCode);
pstmt.setString(2, palletNoSource);
rs = pstmt.executeQuery();
if(rs.next())
pstmt1 = conn.prepareStatement(sql);
pstmt1.setString(1, locationCode);
pstmt1.setString(2, palletNoSource);
rs1 = pstmt1.executeQuery();
if(rs1.next())
{
invStat = checkNullAndTrim(rs.getString("inv_stat"));
invStat = checkNullAndTrim(rs1.getString("inv_stat"));
}
if(pstmt1 != null) { pstmt1.close(); pstmt1 = null; }
if(rs1 != null) { rs1.close(); rs1 = null; }
valueXmlString.append("<Detail2 domID=\"1\" selected=\"N\">\r\n");
valueXmlString.append("<attribute selected=\"N\" updateFlag=\"A\" status=\"N\" pkNames=\"\" />\r\n");
valueXmlString.append( "<tran_id><![CDATA[" ).append( "" ).append( "]]></tran_id>\r\n" );
valueXmlString.append( "<tran_date><![CDATA[" ).append( currDate ).append( "]]></tran_date>\r\n" );
valueXmlString.append( "<site_code><![CDATA[" ).append( loginSite ).append( "]]></site_code>\r\n" );
valueXmlString.append( "<tran_type><![CDATA[" ).append( "" ).append( "]]></tran_type>\r\n" );
if("".equalsIgnoreCase(locationCode) && locationCode.length() <= 0 )
{
valueXmlString.append( "<loc_code><![CDATA[" ).append( palletNoSource ).append( "]]></loc_code>\r\n" );
}
else
{
valueXmlString.append( "<loc_code><![CDATA[" ).append( locationCode ).append( "]]></loc_code>\r\n" );
}
valueXmlString.append( "<pallet_type><![CDATA[" ).append( "" ).append( "]]></pallet_type>\r\n" );
valueXmlString.append( "<inv_stat><![CDATA[" ).append( invStat ).append( "]]></inv_stat>\r\n" );
valueXmlString.append( "<pallet_no><![CDATA[" ).append( palletNo ).append( "]]></pallet_no>\r\n" );
if("".equalsIgnoreCase(palletNoSource) && palletNoSource.length() <= 0 )
{
valueXmlString.append( "<pallet_no__source><![CDATA[" ).append( locationCode ).append( "]]></pallet_no__source>\r\n" );
}
else
{
valueXmlString.append( "<pallet_no__source><![CDATA[" ).append( palletNoSource ).append( "]]></pallet_no__source>\r\n" );
}
valueXmlString.append( "<remarks><![CDATA[" ).append( "" ).append( "]]></remarks>\r\n" );
valueXmlString.append( "<confirmed><![CDATA[" ).append( "N" ).append( "]]></confirmed>\r\n" );
valueXmlString.append( "<conf_date><![CDATA[" ).append( "" ).append( "]]></conf_date>\r\n" );
valueXmlString.append( "<emp_code__aprv><![CDATA[" ).append( loginEmpCode ).append( "]]></emp_code__aprv>\r\n" );
valueXmlString.append( "<status><![CDATA[" ).append( "" ).append( "]]></status>\r\n" );
valueXmlString.append( "<status><![CDATA[" ).append( "P" ).append( "]]></status>\r\n" );
valueXmlString.append( "<add_user><![CDATA[" ).append( chgUser ).append( "]]></add_user>\r\n" );
valueXmlString.append( "<add_date><![CDATA[" ).append( currDate ).append( "]]></add_date>\r\n" );
valueXmlString.append( "<add_term><![CDATA[" ).append( chgTerm ).append( "]]></add_term>\r\n" );
......@@ -832,6 +853,8 @@ public class PalletizationIC extends ValidatorEJB implements PalletizationICLoca
valueXmlString.append( "<chg_term><![CDATA[" ).append( chgTerm ).append( "]]></chg_term>\r\n" );
valueXmlString.append("</Detail2>\r\n");
}
if(pstmt != null) { pstmt.close(); pstmt = null; }
if(rs != null) { rs.close(); rs = null; }
}
} //Case 2. End
break;
......@@ -845,7 +868,7 @@ public class PalletizationIC extends ValidatorEJB implements PalletizationICLoca
System.out.println("allFormDataDom------>>["+genericUtility.serializeDom(allFormDataDom)+"]");
double quantity = 0;
String itemCode = "", lotNo = "", lotSl = "", locationCode ="", palletNo = "", palletNoSource = "";
String itemCode = "", lotNo = "", lotSl = "", locationCode ="", palletNo = "", palletNoSource = "", scanTranId = "";
int noArt = 0;
tranId = checkNull(genericUtility.getColumnValue("tran_id", allFormDataDom, "2" ));
......@@ -858,11 +881,10 @@ public class PalletizationIC extends ValidatorEJB implements PalletizationICLoca
if( currentColumn.trim().equalsIgnoreCase( "itm_default" ) )
{
//System.out.println(" Inside if details 3 for itm_default :::::::::::::::::: ");
sql = "select item_code, lot_no, lot_sl, (quantity - (alloc_qty + hold_qty)) as quantity, no_art from stock where loc_code in (?,?) "
sql = "select item_code, lot_no, lot_sl, (quantity - (alloc_qty + hold_qty)) as quantity, no_art, '' as tran_id from stock where loc_code in (?,?) "
+ "and (quantity - (alloc_qty + hold_qty)) > 0 and site_code = ? "
+ "union "
+ "select d.item_code, d.lot_no, d.lot_sl, d.quantity, no_art from pallet_det d, pallet_hdr h where d.loc_code = ? "
+ "union all "
+ "select d.item_code, d.lot_no, d.lot_sl, d.quantity, no_art, d.tran_id from pallet_det d, pallet_hdr h where d.loc_code = ? "
+ "and d.pallet_no = ? and h.confirmed = ? and d.site_code = ? and d.tran_id = ? "
+ "and d.tran_id = h.tran_id ";
pstmt = conn.prepareStatement(sql);
......@@ -879,6 +901,7 @@ public class PalletizationIC extends ValidatorEJB implements PalletizationICLoca
if( tranId != null && tranId.trim().length() > 0 )
{
System.out.println("-------------- itemchanged Edit mode in Details 3 ----------------------");
while(rs.next())
{
itemCode = checkNullAndTrim(rs.getString("item_code"));
......@@ -886,18 +909,20 @@ public class PalletizationIC extends ValidatorEJB implements PalletizationICLoca
lotSl = checkNullAndTrim(rs.getString("lot_sl"));
quantity = rs.getDouble("quantity");
noArt = rs.getInt("no_art");
scanTranId = checkNullAndTrim(rs.getString("tran_id"));
domId++;
if(isScanningDone(tranId, itemCode, loginSite, locationCode, lotNo, lotSl, palletNo, conn))
if("".equals(scanTranId) && scanTranId.trim().length() <= 0 )
{
valueXmlString.append("<Detail3 domID='"+domId+"' selected=\"Y\">\r\n");
valueXmlString.append("<attribute selected=\"Y\" updateFlag=\"E\" status=\"O\" pkNames=\"\" />\r\n");
valueXmlString.append("<Detail3 domID='"+domId+"' selected=\"N\">\r\n");
valueXmlString.append("<attribute selected=\"N\" updateFlag=\"A\" status=\"N\" pkNames=\"\" />\r\n");
}
else
{
valueXmlString.append("<Detail3 domID='"+domId+"' selected=\"N\">\r\n");
valueXmlString.append("<attribute selected=\"N\" updateFlag=\"A\" status=\"N\" pkNames=\"\" />\r\n");
valueXmlString.append("<Detail3 domID='"+domId+"' selected=\"Y\">\r\n");
valueXmlString.append("<attribute selected=\"Y\" updateFlag=\"E\" status=\"O\" pkNames=\"\" />\r\n");
}
valueXmlString.append( "<tran_id><![CDATA[" ).append( tranId ).append( "]]></tran_id>\r\n" );
valueXmlString.append( "<line_no><![CDATA[" ).append( domId ).append( "]]></line_no>\r\n" );
valueXmlString.append( "<item_code><![CDATA[" ).append( itemCode ).append( "]]></item_code>\r\n" );
......@@ -910,6 +935,8 @@ public class PalletizationIC extends ValidatorEJB implements PalletizationICLoca
valueXmlString.append( "<no_art><![CDATA[" ).append( noArt ).append( "]]></no_art>\r\n" );
valueXmlString.append("</Detail3>\r\n");
}
if(pstmt != null) { pstmt.close(); pstmt = null; }
if(rs != null) { rs.close(); rs = null; }
}
else
{
......@@ -920,6 +947,7 @@ public class PalletizationIC extends ValidatorEJB implements PalletizationICLoca
lotNo = checkNullAndTrim(rs.getString("lot_no"));
lotSl = checkNullAndTrim(rs.getString("lot_sl"));
quantity = rs.getDouble("quantity");
noArt = rs.getInt("no_art");
domId++;
valueXmlString.append("<Detail3 domID='"+domId+"' selected=\"N\">\r\n");
......@@ -937,6 +965,8 @@ public class PalletizationIC extends ValidatorEJB implements PalletizationICLoca
valueXmlString.append( "<no_art><![CDATA[" ).append( noArt ).append( "]]></no_art>\r\n" );
valueXmlString.append("</Detail3>\r\n");
}
if(pstmt != null) { pstmt.close(); pstmt = null; }
if(rs != null) { rs.close(); rs = null; }
}
}
} //Case 3. End
......@@ -1001,42 +1031,7 @@ public class PalletizationIC extends ValidatorEJB implements PalletizationICLoca
return inputVal;
}
private boolean isScanningDone(String tranId, String itemCode, String loginSite, String locationCode, String lotNo, String lotSl, String palletNo, Connection conn) throws ITMException,Exception
{
ResultSet rs = null;
PreparedStatement pstmt = null;
String sql = "";
int count = 0;
tranId = tranId == null ? "" : tranId.trim();
System.out.println("in isScanningDone--------->" + tranId);
sql = "select count(*) from pallet_det where tran_id = ? and item_code = ? and site_code = ? and loc_code = ? and lot_no = ? and lot_sl = ? "
+ " and pallet_no = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranId);
pstmt.setString(2,itemCode);
pstmt.setString(3,loginSite);
pstmt.setString(4,locationCode);
pstmt.setString(5,lotNo);
pstmt.setString(6,lotSl);
pstmt.setString(7,palletNo);
rs = pstmt.executeQuery();
if(rs.next())
{
count = rs.getInt(1);
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
System.out.println("count in isScanningDone@@----->>["+count+"]");
if(count > 0)
{
return true;
}
return false;
}
}
webitm-wms/ibase/webitm/ejb/wms/PalletizationPos.java
View file @ 1f00ac60
......@@ -44,6 +44,7 @@ public class PalletizationPos extends ValidatorEJB implements PalletizationPosLo
double parseQuantity = 0;
HashMap strAllocate = new HashMap();
Connection conn1 = null;
boolean isError = false;
try
{
ConnDriver connDriver = new ConnDriver();
......@@ -131,6 +132,16 @@ public class PalletizationPos extends ValidatorEJB implements PalletizationPosLo
{
try
{
if( !isError )
{
System.out.println("commmit");
conn1.commit();
}
else if ( isError )
{
System.out.println("rollback");
conn1.rollback();
}
if (conn1 != null)
{
conn1.close();
......
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