Skip to content

B
business-java
Commit a10cd636 authored by rtiwari's avatar rtiwari
Browse files
Options

updated 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@94426 ce508802-f39f-4f6c-b175-0d175dae99d5
parent ffd65744
Show whitespace changes
Inline Side-by-side
Showing with 112 additions and 22 deletions
webitm-wms/ibase/webitm/ejb/wms/MPhyItemScanPos.java
View file @ a10cd636
...@@ -44,6 +44,8 @@ public class MPhyItemScanPos extends ValidatorEJB implements MPhyItemScanPosLoca ...@@ -44,6 +44,8 @@ public class MPhyItemScanPos extends ValidatorEJB implements MPhyItemScanPosLoca
Double quantityInput = 0.0; Double quantityInput = 0.0;
String unit=""; String unit="";
int rec=0; int rec=0;
String loginCode= "",empCode=""; // ADDED ON 25/MAR/14 BY RITESH
int upd= 0; // ADDED ON 25/MAR/14 BY RITESH
try try
{ {
conn.setAutoCommit(false); conn.setAutoCommit(false);
...@@ -55,7 +57,28 @@ public class MPhyItemScanPos extends ValidatorEJB implements MPhyItemScanPosLoca ...@@ -55,7 +57,28 @@ public class MPhyItemScanPos extends ValidatorEJB implements MPhyItemScanPosLoca
siteCode = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginSiteCode" ); siteCode = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginSiteCode" );
parentNodeList = dom.getElementsByTagName("Detail3"); parentNodeList = dom.getElementsByTagName("Detail3");
parentNodeListLength = parentNodeList.getLength(); parentNodeListLength = parentNodeList.getLength();
// added on 25/MAR/14 BY RITESH START
loginCode = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginCode" );
System.out.println("********* login code ["+loginCode+"]");
sql = "SELECT EMP_CODE FROM USERS WHERE CODE = ?";
pstmt = conn.prepareStatement( sql );
pstmt.setString(1, loginCode);
rs = pstmt.executeQuery();
if( rs.next() )
{
empCode = rs.getString("EMP_CODE");
}
if(rs != null)
{
rs.close();
rs = null;
}
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
// ADDED ON 25/MAR/14 BY RITESH END
for(ctr = 0; ctr < parentNodeListLength ; ctr++ ) for(ctr = 0; ctr < parentNodeListLength ; ctr++ )
{ {
lineNo=Integer.parseInt((genericUtility.getColumnValueFromNode("line_no",dom.getElementsByTagName("Detail3").item(ctr))).trim()); lineNo=Integer.parseInt((genericUtility.getColumnValueFromNode("line_no",dom.getElementsByTagName("Detail3").item(ctr))).trim());
...@@ -162,12 +185,35 @@ public class MPhyItemScanPos extends ValidatorEJB implements MPhyItemScanPosLoca ...@@ -162,12 +185,35 @@ public class MPhyItemScanPos extends ValidatorEJB implements MPhyItemScanPosLoca
{ {
sql="update physcandet set verified='Y',reverify='N' where tran_id=? and line_no=? "; sql="update physcandet set verified='Y',reverify='N' where tran_id=? and line_no=? ";
pstmt=conn.prepareStatement(sql); pstmt=conn.prepareStatement(sql);
pstmt1.setString(1,tranId); pstmt.setString(1,tranId); // modified on 25/MAR/14
pstmt1.setInt(2,lineNo); pstmt.setInt(2,lineNo); // modified on 25/MAR/14
pstmt.executeUpdate(); pstmt.executeUpdate();
pstmt.close(); pstmt.close();
pstmt=null; pstmt=null;
// ADDED BY RITESH 25/MAR/14 START
sql="update physcandet set emp_code__verify = ?,reverify='N' where tran_id=? and line_no=? ";
pstmt=conn.prepareStatement(sql);
pstmt.setString(1,empCode);
pstmt.setString(2,tranId);
pstmt.setInt(3,lineNo);
upd = pstmt.executeUpdate();
pstmt.close();
pstmt=null;
System.out.println(" UPDATE physcandet ON MANUAL CYCLE COUNT :"+upd);
}else
{
sql="update physcandet set emp_code__verify = ?,reverify='Y' where tran_id=? and line_no=? ";
pstmt=conn.prepareStatement(sql);
pstmt.setString(1,empCode);
pstmt.setString(2,tranId);
pstmt.setInt(3,lineNo);
upd = pstmt.executeUpdate();
pstmt.close();
pstmt=null;
System.out.println(" UPDATE physcandet ON MANUAL CYCLE COUNT on qty mismatch:"+upd);
} }
// ADDED BY RITESH 25/MAR/14 START
} }
......
webitm-wms/ibase/webitm/ejb/wms/PhyItemScanIC.java
View file @ a10cd636
This source diff could not be displayed because it is too large. You can view the blob instead.
webitm-wms/ibase/webitm/ejb/wms/PhyItemScanPos.java
View file @ a10cd636
...@@ -250,8 +250,30 @@ public class PhyItemScanPos extends ValidatorEJB implements PhyItemScanPosLocal, ...@@ -250,8 +250,30 @@ public class PhyItemScanPos extends ValidatorEJB implements PhyItemScanPosLocal,
pstmt1.executeUpdate(); pstmt1.executeUpdate();
pstmt1.close(); pstmt1.close();
pstmt1=null; pstmt1=null;
// ADDED ON 25/MAR/14 BY RITESH START
System.out.println(" WIN_NAME =:: "+winName);
if("w_empty_loc_scan".equalsIgnoreCase(winName))
{
sql="update physcandet set emp_code__verify = ? ,reverify = 'N' where tran_id=? and line_no=? and quantity = phy_input and phy_input = 0 ";
pstmt1=conn.prepareStatement(sql);
pstmt1.setString(1,empCode);
pstmt1.setString(2,tranId);
pstmt1.setInt(3,lineNo);
pstmt1.executeUpdate();
pstmt1.close();
pstmt1=null;
// sql="update physcandet set reverify = 'Y' where tran_id=? and line_no=? and quantity <> phy_input ";
// pstmt1=conn.prepareStatement(sql);
// pstmt1.setString(1,tranId);
// pstmt1.setInt(2,lineNo);
// pstmt1.executeUpdate();
// pstmt1.close();
// pstmt1=null;
} }
// ADDED ON 25/MAR/14 BY RITESH END
}
// added on 12/march/2014 BY RITESH start // added on 12/march/2014 BY RITESH start
sql="update physcandet set emp_code__user = ? where tran_id=? and line_no=? "; sql="update physcandet set emp_code__user = ? where tran_id=? and line_no=? ";
pstmt1=conn.prepareStatement(sql); pstmt1=conn.prepareStatement(sql);
...@@ -263,7 +285,6 @@ public class PhyItemScanPos extends ValidatorEJB implements PhyItemScanPosLocal, ...@@ -263,7 +285,6 @@ public class PhyItemScanPos extends ValidatorEJB implements PhyItemScanPosLocal,
pstmt1=null; pstmt1=null;
// added on 12/march/2014 BY RITESH end // added on 12/march/2014 BY RITESH end
} }
rs.close(); rs.close();
rs=null; rs=null;
......
webitm-wms/ibase/webitm/ejb/wms/PhyItemVerifyIC.java
View file @ a10cd636
...@@ -444,8 +444,8 @@ public class PhyItemVerifyIC extends ValidatorEJB implements PhyItemVerifyICLoca ...@@ -444,8 +444,8 @@ public class PhyItemVerifyIC extends ValidatorEJB implements PhyItemVerifyICLoca
{ {
StringBuffer valueXmlString = new StringBuffer(); StringBuffer valueXmlString = new StringBuffer();
Connection conn = null; Connection conn = null;
PreparedStatement pstmt = null; PreparedStatement pstmt = null,pstmtItem = null;
ResultSet rs = null ; ResultSet rs = null,rsItem= null;
String sSQL = ""; String sSQL = "";
String sql = ""; String sql = "";
int currentFormNo = 0 ; int currentFormNo = 0 ;
...@@ -467,7 +467,7 @@ public class PhyItemVerifyIC extends ValidatorEJB implements PhyItemVerifyICLoca ...@@ -467,7 +467,7 @@ public class PhyItemVerifyIC extends ValidatorEJB implements PhyItemVerifyICLoca
String analysisClass = ""; String analysisClass = "";
String itemCode = "",locCode = "", lotNo = "", lotSl = "", quantity = "", unit = ""; String itemCode = "",locCode = "", lotNo = "", lotSl = "", quantity = "", unit = "";
String currAppdate= "", empCode = "",loginSiteCode = "",isEmpty = ""; String currAppdate= "", empCode = "",loginSiteCode = "",isEmpty = "";
String phyHanBasis = "", phyHanBasisDesc = ""; String phyHanBasis = "", phyHanBasisDesc = "",sqlItem="";
Timestamp currDateNew = null; Timestamp currDateNew = null;
Timestamp date2 = null; Timestamp date2 = null;
java.util.Date currDate = null; java.util.Date currDate = null;
...@@ -609,9 +609,6 @@ public class PhyItemVerifyIC extends ValidatorEJB implements PhyItemVerifyICLoca ...@@ -609,9 +609,6 @@ public class PhyItemVerifyIC extends ValidatorEJB implements PhyItemVerifyICLoca
valueXmlString.append( "<chg_date><![CDATA[" ).append( currDateStr ).append( "]]></chg_date>\r\n" ); valueXmlString.append( "<chg_date><![CDATA[" ).append( currDateStr ).append( "]]></chg_date>\r\n" );
valueXmlString.append( "<chg_term><![CDATA[" ).append( chgTerm ).append( "]]></chg_term>\r\n" ); valueXmlString.append( "<chg_term><![CDATA[" ).append( chgTerm ).append( "]]></chg_term>\r\n" );
} }
valueXmlString.append("</Detail1>"); valueXmlString.append("</Detail1>");
...@@ -679,7 +676,30 @@ public class PhyItemVerifyIC extends ValidatorEJB implements PhyItemVerifyICLoca ...@@ -679,7 +676,30 @@ public class PhyItemVerifyIC extends ValidatorEJB implements PhyItemVerifyICLoca
} }
} }
System.out.println(" phyHanBasisDesc ["+phyHanBasisDesc+"]"); System.out.println(" phyHanBasisDesc ["+phyHanBasisDesc+"]");
// added by ritesh on 25/03/14 start
// if()
// {
// sqlItem = "select analysis_class,cycle_criteria from item WHERE item_code = ?";
// pstmtItem = conn.prepareStatement( sqlItem );
// pstmtItem.setString(1, itemCode);
// rsItem = pstmtItem.executeQuery();
// if( rsItem.next() )
// {
// analysisClass = rsItem.getString("analysis_class");
// cycleCriteria = rsItem.getString("cycle_criteria");
// }
// if(rsItem != null)
// {
// rsItem.close();
// rsItem = null;
// }
// if(pstmtItem != null)
// {
// pstmtItem.close();
// pstmtItem = null;
// }
// }
// added by ritesh on 25/03/14 end
valueXmlString.append("<Detail2 domID='" + lineNo+ "' selected=\"N\">\r\n"); valueXmlString.append("<Detail2 domID='" + lineNo+ "' selected=\"N\">\r\n");
valueXmlString.append("<tran_id/>"); valueXmlString.append("<tran_id/>");
valueXmlString.append( "<ref_id><![CDATA[" ).append( tranId).append( "]]></ref_id>\r\n" ); valueXmlString.append( "<ref_id><![CDATA[" ).append( tranId).append( "]]></ref_id>\r\n" );
......
webitm-wms/ibase/webitm/ejb/wms/PhyItemVerifyPos.java
View file @ a10cd636
...@@ -11,6 +11,8 @@ import org.w3c.dom.Document; ...@@ -11,6 +11,8 @@ import org.w3c.dom.Document;
import org.w3c.dom.Node; import org.w3c.dom.Node;
import org.w3c.dom.NodeList; import org.w3c.dom.NodeList;
import com.google.gwt.dom.client.LIElement;
@javax.ejb.Stateless @javax.ejb.Stateless
public class PhyItemVerifyPos extends ValidatorEJB implements PhyItemVerifyPosLocal, PhyItemVerifyPosRemote public class PhyItemVerifyPos extends ValidatorEJB implements PhyItemVerifyPosLocal, PhyItemVerifyPosRemote
{ {
...@@ -198,33 +200,34 @@ public class PhyItemVerifyPos extends ValidatorEJB implements PhyItemVerifyPosLo ...@@ -198,33 +200,34 @@ public class PhyItemVerifyPos extends ValidatorEJB implements PhyItemVerifyPosLo
if(rec > 0) if(rec > 0)
{ {
System.out.println("rec > 1 : qty mismatch found"); System.out.println("rec > 1 : qty mismatch found");
sql="update physcandet set EMP_CODE__VERIFY = ? where tran_id=? and item_code=? "; sql="update physcandet set EMP_CODE__VERIFY = ? where tran_id=? and item_code=? and line_no = ? ";
pstmt1=conn.prepareStatement(sql); pstmt1=conn.prepareStatement(sql);
pstmt1.setString(1,empCode); pstmt1.setString(1,empCode);
pstmt1.setString(2,refId); pstmt1.setString(2,refId);
pstmt1.setString(3,itemCode); pstmt1.setString(3,itemCode);
pstmt1.setInt(4,refLineNo);
pstmt1.executeUpdate(); pstmt1.executeUpdate();
pstmt1.close(); pstmt1.close();
pstmt1=null; pstmt1=null;
} }
else else
{ {
System.out.println("EMP_CODE__USER UPDATED"); System.out.println("EMP_CODE__USER UPDATED");
sql="update physcandet set EMP_CODE__USER = '"+empCode +"' ,EMP_CODE__VERIFY = '"+empCode+"' where tran_id=? and item_code=? "; // change on 01/mar/14 start sql="update physcandet set EMP_CODE__USER = '"+empCode +"' ,EMP_CODE__VERIFY = '"+empCode+"' where tran_id=? and item_code=? and line_no = ? "; // change on 01/mar/14 start
pstmt1=conn.prepareStatement(sql); pstmt1=conn.prepareStatement(sql);
pstmt1.setString(1,refId); pstmt1.setString(1,refId);
pstmt1.setString(2,itemCode); pstmt1.setString(2,itemCode);
pstmt1.setInt(3,refLineNo);
pstmt1.executeUpdate(); pstmt1.executeUpdate();
pstmt1.close(); pstmt1.close();
pstmt1=null; pstmt1=null;
} }
sql="update physcandet set EMP_CODE__VERIFY = ? where tran_id=? and reverify='N' and line_no = ? ";
sql="update physcandet set EMP_CODE__VERIFY = ? where tran_id=? and reverify='N' ";
pstmt1=conn.prepareStatement(sql); pstmt1=conn.prepareStatement(sql);
pstmt1.setString(1,empCode); pstmt1.setString(1,empCode);
pstmt1.setString(2,tranId); pstmt1.setString(2,tranId);
pstmt1.setInt(3,lineNo);
upd = pstmt1.executeUpdate(); upd = pstmt1.executeUpdate();
pstmt1.close(); pstmt1.close();
pstmt1=null; pstmt1=null;
......
webitm-wms/ibase/webitm/utility/wms/PhysicalCountSchedule.java
View file @ a10cd636
...@@ -113,7 +113,7 @@ public class PhysicalCountSchedule implements Schedule ...@@ -113,7 +113,7 @@ public class PhysicalCountSchedule implements Schedule
System.out.println("Testing::user available::"); System.out.println("Testing::user available::");
if(cnt ==0) if(cnt ==0)
{ {
return ""; // return "";
} }
// added by ritesh on 28/02/14 END // added by ritesh on 28/02/14 END
...@@ -454,8 +454,8 @@ public class PhysicalCountSchedule implements Schedule ...@@ -454,8 +454,8 @@ public class PhysicalCountSchedule implements Schedule
pstmt.setTimestamp(4,dts); pstmt.setTimestamp(4,dts);
// pstmt.setString(5,userInfo.getLoginCode()); // pstmt.setString(5,userInfo.getLoginCode());
// pstmt.setString(6,userInfo.getRemoteHost()); // pstmt.setString(6,userInfo.getRemoteHost());
pstmt.setString(5,"SYSTEM"); // ADDED BY RITESH ON 28/MAR/2014 pstmt.setString(5,"SYSTEM"); // ADDED BY RITESH ON 28/02/2014
pstmt.setString(6,"SYSTEM"); // ADDED BY RITESH ON 28/MAR/2014 pstmt.setString(6,"SYSTEM"); // ADDED BY RITESH ON 28/02/2014
pstmt.setString(7,"A"); pstmt.setString(7,"A");
pstmt.executeUpdate(); pstmt.executeUpdate();
pstmt.close(); pstmt.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