Skip to content

B
business-java
Commit a424bba6 authored by ppatro's avatar ppatro
Browse files
Options

Parcel Picking 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@30699 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 037a086d
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1545 additions and 750 deletions
webitm-wms/ibase/webitm/ejb/wms/ConsolidatToDoc.java
View file @ a424bba6
......@@ -229,9 +229,11 @@ public class ConsolidatToDoc {
System.out.println("CURRENT KEY ["+key+"]");
//if(key.equalsIgnoreCase("P-TASK"))
//Changed By Pragyan 02/01/13 to check the consolidetion
// 23/09/12 manoharan M-PICK and M-PACK to considered together and split accordingly to number of M-PACK
//if("A-PICK".equalsIgnoreCase(key) || "C-PICK".equalsIgnoreCase(key) || "M-PICK".equalsIgnoreCase(key) || "M-PACK".equalsIgnoreCase(key) )
if("A-PICK".equalsIgnoreCase(key) || "C-PICK".equalsIgnoreCase(key))
//if("A-PICK".equalsIgnoreCase(key) || "C-PICK".equalsIgnoreCase(key))
if("A-PICK".equalsIgnoreCase(key) || "C-PICK".equalsIgnoreCase(key) || "P-PICK".equalsIgnoreCase(key))
{
//Changed by rohan on 10-08-12
//isPick = true;
......@@ -433,7 +435,8 @@ public class ConsolidatToDoc {
palletNo = rs.getString("CARTON_NO");
}
else if ( key.equalsIgnoreCase("P-TASK") || key.equalsIgnoreCase("A-PICK") || key.equalsIgnoreCase("C-PICK") || key.equalsIgnoreCase("M-PICK") || key.equalsIgnoreCase("M-PACK"))
//else if ( key.equalsIgnoreCase("P-TASK") || key.equalsIgnoreCase("A-PICK") || key.equalsIgnoreCase("C-PICK") || key.equalsIgnoreCase("M-PICK") || key.equalsIgnoreCase("M-PACK"))
else if ( key.equalsIgnoreCase("P-TASK") || key.equalsIgnoreCase("A-PICK") || key.equalsIgnoreCase("C-PICK") || key.equalsIgnoreCase("M-PICK") || key.equalsIgnoreCase("M-PACK") || key.equalsIgnoreCase("P-PICK"))
{
//Selecting loc_code__to from pick_iss_det
pstmtIss.setString(1, pickOrder);
......@@ -875,7 +878,8 @@ public class ConsolidatToDoc {
String keyList = (String)itr.next();
System.out.println("CURRENT KEY ["+keyList+"]");
if("A-PICK".equalsIgnoreCase(keyList) || "C-PICK".equalsIgnoreCase(keyList))
//if("A-PICK".equalsIgnoreCase(keyList) || "C-PICK".equalsIgnoreCase(keyList))
if("A-PICK".equalsIgnoreCase(keyList) || "C-PICK".equalsIgnoreCase(keyList) || "P-PICK".equalsIgnoreCase(keyList))
{
sql2 = " SELECT P.ITEM_CODE,PO.WAVE_ID "+
......@@ -1319,7 +1323,8 @@ public class ConsolidatToDoc {
String key = (String)it.next();
System.out.println("Key ["+key+"]");
if(key.equalsIgnoreCase("P-TASK") || key.equalsIgnoreCase("C-PICK"))
//if(key.equalsIgnoreCase("P-TASK") || key.equalsIgnoreCase("C-PICK"))
if(key.equalsIgnoreCase("P-TASK") || key.equalsIgnoreCase("C-PICK") || key.equalsIgnoreCase("P-PICK"))
{
sql = "select status from pick_ord_hdr where pick_order = ? ";
......@@ -1362,7 +1367,8 @@ public class ConsolidatToDoc {
if(rs.next())
{
if(key.equalsIgnoreCase("P-TASK") || key.equalsIgnoreCase("C-PICK") ) //added by Kunal on 11/09/12
//if(key.equalsIgnoreCase("P-TASK") || key.equalsIgnoreCase("C-PICK") ) //added by Kunal on 11/09/12
if(key.equalsIgnoreCase("P-TASK") || key.equalsIgnoreCase("C-PICK") || key.equalsIgnoreCase("P-PICK") ) //added by Kunal on 11/09/12
{
status = rs.getString("status");
if(!"C".equalsIgnoreCase(status))
......
webitm-wms/ibase/webitm/ejb/wms/DespEditPrc.java
View file @ a424bba6
......@@ -232,7 +232,8 @@ public class DespEditPrc extends ProcessEJB implements DespEditPrcLocal,DespEdit
+ " AND W.WAVE_ID = WH.WAVE_ID "
+ " AND W.REF_ID = D.PICK_ORDER "
+ " AND D.PICK_ORDER = DD.PICK_ORDER "
+ " AND W.REF_SER IN( 'A-PICK','C-PICK','M-PICK') "
//+ " AND W.REF_SER IN( 'A-PICK','C-PICK','M-PICK') "
+ " AND W.REF_SER IN( 'A-PICK','C-PICK','M-PICK','P-PICK') "
+ " AND CASE WHEN D.STATUS IS NULL THEN 'O' ELSE D.STATUS END = 'O' "
+ " AND CASE WHEN WH.CANCEL IS NULL THEN 'N' ELSE WH.CANCEL END = 'N' "
+ " AND S.SITE_CODE = ? "
......
webitm-wms/ibase/webitm/ejb/wms/WaveCancelEJB.java
View file @ a424bba6
......@@ -285,7 +285,8 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
System.out.println("Curren refser:"+refSer+"REF_ID"+refId);
if(refSer.equalsIgnoreCase("C-PICK") || refSer.equalsIgnoreCase("M-PICK") || refSer.equalsIgnoreCase("A-PICK") || refSer.trim().equalsIgnoreCase("S-DOC") || refSer.equalsIgnoreCase("RP-PND") || refSer.equalsIgnoreCase("RP-PSO"))
//if(refSer.equalsIgnoreCase("C-PICK") || refSer.equalsIgnoreCase("M-PICK") || refSer.equalsIgnoreCase("A-PICK") || refSer.trim().equalsIgnoreCase("S-DOC") || refSer.equalsIgnoreCase("RP-PND") || refSer.equalsIgnoreCase("RP-PSO"))
if(refSer.equalsIgnoreCase("C-PICK") || refSer.equalsIgnoreCase("M-PICK") || refSer.equalsIgnoreCase("A-PICK") || refSer.equalsIgnoreCase("P-PICK") || refSer.trim().equalsIgnoreCase("S-DOC") || refSer.equalsIgnoreCase("RP-PND") || refSer.equalsIgnoreCase("RP-PSO"))
{
if(refSer.trim().equalsIgnoreCase("S-DOC") || refSer.equalsIgnoreCase("RP-PND") || refSer.equalsIgnoreCase("RP-PSO"))
{
......@@ -368,13 +369,14 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
System.out.println("Replenishment updated with actual quantity "+quantity+" For replenishment oder :"+replOrder +" and line no :"+replLineNo);
}
//to check pick type
//if(refSer.equalsIgnoreCase("C-PICK"))
if(refSer.equalsIgnoreCase("C-PICK"))
{
locCode = locCodeTo;
System.out.println("Caspick loc code"+locCode);
break;
}
else if(refSer.equalsIgnoreCase("M-PICK") || refSer.equalsIgnoreCase("A-PICK"))
else if(refSer.equalsIgnoreCase("M-PICK") || refSer.equalsIgnoreCase("A-PICK") || refSer.equalsIgnoreCase("P-PICK"))
{
//to check transfer status
if("Y".equalsIgnoreCase(transferStatus))
......@@ -385,7 +387,7 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
else
{
//stock allocate from staging location
if(refSer.equalsIgnoreCase("M-PICK"))
if(refSer.equalsIgnoreCase("M-PICK") || refSer.equalsIgnoreCase("P-PICK"))
{
locCode = stagingLocMpick;
break;
......
webitm-wms/module-resource/sql/update.sql
View file @ a424bba6
......@@ -36839,6 +36839,64 @@ D.TRAN_CODE FROM WAVE_TASK_DET W, DESPATCH D , WAVE_TASK T WHERE REF_ID =
D.DESP_ID AND D.CONFIRMED != 'Y' AND W.WAVE_ID = T.WAVE_ID AND T.CANCEL <>
'Y''
WHERE MOD_NAME = 'W_SHIPMENT' and FIELD_NAME = 'PTCN';
---added by Ashish Meheta On 03/12/13 not to deliver
--Alter for PARCELPACK_ALLOW for wave_type table
ALTER TABLE WAVE_TYPE
ADD PARCELPACK_ALLOW CHAR(1);
-- RENAMING ORIGNAL TABLE
alter table DISTROUTEDET RENAME TO DISTROUTEDET_RENAMED ;
-- ADDING MAX_CASE AND MIN_CASE TO DISTROUTEDET_RENAMED TABLE
ALTER TABLE DISTROUTEDET_RENAMED ADD MIN_CASE NUMBER(6);
ALTER TABLE DISTROUTEDET_RENAMED ADD MAX_CASE NUMBER(6);
-- UPDATING ALL MIN_CASE AS O AND MAX_CASE 55555
UPDATE DISTROUTEDET_RENAMED SET MIN_CASE = 0, MAX_CASE = 99999;
COMMIT;
-- CREATING TABLE
CREATE TABLE DISTROUTEDET(
DIST_ROUTE CHAR(5) NOT NULL,
LINE_NO NUMBER(3,0) NOT NULL,
STAN_CODE__FR CHAR(5) NOT NULL,
STAN_CODE__TO CHAR(5) NOT NULL,
TRAN_CODE CHAR(10) NOT NULL,
FRT_AMT NUMBER(12,3),
CURR_CODE CHAR(5),
TRAN_TIME NUMBER(12,3),
EXCH_RATE NUMBER(14,6),
TRANS_MODE CHAR(1),
MAX_WEIGHT NUMBER(14,6) NOT NULL,
MIN_WEIGHT NUMBER(14,6) NOT NULL,
MIN_CASE NUMBER(6) NOT NULL,
MAX_CASE NUMBER(6) NOT NULL,
STATE_CODE__TO CHAR(5) NOT NULL,
STATE_CODE__FR CHAR(5) NOT NULL,
LOC_TYPE CHAR(3),
PIN__FR VARCHAR2(15) NOT NULL,
PIN__TO VARCHAR2(15) NOT NULL
) ;
ALTER TABLE DISTROUTEDET ADD ( CONSTRAINT DISROUTEDET_N_X PRIMARY KEY ( DIST_ROUTE, LINE_NO )) ;
--COPPING RECORD FROM ORGNAL TABLE
INSERT INTO DISTROUTEDET
(
DIST_ROUTE , LINE_NO , STAN_CODE__FR , STAN_CODE__TO , TRAN_CODE , FRT_AMT , CURR_CODE , TRAN_TIME , EXCH_RATE ,
TRANS_MODE , MAX_WEIGHT , MIN_WEIGHT , MIN_CASE, MAX_CASE, STATE_CODE__TO , STATE_CODE__FR , LOC_TYPE , PIN__FR , PIN__TO
)
SELECT DIST_ROUTE , LINE_NO , STAN_CODE__FR , STAN_CODE__TO , TRAN_CODE , FRT_AMT , CURR_CODE , TRAN_TIME , EXCH_RATE ,
TRANS_MODE , MAX_WEIGHT , MIN_WEIGHT ,MIN_CASE, MAX_CASE, STATE_CODE__TO , STATE_CODE__FR , LOC_TYPE , PIN__FR , PIN__TO
FROM DISTROUTEDET_RENAMED ;
COMMIT;
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