Skip to content

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

changed by sankara on 14/10/14 updated source and metadata and sql 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@96595 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 3286af3e
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 484 additions and 30 deletions
webitm-wms/ibase/webitm/ejb/wms/PoRcpIC.java
View file @ a570eecd
......@@ -2628,15 +2628,15 @@ public class PoRcpIC extends ValidatorEJB implements PoRcpICRemote, PoRcpICLocal
lineNoOrd = " " + lineNoOrd;
lineNoOrd = lineNoOrd.substring( lineNoOrd.length()-3 );
itemCode = rs.getString("ITEM_CODE");
//changed by sankara on 14/10/14 for added checknull condition
itemCode = checkNull(rs.getString("ITEM_CODE")) ;
quantity = rs.getDouble("QUANTITY");
unit = rs.getString("UNIT");
unit = checkNull(rs.getString("UNIT"));
rate = rs.getDouble("RATE");
expDateDb = rs.getTimestamp("EXP_DATE");
selfLife = rs.getInt("SHELF_LIFE");
lotNo = rs.getString("LOT_NO");
siteCodeMf=rs.getString("SITE_CODE");
lotNo = checkNull(rs.getString("LOT_NO"));
siteCodeMf= checkNull(rs.getString("SITE_CODE"));
System.out.println("@@@@siteCodeMf ["+siteCodeMf+"]");
//Changed by Pragyan on 08-Aug-14 Add function for get available for receipt .
......
webitm-wms/ibase/webitm/ejb/wms/ReplTaskShowDetail.java
View file @ a570eecd
......@@ -119,7 +119,7 @@ public class ReplTaskShowDetail extends ValidatorEJB implements ReplTaskShowDeta
//replenishment end..
// active replenishment start..
sql = " SELECT COUNT(RH.REPL_ORDER) AS COUNT FROM WAVE_TASK W, WAVE_TASK_DET WT, REPL_ORD_HDR RH, REPL_ORD_DET RT " + //created
sql = " SELECT COUNT( DISTINCT RH.REPL_ORDER) AS COUNT FROM WAVE_TASK W, WAVE_TASK_DET WT, REPL_ORD_HDR RH, REPL_ORD_DET RT " + //created
" WHERE W.WAVE_ID = WT.WAVE_ID AND WT.REF_ID = RH.REPL_ORDER AND RH.REPL_ORDER = RT.REPL_ORDER AND ( RT.CANCEL_MODE = 'N' OR RT.CANCEL_MODE IS NULL ) " +
" AND W.CANCEL ='N' AND WT.STATUS ='N' AND WT.WAVE_STATUS ='C' AND RH.ORDER_TYPE IN ('E','Q','T','P','I') ";
pstmt = conn.prepareStatement(sql);
......@@ -133,7 +133,7 @@ public class ReplTaskShowDetail extends ValidatorEJB implements ReplTaskShowDeta
pstmt.close();
pstmt = null;
sql = " SELECT COUNT (RH.REPL_ORDER) AS COUNT FROM REPL_ORD_HDR RH, REPL_ORD_DET RT, WAVE_TASK W, WAVE_TASK_DET WT, " + //verified
sql = " SELECT COUNT ( DISTINCT RH.REPL_ORDER) AS COUNT FROM REPL_ORD_HDR RH, REPL_ORD_DET RT, WAVE_TASK W, WAVE_TASK_DET WT, " + //verified
" REPL_ISS_HDR RIH, REPL_ISS_DET RIT WHERE RH.REPL_ORDER = RT.REPL_ORDER AND W.WAVE_ID = WT.WAVE_ID AND RH.REPL_ORDER = RIT.REPL_ORDER "+
" AND RH.REPL_ORDER = RIH.REPL_ORDER AND RH.REPL_ORDER = WT.REF_ID AND RIH.CONFIRMED ='Y' AND WT.WAVE_STATUS ='V' " +
" AND (RT.CANCEL_MODE ='N' OR RT.CANCEL_MODE IS NULL) AND W.CANCEL ='N' AND RH.ORDER_TYPE IN ('E','Q','T','P','I') ";
......@@ -148,7 +148,7 @@ public class ReplTaskShowDetail extends ValidatorEJB implements ReplTaskShowDeta
pstmt.close();
pstmt = null;
sql = " SELECT COUNT (RH.REPL_ORDER) AS COUNT FROM REPL_ORD_HDR RH, WAVE_TASK W, WAVE_TASK_DET WT, REPL_ORD_DET RT" +
sql = " SELECT COUNT ( DISTINCT RH.REPL_ORDER) AS COUNT FROM REPL_ORD_HDR RH, WAVE_TASK W, WAVE_TASK_DET WT, REPL_ORD_DET RT" +
" WHERE W.WAVE_ID = WT.WAVE_ID AND RH.REPL_ORDER = WT.REF_ID AND RH.REPL_ORDER = RT.REPL_ORDER AND WT.STATUS = 'N' " +
" AND (RT.CANCEL_MODE ='N' OR RT.CANCEL_MODE IS NULL) AND W.CANCEL ='N' AND WT.WAVE_STATUS = 'W' AND RH.ORDER_TYPE IN ('E','Q','T','P','I') " ;
pstmt = conn.prepareStatement(sql);
......@@ -164,7 +164,7 @@ public class ReplTaskShowDetail extends ValidatorEJB implements ReplTaskShowDeta
// active replenishment end..
//pick start
sql = " SELECT COUNT (PH.PICK_ORDER) AS COUNT FROM WAVE_TASK W, WAVE_TASK_DET WT, PICK_ORD_HDR PH, PICK_ORD_DET PT, ITEM I WHERE W.WAVE_ID = WT.WAVE_ID "+
sql = " SELECT COUNT ( DISTINCT PH.PICK_ORDER) AS COUNT FROM WAVE_TASK W, WAVE_TASK_DET WT, PICK_ORD_HDR PH, PICK_ORD_DET PT, ITEM I WHERE W.WAVE_ID = WT.WAVE_ID "+
" AND WT.REF_ID = PH.PICK_ORDER AND PT.ITEM_CODE = I.ITEM_CODE AND PT.PICK_ORDER = WT.REF_ID AND WT.SALE_ORDER = PT.SALE_ORDER AND (I.HAZARDOUS ='N' OR I.HAZARDOUS IS NULL ) AND WT.WAVE_STATUS ='C' AND WT.STATUS ='N' " +
" AND W.CANCEL ='N' AND WT.REF_SER IN('C-PICK','M-PICK','P-PICK') ";
pstmt = conn.prepareStatement(sql);
......@@ -178,7 +178,7 @@ public class ReplTaskShowDetail extends ValidatorEJB implements ReplTaskShowDeta
pstmt.close();
pstmt = null;
sql = " SELECT COUNT (PH.PICK_ORDER) AS COUNT FROM PICK_ORD_HDR PH, PICK_ORD_DET PT, WAVE_TASK W, WAVE_TASK_DET WT, PICK_ISS_HDR PIH, PICK_ISS_DET PIT, ITEM I " +
sql = " SELECT COUNT ( DISTINCT PH.PICK_ORDER) AS COUNT FROM PICK_ORD_HDR PH, PICK_ORD_DET PT, WAVE_TASK W, WAVE_TASK_DET WT, PICK_ISS_HDR PIH, PICK_ISS_DET PIT, ITEM I " +
" WHERE W.WAVE_ID = WT.WAVE_ID AND PH.PICK_ORDER = PIT.PICK_ORDER AND PH.PICK_ORDER = PIH.PICK_ORDER AND PH.PICK_ORDER = WT.REF_ID " +
" AND PT.ITEM_CODE = I.ITEM_CODE AND WT.SALE_ORDER = PT.SALE_ORDER AND (I.HAZARDOUS ='N' OR I.HAZARDOUS IS NULL) AND PIH.CONFIRMED ='Y' AND W.CANCEL ='N' AND WT.REF_SER IN('C-PICK','M-PICK','P-PICK') AND WT.WAVE_STATUS = 'V' " ;
......@@ -193,7 +193,7 @@ public class ReplTaskShowDetail extends ValidatorEJB implements ReplTaskShowDeta
pstmt.close();
pstmt = null;
sql = " SELECT COUNT (PH.PICK_ORDER) AS COUNT FROM PICK_ORD_HDR PH, PICK_ORD_DET PT, WAVE_TASK W, WAVE_TASK_DET WT, ITEM I WHERE W.WAVE_ID = WT.WAVE_ID " +
sql = " SELECT COUNT ( DISTINCT PH.PICK_ORDER) AS COUNT FROM PICK_ORD_HDR PH, PICK_ORD_DET PT, WAVE_TASK W, WAVE_TASK_DET WT, ITEM I WHERE W.WAVE_ID = WT.WAVE_ID " +
" AND PH.PICK_ORDER = WT.REF_ID AND PT.ITEM_CODE = I.ITEM_CODE AND PT.PICK_ORDER = WT.REF_ID AND WT.SALE_ORDER = PT.SALE_ORDER AND (I.HAZARDOUS ='N' OR I.HAZARDOUS IS NULL) AND WT.STATUS = 'N' AND W.CANCEL ='N' " +
" AND WT.WAVE_STATUS = 'W' AND WT.REF_SER IN('C-PICK','M-PICK','P-PICK') ";
pstmt = conn.prepareStatement(sql);
......@@ -209,7 +209,7 @@ public class ReplTaskShowDetail extends ValidatorEJB implements ReplTaskShowDeta
//pick end
//Active pick start
sql = " SELECT COUNT (PH.PICK_ORDER) AS COUNT FROM WAVE_TASK W, WAVE_TASK_DET WT, PICK_ORD_HDR PH, PICK_ORD_DET PT WHERE W.WAVE_ID = WT.WAVE_ID "+
sql = " SELECT COUNT ( DISTINCT PH.PICK_ORDER) AS COUNT FROM WAVE_TASK W, WAVE_TASK_DET WT, PICK_ORD_HDR PH, PICK_ORD_DET PT WHERE W.WAVE_ID = WT.WAVE_ID "+
" AND WT.REF_ID = PH.PICK_ORDER AND PH.PICK_ORDER = PT.PICK_ORDER AND W.CANCEL ='N' AND WT.STATUS ='N' AND WT.WAVE_STATUS ='C' AND WT.REF_SER IN('A-PICK') ";
pstmt = conn.prepareStatement(sql);
......@@ -223,7 +223,7 @@ public class ReplTaskShowDetail extends ValidatorEJB implements ReplTaskShowDeta
pstmt.close();
pstmt = null;
sql = " SELECT COUNT (PH.PICK_ORDER) AS COUNT FROM PICK_ORD_HDR PH, PICK_ORD_DET PT, WAVE_TASK W, WAVE_TASK_DET WT, PICK_ISS_HDR PIH, PICK_ISS_DET PIT " +
sql = " SELECT COUNT ( DISTINCT PH.PICK_ORDER) AS COUNT FROM PICK_ORD_HDR PH, PICK_ORD_DET PT, WAVE_TASK W, WAVE_TASK_DET WT, PICK_ISS_HDR PIH, PICK_ISS_DET PIT " +
" WHERE PH.PICK_ORDER = PT.PICK_ORDER AND W.WAVE_ID = WT.WAVE_ID AND PH.PICK_ORDER = PIT.PICK_ORDER AND PH.PICK_ORDER = PIH.PICK_ORDER AND PH.PICK_ORDER = WT.REF_ID " +
" AND W.CANCEL ='N' AND PIH.CONFIRMED ='Y' AND WT.REF_SER IN ('A-PICK') AND WT.WAVE_STATUS = 'V' " ;
......@@ -238,7 +238,7 @@ public class ReplTaskShowDetail extends ValidatorEJB implements ReplTaskShowDeta
pstmt.close();
pstmt = null;
sql = " SELECT COUNT (PH.PICK_ORDER) AS COUNT FROM PICK_ORD_HDR PH, WAVE_TASK W, WAVE_TASK_DET WT,PICK_ORD_DET PT WHERE W.WAVE_ID = WT.WAVE_ID AND PH.PICK_ORDER = WT.REF_ID " +
sql = " SELECT COUNT ( DISTINCT PH.PICK_ORDER) AS COUNT FROM PICK_ORD_HDR PH, WAVE_TASK W, WAVE_TASK_DET WT,PICK_ORD_DET PT WHERE W.WAVE_ID = WT.WAVE_ID AND PH.PICK_ORDER = WT.REF_ID " +
" AND PH.PICK_ORDER = PT.PICK_ORDER AND W.CANCEL ='N' AND WT.STATUS = 'N' AND WT.WAVE_STATUS = 'W' AND WT.REF_SER IN ('A-PICK') " ;
pstmt = conn.prepareStatement(sql);
rs = pstmt.executeQuery();
......@@ -337,7 +337,7 @@ public class ReplTaskShowDetail extends ValidatorEJB implements ReplTaskShowDeta
pstmt = null;
//Master Pack end.
//Hazmet Case Picking start
sql = " SELECT COUNT (PH.PICK_ORDER) AS COUNT FROM WAVE_TASK W, WAVE_TASK_DET WT, PICK_ORD_HDR PH,ITEM I,PICK_ORD_DET PT WHERE W.WAVE_ID = WT.WAVE_ID " +
sql = " SELECT COUNT ( DISTINCT PH.PICK_ORDER) AS COUNT FROM WAVE_TASK W, WAVE_TASK_DET WT, PICK_ORD_HDR PH,ITEM I,PICK_ORD_DET PT WHERE W.WAVE_ID = WT.WAVE_ID " +
" AND WT.REF_ID = PH.PICK_ORDER AND PH.PICK_ORDER = PT.PICK_ORDER AND PT.ITEM_CODE = I.ITEM_CODE AND I.HAZARDOUS ='Y' AND WT.WAVE_STATUS ='C' " +
" AND WT.STATUS = 'N' AND WT.REF_SER IN('C-PICK') " ;
pstmt = conn.prepareStatement(sql);
......@@ -351,7 +351,7 @@ public class ReplTaskShowDetail extends ValidatorEJB implements ReplTaskShowDeta
pstmt.close();
pstmt = null;
sql = " SELECT COUNT (PH.PICK_ORDER) AS COUNT FROM WAVE_TASK W, WAVE_TASK_DET WT, PICK_ORD_HDR PH,ITEM I,PICK_ORD_DET PT WHERE W.WAVE_ID = WT.WAVE_ID " +
sql = " SELECT COUNT ( DISTINCT PH.PICK_ORDER) AS COUNT FROM WAVE_TASK W, WAVE_TASK_DET WT, PICK_ORD_HDR PH,ITEM I,PICK_ORD_DET PT WHERE W.WAVE_ID = WT.WAVE_ID " +
" AND WT.REF_ID = PH.PICK_ORDER AND PH.PICK_ORDER = PT.PICK_ORDER AND PT.ITEM_CODE = I.ITEM_CODE AND I.HAZARDOUS ='Y' AND WT.WAVE_STATUS ='W' " +
" AND WT.STATUS ='N' AND WT.REF_SER IN('C-PICK') " ;
pstmt = conn.prepareStatement(sql);
......@@ -365,7 +365,7 @@ public class ReplTaskShowDetail extends ValidatorEJB implements ReplTaskShowDeta
pstmt.close();
pstmt = null;
sql = " SELECT COUNT (PH.PICK_ORDER) AS COUNT FROM WAVE_TASK W, WAVE_TASK_DET WT, PICK_ORD_HDR PH,ITEM I,PICK_ORD_DET PT WHERE W.WAVE_ID = WT.WAVE_ID " +
sql = " SELECT COUNT ( DISTINCT PH.PICK_ORDER) AS COUNT FROM WAVE_TASK W, WAVE_TASK_DET WT, PICK_ORD_HDR PH,ITEM I,PICK_ORD_DET PT WHERE W.WAVE_ID = WT.WAVE_ID " +
" AND WT.REF_ID = PH.PICK_ORDER AND PH.PICK_ORDER = PT.PICK_ORDER AND PT.ITEM_CODE = I.ITEM_CODE AND I.HAZARDOUS ='Y' AND WT.WAVE_STATUS ='V' " +
" AND WT.REF_SER IN('C-PICK') " ;
pstmt = conn.prepareStatement(sql);
......
webitm-wms/module-resource/sql/update.sql
View file @ a570eecd
......@@ -49993,6 +49993,16 @@ INSERT INTO obj_itemchange (
'ref_id',
NULL);
commit;
--changed by sankara on 14/10/14 update sql
update obj_forms set disp_metadata ='checkedImage@img<item_code>, <lot_no__fr>, <lot_sl__fr>, <quantity>, <unit>'
where win_name ='w_stocktransfer_multi_wiz'
and form_no ='3';
update obj_forms set disp_metadata ='checkedImage@img<lot_no__to>, <lot_sl__to>, <quantity>, <unit> = <loc_code__sys>'
where win_name ='w_stocktransfer_multi_wiz'
and form_no ='4';
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