Skip to content

B
business-java
Commit 6dce5d8b authored by pjain's avatar pjain
Browse files
Options

changed by sankara on 21//04/14 updated... 

changed by sankara on 21//04/14 updated replissconf,palletnoic,wavegenerationprc messages sql for wms live


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@94625 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 47625369
Hide whitespace changes
Inline Side-by-side
Showing with 122 additions and 11 deletions
webitm-wms/ibase/webitm/ejb/wms/PalletNoIC.java
View file @ 6dce5d8b
......@@ -117,6 +117,8 @@ public class PalletNoIC extends ValidatorEJB implements PalletNoICLocal, PalletN
String palletNoDom = "";
String palletNoDb = "",trfStatus = "N" ;
String objName = "";//Added by sumit on 21/01/13
//Changed By Pragyan 21-APR-14 to check the cofirmed flag for pick issue hader.
String confirmedFlag = "";
int count = 0, cnt = 0;
int rowCount = 0;
......@@ -285,11 +287,15 @@ public class PalletNoIC extends ValidatorEJB implements PalletNoICLocal, PalletN
if("M".equalsIgnoreCase(pickType)) //For master pack
{
sql = "SELECT CASE WHEN TRF_STATUS IS NULL THEN 'N' ELSE TRF_STATUS END AS TRF_STATUS FROM PICK_ISS_HDR WHERE PALLET_NO = ? AND PICK_TYPE = 'M'";
//Changed By Pragyan 21-APR-14 to check the cofirmed flag for pick issue hader.
//sql = "SELECT CASE WHEN TRF_STATUS IS NULL THEN 'N' ELSE TRF_STATUS END AS TRF_STATUS FROM PICK_ISS_HDR WHERE PALLET_NO = ? AND PICK_TYPE = 'M'";
sql = "SELECT CONFIRMED,CASE WHEN TRF_STATUS IS NULL THEN 'N' ELSE TRF_STATUS END AS TRF_STATUS FROM PICK_ISS_HDR WHERE PALLET_NO = ? AND PICK_TYPE = 'M'";
}
else
{
sql = "SELECT CASE WHEN TRF_STATUS IS NULL THEN 'N' ELSE TRF_STATUS END AS TRF_STATUS FROM PICK_ISS_HDR WHERE PALLET_NO = ? AND PICK_TYPE = 'A'";
//Changed By Pragyan 21-APR-14 to check the cofirmed flag for pick issue hader.
//sql = "SELECT CASE WHEN TRF_STATUS IS NULL THEN 'N' ELSE TRF_STATUS END AS TRF_STATUS FROM PICK_ISS_HDR WHERE PALLET_NO = ? AND PICK_TYPE = 'A'";
sql = "SELECT CONFIRMED,CASE WHEN TRF_STATUS IS NULL THEN 'N' ELSE TRF_STATUS END AS TRF_STATUS FROM PICK_ISS_HDR WHERE PALLET_NO = ? AND PICK_TYPE = 'A'";
}
pstmt = conn.prepareStatement( sql );
pstmt.setString( 1, palletNoDom.trim());
......@@ -298,6 +304,7 @@ public class PalletNoIC extends ValidatorEJB implements PalletNoICLocal, PalletN
{
//cnt=rs.getInt(1);
trfStatus = rs.getString("TRF_STATUS");
confirmedFlag = rs.getString("CONFIRMED");
}
//if(cnt == 0)
else
......@@ -309,11 +316,21 @@ public class PalletNoIC extends ValidatorEJB implements PalletNoICLocal, PalletN
rs = null;
pstmt.close();
pstmt = null;
if ("Y".equals(trfStatus))
{
errList.add( "VTPLTTRF" );
errFields.add( childNodeName.toLowerCase() );
}
}
//Changed By Pragyan 21-APR-14 to check the cofirmed flag for pick issue hader.start
if ("N".equals(confirmedFlag))
{
errList.add( "VTPKNTCONF" );
errFields.add( childNodeName.toLowerCase() );
}
//Changed By Pragyan 21-APR-14 to check the cofirmed flag for pick issue hader.end
//Changed by sumit on 21/01/13 adding validation to prevent doc transfer in case of M-PACK not done start
sql = "SELECT PH.CONFIRMED FROM PICK_ISS_HDR PIH, PACK_HDR PH WHERE PIH.PICK_ORDER = PH.PICK_ORDER AND PIH.PALLET_NO = ? AND PIH.PICK_TYPE = 'M' ";
......
webitm-wms/ibase/webitm/ejb/wms/ReplIssConf.java
View file @ 6dce5d8b
......@@ -549,16 +549,16 @@ public class ReplIssConf extends ActionHandlerEJB implements ReplIssConfRemote,
" AND FN_IS_VALID_PICK_ORDER(P.PICK_ORDER) = 'Y'";*/
sql = "SELECT * FROM PICK_ORD_DET P WHERE P.REPL_ORDER = ? AND P.LINE_NO__REPL =? "
+ " AND FN_IS_VALID_PICK_ORDER(P.PICK_ORDER) = 'Y' "
+ " AND FN_IS_VALID_PICK_ORDER(P.PICK_ORDER) = 'Y' AND (QUANTITY -(CASE WHEN DEALLOC_QTY IS NULL THEN 0 ELSE DEALLOC_QTY END)) > 0 "
+ " UNION ALL "
+ " SELECT * FROM PICK_ORD_DET WHERE (REPL_ORDER, LINE_NO__REPL) IN ( "
+ " SELECT REPL_ORDER , LINE_NO FROM REPL_ORD_DET WHERE PICK_ORDER = ? AND LINE_NO__PICK =? ) "
+ " AND FN_IS_VALID_PICK_ORDER(PICK_ORDER) = 'Y' "
+ " AND FN_IS_VALID_PICK_ORDER(PICK_ORDER) = 'Y' AND (QUANTITY -(CASE WHEN DEALLOC_QTY IS NULL THEN 0 ELSE DEALLOC_QTY END)) > 0 "
+ " UNION ALL "
+ " SELECT * FROM PICK_ORD_DET WHERE (REPL_ORDER, LINE_NO__REPL) IN ( "
+ " SELECT REPL_ORDER,LINE_NO FROM REPL_ORD_DET WHERE (PICK_ORDER,LINE_NO__PICK) IN ( "
+ " (SELECT REPL_ORDER , LINE_NO FROM REPL_ORD_DET WHERE PICK_ORDER =? AND LINE_NO__PICK = ? ))) "
+ " AND FN_IS_VALID_PICK_ORDER(PICK_ORDER) = 'Y' ";
+ " AND FN_IS_VALID_PICK_ORDER(PICK_ORDER) = 'Y' AND (QUANTITY -(CASE WHEN DEALLOC_QTY IS NULL THEN 0 ELSE DEALLOC_QTY END)) > 0";
//Changed by sumit on 08/02/13 changed the sql ( Told Manoharan Sir) end
......
webitm-wms/ibase/webitm/ejb/wms/WaveGenerationPrc.java
View file @ 6dce5d8b
......@@ -10163,7 +10163,16 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pstmtRplDet.setString(8,lotNo);
pstmtRplDet.setString(9,lotSl);
pstmtRplDet.setDouble(10,( Double.parseDouble(replQuantity)/packSizeCase));
pstmtRplDet.setDouble(11, Double.parseDouble(replQuantity));//Changes Done By Ashish
if(!( Double.parseDouble(replQuantity) < packSizeCase))
{
pstmtRplDet.setDouble(11, Double.parseDouble(replQuantity));//Changes Done By Ashish
}
else
{
errString = itmDBAccessEJB.getErrorString("","VTREPLQUAN","","",conn);
return errString;
}
/*pstmtRplDet.setString(12,replRefPNDId);
pstmtRplDet.setInt(13,replCtr);*/
pstmtRplDet.setString(12,"");
......@@ -10538,7 +10547,15 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pstmtRplDet.setString(8,lotNo);
pstmtRplDet.setString(9,lotSl);
pstmtRplDet.setDouble(10,( Double.parseDouble(replQuantity)/packSizeCase));
pstmtRplDet.setDouble(11, Double.parseDouble(replQuantity));
if(!( Double.parseDouble(replQuantity) < packSizeCase))
{
pstmtRplDet.setDouble(11, Double.parseDouble(replQuantity));
}
else
{
errString = itmDBAccessEJB.getErrorString("","VTREPLQUAN","","",conn);
return errString;
}
/*pstmtRplDet.setString(12,replRefPNDId);
pstmtRplDet.setInt(13,replCtr);*/
pstmtRplDet.setString(12,"");
......@@ -11419,7 +11436,16 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pstmtRplDet.setString(8,lotNo);
pstmtRplDet.setString(9,lotSl);
pstmtRplDet.setDouble(10,Double.parseDouble(noArt));
pstmtRplDet.setDouble(11, casePackSize);
if(!(casePackSize < packSizeCase))
{
pstmtRplDet.setDouble(11, casePackSize);
}
else
{
errString = itmDBAccessEJB.getErrorString("","VTREPLQUAN","","",conn);
return errString;
}
pstmtRplDet.setInt(13,replCnt);
pstmtRplDet.setString(14,expLevel);
/*
......@@ -11618,7 +11644,16 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
caspkLocationset.add(locCodeCase);
//Changed by Rohan on 08-02-13 to insert 1 case into Quantity block
//pstmtRplDet.setDouble(11, pendActQty);
pstmtRplDet.setDouble(11, packSizeCase);
if(!(casePackSize < packSizeCase))
{
pstmtRplDet.setDouble(11, packSizeCase);
}
else
{
errString = itmDBAccessEJB.getErrorString("","VTREPLQUAN","","",conn);
return errString;
}
pstmtRplDet.setString(12,acPrvReplOrder);
pstmtRplDet.setInt(13,Integer.parseInt(acPrvLineNo));
pstmtRplDet.setString(15,locCodeCaseAct);
......
webitm-wms/module-resource/sql/update.sql
View file @ 6dce5d8b
......@@ -45213,4 +45213,63 @@ VALUES (
'BASE ',
NULL,
NULL);
commit;
commit;
--changed by sankara on 21/04/14 updated messages sql for wms live
INSERT INTO messages (
msg_no ,
msg_str ,
msg_descr ,
msg_type ,
msg_opt ,
msg_time ,
alarm ,
err_source ,
chg_date ,
chg_user ,
chg_term ,
override_input ,
mail_option )
VALUES (
'VTREPLQUAN',
'Invalid quantity',
'Repelinishment quantity Should not be less then Shipper size',
'E',
'Y',
NULL,
NULL,
NULL,
fn_sysdate(),
'Base ',
'Base ',
NULL,
NULL);
INSERT INTO messages (
msg_no ,
msg_str ,
msg_descr ,
msg_type ,
msg_opt ,
msg_time ,
alarm ,
err_source ,
chg_date ,
chg_user ,
chg_term ,
override_input ,
mail_option )
VALUES (
'VTPKNTCONF',
'Dock Transfer Not allowed',
'Picking Task is completed on this pallet, So Dock Trasfer Not allowed',
'E',
'Y',
NULL,
NULL,
NULL,
fn_sysdate(),
'Base ',
'Base ',
NULL,
NULL);
commit;
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