Skip to content

B
business-java
Commit 4762e362 authored by pjain's avatar pjain
Browse files
Options

Changed expirey date validation as per manohara sir (track_shelf_life='Y' then... 

Changed expirey date validation as per manohara sir (track_shelf_life='Y' then check data calculation and empty date not allowed and track_shelf_life='N' then null allowed and user can not set expiry date field protected ).


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@96763 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 4299e213
Show whitespace changes
Inline Side-by-side
Showing with 126 additions and 57 deletions
webitm-wms/ibase/webitm/ejb/wms/PoRcpRmPmIC.java
View file @ 4762e362
...@@ -996,6 +996,7 @@ public class PoRcpRmPmIC extends ValidatorEJB implements PoRcpRmPmICRemote, PoRc ...@@ -996,6 +996,7 @@ public class PoRcpRmPmIC extends ValidatorEJB implements PoRcpRmPmICRemote, PoRc
break; break;
case 3: case 3:
{ {
//Change by Dhanraj on 05-NOV-14 for get proper detail values[Detail 3 value get from currDom not from allDom].
String flag="F"; String flag="F";
parentList = currDom.getElementsByTagName( "Detail" + currentFormNo ); parentList = currDom.getElementsByTagName( "Detail" + currentFormNo );
childList = parentList.item( 0 ).getChildNodes(); childList = parentList.item( 0 ).getChildNodes();
...@@ -1036,7 +1037,8 @@ public class PoRcpRmPmIC extends ValidatorEJB implements PoRcpRmPmICRemote, PoRc ...@@ -1036,7 +1037,8 @@ public class PoRcpRmPmIC extends ValidatorEJB implements PoRcpRmPmICRemote, PoRc
if( "lot_sl".equalsIgnoreCase( childNodeName ) ) if( "lot_sl".equalsIgnoreCase( childNodeName ) )
{ {
lotSl = checkNull(genericUtility.getColumnValue("lot_sl", allDom, "3" )); //lotSl = checkNull(genericUtility.getColumnValue("lot_sl", allDom, "3" ));
lotSl = checkNull(genericUtility.getColumnValue("lot_sl", currDom, "3" ));
if ( lotSl.trim().length() == 0 ) if ( lotSl.trim().length() == 0 )
{ {
errList.add( "NULLLPNNO " ); errList.add( "NULLLPNNO " );
...@@ -1219,11 +1221,17 @@ public class PoRcpRmPmIC extends ValidatorEJB implements PoRcpRmPmICRemote, PoRc ...@@ -1219,11 +1221,17 @@ public class PoRcpRmPmIC extends ValidatorEJB implements PoRcpRmPmICRemote, PoRc
} }
else if( "loc_code".equalsIgnoreCase( childNodeName ) ) else if( "loc_code".equalsIgnoreCase( childNodeName ) )
{ {
itemCode = checkNull(genericUtility.getColumnValue("item_code", allDom, "3" )); /*itemCode = checkNull(genericUtility.getColumnValue("item_code", allDom, "3" ));
siteCode = checkNull(genericUtility.getColumnValue("site_code", allDom, "3" )); siteCode = checkNull(genericUtility.getColumnValue("site_code", allDom, "3" ));
lotNo = checkNull(genericUtility.getColumnValue("lot_no", allDom, "3" )); lotNo = checkNull(genericUtility.getColumnValue("lot_no", allDom, "3" ));
lpnNo = checkNull(genericUtility.getColumnValue("lot_sl", allDom, "3" )); lpnNo = checkNull(genericUtility.getColumnValue("lot_sl", allDom, "3" ));
locCode = checkNull(genericUtility.getColumnValue( "loc_code", allDom, "3" )); locCode = checkNull(genericUtility.getColumnValue( "loc_code", allDom, "3" ));*/
itemCode = checkNull(genericUtility.getColumnValue("item_code", currDom, "3" ));
siteCode = checkNull(genericUtility.getColumnValue("site_code", currDom, "3" ));
lotNo = checkNull(genericUtility.getColumnValue("lot_no", currDom, "3" ));
lpnNo = checkNull(genericUtility.getColumnValue("lot_sl", currDom, "3" ));
locCode = checkNull(genericUtility.getColumnValue( "loc_code", currDom, "3" ));
// 26/10/11 manoharan consider stk_opt and asn_reqd from supplieritem / supplier // 26/10/11 manoharan consider stk_opt and asn_reqd from supplieritem / supplier
suppCode = checkNull(genericUtility.getColumnValue( "supp_code", allDom, "2" )); suppCode = checkNull(genericUtility.getColumnValue( "supp_code", allDom, "2" ));
...@@ -1542,7 +1550,8 @@ public class PoRcpRmPmIC extends ValidatorEJB implements PoRcpRmPmICRemote, PoRc ...@@ -1542,7 +1550,8 @@ public class PoRcpRmPmIC extends ValidatorEJB implements PoRcpRmPmICRemote, PoRc
{ {
//Pending logic for Purchase order scan... //Pending logic for Purchase order scan...
lotNo = checkNull(genericUtility.getColumnValue("lot_no", allDom, "3" )); //lotNo = checkNull(genericUtility.getColumnValue("lot_no", allDom, "3" ));
lotNo = checkNull(genericUtility.getColumnValue("lot_no", currDom, "3" ));
String isMaintainLotMaster = distComm.getDisparams("999999","MAINTAIN_LOT_MASTER",conn); String isMaintainLotMaster = distComm.getDisparams("999999","MAINTAIN_LOT_MASTER",conn);
System.out.println("validation Lot No :["+lotNo+"]"); System.out.println("validation Lot No :["+lotNo+"]");
int cntLotMaster=0; int cntLotMaster=0;
...@@ -1585,8 +1594,10 @@ public class PoRcpRmPmIC extends ValidatorEJB implements PoRcpRmPmICRemote, PoRc ...@@ -1585,8 +1594,10 @@ public class PoRcpRmPmIC extends ValidatorEJB implements PoRcpRmPmICRemote, PoRc
if(asnNo != null && !asnNo.equals(""))//Dhanraj ASN Scan..... if(asnNo != null && !asnNo.equals(""))//Dhanraj ASN Scan.....
{//protect ='1' {//protect ='1'
purcOrder = checkNull(genericUtility.getColumnValue("purc_order", allDom, "3" )); purcOrder = checkNull(genericUtility.getColumnValue("purc_order", allDom, "3" ));
//purcOrder = checkNull(genericUtility.getColumnValue("purc_order", currDom, "3" ));
//Changed by Dhanraj 22-SEP-14 for line_no_ord required space. old use checkNull(); //Changed by Dhanraj 22-SEP-14 for line_no_ord required space. old use checkNull();
String lineNoOrder= checkNullNotTrim(genericUtility.getColumnValue("line_no__ord", allDom, "3" )); //String lineNoOrder= checkNullNotTrim(genericUtility.getColumnValue("line_no__ord", allDom, "3" ));
String lineNoOrder= checkNullNotTrim(genericUtility.getColumnValue("line_no__ord", currDom, "3" ));
itemCode=""; itemCode="";
int noArt=0; int noArt=0;
int noPallet=0; int noPallet=0;
...@@ -1629,7 +1640,7 @@ public class PoRcpRmPmIC extends ValidatorEJB implements PoRcpRmPmICRemote, PoRc ...@@ -1629,7 +1640,7 @@ public class PoRcpRmPmIC extends ValidatorEJB implements PoRcpRmPmICRemote, PoRc
errList.add( "CASNTMT" ); errList.add( "CASNTMT" );
errFields.add( childNodeName.toLowerCase() ); errFields.add( childNodeName.toLowerCase() );
}*/ }*/
//Changed by sumit on 09/11/12 this warnning removed as per issue tracker end. //Changed by sumit on 09/11/12 this warnning removed as per issue er end.
sql="select shipper_size, gross_weight, net_weight, length, width ,height from item_lot_packsize WHERE ITEM_CODE = ? AND LOT_NO__FROM <= ? AND LOT_NO__TO >= ? "; sql="select shipper_size, gross_weight, net_weight, length, width ,height from item_lot_packsize WHERE ITEM_CODE = ? AND LOT_NO__FROM <= ? AND LOT_NO__TO >= ? ";
pstmt =conn.prepareStatement(sql); pstmt =conn.prepareStatement(sql);
pstmt.setString(1,itemCode); pstmt.setString(1,itemCode);
...@@ -1724,7 +1735,8 @@ public class PoRcpRmPmIC extends ValidatorEJB implements PoRcpRmPmICRemote, PoRc ...@@ -1724,7 +1735,8 @@ public class PoRcpRmPmIC extends ValidatorEJB implements PoRcpRmPmICRemote, PoRc
errList.add( "VTNULNARTP" ); //no art null not allowed. errList.add( "VTNULNARTP" ); //no art null not allowed.
errFields.add( childNodeName.toLowerCase() ); errFields.add( childNodeName.toLowerCase() );
}else{ }else{
int qty=Integer.parseInt(checkNull(genericUtility.getColumnValue("no_art", allDom, "3" ).trim())); //int qty=Integer.parseInt(checkNull(genericUtility.getColumnValue("no_art", allDom, "3" ).trim()));
int qty=Integer.parseInt(checkNull(genericUtility.getColumnValue("no_art", currDom, "3" ).trim()));
if(qty <= 0){ if(qty <= 0){
errList.add( "VTNULNARTP" ); //no art null not allowed. errList.add( "VTNULNARTP" ); //no art null not allowed.
errFields.add( childNodeName.toLowerCase() ); errFields.add( childNodeName.toLowerCase() );
...@@ -1747,7 +1759,7 @@ public class PoRcpRmPmIC extends ValidatorEJB implements PoRcpRmPmICRemote, PoRc ...@@ -1747,7 +1759,7 @@ public class PoRcpRmPmIC extends ValidatorEJB implements PoRcpRmPmICRemote, PoRc
}*/ }*/
//Changed by sumit on 18/12/12 commented this as per Ashish Mehta no need of this check end //Changed by sumit on 18/12/12 commented this as per Ashish Mehta no need of this check end
}else if("quantity".equalsIgnoreCase(childNodeName)) }/*else if("quantity".equalsIgnoreCase(childNodeName))
{ {
if(asnNo != null && !asnNo.equals(""))//Dhanraj ASN Scan..... if(asnNo != null && !asnNo.equals(""))//Dhanraj ASN Scan.....
{}//protect ='1' {}//protect ='1'
...@@ -1757,13 +1769,32 @@ public class PoRcpRmPmIC extends ValidatorEJB implements PoRcpRmPmICRemote, PoRc ...@@ -1757,13 +1769,32 @@ public class PoRcpRmPmIC extends ValidatorEJB implements PoRcpRmPmICRemote, PoRc
errList.add( "VTNULNARTP" ); //quantity null not allowed. errList.add( "VTNULNARTP" ); //quantity null not allowed.
errFields.add( childNodeName.toLowerCase() ); errFields.add( childNodeName.toLowerCase() );
}else{ }else{
int qty=Integer.parseInt(checkNull(genericUtility.getColumnValue("no_art", allDom, "3" ).trim())); //int qty=Integer.parseInt(checkNull(genericUtility.getColumnValue("no_art", allDom, "3" ).trim()));
int qty=Integer.parseInt(checkNull(genericUtility.getColumnValue("no_art", currDom, "3" ).trim()));
if(qty <= 0){ if(qty <= 0){
errList.add( "VTNULNARTP" ); //quantity null not allowed. errList.add( "VTNULNARTP" ); //quantity null not allowed.
errFields.add( childNodeName.toLowerCase() ); errFields.add( childNodeName.toLowerCase() );
} }
} }
} }
}*/
else if ( "quantity".equalsIgnoreCase( childNodeName ) ){
if(asnNo != null && !asnNo.equals("")){//protect ='1'
}else{//For Purchase order
System.out.println("RMPMReceipt Generation qty");
if ( childNode.getFirstChild() == null )
{
errList.add( "VTNULLQTYP" ); //quantity null not allowed.
errFields.add( childNodeName.toLowerCase() );
}else{
double qty=Double.parseDouble(checkNull(genericUtility.getColumnValue("quantity", currDom, "3" ).trim()));
if(qty <= 0){
errList.add( "VTNULLQTYP" ); //quantity null not allowed.
errFields.add( childNodeName.toLowerCase() );
}//max qty validation pending...
}
}
} }
//NEW VAlidation remove as per req. Dhanraj 14-AUG-14 Add qty_per_art in porcpdet table and also scanning. //NEW VAlidation remove as per req. Dhanraj 14-AUG-14 Add qty_per_art in porcpdet table and also scanning.
//NEW VAlidation as per req. Dhanraj 12-AUG-14 Add qty_per_art in porcpdet table and also scanning. //NEW VAlidation as per req. Dhanraj 12-AUG-14 Add qty_per_art in porcpdet table and also scanning.
...@@ -1804,19 +1835,43 @@ public class PoRcpRmPmIC extends ValidatorEJB implements PoRcpRmPmICRemote, PoRc ...@@ -1804,19 +1835,43 @@ public class PoRcpRmPmIC extends ValidatorEJB implements PoRcpRmPmICRemote, PoRc
//NEW VAlidation as per req. Dhanraj 07-AUG-14 and supp_code__mnfr validation call by GenValidation. //NEW VAlidation as per req. Dhanraj 07-AUG-14 and supp_code__mnfr validation call by GenValidation.
else if ( "expiry_date".equalsIgnoreCase( childNodeName ) ) else if ( "expiry_date".equalsIgnoreCase( childNodeName ) )
{ {
itemCode = checkNull(genericUtility.getColumnValue("item_code", allDom, "3" )); String trackShelfLife="";
//itemCode = checkNull(genericUtility.getColumnValue("item_code", allDom, "3" ));
itemCode = checkNull(genericUtility.getColumnValue("item_code", currDom, "3" ));
System.out.println(" item code from All Dome dom===========>"+itemCode);
/*String itemCodeTest = checkNull(genericUtility.getColumnValue("item_code", currDom, "3" ));
System.out.println(" item code from current dom===========>"+itemCodeTest);
itemCodeTest = checkNull(genericUtility.getColumnValue("item_code", hdrDom, "3" ));
System.out.println(" item code from Header dom===========>"+itemCodeTest);*/
sql = " SELECT TRACK_SHELF_LIFE FROM ITEM WHERE ITEM_CODE = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, itemCode);
rs = pstmt.executeQuery();
if( rs.next() ){
trackShelfLife= checkNull(rs.getString("TRACK_SHELF_LIFE"));
}
rs.close(); rs = null;
pstmt.close(); pstmt = null;
System.out.println("call Dhanraj exp_date"); System.out.println("call Dhanraj exp_date");
if ( childNode.getFirstChild() == null ) if ( childNode.getFirstChild() == null )
{
if("Y".equalsIgnoreCase(trackShelfLife))
{ {
errList.add( "NULLEXPDT" ); //null not allowed. errList.add( "NULLEXPDT" ); //null not allowed.
errFields.add( childNodeName.toLowerCase() ); errFields.add( childNodeName.toLowerCase() );
} }
} }
}
else if ( "site_code__mfg".equalsIgnoreCase( childNodeName ) ) else if ( "site_code__mfg".equalsIgnoreCase( childNodeName ) )
{ {
System.out.println("call Dhanraj site_code__mfg"); System.out.println("call Dhanraj site_code__mfg");
itemCode = checkNull(genericUtility.getColumnValue("item_code", allDom, "3" ));//genericUtility.getColumnValue( "item_code", dom ); //itemCode = checkNull(genericUtility.getColumnValue("item_code", allDom, "3" ));//genericUtility.getColumnValue( "item_code", dom );
itemCode = checkNull(genericUtility.getColumnValue("item_code", currDom, "3" ));//genericUtility.getColumnValue( "item_code", dom );
sql = "SELECT SUPP_SOUR FROM SITEITEM WHERE ITEM_CODE = ? "; sql = "SELECT SUPP_SOUR FROM SITEITEM WHERE ITEM_CODE = ? ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, itemCode); pstmt.setString(1, itemCode);
...@@ -1857,7 +1912,7 @@ public class PoRcpRmPmIC extends ValidatorEJB implements PoRcpRmPmICRemote, PoRc ...@@ -1857,7 +1912,7 @@ public class PoRcpRmPmIC extends ValidatorEJB implements PoRcpRmPmICRemote, PoRc
{ {
if ( childNode.getFirstChild() == null ) if ( childNode.getFirstChild() == null )
{ //Changed by Dhanraj on 22-SEP-14 Add validation using track_shelf_life { //Changed by Dhanraj on 22-SEP-14 Add validation using track_shelf_life
itemCode = checkNull(genericUtility.getColumnValue("item_code", allDom, "3" )); itemCode = checkNull(genericUtility.getColumnValue("item_code", currDom, "3" ));
sql= " select * from item where item_code = ? and track_shelf_life = ? " ; sql= " select * from item where item_code = ? and track_shelf_life = ? " ;
pstmt = conn.prepareStatement( sql ); pstmt = conn.prepareStatement( sql );
pstmt.setString(1, itemCode); pstmt.setString(1, itemCode);
...@@ -1874,7 +1929,7 @@ public class PoRcpRmPmIC extends ValidatorEJB implements PoRcpRmPmICRemote, PoRc ...@@ -1874,7 +1929,7 @@ public class PoRcpRmPmIC extends ValidatorEJB implements PoRcpRmPmICRemote, PoRc
pstmt = null; pstmt = null;
}else{ }else{
String mfgDate = checkNull(genericUtility.getColumnValue("mfg_date", allDom, "3" ));//genericUtility.getColumnValue( "mfg_date", dom ); String mfgDate = checkNull(genericUtility.getColumnValue("mfg_date", currDom, "3" ));//genericUtility.getColumnValue( "mfg_date", dom );
flag=DateValidation(mfgDate); flag=DateValidation(mfgDate);
//For check manfr date greator than sys date. //For check manfr date greator than sys date.
//Changed by Dhanraj on 20-Aug-14 For by mfg date validation with sys date in asn scannig case. //Changed by Dhanraj on 20-Aug-14 For by mfg date validation with sys date in asn scannig case.
...@@ -1884,12 +1939,17 @@ public class PoRcpRmPmIC extends ValidatorEJB implements PoRcpRmPmICRemote, PoRc ...@@ -1884,12 +1939,17 @@ public class PoRcpRmPmIC extends ValidatorEJB implements PoRcpRmPmICRemote, PoRc
System.out.println("mfg Date Less or equal than sys date flag== ["+flag+"] and ["+asnNo+"]"); System.out.println("mfg Date Less or equal than sys date flag== ["+flag+"] and ["+asnNo+"]");
//for exp date greator than mfg date. //for exp date greator than mfg date.
String expDate = checkNull(genericUtility.getColumnValue("expiry_date", allDom, "3" ));//genericUtility.getColumnValue( "exp_date", dom ); String expDate = checkNull(genericUtility.getColumnValue("expiry_date", currDom, "3" ));//genericUtility.getColumnValue( "exp_date", dom );
mfgDate = checkNull(genericUtility.getColumnValue("mfg_date", allDom, "3" ));//genericUtility.getColumnValue( "mfg_date", dom ); mfgDate = checkNull(genericUtility.getColumnValue("mfg_date", currDom, "3" ));//genericUtility.getColumnValue( "mfg_date", dom );
if("".equals(expDate) || expDate == null ){
flag="T";
}else{
flag=DateValidation(expDate,mfgDate); flag=DateValidation(expDate,mfgDate);
}
if(flag.equals("T")){//Then check exp date if(flag.equals("T")){//Then check exp date
System.out.println("Exp Date Greater than mfg date"); System.out.println("Exp Date Greater than mfg date");
}else{ }else{
errList.add( "VTMFGLXPDT" );//for exp date greater than mfg date. errList.add( "VTMFGLXPDT" );//for exp date greater than mfg date.
errFields.add( childNodeName.toLowerCase() ); errFields.add( childNodeName.toLowerCase() );
} }
...@@ -1900,23 +1960,6 @@ public class PoRcpRmPmIC extends ValidatorEJB implements PoRcpRmPmICRemote, PoRc ...@@ -1900,23 +1960,6 @@ public class PoRcpRmPmIC extends ValidatorEJB implements PoRcpRmPmICRemote, PoRc
} }
} }
}else if ( "quantity".equalsIgnoreCase( childNodeName ) ){
if(asnNo != null && !asnNo.equals("")){//protect ='1'
}else{//For Purchase order
System.out.println("RMPMReceipt Generation qty");
if ( childNode.getFirstChild() == null )
{
errList.add( "VTNULLQTYP" ); //quantity null not allowed.
errFields.add( childNodeName.toLowerCase() );
}else{
double qty=Double.parseDouble(checkNull(genericUtility.getColumnValue("quantity", allDom, "3" ).trim()));
if(qty <= 0){
errList.add( "VTNULLQTYP" ); //quantity null not allowed.
errFields.add( childNodeName.toLowerCase() );
}//max qty validation pending...
}
}
} }
else if ( "batch_no".equalsIgnoreCase( childNodeName ) ) //Changed by Dhanraj on 22-SEP-14 else if ( "batch_no".equalsIgnoreCase( childNodeName ) ) //Changed by Dhanraj on 22-SEP-14
{ {
...@@ -1926,7 +1969,7 @@ public class PoRcpRmPmIC extends ValidatorEJB implements PoRcpRmPmICRemote, PoRc ...@@ -1926,7 +1969,7 @@ public class PoRcpRmPmIC extends ValidatorEJB implements PoRcpRmPmICRemote, PoRc
System.out.println("RMPMReceipt batch_no validation"); System.out.println("RMPMReceipt batch_no validation");
String batchNo = checkNull(genericUtility.getColumnValue( "batch_no", currDom ));//challan no String batchNo = checkNull(genericUtility.getColumnValue( "batch_no", currDom ));//challan no
purcOrder = checkNull(genericUtility.getColumnValue("purc_order", allDom, "3" )); purcOrder = checkNull(genericUtility.getColumnValue("purc_order", allDom, "3" ));
itemCode = checkNull(genericUtility.getColumnValue("item_code", allDom, "3" ));//genericUtility.getColumnValue( "item_code", dom ); itemCode = checkNull(genericUtility.getColumnValue("item_code", currDom, "3" ));//genericUtility.getColumnValue( "item_code", dom );
String tranId = checkNull(genericUtility.getColumnValue("tran_id", allDom, "3" )); String tranId = checkNull(genericUtility.getColumnValue("tran_id", allDom, "3" ));
System.out.println(" batch_no "+batchNo+" , purcOrder "+purcOrder+" , itemCode "+itemCode+" tranId==> "+tranId); System.out.println(" batch_no "+batchNo+" , purcOrder "+purcOrder+" , itemCode "+itemCode+" tranId==> "+tranId);
/*sql = "SELECT COUNT(*) AS CNT FROM PORCPDET WHERE BATCH_NO = ? AND TRAN_ID <> ? "; /*sql = "SELECT COUNT(*) AS CNT FROM PORCPDET WHERE BATCH_NO = ? AND TRAN_ID <> ? ";
...@@ -3291,7 +3334,7 @@ private String disParmValue( Connection conn , String disparmVar ) throws ITMExc ...@@ -3291,7 +3334,7 @@ private String disParmValue( Connection conn , String disparmVar ) throws ITMExc
"SPEC_REF, PORCPDET.STD_RATE, PORCPDET.EFFECT_STOCK, PORCPDET.DEPT_CODE, PORCPDET.PHYSICAL_STATUS, PORCPDET.BENEFIT_TYPE, PORCPDET.LICENCE_NO, PORCPDET."+ "SPEC_REF, PORCPDET.STD_RATE, PORCPDET.EFFECT_STOCK, PORCPDET.DEPT_CODE, PORCPDET.PHYSICAL_STATUS, PORCPDET.BENEFIT_TYPE, PORCPDET.LICENCE_NO, PORCPDET."+
"ACCT_CODE__PROV_DR, PORCPDET.CCTR_CODE__PROV_DR, PORCPDET.ACCT_CODE__PROV_CR, PORCPDET.CCTR_CODE__PROV_CR, PORCPDET.FORM_NO, PORCPDET."+ "ACCT_CODE__PROV_DR, PORCPDET.CCTR_CODE__PROV_DR, PORCPDET.ACCT_CODE__PROV_CR, PORCPDET.CCTR_CODE__PROV_CR, PORCPDET.FORM_NO, PORCPDET."+
"RETEST_DATE, PORCPDET.ASSETINSTALL_QTY, PORCPDET.BATCH_SIZE, PORCPDET.DUTY_PAID, PORCPDET.SAMPLE_QTY, PORCPDET.DAMAGE_QTY, PORCPDET."+ "RETEST_DATE, PORCPDET.ASSETINSTALL_QTY, PORCPDET.BATCH_SIZE, PORCPDET.DUTY_PAID, PORCPDET.SAMPLE_QTY, PORCPDET.DAMAGE_QTY, PORCPDET."+
"SHELF_LIFE__TYPE, PORCPDET.REJC_QTY, PORCPDET.SH_QTY, ITEM.DESCR ITEM_DESCR, PORCPDET.QC_REQD, ITEM.SITE_CODE,PORCPDET.PARTIAL_YN "+ /*,PORCPDET.QTY_PER_ART*/ "SHELF_LIFE__TYPE, PORCPDET.REJC_QTY, PORCPDET.SH_QTY, ITEM.DESCR ITEM_DESCR, PORCPDET.QC_REQD, ITEM.SITE_CODE,PORCPDET.PARTIAL_YN,ITEM.TRACK_SHELF_LIFE "+ /*,PORCPDET.QTY_PER_ART*/
//Changed By Pragyan 21-APR-14 To check confirmed flag //Changed By Pragyan 21-APR-14 To check confirmed flag
//"FROM PORCPDET PORCPDET, ITEM ITEM WHERE PORCPDET.TRAN_ID = ? AND PORCPDET.ITEM_CODE = ITEM.ITEM_CODE ORDER BY PORCPDET.TRAN_ID, PORCPDET.LINE_NO "; //"FROM PORCPDET PORCPDET, ITEM ITEM WHERE PORCPDET.TRAN_ID = ? AND PORCPDET.ITEM_CODE = ITEM.ITEM_CODE ORDER BY PORCPDET.TRAN_ID, PORCPDET.LINE_NO ";
"FROM PORCPDET PORCPDET, ITEM ITEM,PORCP PORCP WHERE PORCP.TRAN_ID = PORCPDET.TRAN_ID AND PORCPDET.TRAN_ID = ? AND CASE WHEN PORCP.CONFIRMED IS NULL THEN 'N' ELSE PORCP.CONFIRMED END = 'N' AND PORCPDET.ITEM_CODE = ITEM.ITEM_CODE ORDER BY PORCPDET.TRAN_ID, PORCPDET.LINE_NO "; "FROM PORCPDET PORCPDET, ITEM ITEM,PORCP PORCP WHERE PORCP.TRAN_ID = PORCPDET.TRAN_ID AND PORCPDET.TRAN_ID = ? AND CASE WHEN PORCP.CONFIRMED IS NULL THEN 'N' ELSE PORCP.CONFIRMED END = 'N' AND PORCPDET.ITEM_CODE = ITEM.ITEM_CODE ORDER BY PORCPDET.TRAN_ID, PORCPDET.LINE_NO ";
...@@ -3305,6 +3348,7 @@ private String disParmValue( Connection conn , String disparmVar ) throws ITMExc ...@@ -3305,6 +3348,7 @@ private String disParmValue( Connection conn , String disparmVar ) throws ITMExc
String mfgDateStr = ""; String mfgDateStr = "";
String lpnNo = ""; String lpnNo = "";
String locCode = ""; String locCode = "";
String trackShelfLife="";
String siteCodeMfg = "";//Added By Mahesh Patidar on 29/06/12 String siteCodeMfg = "";//Added By Mahesh Patidar on 29/06/12
//String expDate = ""; //String expDate = "";
...@@ -3328,7 +3372,9 @@ private String disParmValue( Connection conn , String disparmVar ) throws ITMExc ...@@ -3328,7 +3372,9 @@ private String disParmValue( Connection conn , String disparmVar ) throws ITMExc
lotNo = checkNullAndTrim(rs.getString("LOT_NO")); lotNo = checkNullAndTrim(rs.getString("LOT_NO"));
lpnNo = checkNullAndTrim(rs.getString("LOT_SL")); lpnNo = checkNullAndTrim(rs.getString("LOT_SL"));
locCode = checkNull(rs.getString("LOC_CODE")); locCode = checkNull(rs.getString("LOC_CODE"));
siteCodeMfg = checkNull(rs.getString("SITE_CODE"));//Added By Mahesh Patidar on 29/06/12 siteCodeMfg = checkNullNotTrim(rs.getString("SITE_CODE"));//Added By Mahesh Patidar on 29/06/12
trackShelfLife = checkNull(rs.getString("TRACK_SHELF_LIFE"));
if ( lotNo.trim().length() > 0 && lpnNo.trim().length() > 0 && locCode.trim().length() > 0 ) if ( lotNo.trim().length() > 0 && lpnNo.trim().length() > 0 && locCode.trim().length() > 0 )
{ {
...@@ -3412,8 +3458,17 @@ private String disParmValue( Connection conn , String disparmVar ) throws ITMExc ...@@ -3412,8 +3458,17 @@ private String disParmValue( Connection conn , String disparmVar ) throws ITMExc
if(asnNo != null && !asnNo.equals("")){//protect ='1' if(asnNo != null && !asnNo.equals("")){//protect ='1'
valueXmlString.append( "<expiry_date protect ='1'><![CDATA[" ).append( expDate ).append( "]]></expiry_date>\r\n" ); valueXmlString.append( "<expiry_date protect ='1'><![CDATA[" ).append( expDate ).append( "]]></expiry_date>\r\n" );
}else{ }else{
if("Y".equalsIgnoreCase(trackShelfLife)){
valueXmlString.append( "<expiry_date><![CDATA[" ).append( expDate ).append( "]]></expiry_date>\r\n" ); valueXmlString.append( "<expiry_date><![CDATA[" ).append( expDate ).append( "]]></expiry_date>\r\n" );
}else{
expDate="";
valueXmlString.append( "<expiry_date protect ='1'><![CDATA[" ).append( expDate ).append( "]]></expiry_date>\r\n" );
}
}
}else{
if(!"Y".equalsIgnoreCase(trackShelfLife)){
expDate="";
valueXmlString.append( "<expiry_date protect ='1'><![CDATA[" ).append( expDate ).append( "]]></expiry_date>\r\n" );
} }
} }
valueXmlString.append("<gross_weight><![CDATA[").append(rs.getDouble("GROSS_WEIGHT")).append("]]></gross_weight>\r\n"); valueXmlString.append("<gross_weight><![CDATA[").append(rs.getDouble("GROSS_WEIGHT")).append("]]></gross_weight>\r\n");
...@@ -3636,7 +3691,7 @@ private String disParmValue( Connection conn , String disparmVar ) throws ITMExc ...@@ -3636,7 +3691,7 @@ private String disParmValue( Connection conn , String disparmVar ) throws ITMExc
"PDET.UNIT__STD, PDET.QUANTITY__STDUOM, PDET.RATE__STDUOM, "+ "PDET.UNIT__STD, PDET.QUANTITY__STDUOM, PDET.RATE__STDUOM, "+
"PDET.NO_ART, PDET.ACCT_CODE__DR, PDET.CCTR_CODE__DR, PDET.ACCT_CODE__CR, "+ "PDET.NO_ART, PDET.ACCT_CODE__DR, PDET.CCTR_CODE__DR, PDET.ACCT_CODE__CR, "+
"PDET.CCTR_CODE__CR, PDET.RATE__CLG, PDET.STD_RATE,"+ "PDET.CCTR_CODE__CR, PDET.RATE__CLG, PDET.STD_RATE,"+
"ITEM.CANC_BO_MODE, ITEM.SHELF_LIFE, ITEM.DESCR ITEM_DESCR , PDET.PACK_CODE ,ITEM.SITE_CODE "+ //ITEM.SITE_CODE ADDED BY ASHISH as per manoharan Sir 28/08/12 "ITEM.CANC_BO_MODE, ITEM.SHELF_LIFE, ITEM.DESCR ITEM_DESCR , PDET.PACK_CODE ,ITEM.SITE_CODE,ITEM.TRACK_SHELF_LIFE "+ //ITEM.SITE_CODE ADDED BY ASHISH as per manoharan Sir 28/08/12
"FROM PORDER PO,PORDDET PDET, ITEM ITEM "+ "FROM PORDER PO,PORDDET PDET, ITEM ITEM "+
"WHERE PO.PURC_ORDER = PDET.PURC_ORDER "+ "WHERE PO.PURC_ORDER = PDET.PURC_ORDER "+
"AND PO.PURC_ORDER = ? "+ "AND PO.PURC_ORDER = ? "+
...@@ -3708,8 +3763,11 @@ private String disParmValue( Connection conn , String disparmVar ) throws ITMExc ...@@ -3708,8 +3763,11 @@ private String disParmValue( Connection conn , String disparmVar ) throws ITMExc
//ADET.SITE_CODE__MFG,ADET.SUPP_CODE__MNFR //ADET.SITE_CODE__MFG,ADET.SUPP_CODE__MNFR
selfLife = rs.getInt("SHELF_LIFE"); selfLife = rs.getInt("SHELF_LIFE");
String trackShelfLife= rs.getString("TRACK_SHELF_LIFE");
siteCodeMf=rs.getString("SITE_CODE"); //Already from item table System.out.println(" trackShelfLife=================> "+trackShelfLife);
siteCodeMf=checkNullAndTrim(rs.getString("SITE_CODE")); //Already from item table
System.out.println("@@@@siteCodeMf ["+siteCodeMf+"]"); System.out.println("@@@@siteCodeMf ["+siteCodeMf+"]");
/*Added By Ashish Sonawane on 03/Aug/12 for condition when maintaining lot master is true [END] */ /*Added By Ashish Sonawane on 03/Aug/12 for condition when maintaining lot master is true [END] */
...@@ -3790,13 +3848,13 @@ private String disParmValue( Connection conn , String disparmVar ) throws ITMExc ...@@ -3790,13 +3848,13 @@ private String disParmValue( Connection conn , String disparmVar ) throws ITMExc
{ System.out.println(" For ASN 2"); { System.out.println(" For ASN 2");
//Old logic... //Old logic...
if ( expDateDb != null ) if ( expDateDb != null || !"".equals(expDateDb))
{ {
expDate = dateFormat.format(expDateDb); expDate = dateFormat.format(expDateDb);
System.out.println(" expDate 1==>"+expDate); System.out.println(" expDate 1==>"+expDate);
} }
//Changed by Dhanraj on 20-AUG-14 for --if expdate insert when create asn then set it other wise expDate get from ITEM_LOT_INFO table as per old system. //Changed by Dhanraj on 20-AUG-14 for --if expdate insert when create asn then set it other wise expDate get from ITEM_LOT_INFO table as per old system.
if ( lotExpDateForByPass != null ) if ( lotExpDateForByPass != null || !"".equals(lotExpDateForByPass))
{ {
expDate = dateFormat.format(lotExpDateForByPass); expDate = dateFormat.format(lotExpDateForByPass);
System.out.println(" expDate 2==>"+expDate); System.out.println(" expDate 2==>"+expDate);
...@@ -3840,7 +3898,7 @@ private String disParmValue( Connection conn , String disparmVar ) throws ITMExc ...@@ -3840,7 +3898,7 @@ private String disParmValue( Connection conn , String disparmVar ) throws ITMExc
System.out.println(" For Purchase 2"); System.out.println(" For Purchase 2");
pstmtItemLotPack.setString(1, itemCode); pstmtItemLotPack.setString(1, itemCode);
System.out.println(" currentColumn=====>"+currentColumn); System.out.println(" currentColumn=====>"+currentColumn);
if(currentColumn.trim().equalsIgnoreCase( "no_art"))//this code not call because itemchanged not work in mobile browser. /*if(currentColumn.trim().equalsIgnoreCase( "no_art"))//this code not call because itemchanged not work in mobile browser.
{ {
System.out.println("CALL ITEMCHANGE Dhanraj"); System.out.println("CALL ITEMCHANGE Dhanraj");
if(genericUtility.getColumnValue("no_art",currDom)!= null) if(genericUtility.getColumnValue("no_art",currDom)!= null)
...@@ -3852,7 +3910,7 @@ private String disParmValue( Connection conn , String disparmVar ) throws ITMExc ...@@ -3852,7 +3910,7 @@ private String disParmValue( Connection conn , String disparmVar ) throws ITMExc
System.out.println("CALL ITEMCHANGE Dhanraj" +quantity); System.out.println("CALL ITEMCHANGE Dhanraj" +quantity);
netAmt = (quantity * rate); netAmt = (quantity * rate);
//noArt //noArt
} }*/
System.out.println("Quantity===> "+quantity); System.out.println("Quantity===> "+quantity);
System.out.println("no_art===> "+noArt); System.out.println("no_art===> "+noArt);
...@@ -4057,11 +4115,14 @@ private String disParmValue( Connection conn , String disparmVar ) throws ITMExc ...@@ -4057,11 +4115,14 @@ private String disParmValue( Connection conn , String disparmVar ) throws ITMExc
//CHANGED BY DHANRAJ ON 14-08-14 FOR DEFAULT DATE FORAMTO //CHANGED BY DHANRAJ ON 14-08-14 FOR DEFAULT DATE FORAMTO
java.util.Date currentDate = new java.util.Date(); java.util.Date currentDate = new java.util.Date();
//SimpleDateFormat sdfDestination = new SimpleDateFormat(applDateFormat); //SimpleDateFormat sdfDestination = new SimpleDateFormat(applDateFormat);
expDate = dateFormat.format(currentDate); expDate = dateFormat.format(currentDate);
System.out.println("Default exp date(current date) =======>>"+expDate); System.out.println("Default exp date(current date) =======>>"+expDate);
//Changed by Dhanraj as for RMPM-MFG Date Calculation as disparm table on 22-SEP-14 //Changed by Dhanraj as for RMPM-MFG Date Calculation as disparm table on 22-SEP-14
//MFG date calculation calculated mfgDate - dispham var value as per pragyan sir //MFG date calculation calculated mfgDate - dispham var value as per pragyan sir
String mfgDateCal = distComm.getDisparams("999999","PRCP_MFG_DATE_VALUE",conn); String mfgDateCal = distComm.getDisparams("999999","PRCP_MFG_DATE_VALUE",conn);
System.out.println("PRCP_MFG_DATE_VALUE ==>"+mfgDateCal); System.out.println("PRCP_MFG_DATE_VALUE ==>"+mfgDateCal);
int mfgDateCalInt=0; int mfgDateCalInt=0;
if("".equals(mfgDateCal)){ if("".equals(mfgDateCal)){
...@@ -4078,6 +4139,8 @@ private String disParmValue( Connection conn , String disparmVar ) throws ITMExc ...@@ -4078,6 +4139,8 @@ private String disParmValue( Connection conn , String disparmVar ) throws ITMExc
System.out.println("MFG DATE Get date after calculation==> "+result); System.out.println("MFG DATE Get date after calculation==> "+result);
System.out.println(" MFG DATE Format convertedDate==>"+expDateStr); System.out.println(" MFG DATE Format convertedDate==>"+expDateStr);
//Expire date calculation calculated mfgDate + self_lite val as per pragyan sir //Expire date calculation calculated mfgDate + self_lite val as per pragyan sir
if("Y".equalsIgnoreCase(trackShelfLife))
{
cal = Calendar.getInstance(); cal = Calendar.getInstance();
Timestamp timestam= new Timestamp(result.getTime()); Timestamp timestam= new Timestamp(result.getTime());
Timestamp expDateTimeStamp = distComm.CalcExpiry( timestam, selfLife); Timestamp expDateTimeStamp = distComm.CalcExpiry( timestam, selfLife);
...@@ -4086,13 +4149,19 @@ private String disParmValue( Connection conn , String disparmVar ) throws ITMExc ...@@ -4086,13 +4149,19 @@ private String disParmValue( Connection conn , String disparmVar ) throws ITMExc
cal.add(Calendar.MONTH, + selfLife); cal.add(Calendar.MONTH, + selfLife);
result = cal.getTime(); result = cal.getTime();
expDate = dateFormat.format(result); expDate = dateFormat.format(result);
}else{
expDate="";
}
System.out.println("Shelf Life===>"+selfLife); System.out.println("Shelf Life===>"+selfLife);
System.out.println("EXP DATE Get date after calculation==> "+result); System.out.println("EXP DATE Get date after calculation==> "+result);
System.out.println("EXP DATE Format convertedDate==>"+expDate); System.out.println("EXP DATE Format convertedDate==>"+expDate);
//End 22-SEP-14 //End 22-SEP-14
if("Y".equalsIgnoreCase(trackShelfLife)){
valueXmlString.append("<expiry_date><![CDATA[").append(expDate).append("]]></expiry_date>\r\n"); valueXmlString.append("<expiry_date><![CDATA[").append(expDate).append("]]></expiry_date>\r\n");
}else{
valueXmlString.append("<expiry_date protect ='1'><![CDATA[").append(expDate).append("]]></expiry_date>\r\n");
}
valueXmlString.append("<mfg_date><![CDATA[").append(expDateStr).append("]]></mfg_date>\r\n"); valueXmlString.append("<mfg_date><![CDATA[").append(expDateStr).append("]]></mfg_date>\r\n");
} }
valueXmlString.append("<gross_weight><![CDATA[").append(grossWeight * noArt).append("]]></gross_weight>\r\n"); valueXmlString.append("<gross_weight><![CDATA[").append(grossWeight * noArt).append("]]></gross_weight>\r\n");
......
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