Parcel Picking

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@92469 ce508802-f39f-4f6c-b175-0d175dae99d5

webitm-wms/ibase/webitm/ejb/wms/ConsolidatToDoc.java

@@ -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

@@ -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

@@ -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/ibase/webitm/ejb/wms/WaveGenerationIC.java

@@ -127,6 +127,7 @@ etc
 		String saleOrderTo = "";
 		String printLabel = "";//Added by sumit on 24/11/12
 		String waveMode = ""; //Added by sumit 06/12/12
+		String parcelPackAllow = "";//Addded by sumit 20/12/12
 		
 		try
 		{
@@ -180,6 +181,12 @@ etc
 						valueXmlString.append( "<print_label protect ='1'><![CDATA[" ).append( "" ).append( "]]></print_label>\r\n" );
 						valueXmlString.append( "<printer_name protect ='1'><![CDATA[" ).append( "" ).append( "]]></printer_name>\r\n" );						
 						//Changed by sumit on 18/09/12 adding print_label and printer name end.
+						
+						//Changed by sumit on 29/12/12 adding parcel packing start.
+						valueXmlString.append( "<parcelpack_allow protect ='1'><![CDATA[" ).append( "" ).append( "]]></parcelpack_allow>\r\n" );
+						valueXmlString.append( "<master_override><![CDATA[" ).append( "N" ).append( "]]></master_override>\r\n" );
+						valueXmlString.append( "<parcel_override><![CDATA[" ).append( "N" ).append( "]]></parcel_override>\r\n" );
+						//Changed by sumit on 29/12/12 adding parcel packing end.
 						valueXmlString.append( "</Detail1>\r\n" );
 					}
 					//Changed By Pragyan 21/06/12 Statrt
@@ -198,7 +205,7 @@ etc
 								System.out.println("Hello sale_order__from2");
 								//Changed by sumit 20/09/12 getting cust code start.								
 								//sSQL = "SELECT DUE_DATE FROM SORDER WHERE SALE_ORDER = ?";
-								sSQL = " SELECT S.DUE_DATE,C.CUST_CODE, C.SINGLE_LOT, W.MASTER_PACK_ALLOW, W.ACTIVE_PICK_ALLOW, W.STOCK_TO_DOCK_ALLOW " +
+								sSQL = " SELECT S.DUE_DATE,C.CUST_CODE, C.SINGLE_LOT, W.MASTER_PACK_ALLOW, W.ACTIVE_PICK_ALLOW, W.STOCK_TO_DOCK_ALLOW, W.PARCELPACK_ALLOW " +
 										" FROM SORDER S, CUSTOMER C, WAVE_TYPE W  WHERE SALE_ORDER = ? " +
 										" AND C.CUST_CODE = S.CUST_CODE " +
 										" AND C.WAVE_TYPE = W.WAVE_TYPE ";
@@ -215,6 +222,7 @@ etc
 									masterPackAllow = rs.getString("MASTER_PACK_ALLOW");
 									activePickAllow = rs.getString("ACTIVE_PICK_ALLOW");
 									stockToDockAllow = rs.getString("STOCK_TO_DOCK_ALLOW");
+									parcelPackAllow = rs.getString("PARCELPACK_ALLOW");
 								}
 								
 								if(dateFrom != null)
@@ -234,6 +242,7 @@ etc
 										valueXmlString.append( "<master_pack_allow protect ='0' ><![CDATA[" ).append( checkNull(masterPackAllow) ).append( "]]></master_pack_allow>\r\n" );
 										valueXmlString.append( "<active_pick_allow protect ='0' ><![CDATA[" ).append( checkNull(activePickAllow) ).append( "]]></active_pick_allow>\r\n" );
 										valueXmlString.append( "<stock_to_dock_allow protect ='0' ><![CDATA[" ).append( checkNull(stockToDockAllow) ).append( "]]></stock_to_dock_allow>\r\n" );
+										valueXmlString.append( "<parcelpack_allow protect ='0' ><![CDATA[" ).append( checkNull(parcelPackAllow) ).append( "]]></parcelpack_allow>\r\n" );
 									}
 									else
 									{
@@ -243,6 +252,7 @@ etc
 										valueXmlString.append( "<master_pack_allow protect ='1' ><![CDATA[" ).append( "" ).append( "]]></master_pack_allow>\r\n" );
 										valueXmlString.append( "<active_pick_allow protect ='1' ><![CDATA[" ).append( "" ).append( "]]></active_pick_allow>\r\n" );
 										valueXmlString.append( "<stock_to_dock_allow protect ='1' ><![CDATA[" ).append( "" ).append( "]]></stock_to_dock_allow>\r\n" );		
+										valueXmlString.append( "<parcelpack_allow protect ='1' ><![CDATA[" ).append( "" ).append( "]]></parcelpack_allow>\r\n" );
 									}
 									System.out.println("Hello sale_order__from4");
 									if(pstmt!=null)
@@ -266,6 +276,7 @@ etc
 									valueXmlString.append( "<master_pack_allow protect ='1' ><![CDATA[" ).append( "" ).append( "]]></master_pack_allow>\r\n" );
 									valueXmlString.append( "<active_pick_allow protect ='1' ><![CDATA[" ).append( "" ).append( "]]></active_pick_allow>\r\n" );
 									valueXmlString.append( "<stock_to_dock_allow protect ='1' ><![CDATA[" ).append( "" ).append( "]]></stock_to_dock_allow>\r\n" );
+									valueXmlString.append( "<parcelpack_allow protect ='1' ><![CDATA[" ).append( "" ).append( "]]></parcelpack_allow>\r\n" );
 								}
 							}
 							else
@@ -279,6 +290,7 @@ etc
 								valueXmlString.append( "<active_pick_allow protect ='1' ><![CDATA[" ).append( "" ).append( "]]></active_pick_allow>\r\n" );
 								valueXmlString.append( "<stock_to_dock_allow protect ='1' ><![CDATA[" ).append( "" ).append( "]]></stock_to_dock_allow>\r\n" );
 								//Changed by sumit on 20/09/12 setting value of cust_code__to in case of no data.								
+								valueXmlString.append( "<parcelpack_allow protect ='1' ><![CDATA[" ).append( "" ).append( "]]></parcelpack_allow>\r\n" );
 							}
 							valueXmlString.append( "</Detail1>\r\n" );
 						
@@ -299,7 +311,9 @@ etc
 								System.out.println("Hello sale_order__from2");
 								//Changed by sumit 20/09/12 getting cust code start.								
 								//sSQL = "SELECT DUE_DATE FROM SORDER WHERE SALE_ORDER = ?";
-								sSQL = " SELECT S.DUE_DATE,C.CUST_CODE, C.SINGLE_LOT, W.MASTER_PACK_ALLOW, W.ACTIVE_PICK_ALLOW, W.STOCK_TO_DOCK_ALLOW " +
+								//Changed by sumit 20/09/12 getting cust code start.								
+								//sSQL = "SELECT DUE_DATE FROM SORDER WHERE SALE_ORDER = ?";
+								sSQL = " SELECT S.DUE_DATE,C.CUST_CODE, C.SINGLE_LOT, W.MASTER_PACK_ALLOW, W.ACTIVE_PICK_ALLOW, W.STOCK_TO_DOCK_ALLOW, W.PARCELPACK_ALLOW " +
 										" FROM SORDER S, CUSTOMER C, WAVE_TYPE W  WHERE SALE_ORDER = ? " +
 										" AND C.CUST_CODE = S.CUST_CODE " +
 										" AND C.WAVE_TYPE = W.WAVE_TYPE ";
@@ -316,6 +330,7 @@ etc
 									masterPackAllow = rs.getString("MASTER_PACK_ALLOW");
 									activePickAllow = rs.getString("ACTIVE_PICK_ALLOW");
 									stockToDockAllow = rs.getString("STOCK_TO_DOCK_ALLOW");
+									parcelPackAllow = rs.getString("PARCELPACK_ALLOW");
 								}
 								if(dateFrom != null)
 								{						
@@ -333,6 +348,7 @@ etc
 										valueXmlString.append( "<master_pack_allow protect ='0' ><![CDATA[" ).append( checkNull(masterPackAllow) ).append( "]]></master_pack_allow>\r\n" );
 										valueXmlString.append( "<active_pick_allow protect ='0' ><![CDATA[" ).append( checkNull(activePickAllow) ).append( "]]></active_pick_allow>\r\n" );
 										valueXmlString.append( "<stock_to_dock_allow protect ='0' ><![CDATA[" ).append( checkNull(stockToDockAllow) ).append( "]]></stock_to_dock_allow>\r\n" );
+										valueXmlString.append( "<parcelpack_allow protect ='0' ><![CDATA[" ).append( checkNull(parcelPackAllow) ).append( "]]></parcelpack_allow>\r\n" );
 									}
 									else
 									{	
@@ -342,6 +358,7 @@ etc
 										valueXmlString.append( "<master_pack_allow protect ='1' ><![CDATA[" ).append( "" ).append( "]]></master_pack_allow>\r\n" );
 										valueXmlString.append( "<active_pick_allow protect ='1' ><![CDATA[" ).append( "" ).append( "]]></active_pick_allow>\r\n" );
 										valueXmlString.append( "<stock_to_dock_allow protect ='1' ><![CDATA[" ).append( "" ).append( "]]></stock_to_dock_allow>\r\n" );	
+										valueXmlString.append( "<parcelpack_allow protect ='1' ><![CDATA[" ).append( "" ).append( "]]></parcelpack_allow>\r\n" );
 									}
 									//System.out.println("Hello sale_order__from4");
 								}
@@ -355,6 +372,7 @@ etc
 									valueXmlString.append( "<master_pack_allow protect ='1' ><![CDATA[" ).append( "" ).append( "]]></master_pack_allow>\r\n" );
 									valueXmlString.append( "<active_pick_allow protect ='1' ><![CDATA[" ).append( "" ).append( "]]></active_pick_allow>\r\n" );
 									valueXmlString.append( "<stock_to_dock_allow protect ='1' ><![CDATA[" ).append( "" ).append( "]]></stock_to_dock_allow>\r\n" );
+									valueXmlString.append( "<parcelpack_allow protect ='1' ><![CDATA[" ).append( "" ).append( "]]></parcelpack_allow>\r\n" );
 									
 								}
 								
@@ -381,6 +399,7 @@ etc
 								valueXmlString.append( "<master_pack_allow protect ='1' ><![CDATA[" ).append( "" ).append( "]]></master_pack_allow>\r\n" );
 								valueXmlString.append( "<active_pick_allow protect ='1' ><![CDATA[" ).append( "" ).append( "]]></active_pick_allow>\r\n" );
 								valueXmlString.append( "<stock_to_dock_allow protect ='1' ><![CDATA[" ).append( "" ).append( "]]></stock_to_dock_allow>\r\n" );
+								valueXmlString.append( "<parcelpack_allow protect ='1' ><![CDATA[" ).append( "" ).append( "]]></parcelpack_allow>\r\n" );
 							}
 							valueXmlString.append( "</Detail1>\r\n" );
 						
@@ -830,6 +849,39 @@ etc
 							}
 						}
 					}
+					else if ( "parcelpack_allow".equalsIgnoreCase( childNodeName ) )
+					{
+						stockToDockAllow = checkNull(genericUtility.getColumnValue( "parcelpack_allow", currFormDataDom ));
+						custCode = genericUtility.getColumnValue( "cust_code__from", currFormDataDom );
+						if(stockToDockAllow.trim().length() > 0 )
+						{
+							sql = 	"SELECT C.SINGLE_LOT, W.MASTER_PACK_ALLOW, W.ACTIVE_PICK_ALLOW, W.STOCK_TO_DOCK_ALLOW, W.PARCELPACK_ALLOW " +
+									"FROM CUSTOMER C, WAVE_TYPE W WHERE C.WAVE_TYPE = W.WAVE_TYPE AND C.CUST_CODE = ? ";
+							pstmt = conn.prepareStatement(sql);
+							pstmt.setString(1, custCode);
+							rs = pstmt.executeQuery();
+							if( rs.next())
+							{								
+								if( !stockToDockAllow.equalsIgnoreCase(rs.getString("PARCELPACK_ALLOW")))
+								{
+									//errList.add( "STOCK2DOC" );
+									errFields.add( childNodeName.toLowerCase() );
+									errList.add( "CHSINGLELT" );
+									//errFields.add( "" );
+								}
+							}
+							if( rs != null )
+							{
+								rs.close();
+								rs = null;
+							}
+							if( pstmt != null )
+							{
+								pstmt.close();
+								pstmt = null;								
+							}
+						}
+					}
 					//Changed by sumit on 03/10/12 validating printer service name with existing printer in system start.
 					//Changed by sumit on 24/11/12 changing field name 
 					//else if ( "printer".equalsIgnoreCase( childNodeName ) )

webitm-wms/module-resource/sql/update.sql

@@ -36840,5 +36840,63 @@ 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;